mirror of
https://github.com/temetro/temetro.git
synced 2026-08-27 10:56:58 +00:00
frontend: replace Analyze "Live" card with a Patient-visits area chart
The realtime "Live" hospital card is dropped in favour of a six-month patient visits area chart, aggregated client-side from real appointments. Renames the analysis.live.* i18n block to analysis.area.* and removes the dead live-hospital-chart component. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -4,7 +4,6 @@ import { type ReactNode, useEffect, useMemo, useState } from "react";
|
|||||||
import { useTranslation } from "react-i18next";
|
import { useTranslation } from "react-i18next";
|
||||||
|
|
||||||
import { EarningsChart } from "@/components/analysis/earnings-chart";
|
import { EarningsChart } from "@/components/analysis/earnings-chart";
|
||||||
import { LiveHospitalChart } from "@/components/analysis/live-hospital-chart";
|
|
||||||
import { Area, AreaChart } from "@/components/charts/area-chart";
|
import { Area, AreaChart } from "@/components/charts/area-chart";
|
||||||
import { Bar } from "@/components/charts/bar";
|
import { Bar } from "@/components/charts/bar";
|
||||||
import { BarChart } from "@/components/charts/bar-chart";
|
import { BarChart } from "@/components/charts/bar-chart";
|
||||||
@@ -14,6 +13,7 @@ import { ChartTooltip } from "@/components/charts/tooltip";
|
|||||||
import { XAxis } from "@/components/charts/x-axis";
|
import { XAxis } from "@/components/charts/x-axis";
|
||||||
import { Card } from "@/components/ui/card";
|
import { Card } from "@/components/ui/card";
|
||||||
import { type Analytics, getAnalytics } from "@/lib/analytics";
|
import { type Analytics, getAnalytics } from "@/lib/analytics";
|
||||||
|
import { type Appointment, listAppointments } from "@/lib/appointments";
|
||||||
import { formatMoney } from "@/lib/invoices";
|
import { formatMoney } from "@/lib/invoices";
|
||||||
|
|
||||||
// Clinic analytics computed on the server from real data (patients,
|
// Clinic analytics computed on the server from real data (patients,
|
||||||
@@ -90,6 +90,7 @@ function ChartCard({
|
|||||||
export function AnalysisView() {
|
export function AnalysisView() {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
const [data, setData] = useState<Analytics | null>(null);
|
const [data, setData] = useState<Analytics | null>(null);
|
||||||
|
const [appointments, setAppointments] = useState<Appointment[]>([]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
let active = true;
|
let active = true;
|
||||||
@@ -100,6 +101,13 @@ export function AnalysisView() {
|
|||||||
.catch(() => {
|
.catch(() => {
|
||||||
/* api-client redirects on 401; otherwise leave it loading */
|
/* api-client redirects on 401; otherwise leave it loading */
|
||||||
});
|
});
|
||||||
|
listAppointments()
|
||||||
|
.then((a) => {
|
||||||
|
if (active) setAppointments(a);
|
||||||
|
})
|
||||||
|
.catch(() => {
|
||||||
|
/* leave the visits chart empty on failure */
|
||||||
|
});
|
||||||
return () => {
|
return () => {
|
||||||
active = false;
|
active = false;
|
||||||
};
|
};
|
||||||
@@ -107,6 +115,28 @@ export function AnalysisView() {
|
|||||||
|
|
||||||
const n = (v: number | undefined) => String(v ?? 0);
|
const n = (v: number | undefined) => String(v ?? 0);
|
||||||
|
|
||||||
|
// Patient visits per month over the last six months, aggregated from real
|
||||||
|
// appointments (no server-side monthly series exists yet).
|
||||||
|
const visitData = useMemo(() => {
|
||||||
|
const now = new Date();
|
||||||
|
const months = Array.from({ length: 6 }, (_, i) => ({
|
||||||
|
date: new Date(now.getFullYear(), now.getMonth() - (5 - i), 1),
|
||||||
|
visits: 0,
|
||||||
|
}));
|
||||||
|
for (const a of appointments) {
|
||||||
|
const d = new Date(`${a.date}T00:00:00`);
|
||||||
|
if (Number.isNaN(d.getTime())) continue;
|
||||||
|
const m = months.find(
|
||||||
|
(mo) =>
|
||||||
|
mo.date.getFullYear() === d.getFullYear() &&
|
||||||
|
mo.date.getMonth() === d.getMonth(),
|
||||||
|
);
|
||||||
|
if (m) m.visits += 1;
|
||||||
|
}
|
||||||
|
return months;
|
||||||
|
}, [appointments]);
|
||||||
|
const visitTotal = visitData.reduce((sum, p) => sum + p.visits, 0);
|
||||||
|
|
||||||
// The area chart needs real Date x-values: synthesise one month per point,
|
// The area chart needs real Date x-values: synthesise one month per point,
|
||||||
// ending with the current month.
|
// ending with the current month.
|
||||||
const monthData = useMemo(() => {
|
const monthData = useMemo(() => {
|
||||||
@@ -147,17 +177,27 @@ export function AnalysisView() {
|
|||||||
<section className="flex flex-col gap-3">
|
<section className="flex flex-col gap-3">
|
||||||
<div>
|
<div>
|
||||||
<h2 className="font-semibold text-lg tracking-tight">
|
<h2 className="font-semibold text-lg tracking-tight">
|
||||||
{t("analysis.live.title")}
|
{t("analysis.area.title")}
|
||||||
</h2>
|
</h2>
|
||||||
<p className="text-muted-foreground text-sm">
|
<p className="text-muted-foreground text-sm">
|
||||||
{t("analysis.live.subtitle")}
|
{t("analysis.area.subtitle")}
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
<Card className="gap-3 p-4">
|
<Card className="gap-3 p-4">
|
||||||
<span className="text-muted-foreground text-sm">
|
<div className="flex items-baseline justify-between gap-2">
|
||||||
{t("analysis.live.label")}
|
<span className="text-muted-foreground text-sm">
|
||||||
</span>
|
{t("analysis.area.label")}
|
||||||
<LiveHospitalChart />
|
</span>
|
||||||
|
<span className="font-semibold text-foreground text-xl tabular-nums">
|
||||||
|
{visitTotal}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<AreaChart aspectRatio="3 / 1" data={visitData}>
|
||||||
|
<Grid horizontal />
|
||||||
|
<Area dataKey="visits" fill="var(--chart-line-primary)" />
|
||||||
|
<XAxis numTicks={Math.max(visitData.length, 2)} tickMode="data" />
|
||||||
|
<ChartTooltip showDatePill={false} />
|
||||||
|
</AreaChart>
|
||||||
</Card>
|
</Card>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
|||||||
@@ -1,128 +0,0 @@
|
|||||||
"use client";
|
|
||||||
|
|
||||||
import { Pause, Play } from "lucide-react";
|
|
||||||
import { useEffect, useRef, useState } from "react";
|
|
||||||
import { useTranslation } from "react-i18next";
|
|
||||||
|
|
||||||
import {
|
|
||||||
LiveLineChart,
|
|
||||||
type LiveLinePoint,
|
|
||||||
} from "@/components/charts/live-line-chart";
|
|
||||||
import { LiveLine } from "@/components/charts/live-line";
|
|
||||||
import { LiveYAxis } from "@/components/charts/live-y-axis";
|
|
||||||
import { ChartTooltip } from "@/components/charts/tooltip";
|
|
||||||
import { Button } from "@/components/ui/button";
|
|
||||||
import { getLiveMetric } from "@/lib/analytics";
|
|
||||||
|
|
||||||
// The "Live" panel plots a REAL clinic signal — patients checked in today — by
|
|
||||||
// polling GET /api/analytics/live. It only runs while the clinician toggles it
|
|
||||||
// on, so the Analysis page stays idle by default. The metric changes slowly
|
|
||||||
// (only as people check in), so the line scrolls smoothly using the last value
|
|
||||||
// and refreshes from the server every few seconds.
|
|
||||||
const WINDOW_SECONDS = 30;
|
|
||||||
const REFETCH_EVERY_TICKS = 5; // poll the server every 5s (1s render ticks)
|
|
||||||
|
|
||||||
export function LiveHospitalChart() {
|
|
||||||
const { t } = useTranslation();
|
|
||||||
const [live, setLive] = useState(false);
|
|
||||||
const [data, setData] = useState<LiveLinePoint[]>([]);
|
|
||||||
const [value, setValue] = useState(0);
|
|
||||||
const valueRef = useRef(0);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
if (!live) return;
|
|
||||||
let active = true;
|
|
||||||
|
|
||||||
const refetch = () =>
|
|
||||||
getLiveMetric()
|
|
||||||
.then((r) => {
|
|
||||||
if (!active) return;
|
|
||||||
valueRef.current = r.value;
|
|
||||||
setValue(r.value);
|
|
||||||
})
|
|
||||||
.catch(() => {
|
|
||||||
/* keep the last value on a transient error */
|
|
||||||
});
|
|
||||||
|
|
||||||
// Seed a short flat history from the first reading so the line draws at once.
|
|
||||||
refetch().finally(() => {
|
|
||||||
if (!active) return;
|
|
||||||
const now = Date.now() / 1000;
|
|
||||||
setData(
|
|
||||||
Array.from({ length: WINDOW_SECONDS }, (_, i) => ({
|
|
||||||
time: now - (WINDOW_SECONDS - i),
|
|
||||||
value: valueRef.current,
|
|
||||||
})),
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
let tick = 0;
|
|
||||||
const id = setInterval(() => {
|
|
||||||
tick += 1;
|
|
||||||
if (tick % REFETCH_EVERY_TICKS === 0) void refetch();
|
|
||||||
setData((prev) => [
|
|
||||||
...prev.slice(-500),
|
|
||||||
{ time: Date.now() / 1000, value: valueRef.current },
|
|
||||||
]);
|
|
||||||
}, 1000);
|
|
||||||
return () => {
|
|
||||||
active = false;
|
|
||||||
clearInterval(id);
|
|
||||||
};
|
|
||||||
}, [live]);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className="flex flex-col gap-3">
|
|
||||||
<div className="flex items-center justify-end">
|
|
||||||
<Button
|
|
||||||
onClick={() => setLive((v) => !v)}
|
|
||||||
size="sm"
|
|
||||||
type="button"
|
|
||||||
variant={live ? "outline" : "default"}
|
|
||||||
>
|
|
||||||
{live ? (
|
|
||||||
<>
|
|
||||||
<Pause className="size-4" />
|
|
||||||
{t("analysis.live.pause")}
|
|
||||||
</>
|
|
||||||
) : (
|
|
||||||
<>
|
|
||||||
<Play className="size-4" />
|
|
||||||
{t("analysis.live.start")}
|
|
||||||
</>
|
|
||||||
)}
|
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{live ? (
|
|
||||||
<div className="h-56 w-full">
|
|
||||||
<LiveLineChart
|
|
||||||
data={data}
|
|
||||||
margin={{ left: 52, right: 48 }}
|
|
||||||
value={value}
|
|
||||||
window={WINDOW_SECONDS}
|
|
||||||
>
|
|
||||||
<LiveLine
|
|
||||||
dataKey="value"
|
|
||||||
formatValue={(v) => String(Math.round(v))}
|
|
||||||
momentumColors={{
|
|
||||||
up: "var(--color-emerald-500)",
|
|
||||||
down: "var(--color-red-500)",
|
|
||||||
flat: "var(--chart-line-primary)",
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
<LiveYAxis
|
|
||||||
formatValue={(v) => String(Math.round(v))}
|
|
||||||
position="left"
|
|
||||||
/>
|
|
||||||
<ChartTooltip showDatePill={false} />
|
|
||||||
</LiveLineChart>
|
|
||||||
</div>
|
|
||||||
) : (
|
|
||||||
<div className="flex h-56 w-full items-center justify-center rounded-2xl border border-dashed bg-card/20 text-center text-muted-foreground text-sm">
|
|
||||||
{t("analysis.live.idle")}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
@@ -702,13 +702,10 @@
|
|||||||
"analysis": {
|
"analysis": {
|
||||||
"title": "Analysis",
|
"title": "Analysis",
|
||||||
"subtitle": "Clinic performance at a glance, computed from your clinic's data.",
|
"subtitle": "Clinic performance at a glance, computed from your clinic's data.",
|
||||||
"live": {
|
"area": {
|
||||||
"title": "Live",
|
"title": "Patient visits",
|
||||||
"subtitle": "Patients currently in the building, updating in real time.",
|
"subtitle": "Visit volume over the last six months.",
|
||||||
"label": "In the building now",
|
"label": "Total visits"
|
||||||
"start": "Go live",
|
|
||||||
"pause": "Pause",
|
|
||||||
"idle": "Live stream paused — press Go live to start."
|
|
||||||
},
|
},
|
||||||
"patientVolume": {
|
"patientVolume": {
|
||||||
"title": "Patient volume",
|
"title": "Patient volume",
|
||||||
|
|||||||
Reference in New Issue
Block a user