5e1a885dcb
Dates were a mix: catalog-formatted "25 Qershor 20:01" where screens used
formatRelativeDateTime, and browser-locale "7/6/2026, 9:34 AM" in ~20
places that called raw toLocaleString/-Date-/-Time-String. Unified:
- common.monthsShort in both catalogs (Jan/Shk/…/Qer/Korr/…/Dhj);
formatDate ("25 Qer", year only when not current), formatDateTime
("25 Qer 14:30", optional seconds), formatClock ("HH:mm", 24h) in
lib/format.ts. formatRelativeDateTime keeps Sot/Dje and switches its
older-dates branch to the same short months.
- Every raw toLocale* DATE call swept: shifts X-report line, plan
effective dates, sub version labels, drawer today feed, snapshot
tooltips, device footer checkedAt, event-detail timestamp (keeps
seconds — chain evidence), tariff composer active-since + version
sidebar. Number toLocaleString (thousand separators) untouched.
The catalogs in this commit also carry the keys for the two follow-up
commits (fee breakdown, composer increment labels).
Claude-Session: https://claude.ai/code/session_01Xcm6ikLgGoCxxHrxtjkk5V
144 lines
6.2 KiB
TypeScript
144 lines
6.2 KiB
TypeScript
// Small formatting helpers for the booth. Money is integer MINOR units (never a
|
|
// float — matches the tariff/ledger model); duration is whole minutes.
|
|
|
|
/** Format integer minor units + ISO-4217 currency as a major-unit string. */
|
|
export function formatMoney(amountMinor: number, currency: string): string {
|
|
const major = amountMinor / 100;
|
|
try {
|
|
return new Intl.NumberFormat(undefined, { style: "currency", currency }).format(major);
|
|
} catch {
|
|
// Unknown/garbled currency code — fall back to a plain number + the code.
|
|
return `${major.toFixed(2)} ${currency}`;
|
|
}
|
|
}
|
|
|
|
/** Human duration between two ISO times, e.g. "2h 14m" / "47m" / "0m". */
|
|
export function formatDuration(fromIso: string, toIso: string): string {
|
|
const ms = Date.parse(toIso) - Date.parse(fromIso);
|
|
if (!Number.isFinite(ms) || ms < 0) return "—";
|
|
const mins = Math.floor(ms / 60_000);
|
|
const h = Math.floor(mins / 60);
|
|
const m = mins % 60;
|
|
return h > 0 ? `${h}h ${m}m` : `${m}m`;
|
|
}
|
|
|
|
/** Remaining time until `untilIso`, as a live countdown: "M:SS" (or "H:MM:SS" past an
|
|
* hour). Returns null once expired (or for a bad/empty input) so callers can drop the
|
|
* badge. Pass `nowMs` (a ticking clock) to make it update each second. */
|
|
export function formatCountdown(untilIso: string | null, nowMs: number = Date.now()): string | null {
|
|
if (!untilIso) return null;
|
|
const ms = Date.parse(untilIso) - nowMs;
|
|
if (!Number.isFinite(ms) || ms <= 0) return null;
|
|
const total = Math.ceil(ms / 1000);
|
|
const h = Math.floor(total / 3600);
|
|
const m = Math.floor((total % 3600) / 60);
|
|
const s = total % 60;
|
|
const ss = String(s).padStart(2, "0");
|
|
if (h > 0) return `${h}:${String(m).padStart(2, "0")}:${ss}`;
|
|
return `${m}:${ss}`;
|
|
}
|
|
|
|
/** Human duration from whole minutes, e.g. 134 → "2h 14m", 47 → "47m", 0 → "0m". */
|
|
export function formatMinutes(mins: number): string {
|
|
if (!Number.isFinite(mins) || mins < 0) return "—";
|
|
const m = Math.round(mins);
|
|
const h = Math.floor(m / 60);
|
|
return h > 0 ? `${h}h ${m % 60}m` : `${m}m`;
|
|
}
|
|
|
|
/** Local time-of-day HH:MM:SS from an ISO string. */
|
|
export function formatTime(iso: string | null): string {
|
|
if (!iso) return "—";
|
|
const d = new Date(iso);
|
|
return Number.isNaN(d.getTime()) ? "—" : d.toTimeString().slice(0, 8);
|
|
}
|
|
|
|
/** Calendar-day difference (local) between two dates: 0 = same day, 1 = d is one day
|
|
* before ref, etc. Compares date parts only (ignores time-of-day). */
|
|
function dayDiff(d: Date, ref: Date): number {
|
|
const a = new Date(d.getFullYear(), d.getMonth(), d.getDate());
|
|
const b = new Date(ref.getFullYear(), ref.getMonth(), ref.getDate());
|
|
return Math.round((b.getTime() - a.getTime()) / 86_400_000);
|
|
}
|
|
|
|
/** HH:MM (local, 24h) for the relative-day labels. */
|
|
function hhmm(d: Date): string {
|
|
const p = (n: number) => String(n).padStart(2, "0");
|
|
return `${p(d.getHours())}:${p(d.getMinutes())}`;
|
|
}
|
|
|
|
/** Minimal shape of i18next's `t` that we rely on: a string lookup, plus the
|
|
* `returnObjects` overload used to fetch the month-name array. */
|
|
export interface TFn {
|
|
(key: string): string;
|
|
(key: string, opts: { returnObjects: true }): unknown;
|
|
}
|
|
|
|
/** Localized month name (index 0 = January) from the i18n catalog. Browser ICU on
|
|
* the appliance may lack Albanian data, so we DON'T use Intl — the catalog is the
|
|
* source of truth. Falls back to a numeric month if the array is missing. */
|
|
function monthName(d: Date, t: TFn): string {
|
|
const months = t("common.months", { returnObjects: true });
|
|
if (Array.isArray(months) && typeof months[d.getMonth()] === "string") {
|
|
return months[d.getMonth()] as string;
|
|
}
|
|
return String(d.getMonth() + 1);
|
|
}
|
|
|
|
/** Short month ("Qer", "Korr") from the catalog — the UI-wide date standard
|
|
* (2026-07-06): every visible date reads "25 Qer" / "7 Korr 2025", never the
|
|
* browser-locale "7/6/2026". Falls back to the full name, then the number. */
|
|
function monthShort(d: Date, t: TFn): string {
|
|
const months = t("common.monthsShort", { returnObjects: true });
|
|
if (Array.isArray(months) && typeof months[d.getMonth()] === "string") {
|
|
return months[d.getMonth()] as string;
|
|
}
|
|
return monthName(d, t);
|
|
}
|
|
|
|
/** "HH:mm" (local, 24h) — the unified time-of-day everywhere ("—" for bad input). */
|
|
export function formatClock(iso: string | null): string {
|
|
if (!iso) return "—";
|
|
const d = new Date(iso);
|
|
return Number.isNaN(d.getTime()) ? "—" : hhmm(d);
|
|
}
|
|
|
|
/** "25 Qer" (current year) / "25 Qer 2025" (other years) — the unified DATE. */
|
|
export function formatDate(iso: string | null, t: TFn): string {
|
|
if (!iso) return "—";
|
|
const d = new Date(iso);
|
|
if (Number.isNaN(d.getTime())) return "—";
|
|
const base = `${d.getDate()} ${monthShort(d, t)}`;
|
|
return d.getFullYear() === new Date().getFullYear() ? base : `${base} ${d.getFullYear()}`;
|
|
}
|
|
|
|
/** "25 Qer 14:30" (+ ":ss" when `seconds`) — the unified absolute DATE+TIME. Use
|
|
* formatRelativeDateTime instead where "Sot/Dje" reads better (feeds, history). */
|
|
export function formatDateTime(iso: string | null, t: TFn, opts?: { seconds?: boolean }): string {
|
|
if (!iso) return "—";
|
|
const d = new Date(iso);
|
|
if (Number.isNaN(d.getTime())) return "—";
|
|
const sec = opts?.seconds ? `:${String(d.getSeconds()).padStart(2, "0")}` : "";
|
|
return `${formatDate(iso, t)} ${hhmm(d)}${sec}`;
|
|
}
|
|
|
|
/**
|
|
* Human, day-relative date+time for sessions/logs/history. An event from earlier
|
|
* today reads "Sot 10:48", yesterday "Dje 17:33", and anything older a localized
|
|
* "17 Qershor 10:48" (month name from the active catalog). Keeps time-of-day on
|
|
* every variant — operators care about it within a shift.
|
|
*
|
|
* `t` supplies the today/yesterday words AND the month names (the appliance browser
|
|
* may lack Albanian Intl data, so month names come from the catalog, not Intl).
|
|
*/
|
|
export function formatRelativeDateTime(iso: string | null, t: TFn): string {
|
|
if (!iso) return "—";
|
|
const d = new Date(iso);
|
|
if (Number.isNaN(d.getTime())) return "—";
|
|
const diff = dayDiff(d, new Date());
|
|
if (diff === 0) return `${t("common.today")} ${hhmm(d)}`;
|
|
if (diff === 1) return `${t("common.yesterday")} ${hhmm(d)}`;
|
|
// Older (or future): "17 Qer 10:48" — the short-month standard, year only if it differs.
|
|
return `${formatDate(iso, t)} ${hhmm(d)}`;
|
|
}
|