From edf42bb068a32f86bec164ec7c61439261045a1a Mon Sep 17 00:00:00 2001 From: Daniel Volz Date: Sat, 14 Feb 2026 18:53:52 +0100 Subject: [PATCH] fix: show reminder icon per intake dose in schedule (#198) * fix: show reminder icon per intake dose in schedule * test: align schedule reminder icon test with intake-level flag --- frontend/src/pages/SchedulePage.tsx | 31 ++++++++++--------- frontend/src/test/pages/SchedulePage.test.tsx | 11 ++++++- frontend/src/utils/schedule.ts | 1 + 3 files changed, 28 insertions(+), 15 deletions(-) diff --git a/frontend/src/pages/SchedulePage.tsx b/frontend/src/pages/SchedulePage.tsx index ae3b574..113c0e5 100644 --- a/frontend/src/pages/SchedulePage.tsx +++ b/frontend/src/pages/SchedulePage.tsx @@ -176,14 +176,6 @@ export function SchedulePage() {
{item.medName} - {med?.intakeRemindersEnabled && ( - - 🔔 - - )}
{t("common.pillsTotal", { count: item.total })} @@ -199,7 +191,15 @@ export function SchedulePage() { {dose.usage} {dose.usage !== 1 ? t("common.pills") : t("common.pill")} {med?.pillWeightMg && ` (${dose.usage * med.pillWeightMg} ${med.doseUnit ?? "mg"})`} - + {" "} + {dose.intakeRemindersEnabled && ( + + 🔔 + + )}{" "}
{people.map((person) => { const doseId = getDoseId(dose.id, person); @@ -313,11 +313,6 @@ export function SchedulePage() {
{item.medName} - {med?.intakeRemindersEnabled && ( - - 🔔 - - )}
{t("common.pillsTotal", { count: item.total })} @@ -337,6 +332,14 @@ export function SchedulePage() { {dose.usage} {dose.usage !== 1 ? t("common.pills") : t("common.pill")} {med?.pillWeightMg && ` (${dose.usage * med.pillWeightMg} ${med.doseUnit ?? "mg"})`} + {dose.intakeRemindersEnabled && ( + + 🔔 + + )}
{people.map((person) => { const doseId = getDoseId(dose.id, person); diff --git a/frontend/src/test/pages/SchedulePage.test.tsx b/frontend/src/test/pages/SchedulePage.test.tsx index 6f2b09a..5bd3d37 100644 --- a/frontend/src/test/pages/SchedulePage.test.tsx +++ b/frontend/src/test/pages/SchedulePage.test.tsx @@ -45,7 +45,16 @@ const mockFutureDays = [ { medName: "Aspirin", total: 1, - doses: [{ id: `1-0-${FIXED_TIMESTAMP}`, timeStr: "09:00", when: FIXED_TIMESTAMP, usage: 1, takenBy: ["John"] }], + doses: [ + { + id: `1-0-${FIXED_TIMESTAMP}`, + timeStr: "09:00", + when: FIXED_TIMESTAMP, + usage: 1, + takenBy: ["John"], + intakeRemindersEnabled: true, + }, + ], lastWhen: FIXED_TIMESTAMP, }, ], diff --git a/frontend/src/utils/schedule.ts b/frontend/src/utils/schedule.ts index 05f9a20..716c2d9 100644 --- a/frontend/src/utils/schedule.ts +++ b/frontend/src/utils/schedule.ts @@ -70,6 +70,7 @@ export function buildSchedulePreview( isPast, timeStr: d.toLocaleTimeString(locale, { hour: "2-digit", minute: "2-digit" }), dateStr: d.toLocaleDateString(locale, { weekday: "short", day: "2-digit", month: "short" }), + intakeRemindersEnabled: intake.intakeRemindersEnabled, }); } });