mirror of
https://github.com/MBombeck/HealthLog.git
synced 2026-11-16 07:13:29 +00:00
fix(medications): the audit findings on the new supply and dose surfaces
- The escalated card row keeps its time anchor: the red badge carries the matched window or the overdue-slot value beside it, and the inline row's range stays visible on mobile, where it was the only clock on the card. - Take-all-due collects what the cards offer: a dose escalated past its catch-up band joins the set with exactly the slot the card's own button would record; as-needed medications never join. - The table's stock warning follows the user's runway threshold instead of a leftover four-dose constant; threshold off means no amber, empty stays red. - The card itself shows the remaining runway in the warning tone once it crosses the threshold — only then, the card stays calm above. - The low-stock push deep-links straight into the supply tab and its APNs payload keeps url, runwayDays and thresholdDays; supply tab and threshold setting link to each other; the reminder-thresholds and notification-prefs endpoints enter the OpenAPI contract.
This commit is contained in:
1 parent
3943dcfb72
commit
6fef2081d0
24 files changed
+970
-40
No files matched your search
@@ -65,6 +65,20 @@ function seedCompliance(
|
||||
]);
|
||||
}
|
||||
|
||||
// Seed the SAME reminder-thresholds key the cards read — the stock
|
||||
// cell's amber tier rides the per-user low-stock runway threshold
|
||||
// (v1.16.11); `null` = the alert (and the tier) is off.
|
||||
function seedThresholds(
|
||||
client: QueryClient,
|
||||
lowStockRunwayDays: number | null,
|
||||
) {
|
||||
client.setQueryData(["settings", "reminder-thresholds"], {
|
||||
lateMinutes: 120,
|
||||
missedMinutes: 240,
|
||||
lowStockRunwayDays,
|
||||
});
|
||||
}
|
||||
|
||||
// A schedule whose window has already passed for today (01:00–02:00) so
|
||||
// the row shows the next-intake value rather than the take-now pill,
|
||||
// regardless of host clock.
|
||||
@@ -217,6 +231,54 @@ describe("<MedicationTable> — structure + shared payloads", () => {
|
||||
expect(html).toContain("text-warning");
|
||||
});
|
||||
|
||||
it("warns on runway DAYS below the user's threshold, not a legacy dose count", () => {
|
||||
const client = makeClient();
|
||||
seedCompliance(client, "m1", 90, 88);
|
||||
seedCompliance(client, "m2", 90, 88);
|
||||
// Per-user threshold: 3 runway days (the same value the low-stock
|
||||
// notification fires on).
|
||||
seedThresholds(client, 3);
|
||||
const html = render(
|
||||
<MedicationTable
|
||||
activeMedications={[
|
||||
// Daily schedule → 5 doses = 5 runway days ≥ 3 → calm, even
|
||||
// though the retired 4-dose constant would have tinted it.
|
||||
med({ id: "m1", name: "Aspirin", stockDosesRemaining: 5 }),
|
||||
// 2 doses = 2 runway days < 3 → amber.
|
||||
med({ id: "m2", name: "Mounjaro", stockDosesRemaining: 2 }),
|
||||
]}
|
||||
inactiveMedications={[]}
|
||||
/>,
|
||||
client,
|
||||
);
|
||||
|
||||
expect((html.match(/text-warning/g) ?? []).length).toBe(1);
|
||||
expect(html.indexOf("text-warning")).toBeGreaterThan(
|
||||
html.indexOf("Mounjaro"),
|
||||
);
|
||||
});
|
||||
|
||||
it("threshold OFF (null) disables the amber tier; an exhausted stock stays destructive", () => {
|
||||
const client = makeClient();
|
||||
seedCompliance(client, "m1", 90, 88);
|
||||
seedCompliance(client, "m2", 90, 88);
|
||||
seedThresholds(client, null);
|
||||
const html = render(
|
||||
<MedicationTable
|
||||
activeMedications={[
|
||||
med({ id: "m1", name: "Aspirin", stockDosesRemaining: 1 }),
|
||||
med({ id: "m2", name: "Mounjaro", stockDosesRemaining: 0 }),
|
||||
]}
|
||||
inactiveMedications={[]}
|
||||
/>,
|
||||
client,
|
||||
);
|
||||
|
||||
expect(html).not.toContain("text-warning");
|
||||
// Stock 0 is destructive red regardless of the threshold switch.
|
||||
expect(html).toContain("text-destructive");
|
||||
});
|
||||
|
||||
it("pins inactive rows after the active block, muted and without actions", () => {
|
||||
const client = makeClient();
|
||||
seedCompliance(client, "m1", 90, 88);
|
||||
|
||||
@@ -280,6 +280,108 @@ describe("deriveDueMedications — only currently-due, active, unpaused", () =>
|
||||
});
|
||||
});
|
||||
|
||||
describe("deriveDueMedications — compliance-escalated medications (band tail closed)", () => {
|
||||
// 14:00 UTC: the 08:00 dose band's catch-up tail closed at 13:00
|
||||
// (missedMinutes 240), so the window-derived status is null — but the
|
||||
// card still renders the red escalation value with an ACTIVE take
|
||||
// button when the batched compliance dose status says overdue/missed.
|
||||
const now = todayAtUtc(14, 0);
|
||||
|
||||
const morning = () =>
|
||||
makeMed({
|
||||
id: "morning",
|
||||
schedules: [
|
||||
{
|
||||
windowStart: "08:00",
|
||||
windowEnd: "08:00",
|
||||
daysOfWeek: null,
|
||||
timesOfDay: ["08:00"],
|
||||
dose: null,
|
||||
},
|
||||
],
|
||||
// The server still serves the open overdue slot as next-due.
|
||||
nextDueAt: todayAtUtc(8, 0).toISOString(),
|
||||
nextDueOverdue: true,
|
||||
});
|
||||
|
||||
it("includes a missed dose past its catch-up tail, recording the card's own displayed slot", () => {
|
||||
const due = deriveDueMedications([morning()], {
|
||||
now,
|
||||
tz: "UTC",
|
||||
doseStatusById: new Map([["morning", "missed"]]),
|
||||
});
|
||||
expect(due).toHaveLength(1);
|
||||
expect(due[0].id).toBe("morning");
|
||||
// Band closed → no matched window for the dialog line.
|
||||
expect(due[0].window).toBeNull();
|
||||
// EXACTLY what the card's take button records: the same
|
||||
// `resolveDisplayedSlotInstant` call resolves (status null) to the
|
||||
// server's next-due instant.
|
||||
expect(due[0].scheduledFor?.toISOString()).toBe(
|
||||
todayAtUtc(8, 0).toISOString(),
|
||||
);
|
||||
});
|
||||
|
||||
it("matches the count of visible red/due cards: dedupes window-due + escalated, excludes calm doses", () => {
|
||||
const inWindow = makeMed({
|
||||
id: "in-window",
|
||||
schedules: [
|
||||
{
|
||||
windowStart: "14:00",
|
||||
windowEnd: "14:00",
|
||||
daysOfWeek: null,
|
||||
timesOfDay: ["14:00"],
|
||||
dose: null,
|
||||
},
|
||||
],
|
||||
});
|
||||
const evening = makeMed({
|
||||
id: "evening",
|
||||
schedules: [
|
||||
{
|
||||
windowStart: "20:00",
|
||||
windowEnd: "20:00",
|
||||
daysOfWeek: null,
|
||||
timesOfDay: ["20:00"],
|
||||
dose: null,
|
||||
},
|
||||
],
|
||||
});
|
||||
const due = deriveDueMedications([inWindow, morning(), evening], {
|
||||
now,
|
||||
tz: "UTC",
|
||||
doseStatusById: new Map([
|
||||
// The open-window med is ALSO compliance-escalated — it must
|
||||
// appear exactly once (the two branches are exclusive).
|
||||
["in-window", "overdue"],
|
||||
["morning", "missed"],
|
||||
["evening", "upcoming"],
|
||||
]),
|
||||
});
|
||||
expect(due.map((d) => d.id)).toEqual(["in-window", "morning"]);
|
||||
});
|
||||
|
||||
it("never includes an as-needed medication, even with a (bogus) escalated compliance row", () => {
|
||||
const prn = makeMed({
|
||||
id: "prn",
|
||||
asNeeded: true,
|
||||
schedules: [],
|
||||
nextDueAt: null,
|
||||
});
|
||||
const due = deriveDueMedications([prn], {
|
||||
now,
|
||||
tz: "UTC",
|
||||
doseStatusById: new Map([["prn", "missed"]]),
|
||||
});
|
||||
expect(due).toEqual([]);
|
||||
});
|
||||
|
||||
it("does not escalate without a compliance verdict (window-only derivation stays the floor)", () => {
|
||||
const due = deriveDueMedications([morning()], { now, tz: "UTC" });
|
||||
expect(due).toEqual([]);
|
||||
});
|
||||
});
|
||||
|
||||
describe("runTakeAllDue — per-medication loop with failure isolation", () => {
|
||||
const slotA = new Date(Date.now() - 60 * 60 * 1000);
|
||||
const slotB = new Date(Date.now() - 30 * 60 * 1000);
|
||||
|
||||
@@ -5,6 +5,7 @@ import { AlertTriangle } from "lucide-react";
|
||||
|
||||
import { Card, CardContent } from "@/components/ui/card";
|
||||
import { cn } from "@/lib/utils";
|
||||
import { formatTimeWindowRange } from "@/lib/time-window-format";
|
||||
import { MedicationCardHeader } from "@/components/medications/MedicationCardHeader";
|
||||
import { MedicationStatusPill } from "@/components/medications/card-parts/medication-status-pill";
|
||||
import {
|
||||
@@ -120,6 +121,16 @@ export interface MedicationCardBodyProps {
|
||||
*/
|
||||
asNeeded?: 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).
|
||||
* Non-null renders one muted warning-toned "Vorrat: ≈ N Tage" line
|
||||
* under the next/last slot; null keeps the card free of stock noise.
|
||||
* Never set for as-needed medications (no consuming schedule, no
|
||||
* runway).
|
||||
*/
|
||||
lowStockRunwayDays?: number | null;
|
||||
|
||||
/** "take" | "skip" while the matching request is in flight, else null. */
|
||||
intakeLoading: string | null;
|
||||
/** Record the displayed dose (the card binds the slot instant). */
|
||||
@@ -147,11 +158,12 @@ export function MedicationCardBody({
|
||||
onRetryCompliance,
|
||||
currentCycle,
|
||||
asNeeded = false,
|
||||
lowStockRunwayDays = null,
|
||||
intakeLoading,
|
||||
onRecordIntake,
|
||||
children,
|
||||
}: MedicationCardBodyProps) {
|
||||
const { t } = useTranslations();
|
||||
const { t, locale } = useTranslations();
|
||||
|
||||
// Overdue escalation line: a dose past its on-time window. `missed` (at /
|
||||
// past the clinical miss cutoff) reads "Stark überfällig"; the still-takeable
|
||||
@@ -176,11 +188,31 @@ export function MedicationCardBody({
|
||||
// tier: the row falls through to the plain schedule value and the
|
||||
// "last intake" line directly below already names the recent dose —
|
||||
// the guard's job is that no take prompt renders, not a louder line.
|
||||
//
|
||||
// The escalation value keeps the due time: the red badge alone evicted
|
||||
// the window / time the amber tier used to carry, leaving the user
|
||||
// with urgency but no anchor. The matched window rides along when one
|
||||
// is still open; otherwise the card's own next-intake value (the
|
||||
// overdue slot time) fills the gap.
|
||||
const nextValueOverride =
|
||||
windowStatus?.takenEarlyDaysAgo != null ? null : overdueLabel ? (
|
||||
<span className="text-destructive inline-flex items-center gap-1 text-sm font-medium">
|
||||
<AlertTriangle className="size-3.5 shrink-0" aria-hidden="true" />
|
||||
{overdueLabel}
|
||||
<span className="inline-flex flex-wrap items-center gap-x-1 gap-y-0.5 text-sm">
|
||||
<span className="text-destructive inline-flex items-center gap-1 font-medium">
|
||||
<AlertTriangle className="size-3.5 shrink-0" aria-hidden="true" />
|
||||
{overdueLabel}
|
||||
</span>
|
||||
{windowStatus !== null ? (
|
||||
<span className="text-muted-foreground">
|
||||
—{" "}
|
||||
{formatTimeWindowRange(
|
||||
windowStatus.windowStart,
|
||||
windowStatus.windowEnd,
|
||||
locale,
|
||||
)}
|
||||
</span>
|
||||
) : nextLine !== null ? (
|
||||
<span className="text-muted-foreground">— {nextLine}</span>
|
||||
) : null}
|
||||
</span>
|
||||
) : windowStatus !== null ? (
|
||||
<MedicationStatusPill
|
||||
@@ -218,6 +250,21 @@ export function MedicationCardBody({
|
||||
last={lastLine}
|
||||
/>
|
||||
|
||||
{/* v1.16.11 — low-stock context, ONLY below the user's runway
|
||||
threshold (the prop is pre-gated). One calm warning-toned
|
||||
line, not a badge: the card stays quiet until the supply
|
||||
actually needs attention. */}
|
||||
{active && !asNeeded && lowStockRunwayDays != null && (
|
||||
<p
|
||||
className="text-warning text-xs"
|
||||
data-slot="medication-card-low-stock"
|
||||
>
|
||||
{t("medications.cardLowStockRunway", {
|
||||
days: lowStockRunwayDays,
|
||||
})}
|
||||
</p>
|
||||
)}
|
||||
|
||||
{/* Compliance bars — always two rows; constant-height skeleton holds
|
||||
the slot while the query is in flight so the grid row stays even.
|
||||
A FAILED query swaps the skeleton for the same-footprint quiet
|
||||
|
||||
@@ -55,6 +55,14 @@ export function MedicationStatusPill({
|
||||
const { t, locale } = useTranslations();
|
||||
const Root = inline ? "span" : "p";
|
||||
|
||||
// v1.16.11 — the inline (next-row) variant keeps its window-range
|
||||
// suffix visible on mobile: the suffix is the row's only time anchor
|
||||
// there, and hiding it left every prompt tier time-less below `sm`.
|
||||
// The standalone `<p>` contexts keep the legacy truncation.
|
||||
const suffixClass = inline
|
||||
? "text-muted-foreground"
|
||||
: "text-muted-foreground hidden sm:inline";
|
||||
|
||||
if (takenEarlyDaysAgo != null) {
|
||||
return (
|
||||
<Root className="text-sm">
|
||||
@@ -65,7 +73,7 @@ export function MedicationStatusPill({
|
||||
: t("medications.lastDoseDaysAgo", { count: takenEarlyDaysAgo })}
|
||||
</span>
|
||||
{!compact && (
|
||||
<span className="text-muted-foreground hidden sm:inline">
|
||||
<span className={suffixClass}>
|
||||
{" "}
|
||||
— {formatTimeWindowRange(windowStart, windowEnd, locale)}
|
||||
</span>
|
||||
@@ -106,7 +114,7 @@ export function MedicationStatusPill({
|
||||
: t("medications.veryOverdue")}
|
||||
</span>
|
||||
{!compact && (
|
||||
<span className="text-muted-foreground hidden sm:inline">
|
||||
<span className={suffixClass}>
|
||||
{" "}
|
||||
— {formatTimeWindowRange(windowStart, windowEnd, locale)}
|
||||
</span>
|
||||
|
||||
@@ -26,6 +26,10 @@ import {
|
||||
toZonedDate,
|
||||
} from "@/lib/medications/window-status";
|
||||
import { resolveDisplayedSlotInstant } from "@/components/medications/card-parts/displayed-slot-instant";
|
||||
import {
|
||||
estimateDailyDoseCount,
|
||||
estimateRunwayDays,
|
||||
} from "@/components/medications/detail/supply-runway";
|
||||
import { useAuth } from "@/hooks/use-auth";
|
||||
import { useMedicationComplianceSummary } from "@/lib/queries/use-medication-compliance-summary";
|
||||
|
||||
@@ -61,6 +65,9 @@ interface ScheduleLite {
|
||||
*/
|
||||
timesOfDay?: string[];
|
||||
doseWindows?: { timeOfDay: string; start: string; end: string }[] | null;
|
||||
/** Cadence fields the supply-runway estimate reads (v1.16.11). */
|
||||
rrule?: string | null;
|
||||
rollingIntervalDays?: number | null;
|
||||
}
|
||||
|
||||
interface DoseChangeLite {
|
||||
@@ -108,6 +115,8 @@ export interface Glp1Medication {
|
||||
* renders it as "overdue — still takeable" instead of a future date.
|
||||
*/
|
||||
nextDueOverdue?: boolean;
|
||||
/** v1.16.10 — dose-derived stock from the list payload; null = inventory tracking off. */
|
||||
stockDosesRemaining?: number | null;
|
||||
schedules: ScheduleLite[];
|
||||
}
|
||||
|
||||
@@ -212,9 +221,11 @@ export function Glp1MedicationCard({
|
||||
queryKey: queryKeys.settingsReminderThresholds(),
|
||||
queryFn: async () => {
|
||||
try {
|
||||
return await apiGet<{ lateMinutes: number; missedMinutes: number }>(
|
||||
"/api/settings/reminder-thresholds",
|
||||
);
|
||||
return await apiGet<{
|
||||
lateMinutes: number;
|
||||
missedMinutes: number;
|
||||
lowStockRunwayDays: number | null;
|
||||
}>("/api/settings/reminder-thresholds");
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
@@ -328,6 +339,31 @@ export function Glp1MedicationCard({
|
||||
timeZone: userTz,
|
||||
});
|
||||
|
||||
// v1.16.11 — low-stock card context, identical to the generic card:
|
||||
// runway days from the list payload's dose-derived stock, surfaced
|
||||
// ONLY below the user's runway threshold (`lowStockRunwayDays`,
|
||||
// default 7, null = alert off → no card line). Stock 0 with a
|
||||
// consuming schedule is runway 0 (mirrors `evaluateMedicationRunway`).
|
||||
const lowStockThreshold =
|
||||
thresholds == null ? 7 : thresholds.lowStockRunwayDays;
|
||||
const stockRunwayDays =
|
||||
medication.stockDosesRemaining == null
|
||||
? null
|
||||
: medication.stockDosesRemaining > 0
|
||||
? estimateRunwayDays(
|
||||
medication.stockDosesRemaining,
|
||||
medication.schedules,
|
||||
)
|
||||
: estimateDailyDoseCount(medication.schedules) > 0
|
||||
? 0
|
||||
: null;
|
||||
const lowStockRunwayDays =
|
||||
stockRunwayDays !== null &&
|
||||
lowStockThreshold !== null &&
|
||||
stockRunwayDays < lowStockThreshold
|
||||
? stockRunwayDays
|
||||
: null;
|
||||
|
||||
// v1.15.9 — the recent-injection list now feeds ONLY the post-dose
|
||||
// injection-site dialog's rotation history; the card surface no longer
|
||||
// shows where the last shot landed. The operator: "where I injected
|
||||
@@ -459,6 +495,7 @@ export function Glp1MedicationCard({
|
||||
complianceError={complianceError}
|
||||
onRetryCompliance={refetchCompliance}
|
||||
currentCycle={display?.currentCycle ?? null}
|
||||
lowStockRunwayDays={lowStockRunwayDays}
|
||||
intakeLoading={intakeLoading}
|
||||
onRecordIntake={(skipped) => recordIntake(skipped, displayedSlot)}
|
||||
>
|
||||
|
||||
@@ -16,6 +16,10 @@ import {
|
||||
toZonedDate,
|
||||
} from "@/lib/medications/window-status";
|
||||
import { resolveDisplayedSlotInstant } from "@/components/medications/card-parts/displayed-slot-instant";
|
||||
import {
|
||||
estimateDailyDoseCount,
|
||||
estimateRunwayDays,
|
||||
} from "@/components/medications/detail/supply-runway";
|
||||
import { useTranslations, useFormatters } from "@/lib/i18n/context";
|
||||
import {
|
||||
invalidateKeys,
|
||||
@@ -44,6 +48,9 @@ interface Schedule {
|
||||
*/
|
||||
timesOfDay?: string[];
|
||||
doseWindows?: { timeOfDay: string; start: string; end: string }[] | null;
|
||||
/** Cadence fields the supply-runway estimate reads (v1.16.11). */
|
||||
rrule?: string | null;
|
||||
rollingIntervalDays?: number | null;
|
||||
}
|
||||
|
||||
interface Medication {
|
||||
@@ -92,6 +99,8 @@ interface Medication {
|
||||
* compliance bars with the last-taken oriented presentation.
|
||||
*/
|
||||
asNeeded?: boolean;
|
||||
/** v1.16.10 — dose-derived stock from the list payload; null = inventory tracking off. */
|
||||
stockDosesRemaining?: number | null;
|
||||
schedules: Schedule[];
|
||||
}
|
||||
|
||||
@@ -158,9 +167,11 @@ export function MedicationCard({
|
||||
queryKey: queryKeys.settingsReminderThresholds(),
|
||||
queryFn: async () => {
|
||||
try {
|
||||
return await apiGet<{ lateMinutes: number; missedMinutes: number }>(
|
||||
"/api/settings/reminder-thresholds",
|
||||
);
|
||||
return await apiGet<{
|
||||
lateMinutes: number;
|
||||
missedMinutes: number;
|
||||
lowStockRunwayDays: number | null;
|
||||
}>("/api/settings/reminder-thresholds");
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
@@ -264,6 +275,33 @@ export function MedicationCard({
|
||||
timeZone: userTz,
|
||||
});
|
||||
|
||||
// v1.16.11 — low-stock card context. Runway days from the list
|
||||
// payload's dose-derived stock over the same estimate the table /
|
||||
// detail Übersicht / notification engine use; surfaced ONLY below the
|
||||
// user's runway threshold (`lowStockRunwayDays`, default 7, null =
|
||||
// alert off → no card line either). Stock 0 with a consuming schedule
|
||||
// is runway 0 (mirrors `evaluateMedicationRunway`); as-needed has no
|
||||
// runway, ever.
|
||||
const lowStockThreshold =
|
||||
thresholds == null ? 7 : thresholds.lowStockRunwayDays;
|
||||
const stockRunwayDays =
|
||||
medication.asNeeded || medication.stockDosesRemaining == null
|
||||
? null
|
||||
: medication.stockDosesRemaining > 0
|
||||
? estimateRunwayDays(
|
||||
medication.stockDosesRemaining,
|
||||
medication.schedules,
|
||||
)
|
||||
: estimateDailyDoseCount(medication.schedules) > 0
|
||||
? 0
|
||||
: null;
|
||||
const lowStockRunwayDays =
|
||||
stockRunwayDays !== null &&
|
||||
lowStockThreshold !== null &&
|
||||
stockRunwayDays < lowStockThreshold
|
||||
? stockRunwayDays
|
||||
: null;
|
||||
|
||||
function formatLastTakenAt(value: string): string {
|
||||
// Intentionally en-CA: gives YYYY-MM-DD which is locale-independent and
|
||||
// string-comparable for the today / yesterday / older bucketing below.
|
||||
@@ -426,6 +464,7 @@ export function MedicationCard({
|
||||
complianceError={complianceError}
|
||||
onRetryCompliance={refetchCompliance}
|
||||
currentCycle={display?.currentCycle ?? null}
|
||||
lowStockRunwayDays={lowStockRunwayDays}
|
||||
intakeLoading={intakeLoading}
|
||||
onRecordIntake={(skipped) => recordIntake(skipped, displayedSlot)}
|
||||
>
|
||||
|
||||
@@ -167,8 +167,6 @@ export function sortMedicationRows<T extends TableMedication>(
|
||||
});
|
||||
}
|
||||
|
||||
const LOW_STOCK_DOSES = 4;
|
||||
|
||||
interface MedicationTableProps {
|
||||
/** Active medications, already in the page's manual order. */
|
||||
activeMedications: TableMedication[];
|
||||
@@ -190,14 +188,19 @@ export function MedicationTable({
|
||||
const [, forceUpdate] = useReducer((x: number) => x + 1, 0);
|
||||
|
||||
// Same reminder-thresholds source as the cards so the status pill
|
||||
// tiers identically on both presentations.
|
||||
// tiers identically on both presentations. The read also carries the
|
||||
// per-user low-stock runway threshold (v1.16.11) so the stock cell's
|
||||
// warn tier fires on the SAME days-of-runway predicate as the
|
||||
// low-stock notification, not a legacy dose count.
|
||||
const { data: thresholds } = useQuery({
|
||||
queryKey: queryKeys.settingsReminderThresholds(),
|
||||
queryFn: async () => {
|
||||
try {
|
||||
return await apiGet<{ lateMinutes: number; missedMinutes: number }>(
|
||||
"/api/settings/reminder-thresholds",
|
||||
);
|
||||
return await apiGet<{
|
||||
lateMinutes: number;
|
||||
missedMinutes: number;
|
||||
lowStockRunwayDays: number | null;
|
||||
}>("/api/settings/reminder-thresholds");
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
@@ -237,6 +240,11 @@ export function MedicationTable({
|
||||
|
||||
const lateMinutes = thresholds?.lateMinutes ?? 120;
|
||||
const missedMinutes = thresholds?.missedMinutes ?? 240;
|
||||
// Per-user low-stock runway threshold: explicit `null` = the alert is
|
||||
// OFF (no amber tier); a missing / failed read falls back to the
|
||||
// server default (7 days), mirroring `resolveLowStockRunwayDays`.
|
||||
const lowStockRunwayDays =
|
||||
thresholds == null ? 7 : thresholds.lowStockRunwayDays;
|
||||
|
||||
const columns: Array<{
|
||||
key: MedicationTableSortColumn | "status" | "actions";
|
||||
@@ -335,6 +343,7 @@ export function MedicationTable({
|
||||
userTz={userTz}
|
||||
lateMinutes={lateMinutes}
|
||||
missedMinutes={missedMinutes}
|
||||
lowStockRunwayDays={lowStockRunwayDays}
|
||||
/>
|
||||
))}
|
||||
{sortedInactive.map((med) => (
|
||||
@@ -344,6 +353,7 @@ export function MedicationTable({
|
||||
userTz={userTz}
|
||||
lateMinutes={lateMinutes}
|
||||
missedMinutes={missedMinutes}
|
||||
lowStockRunwayDays={lowStockRunwayDays}
|
||||
/>
|
||||
))}
|
||||
</TableBody>
|
||||
@@ -357,6 +367,8 @@ interface MedicationTableRowItemProps {
|
||||
userTz: string;
|
||||
lateMinutes: number;
|
||||
missedMinutes: number;
|
||||
/** Per-user low-stock runway threshold in days; null = alert off. */
|
||||
lowStockRunwayDays: number | null;
|
||||
}
|
||||
|
||||
function MedicationTableRowItem({
|
||||
@@ -364,6 +376,7 @@ function MedicationTableRowItem({
|
||||
userTz,
|
||||
lateMinutes,
|
||||
missedMinutes,
|
||||
lowStockRunwayDays,
|
||||
}: MedicationTableRowItemProps) {
|
||||
const { t, locale } = useTranslations();
|
||||
const fmt = useFormatters();
|
||||
@@ -427,8 +440,13 @@ function MedicationTableRowItem({
|
||||
timeZone: userTz,
|
||||
});
|
||||
|
||||
// Status cell — the card body's exact precedence: last-dose context
|
||||
// outranks the overdue escalation, which outranks the window pill.
|
||||
// Status cell — the card body's precedence with one DELIBERATE
|
||||
// divergence: the card suppresses the taken-early pill on its
|
||||
// next-intake row (the "last intake" line below already names the
|
||||
// dose), while the table keeps it — the table has a dedicated Status
|
||||
// column with no neighbouring last-intake context. Order here:
|
||||
// last-dose context outranks the overdue escalation, which outranks
|
||||
// the window pill.
|
||||
const overdueLabel =
|
||||
medication.active && doseStatus === "missed"
|
||||
? t("medications.veryOverdue")
|
||||
@@ -574,6 +592,14 @@ function MedicationTableRowItem({
|
||||
stock === null || stock === undefined
|
||||
? null
|
||||
: estimateRunwayDays(stock, medication.schedules);
|
||||
// Warn tier (amber) on the SAME predicate as the low-stock
|
||||
// notification: projected runway days strictly below the user's
|
||||
// threshold. Threshold OFF (null) → no amber tier; an exhausted stock
|
||||
// (0) stays destructive red regardless.
|
||||
const lowStock =
|
||||
runwayDays !== null &&
|
||||
lowStockRunwayDays !== null &&
|
||||
runwayDays < lowStockRunwayDays;
|
||||
const stockCell =
|
||||
stock === null || stock === undefined ? (
|
||||
<span className="text-muted-foreground">–</span>
|
||||
@@ -584,7 +610,7 @@ function MedicationTableRowItem({
|
||||
"tabular-nums",
|
||||
stock === 0
|
||||
? "text-destructive font-medium"
|
||||
: stock < LOW_STOCK_DOSES
|
||||
: lowStock
|
||||
? "text-warning font-medium"
|
||||
: undefined,
|
||||
)}
|
||||
|
||||
@@ -36,6 +36,7 @@
|
||||
*/
|
||||
|
||||
import { useState, type FormEvent } from "react";
|
||||
import Link from "next/link";
|
||||
import { useQuery, useQueryClient } from "@tanstack/react-query";
|
||||
import { toast } from "sonner";
|
||||
import { Loader2, PackageOpen, Plus } from "lucide-react";
|
||||
@@ -153,6 +154,26 @@ export function InventorySection({
|
||||
staleTime: 30_000,
|
||||
});
|
||||
|
||||
// v1.16.11 — the low-stock alert threshold, for the cross-link row
|
||||
// below the supply summary (same shared key + cache the cards read).
|
||||
// Null on failure falls back to the server default (7 days).
|
||||
const { data: thresholds } = useQuery({
|
||||
queryKey: queryKeys.settingsReminderThresholds(),
|
||||
queryFn: async () => {
|
||||
try {
|
||||
return await apiGet<{
|
||||
lateMinutes: number;
|
||||
missedMinutes: number;
|
||||
lowStockRunwayDays: number | null;
|
||||
}>("/api/settings/reminder-thresholds");
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
},
|
||||
staleTime: 5 * 60 * 1000,
|
||||
});
|
||||
const lowStockDays = thresholds == null ? 7 : thresholds.lowStockRunwayDays;
|
||||
|
||||
if (isLoading) {
|
||||
return (
|
||||
<div
|
||||
@@ -271,6 +292,22 @@ export function InventorySection({
|
||||
{t("medications.detail.bestand.addButton")}
|
||||
</Button>
|
||||
</div>
|
||||
{/* v1.16.11 — cross-link to the low-stock alert setting: the
|
||||
threshold lives in Settings → Notifications, but the question
|
||||
"when will it warn me?" comes up here, where the stock lives. */}
|
||||
<div className="py-2">
|
||||
<Link
|
||||
href="/settings/notifications#low-stock"
|
||||
className="text-muted-foreground hover:text-foreground text-xs underline-offset-2 hover:underline"
|
||||
data-slot="inventory-low-stock-link"
|
||||
>
|
||||
{lowStockDays !== null
|
||||
? t("medications.detail.bestand.lowStockLinkOn", {
|
||||
days: lowStockDays,
|
||||
})
|
||||
: t("medications.detail.bestand.lowStockLinkOff")}
|
||||
</Link>
|
||||
</div>
|
||||
</SettingsGroup>
|
||||
|
||||
{/* v1.16.11 — packaging economics surfaced where the stock lives:
|
||||
|
||||
@@ -46,6 +46,7 @@ import {
|
||||
type ScheduleWindowInput,
|
||||
} from "@/lib/medications/window-status";
|
||||
import { resolveDisplayedSlotInstant } from "@/components/medications/card-parts/displayed-slot-instant";
|
||||
import type { DoseStatus } from "@/lib/analytics/compliance";
|
||||
|
||||
type Translator = (
|
||||
key: string,
|
||||
@@ -69,6 +70,8 @@ export interface DueDerivationMedication {
|
||||
/** Server display-due verdict from `GET /api/medications`. */
|
||||
nextDueAt?: string | null;
|
||||
nextDueOverdue?: boolean;
|
||||
/** v1.16.11 (#316) — as-needed (PRN): never due, never in the set. */
|
||||
asNeeded?: boolean;
|
||||
schedules: DueDerivationSchedule[];
|
||||
}
|
||||
|
||||
@@ -95,6 +98,21 @@ const DEFAULT_THRESHOLDS = { lateMinutes: 120, missedMinutes: 240 };
|
||||
* a non-null current-window status (in_window / late / very_late) that is
|
||||
* not the day-scale taken-early downgrade. Input order is preserved so
|
||||
* the dialog lists medications in the same order the page renders them.
|
||||
*
|
||||
* The due set ADDITIONALLY includes escalated medications: an active,
|
||||
* unpaused, non-as-needed medication whose batched compliance
|
||||
* `currentDose.status` (`doseStatusById`, the same
|
||||
* `useMedicationComplianceSummaryAll` rows the page and the table hold)
|
||||
* is `overdue` / `missed`. A dose whose band + catch-up tail have closed
|
||||
* renders the red escalation value with an ACTIVE take button on its
|
||||
* card, so it must be takeable from the batch too — the window-only
|
||||
* derivation silently dropped it. The recorded slot for such an entry is
|
||||
* exactly what the card's own take button records: the SAME
|
||||
* `resolveDisplayedSlotInstant` call over the same (closed) window
|
||||
* status, which resolves to the server's `nextDueAt` instant (or null,
|
||||
* preserving the unscheduled now-snap path). Entries dedupe by
|
||||
* construction — the window branch and the escalation branch are
|
||||
* mutually exclusive per medication.
|
||||
*/
|
||||
export function deriveDueMedications(
|
||||
medications: DueDerivationMedication[],
|
||||
@@ -103,6 +121,12 @@ export function deriveDueMedications(
|
||||
/** IANA timezone (profile timezone; Berlin is the legacy fallback). */
|
||||
tz?: string;
|
||||
thresholds?: { lateMinutes: number; missedMinutes: number };
|
||||
/**
|
||||
* Batched compliance dose status per medication id (the page's
|
||||
* `useMedicationComplianceSummaryAll` rows). Absent / unknown ids
|
||||
* keep the window-only derivation — the legacy behaviour.
|
||||
*/
|
||||
doseStatusById?: ReadonlyMap<string, DoseStatus>;
|
||||
} = {},
|
||||
): DueMedication[] {
|
||||
const now = options.now ?? new Date();
|
||||
@@ -114,8 +138,10 @@ export function deriveDueMedications(
|
||||
const due: DueMedication[] = [];
|
||||
for (const m of medications) {
|
||||
// Paused courses keep their schedules but must never surface here —
|
||||
// the cards suppress their pills the same way.
|
||||
if (!m.active || m.pausedAt) continue;
|
||||
// the cards suppress their pills the same way. As-needed (PRN)
|
||||
// medications are never due, structurally — even a (bogus)
|
||||
// compliance row for one must not pull it into the set.
|
||||
if (!m.active || m.pausedAt || m.asNeeded) continue;
|
||||
|
||||
const nextDueMs = m.nextDueAt ? new Date(m.nextDueAt).getTime() : NaN;
|
||||
const status = reduceCurrentWindowStatus({
|
||||
@@ -139,8 +165,17 @@ export function deriveDueMedications(
|
||||
});
|
||||
// `takenEarlyDaysAgo` non-null = a day-scale dose already on board
|
||||
// earlier in its period; including it would build a double-dose
|
||||
// confirm list.
|
||||
if (!status.status || status.takenEarlyDaysAgo !== null) continue;
|
||||
// confirm list. The card suppresses every prompt tier (incl. the red
|
||||
// escalation value) the same way.
|
||||
if (status.takenEarlyDaysAgo !== null) continue;
|
||||
|
||||
// Escalation alignment with the card: a compliance-derived
|
||||
// overdue / missed dose keeps an active take button on its card even
|
||||
// after the band's catch-up tail closed (window status null).
|
||||
const complianceStatus = options.doseStatusById?.get(m.id);
|
||||
const escalated =
|
||||
complianceStatus === "overdue" || complianceStatus === "missed";
|
||||
if (!status.status && !escalated) continue;
|
||||
|
||||
due.push({
|
||||
id: m.id,
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
"use client";
|
||||
|
||||
import { useEffect, useRef, useState } from "react";
|
||||
import Link from "next/link";
|
||||
import { useQuery, useQueryClient } from "@tanstack/react-query";
|
||||
import { PackageOpen } from "lucide-react";
|
||||
|
||||
@@ -144,8 +145,11 @@ export function LowStockCard({
|
||||
|
||||
return (
|
||||
<section
|
||||
// `id` is the anchor target of the supply tab's cross-link
|
||||
// (`/settings/notifications#low-stock`) — keep it stable.
|
||||
id="low-stock"
|
||||
aria-labelledby="settings-low-stock-title"
|
||||
className="bg-card border-border rounded-xl border p-4 sm:p-6"
|
||||
className="bg-card border-border scroll-mt-20 rounded-xl border p-4 sm:p-6"
|
||||
>
|
||||
<SettingsCardHeader
|
||||
icon={PackageOpen}
|
||||
@@ -207,6 +211,17 @@ export function LowStockCard({
|
||||
{msg}
|
||||
</p>
|
||||
)}
|
||||
{/* v1.16.11 — back-link to the medications list, the surface the
|
||||
alert is about (the supply tab links here the same way). */}
|
||||
<p className="mt-3 pl-7">
|
||||
<Link
|
||||
href="/medications"
|
||||
className="text-muted-foreground hover:text-foreground text-xs underline-offset-2 hover:underline"
|
||||
data-slot="low-stock-medications-link"
|
||||
>
|
||||
{t("notifications.lowStock.medicationsLink")}
|
||||
</Link>
|
||||
</p>
|
||||
</section>
|
||||
);
|
||||
}
|
||||
Reference in new issue
Block a user