feat: 新增备课模块并修复全模块 P0/P1/P2 缺陷
Some checks failed
Security / deep-security-scan (push) Failing after 20m5s
DR Drill / dr-drill (push) Failing after 1m31s
CI / scheduled-backup (push) Failing after 1m31s
CI / backup-verify (push) Has been skipped
CI / weekly-dr-drill (push) Failing after 0s
CI / build-deploy (push) Has been cancelled
CI / security-scan (push) Has been cancelled
Some checks failed
Security / deep-security-scan (push) Failing after 20m5s
DR Drill / dr-drill (push) Failing after 1m31s
CI / scheduled-backup (push) Failing after 1m31s
CI / backup-verify (push) Has been skipped
CI / weekly-dr-drill (push) Failing after 0s
CI / build-deploy (push) Has been cancelled
CI / security-scan (push) Has been cancelled
主要变更: - 新增 lesson-preparation 模块: 备课编辑器、节点编辑、AI 建议、知识点选择、版本历史、作业发布 - 新增 shared 通用组件: charts/question-bank-filters/schedule-list/ui (chip-nav/filter-bar/page-header/stat-card/stat-item) - 新增 student/admin 端 loading.tsx 与 error.tsx, 优化加载与错误态体验 - 新增 teacher/lesson-plans 页面 (列表/新建/编辑) - 新增 drizzle 迁移 0002_tiny_lionheart 及 snapshot - 新增 textbooks/schema.ts 与 exams/utils/normalize-structure.ts - 修复 Tiptap v3 SSR hydration 崩溃 (rich-text-block immediatelyRender: false) - 重构多模块 data-access/actions/组件, 修复权限校验与类型规范 - 同步架构文档 004/005 反映新增模块、导出、依赖关系 - 归档 bugs/* 测试报告与 e2e 测试脚本 (admin/parent/student/teacher web_test)
This commit is contained in:
@@ -1,7 +1,10 @@
|
||||
import { getAuthContext } from "@/shared/lib/auth-guard"
|
||||
import { getStudentAttendanceSummary } from "@/modules/attendance/data-access-stats"
|
||||
import { StudentAttendanceView } from "@/modules/attendance/components/student-attendance-view"
|
||||
import { EmptyState } from "@/shared/components/ui/empty-state"
|
||||
import {
|
||||
ParentChildrenDataPage,
|
||||
ParentNoChildrenPage,
|
||||
} from "@/modules/parent/components/parent-children-data-page"
|
||||
import { CalendarCheck } from "lucide-react"
|
||||
|
||||
export const dynamic = "force-dynamic"
|
||||
@@ -11,51 +14,41 @@ export default async function ParentAttendancePage() {
|
||||
|
||||
if (ctx.dataScope.type !== "children" || ctx.dataScope.childrenIds.length === 0) {
|
||||
return (
|
||||
<div className="h-full flex-1 flex-col space-y-8 p-8 md:flex">
|
||||
<div>
|
||||
<h2 className="text-2xl font-bold tracking-tight">Children Attendance</h2>
|
||||
<p className="text-muted-foreground">View your children's attendance records.</p>
|
||||
</div>
|
||||
<EmptyState
|
||||
title="No children linked"
|
||||
description="Your account is not linked to any student accounts yet. Please contact the school administrator."
|
||||
icon={CalendarCheck}
|
||||
className="border-none shadow-none"
|
||||
/>
|
||||
</div>
|
||||
<ParentNoChildrenPage
|
||||
title="Children Attendance"
|
||||
description="View your children's attendance records."
|
||||
icon={CalendarCheck}
|
||||
emptyTitle="No children linked"
|
||||
emptyDescription="Your account is not linked to any student accounts yet. Please contact the school administrator."
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
const summaries = await Promise.all(
|
||||
ctx.dataScope.childrenIds.map((id) => getStudentAttendanceSummary(id))
|
||||
// 使用 allSettled 容错:单个子女查询失败不影响其他子女展示
|
||||
const results = await Promise.allSettled(
|
||||
ctx.dataScope.childrenIds.map((id) => getStudentAttendanceSummary(id)),
|
||||
)
|
||||
|
||||
const validSummaries = summaries.filter((s): s is NonNullable<typeof s> => s !== null)
|
||||
const validSummaries = results
|
||||
.filter(
|
||||
(r): r is PromiseFulfilledResult<NonNullable<Awaited<ReturnType<typeof getStudentAttendanceSummary>>>> =>
|
||||
r.status === "fulfilled" && r.value !== null,
|
||||
)
|
||||
.map((r) => r.value)
|
||||
|
||||
return (
|
||||
<div className="h-full flex-1 flex-col space-y-8 p-8 md:flex">
|
||||
<div>
|
||||
<h2 className="text-2xl font-bold tracking-tight">Children Attendance</h2>
|
||||
<p className="text-muted-foreground">View your children's attendance records.</p>
|
||||
</div>
|
||||
|
||||
{validSummaries.length === 0 ? (
|
||||
<EmptyState
|
||||
title="No attendance records"
|
||||
description="Your children don't have any attendance records yet."
|
||||
icon={CalendarCheck}
|
||||
className="border-none shadow-none"
|
||||
/>
|
||||
) : (
|
||||
<div className="space-y-8">
|
||||
{validSummaries.map((summary) => (
|
||||
<div key={summary.studentId} className="space-y-4">
|
||||
<h3 className="text-lg font-semibold border-b pb-2">{summary.studentName}</h3>
|
||||
<StudentAttendanceView summary={summary} />
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
<ParentChildrenDataPage
|
||||
title="Children Attendance"
|
||||
description="View your children's attendance records."
|
||||
icon={CalendarCheck}
|
||||
noRecordsTitle="No attendance records"
|
||||
noRecordsDescription="Your children don't have any attendance records yet."
|
||||
items={validSummaries}
|
||||
renderItem={(summary) => (
|
||||
<>
|
||||
<h3 className="text-lg font-semibold border-b pb-2">{summary.studentName}</h3>
|
||||
<StudentAttendanceView summary={summary} />
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -1,10 +1,7 @@
|
||||
import { notFound } from "next/navigation"
|
||||
import { eq } from "drizzle-orm"
|
||||
|
||||
import { requireAuth } from "@/shared/lib/auth-guard"
|
||||
import { db } from "@/shared/db"
|
||||
import { parentStudentRelations } from "@/shared/db/schema"
|
||||
import { getChildDashboardData } from "@/modules/parent/data-access"
|
||||
import { verifyParentChildRelation, getChildDashboardData } from "@/modules/parent/data-access"
|
||||
import { ChildDetailHeader } from "@/modules/parent/components/child-detail-header"
|
||||
import { ChildDetailPanel } from "@/modules/parent/components/child-detail-panel"
|
||||
import { EmptyState } from "@/shared/components/ui/empty-state"
|
||||
@@ -20,17 +17,15 @@ export default async function ChildDetailPage({
|
||||
const { studentId } = await params
|
||||
const ctx = await requireAuth()
|
||||
|
||||
// Verify the student is linked to the current parent
|
||||
const [relation] = await db
|
||||
.select({
|
||||
id: parentStudentRelations.id,
|
||||
relation: parentStudentRelations.relation,
|
||||
})
|
||||
.from(parentStudentRelations)
|
||||
.where(eq(parentStudentRelations.studentId, studentId))
|
||||
.limit(1)
|
||||
// 校验当前家长与该子女存在关系(同时按 parentId + studentId 过滤,防止跨家庭信息泄露)
|
||||
const relation = await verifyParentChildRelation(studentId, ctx.userId)
|
||||
|
||||
if (!relation) {
|
||||
// dataScope 二次校验:admin/其他角色可能通过 requireAuth,但需确认 dataScope 包含该子女
|
||||
const isInScope =
|
||||
ctx.dataScope.type === "all" ||
|
||||
(ctx.dataScope.type === "children" && ctx.dataScope.childrenIds.includes(studentId))
|
||||
|
||||
if (!relation || !isInScope) {
|
||||
return (
|
||||
<div className="p-6 md:p-8">
|
||||
<EmptyState
|
||||
@@ -43,21 +38,7 @@ export default async function ChildDetailPage({
|
||||
)
|
||||
}
|
||||
|
||||
// Double-check the parent owns this relation
|
||||
if (ctx.dataScope.type === "children" && !ctx.dataScope.childrenIds.includes(studentId)) {
|
||||
return (
|
||||
<div className="p-6 md:p-8">
|
||||
<EmptyState
|
||||
icon={ShieldAlert}
|
||||
title="Access denied"
|
||||
description="You do not have permission to view this student's data."
|
||||
className="border-none shadow-none"
|
||||
/>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
const child = await getChildDashboardData(studentId, relation.relation)
|
||||
const child = await getChildDashboardData(studentId, relation)
|
||||
if (!child) {
|
||||
notFound()
|
||||
}
|
||||
|
||||
@@ -1,11 +1,32 @@
|
||||
import { requireAuth } from "@/shared/lib/auth-guard"
|
||||
import { getParentDashboardData } from "@/modules/parent/data-access"
|
||||
import { ParentDashboard } from "@/modules/parent/components/parent-dashboard"
|
||||
import { ParentNoChildrenPage } from "@/modules/parent/components/parent-children-data-page"
|
||||
import { Users } from "lucide-react"
|
||||
|
||||
export const dynamic = "force-dynamic"
|
||||
|
||||
export default async function ParentDashboardPage() {
|
||||
const ctx = await requireAuth()
|
||||
|
||||
// 非 admin 且 dataScope 非 children 类型时,显示空状态
|
||||
if (
|
||||
ctx.dataScope.type !== "all" &&
|
||||
!(ctx.dataScope.type === "children" && ctx.dataScope.childrenIds.length > 0)
|
||||
) {
|
||||
return (
|
||||
<div className="p-6 md:p-8">
|
||||
<ParentNoChildrenPage
|
||||
title="Parent Dashboard"
|
||||
description="Here's an overview of your children."
|
||||
icon={Users}
|
||||
emptyTitle="No children linked"
|
||||
emptyDescription="Your account is not linked to any student accounts yet. Please contact the school administrator."
|
||||
/>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
const data = await getParentDashboardData(ctx.userId)
|
||||
|
||||
return (
|
||||
|
||||
@@ -1,7 +1,10 @@
|
||||
import { getAuthContext } from "@/shared/lib/auth-guard"
|
||||
import { getStudentGradeSummary } from "@/modules/grades/data-access"
|
||||
import { StudentGradeSummary } from "@/modules/grades/components/student-grade-summary"
|
||||
import { EmptyState } from "@/shared/components/ui/empty-state"
|
||||
import {
|
||||
ParentChildrenDataPage,
|
||||
ParentNoChildrenPage,
|
||||
} from "@/modules/parent/components/parent-children-data-page"
|
||||
import { GraduationCap } from "lucide-react"
|
||||
|
||||
export const dynamic = "force-dynamic"
|
||||
@@ -11,51 +14,41 @@ export default async function ParentGradesPage() {
|
||||
|
||||
if (ctx.dataScope.type !== "children" || ctx.dataScope.childrenIds.length === 0) {
|
||||
return (
|
||||
<div className="h-full flex-1 flex-col space-y-8 p-8 md:flex">
|
||||
<div>
|
||||
<h2 className="text-2xl font-bold tracking-tight">Children Grades</h2>
|
||||
<p className="text-muted-foreground">View your children's grade records.</p>
|
||||
</div>
|
||||
<EmptyState
|
||||
title="No children linked"
|
||||
description="Your account is not linked to any student accounts yet. Please contact the school administrator."
|
||||
icon={GraduationCap}
|
||||
className="border-none shadow-none"
|
||||
/>
|
||||
</div>
|
||||
<ParentNoChildrenPage
|
||||
title="Children Grades"
|
||||
description="View your children's grade records."
|
||||
icon={GraduationCap}
|
||||
emptyTitle="No children linked"
|
||||
emptyDescription="Your account is not linked to any student accounts yet. Please contact the school administrator."
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
const summaries = await Promise.all(
|
||||
ctx.dataScope.childrenIds.map((id) => getStudentGradeSummary(id))
|
||||
// 使用 allSettled 容错:单个子女查询失败不影响其他子女展示
|
||||
const results = await Promise.allSettled(
|
||||
ctx.dataScope.childrenIds.map((id) => getStudentGradeSummary(id)),
|
||||
)
|
||||
|
||||
const validSummaries = summaries.filter((s): s is NonNullable<typeof s> => s !== null)
|
||||
const validSummaries = results
|
||||
.filter(
|
||||
(r): r is PromiseFulfilledResult<NonNullable<Awaited<ReturnType<typeof getStudentGradeSummary>>>> =>
|
||||
r.status === "fulfilled" && r.value !== null,
|
||||
)
|
||||
.map((r) => r.value)
|
||||
|
||||
return (
|
||||
<div className="h-full flex-1 flex-col space-y-8 p-8 md:flex">
|
||||
<div>
|
||||
<h2 className="text-2xl font-bold tracking-tight">Children Grades</h2>
|
||||
<p className="text-muted-foreground">View your children's grade records.</p>
|
||||
</div>
|
||||
|
||||
{validSummaries.length === 0 ? (
|
||||
<EmptyState
|
||||
title="No grade records"
|
||||
description="Your children don't have any grade records yet."
|
||||
icon={GraduationCap}
|
||||
className="border-none shadow-none"
|
||||
/>
|
||||
) : (
|
||||
<div className="space-y-8">
|
||||
{validSummaries.map((summary) => (
|
||||
<div key={summary.studentId} className="space-y-4">
|
||||
<h3 className="text-lg font-semibold border-b pb-2">{summary.studentName}</h3>
|
||||
<StudentGradeSummary summary={summary} />
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
<ParentChildrenDataPage
|
||||
title="Children Grades"
|
||||
description="View your children's grade records."
|
||||
icon={GraduationCap}
|
||||
noRecordsTitle="No grade records"
|
||||
noRecordsDescription="Your children don't have any grade records yet."
|
||||
items={validSummaries}
|
||||
renderItem={(summary) => (
|
||||
<>
|
||||
<h3 className="text-lg font-semibold border-b pb-2">{summary.studentName}</h3>
|
||||
<StudentGradeSummary summary={summary} />
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
/>
|
||||
)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user