家长中心
-
-
-
-
-
-
+
+ ({ id: k.id, name: k.name }))} />
+
+
+
+
+
+
+ ✏️ 编辑英语语法课程
+改标题/目标/课文,保存即生效
+
+
+ 📝 每周检测成绩
+
+ {weekly.length === 0 &&
+ 暂无检测记录
} + {weekly.map((w, i) => ( ++ {w.childName} · {w.weekKey} · {w.score} 分 {w.passed ? "✅" : "❌"} +
+ ))} +
- {data.kids.map((kid) => (
-
-
- {kid.name}
-
-
- ("other");
const [title, setTitle] = useState("");
- const [requiresPhoto, setRequiresPhoto] = useState(false);
+ const [photo, setPhoto] = useState(false);
+ const [rangeStart, setRangeStart] = useState(todayStr());
+ const [rangeEnd, setRangeEnd] = useState(addDays(todayStr(), 6));
const [error, setError] = useState("");
const [pending, startTransition] = useTransition();
+ if (!kid) return null;
- function onAdd(e: React.FormEvent) {
+ const today = todayStr();
+ const ym = today.slice(0, 7);
+ const daysInMonth = new Date(Number(ym.slice(0, 4)), Number(ym.slice(5, 7)), 0).getDate();
+ const lead = (dowOf(`${ym}-01`) + 6) % 7;
+ const dates = Array.from({ length: daysInMonth }, (_, i) => `${ym}-${String(i + 1).padStart(2, "0")}`);
+ const dayTasks = (d: string) => kid.items.filter((t) => covers(t, d));
+
+ const submit = (e: React.FormEvent) => {
e.preventDefault();
setError("");
const fd = new FormData();
fd.set("childId", String(kid.id));
- fd.set("dow", String(dow));
fd.set("subject", subject);
fd.set("title", title);
- if (requiresPhoto) fd.set("requiresPhoto", "on");
+ fd.set("mode", mode);
+ fd.set("dow", String(dowOf(selected)));
+ if (mode === "date" || mode === "week") fd.set("dateStart", selected);
+ if (mode === "range") {
+ fd.set("dateStart", rangeStart);
+ fd.set("dateEnd", rangeEnd);
+ }
+ if (photo) fd.set("requiresPhoto", "on");
startTransition(async () => {
try {
await addTemplate(fd);
setTitle("");
- setRequiresPhoto(false);
+ setPhoto(false);
} catch (err) {
setError(err instanceof Error ? err.message : "添加失败");
}
});
- }
+ };
+
+ const modeLabel: Record = {
+ date: "某一天",
+ weekly: "每周X",
+ week: "某一周",
+ range: "日期区间",
+ };
return (
-
-
- {kid.name}
-
-
-
-
- - 今日完成 {kid.today.done} / {kid.today.total} 项 -
-
- 英语语法
-
);
}
diff --git a/src/app/parent/page.tsx b/src/app/parent/page.tsx
index b115846..4735fa8 100644
--- a/src/app/parent/page.tsx
+++ b/src/app/parent/page.tsx
@@ -1,19 +1,30 @@
import crypto from "node:crypto";
-import { and, asc, desc, eq, inArray } from "drizzle-orm";
+import { and, asc, desc, eq, gte, lte, inArray } from "drizzle-orm";
import { cookies } from "next/headers";
import { redirect } from "next/navigation";
import { db } from "@/db";
-import { sessions, taskInstances, taskTemplates, users } from "@/db/schema";
+import {
+ sessions,
+ taskInstances,
+ taskTemplates,
+ users,
+ grammarProgress,
+ weeklyTest,
+ wrongBook,
+} from "@/db/schema";
import { SESSION_COOKIE, getSessionUser } from "@/lib/auth";
-import { daysAgo, todayStr } from "@/lib/dates";
-import { ensureDay } from "@/lib/tasks";
-import { streakOf } from "@/lib/streak";
+import { addDays, dowOf, todayStr } from "@/lib/dates";
import { passedCount, totalPoints } from "@/lib/grammar";
-import { ParentDashboard, type DevicesData, type OverviewData, type TemplatesData } from "./dashboard";
+import {
+ ParentDashboard,
+ type DevicesData,
+ type OverviewData,
+ type TemplatesData,
+ type WeeklyRow,
+} from "./dashboard";
-const SHANGHAI = { timeZone: "Asia/Shanghai" } as const;
-const fmtDateTime = (d: Date) =>
- d.toLocaleString("zh-CN", { ...SHANGHAI, hour12: false }).replace(/\//g, "-");
+const SH = { timeZone: "Asia/Shanghai" } as const;
+const dstr = (d: Date) => d.toLocaleDateString("en-CA", SH);
export default async function ParentPage() {
const parent = await getSessionUser();
@@ -27,58 +38,62 @@ export default async function ParentPage() {
.orderBy(asc(users.sortOrder));
const today = todayStr();
- const weekDates = Array.from({ length: 7 }, (_, i) => daysAgo(i)); // 今天在前
+ const ym = today.slice(0, 7);
+ const daysInMonth = new Date(Number(ym.slice(0, 4)), Number(ym.slice(5, 7)), 0).getDate();
+ const mStart = `${ym}-01`;
+ const mEnd = `${ym}-${String(daysInMonth).padStart(2, "0")}`;
const gTotal = await totalPoints();
- // ===== 今日概览 =====
+ // ===== 学习概览(日历) =====
const overview: OverviewData = { kids: [] };
for (const kid of kids) {
- await ensureDay(kid.id, today); // 家长先看时也要生成今天的快照
- const [streak, gDone, rows] = await Promise.all([
- streakOf(kid.id),
- passedCount(kid.id),
+ const [instRows, gRows, wRows, wrongRow, gDone] = await Promise.all([
db
- .select({
- id: taskInstances.id,
- date: taskInstances.date,
- title: taskInstances.title,
- subject: taskInstances.subject,
- status: taskInstances.status,
- isMakeup: taskInstances.isMakeup,
- sortOrder: taskInstances.sortOrder,
- })
+ .select({ date: taskInstances.date, status: taskInstances.status })
.from(taskInstances)
- .where(and(eq(taskInstances.childUserId, kid.id), inArray(taskInstances.date, weekDates)))
- .orderBy(desc(taskInstances.date), asc(taskInstances.sortOrder)),
+ .where(and(eq(taskInstances.childUserId, kid.id), gte(taskInstances.date, mStart), lte(taskInstances.date, mEnd))),
+ db
+ .select({ completedAt: grammarProgress.completedAt, passed: grammarProgress.passed })
+ .from(grammarProgress)
+ .where(and(eq(grammarProgress.childUserId, kid.id), eq(grammarProgress.passed, true))),
+ db.select().from(weeklyTest).where(eq(weeklyTest.childUserId, kid.id)).orderBy(desc(weeklyTest.takenAt)),
+ db
+ .select({ id: wrongBook.id })
+ .from(wrongBook)
+ .where(and(eq(wrongBook.childUserId, kid.id), eq(wrongBook.mastered, false))),
+ passedCount(kid.id),
]);
- const week = weekDates.map((date) => ({
- date,
- isToday: date === today,
- tasks: rows.filter((r) => r.date === date),
- }));
- const todayTasks = week.find((w) => w.isToday)?.tasks ?? [];
-
+ const days: OverviewData["kids"][number]["days"] = {};
+ for (let i = 1; i <= daysInMonth; i++) {
+ const d = `${ym}-${String(i).padStart(2, "0")}`;
+ const inst = instRows.filter((r) => r.date === d);
+ const grammar = gRows.filter((r) => dstr(r.completedAt) === d).length;
+ const w = wRows.find((r) => dstr(r.takenAt) === d);
+ days[d] = {
+ done: inst.filter((r) => r.status === "done").length,
+ total: inst.length,
+ grammar,
+ weekly: w ? w.score : null,
+ };
+ }
overview.kids.push({
id: kid.id,
name: kid.name,
- streak,
- today: {
- total: todayTasks.length,
- done: todayTasks.filter((t) => t.status === "done").length,
- },
grammar: { done: gDone, total: gTotal },
- week,
+ wrongOpen: wrongRow.length,
+ weeklyLatest: wRows[0] ? { weekKey: wRows[0].weekKey, score: wRows[0].score ?? 0, passed: wRows[0].passed } : null,
+ days,
});
}
- // ===== 周模板 =====
+ // ===== 任务模板 =====
const templateRows = kids.length
? await db
.select()
.from(taskTemplates)
.where(inArray(taskTemplates.childUserId, kids.map((k) => k.id)))
- .orderBy(asc(taskTemplates.childUserId), asc(taskTemplates.dow), asc(taskTemplates.sortOrder))
+ .orderBy(asc(taskTemplates.childUserId), asc(taskTemplates.sortOrder))
: [];
const templates: TemplatesData = {
kids: kids.map((kid) => ({
@@ -92,6 +107,9 @@ export default async function ParentPage() {
title: t.title,
subject: t.subject,
requiresPhoto: t.requiresPhoto,
+ mode: t.mode,
+ dateStart: t.dateStart,
+ dateEnd: t.dateEnd,
})),
})),
};
@@ -118,11 +136,31 @@ export default async function ParentPage() {
id: s.id,
owner: s.role === "parent" ? `${s.owner}(家长)` : s.owner,
deviceLabel: s.deviceLabel,
- createdAt: fmtDateTime(s.createdAt),
- expiresAt: fmtDateTime(s.expiresAt),
+ createdAt: dstr(s.createdAt),
+ expiresAt: dstr(s.expiresAt),
isCurrent: s.tokenHash === tokenHash,
})),
};
- return
-
+
+ {data.kids.map((k) => (
+
+ ))}
+
+
+
+
+
+
+
+ 语法进度
++ {kid.grammar.done}/{kid.grammar.total} +
+
+
+ 待掌握错题
+{kid.wrongOpen}
+
+
+ 最近周测
++ {kid.weeklyLatest ? `${kid.weeklyLatest.score}分` : "—"} +
+
+
+
+ {["一", "二", "三", "四", "五", "六", "日"].map((w) => (
+
+ 周{w}
+ ))}
+
+ {Array.from({ length: lead }).map((_, i) => (
+
+ ))}
+ {dates.map((d) => {
+ const c = kid.days[d];
+ const isToday = d === today;
+ const check = c && c.total > 0 ? (c.done >= c.total && c.done > 0 ? 2 : c.done > 0 ? 1 : 0) : 0;
+ return (
+
-
+
+ {Number(d.slice(8))}
+
+
+ {check === 2 && }
+ {check === 1 && }
+ {(c?.grammar ?? 0) > 0 && }
+ {c?.weekly != null && }
+
-
- {kid.grammar.done}/{kid.grammar.total}
-
-
- {kid.week.map((day) => (
-
-
-
- ))}
+ );
+ })}
+
-
- ))}
- - {dateLabel(day.date)} - {day.isToday && " · 今天"} -
- {day.tasks.length === 0 ? ( -无任务(自动保持连击)
- ) : ( -
- {day.tasks.map((t) => (
-
-
-
- {t.title}
- {t.isMakeup && " · 补"}
-
- {!day.isToday && t.status === "pending" && (
-
- )}
- {!day.isToday && t.isMakeup && (
-
- )}
-
- ))}
-
- )}
- + 打卡完成 + 打卡部分 + 语法点亮 + 周检测 +
+
-
- );
+function covers(t: Item, date: string): boolean {
+ if (t.mode === "weekly") return t.dow === dowOf(date);
+ if (t.mode === "date") return t.dateStart === date;
+ if (t.mode === "range") return !!t.dateStart && !!t.dateEnd && date >= t.dateStart && date <= t.dateEnd;
+ if (t.mode === "week") return !!t.dateStart && mondayOf(t.dateStart) === mondayOf(date);
+ return false;
}
-function KidTemplateCard({
- kid,
-}: {
- kid: TemplatesData["kids"][number];
-}) {
- const [dow, setDow] = useState(1);
+// 任务模板:日历展示 + 灵活添加(某一天/每周X/本周/日期区间)
+export function TemplatesTab({ data }: { data: TemplatesData }) {
+ const [kidId, setKidId] = useState(data.kids[0]?.id);
+ const kid = data.kids.find((k) => k.id === kidId) ?? data.kids[0];
+ const [selected, setSelected] = useState(todayStr());
+ const [mode, setMode] = useState<"date" | "weekly" | "week" | "range">("weekly");
const [subject, setSubject] = useState- 模板改动从第二天起生效,不影响已生成的历史任务。 -
- {data.kids.map((kid) => ( -
- {WEEK_ORDER.map((d) => {
- const items = kid.items.filter((i) => i.dow === d);
+
+
+ {data.kids.map((k) => (
+
+ ))}
+
+
+
+
+ {["一", "二", "三", "四", "五", "六", "日"].map((w) => (
+
+ 周{w}
+ ))}
+
+ {Array.from({ length: lead }).map((_, i) => (
+
+ ))}
+ {dates.map((d) => {
+ const ts = dayTasks(d);
return (
-
+
+
-
- {DOW_LABELS[d]}
+
+ );
+ })}
+
+
+
{selected} 的任务
+
+ {dayTasks(selected).length === 0 &&
- 这一天没有任务(休息日)
} + {dayTasks(selected).map((t) => { + const sm = subjectMeta(t.subject); + return ( +
+
+ {sm.label}
+ {t.title}
+ ({modeLabel[t.mode] ?? t.mode})
+
);
})}