mirror of
https://github.com/MBombeck/HealthLog.git
synced 2026-11-18 16:12:11 +00:00
Remove the 7-day bar strip under the Vorsorge card last-done line and its backing component, query key, and i18n strings. Render the last-done value as a relative date (today / yesterday / absolute) through a shared relativeCalendarDate helper that reuses the medication today/yesterday keys. Show the next-due status as discreet coloured text - green today, orange overdue - leaving the card surface neutral.
89 lines
3.1 KiB
TypeScript
89 lines
3.1 KiB
TypeScript
/**
|
|
* v1.4.20 phase D reconcile — shared relative-time helper.
|
|
*
|
|
* Formats an ISO timestamp as a localised "just now" / "N minutes ago"
|
|
* string via i18n keys. Three Insights surfaces (hero strip, daily
|
|
* briefing, history rail) carried byte-identical copies of this helper;
|
|
* lift the body here so a future i18n key change lands once.
|
|
*
|
|
* Buckets: <1m → just-now, <1h → minutes, <24h → hours, else days.
|
|
*
|
|
* v1.4.43 H6 — pluralisation. Each bucket now branches on `count === 1`
|
|
* to read the *One key (singular) or *Other key (plural), matching the
|
|
* dashboard.staleHintWeeksOne / Other pattern already in the bundle.
|
|
* Eliminates the "vor 1 Minuten" grammar bug a German user spotted.
|
|
*/
|
|
export function formatRelativeTime(
|
|
iso: string,
|
|
t: (key: string, params?: Record<string, string | number>) => string,
|
|
): string {
|
|
const target = new Date(iso).getTime();
|
|
if (Number.isNaN(target)) return "";
|
|
const diffMs = Date.now() - target;
|
|
if (diffMs < 60_000) return t("insights.relativeJustNow");
|
|
const minutes = Math.floor(diffMs / 60_000);
|
|
if (minutes < 60) {
|
|
return t(
|
|
minutes === 1
|
|
? "insights.relativeMinutesAgoOne"
|
|
: "insights.relativeMinutesAgoOther",
|
|
{ count: minutes },
|
|
);
|
|
}
|
|
const hours = Math.floor(minutes / 60);
|
|
if (hours < 24) {
|
|
return t(
|
|
hours === 1
|
|
? "insights.relativeHoursAgoOne"
|
|
: "insights.relativeHoursAgoOther",
|
|
{ count: hours },
|
|
);
|
|
}
|
|
const days = Math.floor(hours / 24);
|
|
return t(
|
|
days === 1
|
|
? "insights.relativeDaysAgoOne"
|
|
: "insights.relativeDaysAgoOther",
|
|
{ count: days },
|
|
);
|
|
}
|
|
|
|
/**
|
|
* v1.18.9 — date-only relative label, shared with the medication card grammar.
|
|
*
|
|
* Buckets a calendar date against "now": same day → `medications.today`
|
|
* ("Heute"), the day before → `medications.yesterday` ("Gestern"), otherwise
|
|
* the absolute date through the caller's locale formatter. The today /
|
|
* yesterday i18n keys are the SAME ones the medication card renders for its
|
|
* last-taken line, so a Vorsorge "zuletzt erledigt" reads identically.
|
|
*
|
|
* Day-bucketing uses an `en-CA` (YYYY-MM-DD) day key — locale-independent and
|
|
* string-comparable — formatted in the supplied IANA `timeZone` so the
|
|
* boundary follows the user's zone, not the server's. `formatDate` renders the
|
|
* absolute fallback (pass the locale `fmt.date`).
|
|
*/
|
|
export function relativeCalendarDate(
|
|
iso: string,
|
|
t: (key: string, params?: Record<string, string | number>) => string,
|
|
formatDate: (value: Date) => string,
|
|
timeZone?: string,
|
|
): string {
|
|
const target = new Date(iso);
|
|
if (Number.isNaN(target.getTime())) return "";
|
|
const dayFormatter = new Intl.DateTimeFormat("en-CA", {
|
|
timeZone,
|
|
year: "numeric",
|
|
month: "2-digit",
|
|
day: "2-digit",
|
|
});
|
|
const now = new Date();
|
|
const yesterday = new Date(now);
|
|
yesterday.setDate(yesterday.getDate() - 1);
|
|
|
|
const targetDay = dayFormatter.format(target);
|
|
if (targetDay === dayFormatter.format(now)) return t("medications.today");
|
|
if (targetDay === dayFormatter.format(yesterday))
|
|
return t("medications.yesterday");
|
|
return formatDate(target);
|
|
}
|