From 0db74b2787c9ffdc5a83274e697085741dc61c54 Mon Sep 17 00:00:00 2001 From: JCEEE <0xjceee@proton.me> Date: Fri, 11 Sep 2026 08:47:34 +0100 Subject: [PATCH] add pocket money count --- frontend/src/routes/[fam]/+page.svelte | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/frontend/src/routes/[fam]/+page.svelte b/frontend/src/routes/[fam]/+page.svelte index 172575a..6912039 100644 --- a/frontend/src/routes/[fam]/+page.svelte +++ b/frontend/src/routes/[fam]/+page.svelte @@ -78,6 +78,18 @@ } return map; }); + let pocketMoneyByMember = $derived.by(() => { + const ws = (summary?.weekStart as string) || todayInTz(famTz); + const pmIds = new Set(bonusConfigs.filter((c: any) => c.isPocketMoney).map((c: any) => c.id)); + const map = new Map(); + for (const r of rewards as any[]) { + if (!r.bonusConfigId || !pmIds.has(r.bonusConfigId)) continue; + if ((r.date || '').slice(0, 10) < ws) continue; + const entry = map.get(r.memberId) || 0; + map.set(r.memberId, entry + 1); + } + return map; + }); // ─── Trend chart window: show current month, expand a month at a time up to 3. ─── let trend = $derived.by(() => { @@ -414,6 +426,10 @@ >{goals?.count ?? 0} +
+ Pocket Money + {pocketMoneyByMember.get(s.memberId) ?? 0} +
{/each} @@ -703,6 +719,9 @@ .stat-val.goals { color: #059669; } + .stat-val.pm { + color: #d97706; + } /* ── Chart ── */ .chart-wrap {