fix(medications): stop offering a dose once the course has ended

A medication whose end date had passed still showed taken and skip in the
table and on its card, because the action row only looked at whether the
medication was active. The schedule engine already stops minting doses
after the end date, so reminders, the doses card and the today list were
quiet, but the medication itself kept inviting a dose that is no longer
part of the course.

The server now resolves one rule and publishes it on the list and detail
reads: `courseStatus` (UPCOMING, CURRENT or ENDED, in calendar days on the
user's clock, both ends inclusive) and `intakeActionable` (active, intake
tracked, course includes today). The table and both card variants render
their actions from it, the take-all flow skips such a medication, the card
and table name an ended course with an "Ended" badge, and no overdue
escalation is raised for it. A course that ends today keeps its actions
for the whole local day.

The detail header's "Ended" status now follows the same field. It compared
the end date's UTC midnight with the clock and so called the whole last
course day ended. Logging a past dose from the history is unchanged.
This commit is contained in:
Marc-André Bombeck committed 2026-09-27 13:49:21 +02:00
1 parent 419ff04765
commit 8295dfe9b6
28 files changed
+640 -20

No files matched your search

@@ -367,3 +367,62 @@ describe("<MedicationCard> — as-needed marker (v1.16.11, #316)", () => {
expect(html).toContain("Taken");
});
});
/**
* v1.39.4 (#1040) — a medication whose course has ended keeps its card
* (history, adherence) but offers no taken / skip and names the state.
*/
describe("<MedicationCard> — ended course (#1040)", () => {
function makeMed(overrides: Record<string, unknown> = {}) {
return {
id: "med-course-1",
name: "Amoxicillin",
dose: "500 mg",
category: "ANTIBIOTIC",
treatmentClass: undefined as string | undefined,
active: true,
notificationsEnabled: true,
pausedAt: null,
lastTakenAt: null,
todayEventCount: 0,
nextDueAt: null,
nextDueOverdue: false,
schedules: [{ id: "s1", ...pastWindow }],
...overrides,
};
}
it("drops the action row and shows the Ended badge once the course is over", () => {
const client = makeClient();
seedCompliance(client, "med-course-1");
const html = render(
<MedicationCard
medication={makeMed({ courseStatus: "ENDED", intakeActionable: false })}
onEdit={() => {}}
onOpenHistory={() => {}}
/>,
client,
);
expect(html).not.toContain('data-slot="medication-intake-take"');
expect(html).not.toContain('data-slot="medication-intake-skip"');
expect(html).toContain('data-slot="medication-course-ended-badge"');
});
it("keeps the action row on the last course day", () => {
const client = makeClient();
seedCompliance(client, "med-course-1");
const html = render(
<MedicationCard
medication={makeMed({
courseStatus: "CURRENT",
intakeActionable: true,
})}
onEdit={() => {}}
onOpenHistory={() => {}}
/>,
client,
);
expect(html).toContain('data-slot="medication-intake-take"');
expect(html).not.toContain('data-slot="medication-course-ended-badge"');
});
});
@@ -0,0 +1,71 @@
/**
* v1.39.4 (#1040) — the detail header's "Ended" status follows the
* server's `courseStatus`. It used to compare the end date's UTC midnight
* with the clock, which read the whole last course day as ended.
*/
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
import { renderToStaticMarkup } from "react-dom/server";
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import { I18nProvider } from "@/lib/i18n/context";
import { MedicationDetailSummary } from "@/components/medications/medication-detail-summary";
const payload = {
id: "m1",
name: "Amoxicillin",
dose: "500 mg",
category: "ANTIBIOTIC",
notificationsEnabled: true,
startsOn: new Date("2026-09-20T00:00:00Z"),
endsOn: new Date("2026-09-27T00:00:00Z"),
oneShot: false,
schedules: [
{
windowStart: "08:00",
windowEnd: "09:00",
timesOfDay: ["08:00"],
rrule: "FREQ=DAILY",
},
],
};
function render(courseStatus: "UPCOMING" | "CURRENT" | "ENDED") {
return renderToStaticMarkup(
<I18nProvider initialLocale="en">
<QueryClientProvider client={new QueryClient()}>
<MedicationDetailSummary
name="Amoxicillin"
dose="500 mg"
active
courseStatus={courseStatus}
payload={payload}
oneShot={false}
startsOn="2026-09-20T00:00:00.000Z"
/>
</QueryClientProvider>
</I18nProvider>,
);
}
beforeEach(() => {
vi.useFakeTimers({ toFake: ["Date"] });
// The last course day, mid-morning in UTC.
vi.setSystemTime(new Date("2026-09-27T10:00:00Z"));
});
afterEach(() => {
vi.useRealTimers();
});
describe("<MedicationDetailSummary> — course status (#1040)", () => {
it("reads as active on the last course day", () => {
const html = render("CURRENT");
expect(html).toContain("bg-success");
expect(html).not.toContain("bg-muted-foreground");
});
it("reads as ended once the server says the course is over", () => {
const html = render("ENDED");
expect(html).toContain("bg-muted-foreground");
expect(html).not.toContain("bg-success");
});
});
@@ -411,6 +411,39 @@ describe("<MedicationTable> — structure + shared payloads", () => {
expect(html).toContain("4 doses");
});
it("offers no dose actions on an ended course and names it; the last course day keeps them (#1040)", () => {
const client = makeClient();
seedCompliance(client, "ended", 90, 88);
seedCompliance(client, "last", 90, 88);
const html = render(
<MedicationTable
activeMedications={[
med({
id: "ended",
name: "Amoxicillin",
courseStatus: "ENDED",
intakeActionable: false,
}),
med({
id: "last",
name: "Prednisolone",
courseStatus: "CURRENT",
intakeActionable: true,
}),
]}
inactiveMedications={[]}
/>,
client,
);
expect(html).not.toContain('aria-label="Take – Amoxicillin"');
expect(html).not.toContain('aria-label="Skip – Amoxicillin"');
expect(html).toContain('data-slot="medication-table-course-ended-marker"');
expect(html).toContain(">Ended<");
expect(html).toContain('aria-label="Take – Prednisolone"');
expect(html).toContain('aria-label="Skip – Prednisolone"');
});
it("renders an as-needed row: calm marker, no compliance bars (v1.16.11 #316)", () => {
const client = makeClient();
// Deliberately NOT seeding compliance for the PRN row — the batched
@@ -174,6 +174,23 @@ describe("deriveDueMedications — only currently-due, active, unpaused", () =>
expect(due.map((d) => d.id)).toEqual(["due"]);
});
it("excludes a medication whose course has ended, even with an escalated dose (#1040)", () => {
const due = deriveDueMedications(
[
makeMed({ id: "ended", intakeActionable: false }),
makeMed({ id: "on" }),
],
{
...opts,
doseStatusById: new Map([
["ended", "missed" as const],
["on", "upcoming" as const],
]),
},
);
expect(due.map((d) => d.id)).toEqual(["on"]);
});
it("excludes a medication whose dose band is not currently open", () => {
const due = deriveDueMedications(
[
@@ -141,6 +141,13 @@ export interface MedicationCardBodyProps {
*/
recordOnly?: boolean;
/**
* v1.39.4 (#1040) — the server's `intakeActionable`: false once the course
* has ended (or before it starts), so the card offers no take / skip and
* raises no overdue escalation for a dose that is no longer part of it.
*/
intakeActionable?: boolean;
/**
* v1.16.11 — projected supply runway in whole days, set ONLY while it
* sits below the user's low-stock threshold (the variants gate it).
@@ -191,6 +198,7 @@ export function MedicationCardBody({
currentCycle,
asNeeded = false,
recordOnly = false,
intakeActionable = true,
lowStockRunwayDays = null,
intakeLoading,
onRecordIntake,
@@ -203,10 +211,11 @@ export function MedicationCardBody({
// past the clinical miss cutoff) reads "Stark überfällig"; the still-takeable
// `overdue` tail reads the calmer "Überfällig". Both use the destructive
// tone so the urgency is unmistakable; suppressed on an inactive med.
const canAct = active && intakeActionable;
const overdueLabel =
active && doseStatus === "missed"
canAct && doseStatus === "missed"
? t("medications.veryOverdue")
: active && doseStatus === "overdue"
: canAct && doseStatus === "overdue"
? t("medications.overdue")
: null;
@@ -352,7 +361,7 @@ export function MedicationCardBody({
{/* Quick actions — bottom-pinned so the action rows align across a
grid row regardless of how much content sits above. */}
{active && !recordOnly && (
{canAct && !recordOnly && (
<div className="mt-auto pt-0">
<MedicationIntakeActions
intakeLoading={intakeLoading}
@@ -8,6 +8,8 @@ interface MedicationStateBadgesProps {
pausedAt: string | null;
/** v1.39.1 (#1033) — intake tracking off: kept as a record only. */
recordOnly?: boolean;
/** v1.39.4 (#1040) — the course's end date has passed. */
courseEnded?: boolean;
}
/**
@@ -21,6 +23,7 @@ export function MedicationStateBadges({
active,
pausedAt,
recordOnly = false,
courseEnded = false,
}: MedicationStateBadgesProps) {
const { t } = useTranslations();
@@ -35,7 +38,16 @@ export function MedicationStateBadges({
{t("medications.recordOnlyBadge")}
</Badge>
)}
{!notificationsEnabled && !recordOnly && (
{courseEnded && (
<Badge
variant="secondary"
className="text-xs"
data-slot="medication-course-ended-badge"
>
{t("medications.courseEndedBadge")}
</Badge>
)}
{!notificationsEnabled && !recordOnly && !courseEnded && (
<Badge variant="secondary" className="text-xs">
{t("medications.withoutNotification")}
</Badge>
@@ -170,6 +170,8 @@ export interface MedicationDetailSnapshot {
* `recordedSchedules`; the page shows (and edits) the stored rows.
*/
trackIntake?: boolean;
/** v1.39.4 (#1040) — where today sits in the course (server-resolved). */
courseStatus?: "UPCOMING" | "CURRENT" | "ENDED";
recordedSchedules?: ScheduleSnapshot[];
schedules: ScheduleSnapshot[];
}
@@ -501,7 +503,7 @@ export function MedicationDetailTabs({
name={medication.name}
dose={formatDose(medication.dose, t)}
active={medication.active}
endsOn={medication.endsOn}
courseStatus={served.courseStatus}
payload={payload}
oneShot={oneShot}
asNeeded={asNeeded}
@@ -135,6 +135,13 @@ export interface Glp1Medication {
* compliance bars and the take / skip actions and shows a badge instead.
*/
trackIntake?: boolean;
/**
* v1.39.4 (#1040) — server-resolved: taken / skip are offered today only
* when true (active, tracked, and the course includes today).
*/
intakeActionable?: boolean;
/** v1.39.4 (#1040) — where today sits in the course. */
courseStatus?: "UPCOMING" | "CURRENT" | "ENDED";
schedules: ScheduleLite[];
}
@@ -446,6 +453,7 @@ export function Glp1MedicationCard({
active={medication.active}
pausedAt={medication.pausedAt}
recordOnly={medication.trackIntake === false}
courseEnded={medication.courseStatus === "ENDED"}
/>
);
@@ -560,6 +568,7 @@ export function Glp1MedicationCard({
complianceNotApplicable ? null : (display?.currentCycle ?? null)
}
recordOnly={medication.trackIntake === false}
intakeActionable={medication.intakeActionable !== false}
lowStockRunwayDays={lowStockRunwayDays}
intakeLoading={intakeLoading}
onRecordIntake={(skipped) => recordIntake(skipped, displayedSlot)}
@@ -120,6 +120,13 @@ interface Medication {
* compliance bars and the take / skip actions and shows a badge instead.
*/
trackIntake?: boolean;
/**
* v1.39.4 (#1040) — server-resolved: taken / skip are offered today only
* when true (active, tracked, and the course includes today).
*/
intakeActionable?: boolean;
/** v1.39.4 (#1040) — where today sits in the course. */
courseStatus?: "UPCOMING" | "CURRENT" | "ENDED";
schedules: Schedule[];
}
@@ -385,6 +392,7 @@ export function MedicationCard({
active={medication.active}
pausedAt={medication.pausedAt}
recordOnly={medication.trackIntake === false}
courseEnded={medication.courseStatus === "ENDED"}
/>
);
@@ -525,6 +533,7 @@ export function MedicationCard({
complianceNotApplicable ? null : (display?.currentCycle ?? null)
}
recordOnly={medication.trackIntake === false}
intakeActionable={medication.intakeActionable !== false}
lowStockRunwayDays={lowStockRunwayDays}
intakeLoading={intakeLoading}
onRecordIntake={(skipped) => recordIntake(skipped, displayedSlot)}
@@ -32,7 +32,12 @@ export interface MedicationDetailSummaryProps {
name: string;
dose: string;
active: boolean;
endsOn?: string | null;
/**
* v1.39.4 (#1040) — the server's course position. "Ended" follows it, so
* the last course day reads as active on the user's clock instead of
* flipping at UTC midnight of the end date.
*/
courseStatus?: "UPCOMING" | "CURRENT" | "ENDED";
/** Wizard payload used to derive the plain-language cadence line. */
payload: MedicationPayload;
oneShot: boolean;
@@ -45,13 +50,11 @@ export interface MedicationDetailSummaryProps {
type Status = "active" | "paused" | "ended";
function resolveStatus(active: boolean, endsOn?: string | null): Status {
if (endsOn) {
const end = new Date(endsOn);
if (!Number.isNaN(end.getTime()) && end.getTime() <= Date.now()) {
return "ended";
}
}
function resolveStatus(
active: boolean,
courseStatus?: "UPCOMING" | "CURRENT" | "ENDED",
): Status {
if (courseStatus === "ENDED") return "ended";
return active ? "active" : "paused";
}
@@ -59,7 +62,7 @@ export function MedicationDetailSummary({
name,
dose,
active,
endsOn,
courseStatus,
payload,
oneShot,
asNeeded = false,
@@ -69,7 +72,7 @@ export function MedicationDetailSummary({
const { t, locale } = useTranslations();
const formatters = useFormatters();
const dateFormatPref = useDateFormatPreference();
const status = resolveStatus(active, endsOn);
const status = resolveStatus(active, courseStatus);
const statusLabel =
status === "active"
@@ -98,6 +98,12 @@ export interface TableMedication {
* cell names that, the compliance and action cells show "–".
*/
trackIntake?: boolean;
/**
* v1.39.4 (#1040) — server-resolved: the action cell offers taken / skip
* only when true; an ended course shows "Ended" where next-due sits.
*/
intakeActionable?: boolean;
courseStatus?: "UPCOMING" | "CURRENT" | "ENDED";
/** v1.16.10 — dose-derived stock from the list payload; null = inventory tracking off. */
stockDosesRemaining?: number | null;
/** v1.37.19 — server-resolved slot-aware runway (days); null = off/no cadence. */
@@ -478,10 +484,11 @@ function MedicationTableRowItem({
// column with no neighbouring last-intake context. Order here:
// last-dose context outranks the overdue escalation, which outranks
// the window pill.
const canAct = medication.active && medication.intakeActionable !== false;
const overdueLabel =
medication.active && doseStatus === "missed"
canAct && doseStatus === "missed"
? t("medications.veryOverdue")
: medication.active && doseStatus === "overdue"
: canAct && doseStatus === "overdue"
? t("medications.overdue")
: null;
@@ -528,6 +535,16 @@ function MedicationTableRowItem({
{t("medications.recordOnlyBadge")}
</span>
);
} else if (medication.courseStatus === "ENDED") {
// v1.39.4 (#1040) — the course is over: nothing is due any more.
nextCell = (
<span
className="text-muted-foreground"
data-slot="medication-table-course-ended-marker"
>
{t("medications.courseEndedBadge")}
</span>
);
} else if (medication.asNeeded) {
// v1.16.11 — a calm marker where next-due normally sits; no due
// pill, no overdue escalation, ever.
@@ -713,7 +730,7 @@ function MedicationTableRowItem({
</TableCell>
<TableCell className="text-sm">{stockCell}</TableCell>
<TableCell>
{medication.active && canAddIntake && !recordOnly ? (
{canAct && canAddIntake && !recordOnly ? (
<div className="flex gap-1.5">
<Button
size="icon"
+9 -1
View File
@@ -85,6 +85,8 @@ export interface DueDerivationMedication {
asNeeded?: boolean;
/** v1.39.1 (#1033) — false: kept as a record, never due, never in the set. */
trackIntake?: boolean;
/** v1.39.4 (#1040) — false: no dose actions today (e.g. the course ended). */
intakeActionable?: boolean;
schedules: DueDerivationSchedule[];
}
@@ -155,7 +157,13 @@ export function deriveDueMedications(
// compliance row for one must not pull it into the set.
// A medication with intake tracking off is never due either; the list
// already serves it with no schedules, this makes the rule explicit.
if (!m.active || m.pausedAt || m.asNeeded || m.trackIntake === false) {
if (
!m.active ||
m.pausedAt ||
m.asNeeded ||
m.trackIntake === false ||
m.intakeActionable === false
) {
continue;
}