enhance with charts and home layout, and make more mobile friendly
This commit is contained in:
@@ -7,6 +7,7 @@ import * as chatSvc from './chat';
|
||||
import * as settingsSvc from './settings';
|
||||
import * as crudSvc from './crud';
|
||||
import * as debugSvc from './debug';
|
||||
import * as statsSvc from './stats';
|
||||
|
||||
export * from './chat';
|
||||
export { famMeta } from './fam';
|
||||
@@ -93,6 +94,9 @@ export function createServices(
|
||||
},
|
||||
debug: {
|
||||
generateData: (famId: string, days?: number) => debugSvc.generateData(pb, famId, days)
|
||||
},
|
||||
stats: {
|
||||
family: (famId: string) => statsSvc.familyStats(pb, famId)
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
@@ -0,0 +1,120 @@
|
||||
import { addDaysStr, weekdayInTz, resolveTz } from '@shared/timezone';
|
||||
import { famMeta } from './fam';
|
||||
|
||||
// Week start (payday-anchored) for an arbitrary YYYY-MM-DD date — a
|
||||
// parametric form of `weekStart()` so we can bucket historical weeks, not
|
||||
// just the current one.
|
||||
function weekStartFor(dateStr: string, payday: number, tz: string): string {
|
||||
const wd = weekdayInTz(new Date(dateStr + 'T12:00:00Z'), tz);
|
||||
const back = (((wd - payday) % 7) + 7) % 7;
|
||||
return addDaysStr(dateStr, -back);
|
||||
}
|
||||
|
||||
export type WeeklyPoint = {
|
||||
weekStart: string;
|
||||
points: number;
|
||||
cash: number;
|
||||
chores: number;
|
||||
};
|
||||
|
||||
export type MemberSeries = {
|
||||
memberId: string;
|
||||
memberName: string;
|
||||
memberColor: string;
|
||||
weeks: WeeklyPoint[];
|
||||
};
|
||||
|
||||
export type FamilyStats = {
|
||||
allTimePts: number;
|
||||
allTimeCash: number;
|
||||
allTimeChores: number;
|
||||
series: MemberSeries[];
|
||||
};
|
||||
|
||||
// Server-side lifetime + weekly aggregates. Scans full-history `completions`
|
||||
// and `rewards` once here (filtered and summed on the server) so the client
|
||||
// receives fixed-size pre-computed numbers instead of every historical row —
|
||||
// this is what keeps the all-time totals + retrospective graph scalable.
|
||||
export async function familyStats(pb: any, famId: string): Promise<FamilyStats> {
|
||||
const { payday, tz } = await famMeta(pb, famId);
|
||||
|
||||
const [members, assigned, completions, rewards] = await Promise.all([
|
||||
pb.collection('users').getFullList({ filter: `famId = '${famId}' && role = 'child'` }),
|
||||
pb.collection('assigned_chores').getFullList({ filter: `famId = '${famId}'` }),
|
||||
pb.collection('completions').getFullList({ filter: `famId = '${famId}'` }),
|
||||
pb.collection('rewards').getFullList({ filter: `famId = '${famId}'` })
|
||||
]);
|
||||
|
||||
const assignedMap = new Map<string, any>(assigned.map((a: any) => [a.id, a]));
|
||||
|
||||
const memberPts: Record<string, number> = {};
|
||||
const memberCash: Record<string, number> = {};
|
||||
const memberChores: Record<string, number> = {};
|
||||
for (const m of members) {
|
||||
memberPts[m.id] = 0;
|
||||
memberCash[m.id] = 0;
|
||||
memberChores[m.id] = 0;
|
||||
}
|
||||
|
||||
// Per-member weekly buckets (points/cash/chores), keyed by `memberId:weekStart`.
|
||||
const weekMap = new Map<string, WeeklyPoint>();
|
||||
|
||||
function addWeek(memberId: string, weekStart: string, pts: number, cash: number, chores: number) {
|
||||
const key = `${memberId}:${weekStart}`;
|
||||
const w = weekMap.get(key);
|
||||
if (w) {
|
||||
w.points += pts;
|
||||
w.cash += cash;
|
||||
w.chores += chores;
|
||||
} else {
|
||||
weekMap.set(key, { weekStart, points: pts, cash, chores });
|
||||
}
|
||||
}
|
||||
|
||||
// Chore completions contribute their chore value (points/money) to the
|
||||
// member's lifetime totals and their weekly bucket. Every completion counts
|
||||
// as a chore done (regardless of type).
|
||||
for (const c of completions) {
|
||||
const chore = assignedMap.get(c.assignedChoreId);
|
||||
const pts = chore?.type === 'points' ? Number(chore.value) || 0 : 0;
|
||||
const cash = chore?.type === 'money' ? Number(chore.value) || 0 : 0;
|
||||
const date = (c.date || '').slice(0, 10);
|
||||
memberPts[c.memberId] = (memberPts[c.memberId] || 0) + pts;
|
||||
memberCash[c.memberId] = (memberCash[c.memberId] || 0) + cash;
|
||||
memberChores[c.memberId] = (memberChores[c.memberId] || 0) + 1;
|
||||
if (date) addWeek(c.memberId, weekStartFor(date, payday, tz), pts, cash, 1);
|
||||
}
|
||||
|
||||
// Claimed rewards (bonuses/triggers/pocket money) count toward lifetime
|
||||
// earnings once issued. Unclaimed/requested stay "to chase" client-side.
|
||||
for (const r of rewards) {
|
||||
if (r.status !== 'claimed') continue;
|
||||
const date = ((r.claimedAt as string) || (r.date as string) || '').slice(0, 10);
|
||||
if (r.rewardType === 'points') {
|
||||
const v = Number(r.value) || 0;
|
||||
memberPts[r.memberId] = (memberPts[r.memberId] || 0) + v;
|
||||
if (date) addWeek(r.memberId, weekStartFor(date, payday, tz), v, 0, 0);
|
||||
} else if (r.rewardType === 'cash') {
|
||||
const v = Number(r.value) || 0;
|
||||
memberCash[r.memberId] = (memberCash[r.memberId] || 0) + v;
|
||||
if (date) addWeek(r.memberId, weekStartFor(date, payday, tz), 0, v, 0);
|
||||
}
|
||||
}
|
||||
|
||||
const series: MemberSeries[] = members.map((m: any) => ({
|
||||
memberId: m.id,
|
||||
memberName: m.name,
|
||||
memberColor: m.color || '#6366f1',
|
||||
weeks: [...weekMap.entries()]
|
||||
.filter(([key]) => key.startsWith(m.id + ':'))
|
||||
.map(([, w]) => w)
|
||||
.sort((a, b) => a.weekStart.localeCompare(b.weekStart))
|
||||
}));
|
||||
|
||||
return {
|
||||
allTimePts: Object.values(memberPts).reduce((s, n) => s + n, 0),
|
||||
allTimeCash: Object.values(memberCash).reduce((s, n) => s + n, 0),
|
||||
allTimeChores: Object.values(memberChores).reduce((s, n) => s + n, 0),
|
||||
series
|
||||
};
|
||||
}
|
||||
Reference in New Issue
Block a user