@nakamura-123/pages 0.1.45 → 0.1.46

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/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

@@ -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/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/GetBadgePage.js

@@ -124,6 +124,7 @@ var GetBadgePage = function (_a) {
           </common_1.MyText>
         </react_native_1.View>
         <react_native_1.View style={styles.btnBox}>
+          <common_1.MiniIconBtn onPress={function () { return navigation.navigate("Badge"); }} icon="shield-alt" title="バッジ一覧" color="ltBlack" outerStyle={styles.miniBtnOuter}/>
           <common_1.MiniIconBtn onPress={handleNext} icon="arrow-right" title="次 へ" color="blue" outerStyle={styles.miniBtnOuter}/>
         </react_native_1.View>
       </Animatable.View>
@@ -144,7 +145,7 @@ var styles = react_native_1.StyleSheet.create({
         borderWidth: 1,
         borderColor: lib_1.colors.ltBlack,
         borderRadius: 30,
-        width: "80%",
+        width: "90%",
     },
     txt: {
         marginTop: 5,
@@ -169,7 +170,7 @@ var styles = react_native_1.StyleSheet.create({
         paddingVertical: 5,
     },
     miniBtnOuter: {
-        width: "50%",
+        width: "45%",
     },
 });
 exports.default = GetBadgePage;