@nakamura-123/pages 0.1.45 → 0.1.47

package/dist/component/Coin/CoinCheck.d.ts

@@ -1,7 +1,7 @@
 import { Storage } from "@nakamura-123/types";
 export declare const coinCheckFnc: import("@reduxjs/toolkit").AsyncThunk<void, string, {
     state?: unknown;
-    dispatch?: import("redux").Dispatch<import("redux").AnyAction> | undefined;
+    dispatch?: import("redux").Dispatch;
     extra?: unknown;
     rejectValue?: unknown;
     serializedErrorType?: unknown;

package/dist/component/Coin/CoinCheck.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
@@ -42,26 +42,24 @@ var toolkit_1 = require("@reduxjs/toolkit");
 var CoinFnc_1 = require("./CoinFnc");
 var stores_1 = require("@nakamura-123/stores");
 // 00.メイン関数
-exports.coinCheckFnc = (0, toolkit_1.createAsyncThunk)("coin/check", function (allFreeId, _a) {
-    var dispatch = _a.dispatch;
-    return __awaiter(void 0, void 0, void 0, function () {
-        var receipts, isExistedId;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0: return [4 /*yield*/, (0, CoinFnc_1.restorePurchases)(dispatch, false)];
-                case 1:
-                    receipts = _b.sent();
-                    isExistedId = hasPurchasedItems(receipts, allFreeId);
-                    if (!isExistedId) {
-                        // 返金などをされていて、flaseの場合、このIDのアイテムを削除し、store更新
-                        stores_1.coinStorage.removePurchasedItem(allFreeId);
-                        dispatch({ type: "setting/updateAllFreeState", payload: "none" });
-                    }
-                    return [2 /*return*/];
-            }
-        });
+exports.coinCheckFnc = (0, toolkit_1.createAsyncThunk)("coin/check", function (allFreeId_1, _a) { return __awaiter(void 0, [allFreeId_1, _a], void 0, function (allFreeId, _b) {
+    var receipts, isExistedId;
+    var dispatch = _b.dispatch;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
+            case 0: return [4 /*yield*/, (0, CoinFnc_1.restorePurchases)(dispatch, false)];
+            case 1:
+                receipts = _c.sent();
+                isExistedId = hasPurchasedItems(receipts, allFreeId);
+                if (!isExistedId) {
+                    // 返金などをされていて、flaseの場合、このIDのアイテムを削除し、store更新
+                    stores_1.coinStorage.removePurchasedItem(allFreeId);
+                    dispatch({ type: "setting/updateAllFreeState", payload: "none" });
+                }
+                return [2 /*return*/];
+        }
     });
-});
+}); });
 // 91.　復元を行い、チェックが必要か判定
 var isCheckRequired = function (allFreeState, lastCheckedDate, isCompoleteFree) {
     if (isCompoleteFree)

package/dist/component/Coin/CoinFnc.d.ts

@@ -1,4 +1,4 @@
-import RNIap, { Product, ProductPurchase } from "react-native-iap";
+import RNIap, { ProductPurchase } from "react-native-iap";
 import { Storage } from "@nakamura-123/types";
 export declare const initializeIAP: (paymentItems: string[] | undefined, setProducts: (products: RNIap.Product[]) => void, setLoading: (loading: boolean) => void) => Promise<void>;
 export declare const handlePurchase: (productId: string, dispatch: (action: any) => void) => Promise<ProductPurchase | null>;

package/dist/component/Coin/CoinFnc.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");

package/dist/component/Grade/ShareBtn.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");

package/dist/component/OnlineInput/PasswardModal.js

@@ -32,8 +32,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");

package/dist/component/OnlineInput/PasswordIdModal.js

@@ -32,8 +32,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");

package/dist/functions/badgeDailyFnc.d.ts

@@ -12,4 +12,5 @@ type DailyData = {
 export declare const checkDaily: (dailyData: DailyData, info: BadgeInfo) => boolean;
 export declare const addDailyBadgeTitleInfo: (badge: BadgeInfo, t: any) => BadgeInfo;
 export declare const getDailyLogData: (DailyDB: RD) => DailyData;
+export declare const getBestDailyLogData: (DailyDB: RD) => DailyData;
 export {};

package/dist/functions/badgeDailyFnc.js

@@ -11,7 +11,7 @@ var __assign = (this && this.__assign) || function () {
     return __assign.apply(this, arguments);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDailyLogData = exports.addDailyBadgeTitleInfo = exports.checkDaily = void 0;
+exports.getBestDailyLogData = exports.getDailyLogData = exports.addDailyBadgeTitleInfo = exports.checkDaily = void 0;
 var lib_1 = require("@nakamura-123/lib");
 var gradeFnc_1 = require("./gradeFnc");
 // デイリーバッジの取得条件を確認
@@ -39,7 +39,7 @@ var addDailyBadgeTitleInfo = function (badge, t) {
     return __assign(__assign({}, badge), { title: title, subject: "daily", category: fnc });
 };
 exports.addDailyBadgeTitleInfo = addDailyBadgeTitleInfo;
-// デイリーログの情報を取得
+// # 今日時点のデイリーログの情報を取得
 var getDailyLogData = function (DailyDB) {
     // 今日の問題数取得
     var today = lib_1.timeFnc.getToday();
@@ -61,3 +61,22 @@ var getDailyLogData = function (DailyDB) {
     };
 };
 exports.getDailyLogData = getDailyLogData;
+// # 過去も含めてすべてのデイリーログ情報からベストデータを取得
+var getBestDailyLogData = function (DailyDB) {
+    // rd 1. 1日の最高問題数
+    var maxQuizCntLog = (0, gradeFnc_1.findMaxQuizCntLog)(DailyDB);
+    var maxQuizCnt = maxQuizCntLog ? maxQuizCntLog.quizCnt : 0;
+    // rd 2. 週間の最高問題数
+    var weeklyMaxQuizCnt = (0, gradeFnc_1.getMaxWeeklyQuizCnt)(DailyDB);
+    // rd 3. 通算問題数を取得
+    var totalCnt = (0, gradeFnc_1.getTotalQuizCnt)(DailyDB);
+    // rd 4. 通算学習日数を取得
+    var longestConsecutiveDays = (0, gradeFnc_1.getLongestConsecutiveStudyDays)(DailyDB);
+    return {
+        today: maxQuizCnt,
+        weekly: weeklyMaxQuizCnt,
+        total: totalCnt,
+        consecutive: longestConsecutiveDays,
+    };
+};
+exports.getBestDailyLogData = getBestDailyLogData;

package/dist/functions/badgeFnc.d.ts

@@ -11,5 +11,5 @@ type Selected = QSelected.Selected;
 type BadgeInfo = badgeSet.BadgeInfo;
 export declare const checkBasicBadge: (BadgeDB: RB, MiniDB: RM, selected: Selected) => BadgeInfo[];
 export declare const checkTestBadge: (BadgeDB: RB, TestDB: RT, selected: Selected) => BadgeInfo[];
-export declare const checkDailyLogBadge: (BadgeDB: RB, DailyLogDB: RD, t: any) => BadgeInfo[];
+export declare const checkDailyLogBadge: (BadgeDB: RB, DailyLogDB: RD, t: any, isPast?: boolean) => BadgeInfo[];
 export {};

package/dist/functions/badgeFnc.js

@@ -51,20 +51,20 @@ var checkTestBadge = function (BadgeDB, TestDB, selected) {
 };
 exports.checkTestBadge = checkTestBadge;
 // # 3.デイリーログのバッジを取得
-var checkDailyLogBadge = function (BadgeDB, DailyLogDB, t) {
-    // ### 01.未取得のバッジinfoを配列で取得
+var checkDailyLogBadge = function (BadgeDB, DailyLogDB, t, isPast) {
+    if (isPast === void 0) { isPast = false; }
+    // rd 01.未取得のバッジinfoを配列で取得
     var collectedBadges = (0, badgeFilter_1.filterDailyLogBadge)(BadgeDB);
     var missingBadgeInfos = (0, badgeBasicFnc_1.getMissingDailyBadgeInfos)(collectedBadges);
-    // ### 02.デイリーログの情報を取得(今日の問題数、今週の問題数、累計問題数、連続日数)
-    var dailyLogData = (0, badgeDailyFnc_1.getDailyLogData)(DailyLogDB);
-    console.log("collectedBadges", collectedBadges);
-    console.log("dailyLogData", dailyLogData);
-    console.log("missingBadgeInfos", missingBadgeInfos);
-    // ### 03.取得条件を満たしているバッジを判定
+    // rd 02.デイリーログの情報を取得(今日の問題数、今週の問題数、累計問題数、連続日数)
+    var dailyLogData = isPast
+        ? (0, badgeDailyFnc_1.getBestDailyLogData)(DailyLogDB)
+        : (0, badgeDailyFnc_1.getDailyLogData)(DailyLogDB);
+    // rd 03.取得条件を満たしているバッジを判定
     var eligibleBadges = missingBadgeInfos.filter(function (info) {
         return (0, badgeDailyFnc_1.checkDaily)(dailyLogData, info);
     });
-    // ### 04.タイトルなどの必要情報を挿入
+    // rd 04.タイトルなどの必要情報を挿入
     eligibleBadges = eligibleBadges.map(function (badge) {
         return (0, badgeDailyFnc_1.addDailyBadgeTitleInfo)(badge, t);
     });

package/dist/functions/createQuizFncD.d.ts

@@ -1,18 +1,11 @@
-import { QuizInitial } from "@nakamura-123/stores";
+import { CfgInitial, QuizInitial } from "@nakamura-123/stores";
 import { Store } from "@nakamura-123/types";
 import { QRD } from "../types/filterType";
+type startCfg = CfgInitial["startCfg"];
 type Selected = QuizInitial["selected"];
-export declare const getBasicQuizList: (QuestionDB: QRD, startCfg: {
-    tags: import("@nakamura-123/types/dist/types/libType").LevelNames[];
-    option: import("@nakamura-123/lib/dist/config/startOption").StoreStartOptions;
-    outOfYearRange: number[];
-}, selected: Selected) => Store.DQInStore[];
+export declare const getBasicQuizList: (QuestionDB: QRD, startCfg: startCfg, selected: Selected) => Store.DQInStore[];
 export declare const getMiniTestQuestions: (QuestionDB: QRD, subjectType: "unit" | "year", key: number, cnt: number, outOfYearRange: number[]) => Store.DQInStore[];
 export declare const getTestQuestions: (QuestionDB: QRD, cnt: number) => Store.DQInStore[];
 export declare const getTestQuestionsByUnit: (QuestionDB: QRD, cnt: number, unit: number[]) => Store.DQInStore[];
-export declare const getBootQuestions: (QuestionDB: QRD, startCfg: {
-    tags: import("@nakamura-123/types/dist/types/libType").LevelNames[];
-    option: import("@nakamura-123/lib/dist/config/startOption").StoreStartOptions;
-    outOfYearRange: number[];
-}, outOfUnitRange: number[], outOfYearRange: number[]) => Store.DQInStore[];
+export declare const getBootQuestions: (QuestionDB: QRD, startCfg: startCfg, outOfUnitRange: number[], outOfYearRange: number[]) => Store.DQInStore[];
 export {};

package/dist/functions/gradeFnc.d.ts

@@ -13,5 +13,6 @@ export declare const findMaxQuizCntLog: (DailyDB: RD) => DailyLogSchema | null;
 export declare const getTotalQuizCnt: (DailyLogDB: RD) => number;
 export declare const getConsecutiveStudyDays: (DailyLogDB: RD) => number;
 export declare const getLongestConsecutiveStudyDays: (DailyLogDB: RD) => number;
+export declare const getMaxWeeklyQuizCnt: (DailyLogDB: RD, weeks?: number) => number;
 export declare const promptStoreReview: () => Promise<void>;
 export {};

package/dist/functions/gradeFnc.js

@@ -32,8 +32,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
@@ -62,10 +62,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.promptStoreReview = exports.getLongestConsecutiveStudyDays = exports.getConsecutiveStudyDays = exports.getTotalQuizCnt = exports.findMaxQuizCntLog = exports.getWeeklyCnts = exports.formatTodayLog = void 0;
+exports.promptStoreReview = exports.getMaxWeeklyQuizCnt = exports.getLongestConsecutiveStudyDays = exports.getConsecutiveStudyDays = exports.getTotalQuizCnt = exports.findMaxQuizCntLog = exports.getWeeklyCnts = exports.formatTodayLog = void 0;
 var dayjs_1 = __importDefault(require("dayjs"));
 var StoreReview = __importStar(require("expo-store-review"));
-//  (day)指定した日の1日のログを整形して返す
+// # (day)指定した日の1日のログを整形して返す
 var formatTodayLog = function (todayLog) {
     var quizCnt = (todayLog === null || todayLog === void 0 ? void 0 : todayLog.quizCnt) || 0;
     var targetCnt = (todayLog === null || todayLog === void 0 ? void 0 : todayLog.targetCnt) || 0;
@@ -74,7 +74,7 @@ var formatTodayLog = function (todayLog) {
     return { quizCnt: quizCnt, targetCnt: targetCnt, isAchieved: isAchieved, isNotified: isNotified };
 };
 exports.formatTodayLog = formatTodayLog;
-// 1週間の各日に、何問解いたかをweeklyDaysの日付から順に配列で返す。
+// # 1週間の各日に、何問解いたかをweeklyDaysの日付から順に配列で返す。
 var getWeeklyCnts = function (DailyLog, weeklyDays) {
     return weeklyDays.map(function (day) {
         var date = day.toDate();
@@ -83,20 +83,20 @@ var getWeeklyCnts = function (DailyLog, weeklyDays) {
     });
 };
 exports.getWeeklyCnts = getWeeklyCnts;
-// 1日の最大問題数を持つログを取得
+// # 1日の最大問題数を持つログを取得
 var findMaxQuizCntLog = function (DailyDB) {
     // すべてのレコードを取得
     var allLogs = DailyDB.sorted("quizCnt", true); // quizCntで降順にソート
     return allLogs.length > 0 ? allLogs[0] : null; // 最初のレコードが最大値を持つ
 };
 exports.findMaxQuizCntLog = findMaxQuizCntLog;
-// 全期間の問題数の通算を算出する
+// # 全期間の問題数の通算を算出する
 var getTotalQuizCnt = function (DailyLogDB) {
     return DailyLogDB.reduce(function (total, log) { return total + (log.quizCnt || 0); }, 0);
 };
 exports.getTotalQuizCnt = getTotalQuizCnt;
 //
-// 連続学習日数を取得
+// # 連続学習日数を取得
 var getConsecutiveStudyDays = function (DailyLogDB) {
     var today = (0, dayjs_1.default)(); // 現在の日付を取得
     var dailyLogs = DailyLogDB.sorted("date", true); // 日付で降順にソート
@@ -141,6 +141,25 @@ var getLongestConsecutiveStudyDays = function (DailyLogDB) {
     return longestStreak;
 };
 exports.getLongestConsecutiveStudyDays = getLongestConsecutiveStudyDays;
+// # 指定した週数分の各週の合計問題数の最大値を返す
+var getMaxWeeklyQuizCnt = function (DailyLogDB, weeks) {
+    if (weeks === void 0) { weeks = 20; }
+    var today = (0, dayjs_1.default)();
+    var maxCnt = 0;
+    for (var i = 0; i < weeks; i++) {
+        var weekStart = today.subtract(i, "week").startOf("week").add(1, "day");
+        var weekEnd = today.subtract(i, "week").endOf("week").add(1, "day");
+        // その週のログを抽出
+        var weekLogs = DailyLogDB.filtered("date >= $0 && date <= $1", weekStart.toDate(), weekEnd.toDate());
+        // その週のquizCnt合計
+        var weekCnt = weekLogs.reduce(function (sum, log) { return sum + (log.quizCnt || 0); }, 0);
+        if (weekCnt > maxCnt) {
+            maxCnt = weekCnt;
+        }
+    }
+    return maxCnt;
+};
+exports.getMaxWeeklyQuizCnt = getMaxWeeklyQuizCnt;
 var promptStoreReview = function () { return __awaiter(void 0, void 0, void 0, function () {
     var isAvailable;
     return __generator(this, function (_a) {

package/dist/functions/oldStorageFnc.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
@@ -194,23 +194,21 @@ var replaceOldInputData = function (realm) { return __awaiter(void 0, void 0, vo
     });
 }); };
 // 60. inputIdの読み込み(reduxThunk)
-var loadOldInputId = (0, toolkit_1.createAsyncThunk)("old/loadOldInputId", function (_, _a) {
-    var dispatch = _a.dispatch;
-    return __awaiter(void 0, void 0, void 0, function () {
-        var id;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0: return [4 /*yield*/, loadOldData("id")];
-                case 1:
-                    id = _b.sent();
-                    if (!id)
-                        return [2 /*return*/];
-                    dispatch({ type: "setting/updateOldId", payload: id[0] });
+var loadOldInputId = (0, toolkit_1.createAsyncThunk)("old/loadOldInputId", function (_1, _a) { return __awaiter(void 0, [_1, _a], void 0, function (_, _b) {
+    var id;
+    var dispatch = _b.dispatch;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
+            case 0: return [4 /*yield*/, loadOldData("id")];
+            case 1:
+                id = _c.sent();
+                if (!id)
                     return [2 /*return*/];
-            }
-        });
+                dispatch({ type: "setting/updateOldId", payload: id[0] });
+                return [2 /*return*/];
+        }
     });
-});
+}); });
 // 90. 旧データの存在をMarkデータから確認
 var existOldData = function () { return __awaiter(void 0, void 0, void 0, function () {
     var markData;

package/dist/functions/questionFilterD.d.ts

@@ -1,14 +1,13 @@
+import { CfgInitial } from "@nakamura-123/stores";
 import { Store } from "@nakamura-123/types";
 import { QRD } from "../types/filterType";
+type startCfg = CfgInitial["startCfg"];
 export declare const getUnitQuestions: (questions: QRD, unitId: number) => QRD;
 export declare const getSubUnitQuestions: (questions: QRD, unitId: number, subUnitId: number) => QRD;
 export declare const getYearQuestions: (questions: QRD, year: number) => QRD;
 export declare const getSubYearQuestions: (questions: QRD, year: number, key: number) => QRD;
 export declare const filterByOutOfYearRange: (questions: QRD, outOfYearRange: number[]) => QRD;
 export declare const filterByOutOfUnitRange: (questions: QRD, outOfUnitRange: number[]) => QRD;
-export declare const filterByTags: (questions: QRD, startCfg: {
-    tags: import("@nakamura-123/types/dist/types/libType").LevelNames[];
-    option: import("@nakamura-123/lib/dist/config/startOption").StoreStartOptions;
-    outOfYearRange: number[];
-}) => QRD;
+export declare const filterByTags: (questions: QRD, startCfg: startCfg) => QRD;
 export declare const commonFilter: (questions: Store.DQInStore[], quizCnt: number, isShuffle: boolean) => Store.DQInStore[];
+export {};

package/dist/functions/questionFilterJ.d.ts

@@ -1,10 +1,9 @@
 import { QRJ } from "../types/filterType";
 import { Db, JStore } from "@nakamura-123/types";
+import { CfgInitial } from "@nakamura-123/stores";
+type startCfg = CfgInitial["startCfg"];
 export declare const getUnitQuestionsJ: (questions: QRJ, unitId: number) => QRJ;
 export declare const getSubUnitQuestionsJ: (questions: QRJ, unitId: number, subUnitId: number) => QRJ;
-export declare const filterByTagsJ: (questions: QRJ, startCfg: {
-    tags: import("@nakamura-123/types/dist/types/libType").LevelNames[];
-    option: import("@nakamura-123/lib/dist/config/startOption").StoreStartOptions;
-    outOfYearRange: number[];
-}, tagName: Db.SubjectTag) => QRJ;
+export declare const filterByTagsJ: (questions: QRJ, startCfg: startCfg, tagName: Db.SubjectTag) => QRJ;
 export declare const commonFilterJ: (questions: JStore.JQInStore[], quizCnt: number, isShuffle: boolean) => JStore.JQInStore[];
+export {};

package/dist/functions/tagFncD.js

@@ -1,7 +1,14 @@
 "use strict";
 // helpers.ts
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.countTagsByLevelSelected = exports.getCategoryRate = exports.countTagsByLevel = exports.getCompletedTagRate = exports.getBootTagLevelCnts = exports.getSubTagLevelCnts = exports.getYearSubTagLevelCnts = exports.getUnitSubTagLevelCnts = exports.getCategoryTagLevelCntsD = void 0;
+exports.getBootTagLevelCnts = exports.getSubTagLevelCnts = void 0;
+exports.getCategoryTagLevelCntsD = getCategoryTagLevelCntsD;
+exports.getUnitSubTagLevelCnts = getUnitSubTagLevelCnts;
+exports.getYearSubTagLevelCnts = getYearSubTagLevelCnts;
+exports.getCompletedTagRate = getCompletedTagRate;
+exports.countTagsByLevel = countTagsByLevel;
+exports.getCategoryRate = getCategoryRate;
+exports.countTagsByLevelSelected = countTagsByLevelSelected;
 var lib_1 = require("@nakamura-123/lib");
 var questionFilterD_1 = require("./questionFilterD");
 // 01_大単元のTagのレベルを取得
@@ -16,7 +23,6 @@ function getCategoryTagLevelCntsD(QuestionDB, category, type, outOfYearRange) {
             : (0, questionFilterD_1.getYearQuestions)(returnQuestions, category);
     return returnQuestions.map(function (question) { return question.tag.level; });
 }
-exports.getCategoryTagLevelCntsD = getCategoryTagLevelCntsD;
 // 02_Unitの小単元のTagのレベルを取得
 function getUnitSubTagLevelCnts(QuestionDB, unitId, subUnitId, outOfYearRange) {
     var returnQuestions = QuestionDB;
@@ -26,12 +32,10 @@ function getUnitSubTagLevelCnts(QuestionDB, unitId, subUnitId, outOfYearRange) {
     returnQuestions = (0, questionFilterD_1.getSubUnitQuestions)(returnQuestions, unitId, subUnitId);
     return returnQuestions.map(function (question) { return question.tag.level; });
 }
-exports.getUnitSubTagLevelCnts = getUnitSubTagLevelCnts;
 // 03_Yearの小単元のTagのレベルを取得
 function getYearSubTagLevelCnts(QuestionDB, year, key) {
     return (0, questionFilterD_1.getSubYearQuestions)(QuestionDB, year, key).map(function (question) { return question.tag.level; });
 }
-exports.getYearSubTagLevelCnts = getYearSubTagLevelCnts;
 // 11_5Tagのレベルを取得。Unit(大・小単元) 、Year(大・小単元) どちらでも可。
 var getSubTagLevelCnts = function (QuestionDB, selected, outOfYearRange) {
     // QuestionDB をフィルタリング（共通処理）
@@ -78,7 +82,6 @@ function getCompletedTagRate(tags, onlyCnt) {
     var completedTagRate = Math.round((completedTagCnt / tags.length) * 100);
     return completedTagRate;
 }
-exports.getCompletedTagRate = getCompletedTagRate;
 // 22_タグをレベル別に集計し、色と数を返す
 function countTagsByLevel(tags) {
     var tagInfos = lib_1.tagLevels.map(function (_a) {
@@ -88,7 +91,6 @@ function countTagsByLevel(tags) {
     });
     return tagInfos;
 }
-exports.countTagsByLevel = countTagsByLevel;
 // 23_タグをレベルごとに点数化し、到達度を%で返す
 function getCategoryRate(tags) {
     var tagCnt = tags.length;
@@ -96,7 +98,6 @@ function getCategoryRate(tags) {
     var tagPoint = tags.reduce(function (acc, tag) { return acc + POINT_LIST[tag]; }, 0);
     return (tagPoint / (tagCnt * 5)) * 100;
 }
-exports.getCategoryRate = getCategoryRate;
 // タグをレベル別に集計し、色と数を返す。また、選択すると色が変わる
 function countTagsByLevelSelected(tags, tagActives) {
     var tagInfos = lib_1.tagLevels.map(function (_a) {
@@ -111,4 +112,3 @@ function countTagsByLevelSelected(tags, tagActives) {
     });
     return tagInfos;
 }
-exports.countTagsByLevelSelected = countTagsByLevelSelected;

package/dist/functions/tagFncJ.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTagNameFilterJ = exports.getSubTagLevelCntsJ = exports.getUnitSubTagLevelCntsJ = exports.getCategoryTagLevelCntsJ = void 0;
+exports.getTagNameFilterJ = exports.getSubTagLevelCntsJ = void 0;
+exports.getCategoryTagLevelCntsJ = getCategoryTagLevelCntsJ;
+exports.getUnitSubTagLevelCntsJ = getUnitSubTagLevelCntsJ;
 var questionFilterJ_1 = require("./questionFilterJ");
 // 01_大単元のTagのレベルを取得
 function getCategoryTagLevelCntsJ(QuestionDB, category, tag) {
@@ -8,7 +10,6 @@ function getCategoryTagLevelCntsJ(QuestionDB, category, tag) {
     var returnQuestions = (0, questionFilterJ_1.getUnitQuestionsJ)(QuestionDB, category);
     return returnQuestions.map(function (question) { return question[tag].level; });
 }
-exports.getCategoryTagLevelCntsJ = getCategoryTagLevelCntsJ;
 // 02_Unitの小単元のTagのレベルを取得
 function getUnitSubTagLevelCntsJ(QuestionDB, unitId, subUnitId, tag) {
     if (tag === void 0) { tag = "basicTag"; }
@@ -16,7 +17,6 @@ function getUnitSubTagLevelCntsJ(QuestionDB, unitId, subUnitId, tag) {
     returnQuestions = (0, questionFilterJ_1.getSubUnitQuestionsJ)(returnQuestions, unitId, subUnitId);
     return returnQuestions.map(function (question) { return question[tag].level; });
 }
-exports.getUnitSubTagLevelCntsJ = getUnitSubTagLevelCntsJ;
 // 11_5Tagのレベルを取得。Unit(大・小単元) 、Year(大・小単元) どちらでも可。
 var getSubTagLevelCntsJ = function (QuestionDB, selected) {
     // QuestionDB をフィルタリング（共通処理）

package/dist/functions/testFnc.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.countByLevel = exports.getTestLevelCnts = exports.getMiniTestLevelCnts = void 0;
+exports.getMiniTestLevelCnts = getMiniTestLevelCnts;
+exports.getTestLevelCnts = getTestLevelCnts;
+exports.countByLevel = countByLevel;
 var lib_1 = require("@nakamura-123/lib");
 function getMiniTestLevelCnts(MiniTestDB, subject, key) {
     return MiniTestDB.filtered("subject == $0 && categoryKey == $1", subject, String(key)).map(function (item) { return item.level; });
 }
-exports.getMiniTestLevelCnts = getMiniTestLevelCnts;
 function getTestLevelCnts(TestDB, subject) {
     return TestDB.filtered("subject == $0", subject).map(function (item) { return item.level; });
 }
-exports.getTestLevelCnts = getTestLevelCnts;
 // タグをレベル別に集計し、色と数を返す
 function countByLevel(levels) {
     var levelInfos = lib_1.scoreLevels.map(function (_a) {
@@ -19,4 +19,3 @@ function countByLevel(levels) {
     });
     return levelInfos;
 }
-exports.countByLevel = countByLevel;

package/dist/page/BadgePage.js

@@ -1,9 +1,32 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var react_1 = __importDefault(require("react"));
+var react_1 = __importStar(require("react"));
 var react_native_1 = require("react-native");
 var react_native_gesture_handler_1 = require("react-native-gesture-handler");
 var common_1 = require("@nakamura-123/common");
@@ -11,10 +34,28 @@ var Badge5s_1 = __importDefault(require("../component/Basic/Badge5s"));
 var lib_1 = require("@nakamura-123/lib");
 var BasicBadge_1 = __importDefault(require("../component/Grade/BasicBadge"));
 var react_i18next_1 = require("react-i18next");
+var react_2 = require("@realm/react");
+var db_1 = require("@nakamura-123/db");
+var badgeFnc_1 = require("../functions/badgeFnc");
+var react_redux_1 = require("react-redux");
 // メインコンポーネント
 var BadgePage = function (_a) {
     var basicBadgeInfos = _a.basicBadgeInfos, testBadgeInfos = _a.testBadgeInfos;
     var t = (0, react_i18next_1.useTranslation)().t;
+    // ## デイリーバッジの取得条件を再度確認する
+    var realm = (0, react_2.useRealm)();
+    var dispatch = (0, react_redux_1.useDispatch)();
+    var BadgeDB = (0, react_2.useQuery)(db_1.BadgeSchema);
+    var DailyLogDB = (0, react_2.useQuery)(db_1.DailyLogSchema);
+    (0, react_1.useEffect)(function () {
+        // yl 取得条件を満たしており、未取得のバッジ
+        var dailyLogBadges = (0, badgeFnc_1.checkDailyLogBadge)(BadgeDB, DailyLogDB, t, true);
+        // yl バッジをScore Storeへ保存
+        if (dailyLogBadges.length > 0) {
+            dispatch({ type: "score/replaceNotification", payload: dailyLogBadges });
+            db_1.BadgeModel.createBadge(realm, dailyLogBadges);
+        }
+    }, []);
     return (<react_native_gesture_handler_1.ScrollView style={styles.page} contentContainerStyle={styles.container}>
       {basicBadgeInfos.map(function (info) { return (<BasicBadge_1.default info={info} key={info.name}/>); })}
       {testBadgeInfos.map(function (info) { return (<TestBadge5s info={info} key={info.subject}/>); })}

package/dist/page/CoinPage.js

@@ -32,8 +32,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");