xiner/NextEdu
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

feat(attendance,elective): 实现所有 P2 长期改进项

Browse Source 
P2 修复（来自审计报告）：
- 2.4.4: Server Action 错误消息 i18n 化（attendance/elective 全部 Action）
- 2.5.3: 抽取 AttendancePageLayout 组件复用（admin/teacher 页面）
- 2.5.4: 抽取 ElectivePageLayout 组件复用（admin/teacher 列表页）
- 2.6.3: 考勤月历键盘导航（tabIndex + 方向键 + Home/End + role=grid）
- 2.8.2: getStudentAttendanceSummary 分页优化（SQL 聚合统计 + LIMIT 分页）
- 2.8.3: resolveCourseDisplayNames 缓存优化（React cache 去重）
- 2.1.4: elective data-access 跨模块依赖接口抽象（resolvers.ts 可注入）

P2 建议项：
- 选课时间冲突检测（parseSchedule + isScheduleConflict 纯函数 + checkScheduleConflict）
- 学分上限校验（MAX_CREDIT_PER_TERM + checkCreditLimit）
- 考勤/选课数据导出 Excel（export.ts + API 路由扩展）

新增文件：
- src/modules/attendance/components/attendance-page-layout.tsx
- src/modules/elective/components/elective-page-layout.tsx
- src/modules/elective/resolvers.ts
- src/modules/attendance/export.ts
- src/modules/elective/export.ts

校验：
- npm run lint 通过（exit 0）
- npx tsc --noEmit attendance/elective/parent 相关零错误
This commit is contained in:
SpecialX
2026-06-23 09:02:41 +08:00
parent c766951374
commit e2e0487a3b
50 changed files with 1514 additions and 411 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/modules/attendance/actions.ts
View File

@@ -1,9 +1,11 @@
"use server"
import { revalidatePath } from "next/cache"
import { requirePermission, PermissionDeniedError } from "@/shared/lib/auth-guard"
import { getTranslations } from "next-intl/server"
import { requirePermission } from "@/shared/lib/auth-guard"
import { Permissions } from "@/shared/types/permissions"
import type { ActionState } from "@/shared/types/action-state"
import { handleActionError, safeJsonParse } from "@/shared/lib/action-utils"
import { trackEvent } from "@/shared/lib/track-event"
import { verifyTeacherOwnsClass } from "@/modules/classes/data-access"
@@ -32,15 +34,16 @@ async function assertRecordOwnership(
recordId: string,
ctx: Awaited<ReturnType<typeof requirePermission>>
): Promise<{ ok: boolean; message?: string }> {
const t = await getTranslations("attendance")
if (ctx.dataScope.type === "all") return { ok: true }
if (ctx.dataScope.type === "class_taught") {
const classId = await getAttendanceRecordClassId(recordId)
if (!classId) return { ok: false, message: "Attendance record not found" }
if (!classId) return { ok: false, message: t("errors.notFound") }
const owns = await verifyTeacherOwnsClass(classId, ctx.userId)
if (!owns) return { ok: false, message: "You do not own this attendance record" }
if (!owns) return { ok: false, message: t("errors.noOwnership") }
return { ok: true }
}
return { ok: false, message: "Insufficient permissions" }
return { ok: false, message: t("errors.insufficientPermissions") }
}
/**
@@ -53,13 +56,14 @@ async function assertClassOwnership(
classId: string,
ctx: Awaited<ReturnType<typeof requirePermission>>
): Promise<{ ok: boolean; message?: string }> {
const t = await getTranslations("attendance")
if (ctx.dataScope.type === "all") return { ok: true }
if (ctx.dataScope.type === "class_taught") {
const owns = await verifyTeacherOwnsClass(classId, ctx.userId)
if (!owns) return { ok: false, message: "You do not own this class" }
if (!owns) return { ok: false, message: t("errors.noClassOwnership") }
return { ok: true }
}
return { ok: false, message: "Insufficient permissions" }
return { ok: false, message: t("errors.insufficientPermissions") }
}
export async function recordAttendanceAction(
@@ -67,6 +71,7 @@ export async function recordAttendanceAction(
formData: FormData
): Promise<ActionState<string>> {
try {
const t = await getTranslations("attendance")
const ctx = await requirePermission(Permissions.ATTENDANCE_MANAGE)
const parsed = RecordAttendanceSchema.safeParse({
@@ -81,7 +86,7 @@ export async function recordAttendanceAction(
if (!parsed.success) {
return {
success: false,
message: "Invalid form data",
message: t("errors.invalidForm"),
errors: parsed.error.flatten().fieldErrors,
}
}
@@ -95,11 +100,9 @@ export async function recordAttendanceAction(
targetType: "attendance_record",
properties: { studentId: parsed.data.studentId, classId: parsed.data.classId, status: parsed.data.status },
})
return { success: true, message: "Attendance recorded", data: id }
return { success: true, message: t("messages.recorded"), data: id }
} catch (e) {
if (e instanceof PermissionDeniedError) return { success: false, message: e.message }
if (e instanceof Error) return { success: false, message: e.message }
return { success: false, message: "Unexpected error" }
return handleActionError(e)
}
}
@@ -108,21 +111,22 @@ export async function batchRecordAttendanceAction(
formData: FormData
): Promise<ActionState<number>> {
try {
const t = await getTranslations("attendance")
const ctx = await requirePermission(Permissions.ATTENDANCE_MANAGE)
const recordsJson = formData.get("recordsJson")
if (typeof recordsJson !== "string" || recordsJson.length === 0) {
return { success: false, message: "Missing records data" }
return { success: false, message: t("errors.missingRecords") }
}
const parsed = BatchRecordAttendanceSchema.safeParse({
records: JSON.parse(recordsJson),
records: safeJsonParse(recordsJson, t("errors.invalidRecordsJson")),
})
if (!parsed.success) {
return {
success: false,
message: "Invalid form data",
message: t("errors.invalidForm"),
errors: parsed.error.flatten().fieldErrors,
}
}
@@ -135,11 +139,9 @@ export async function batchRecordAttendanceAction(
targetType: "attendance_record",
properties: { count, classId: parsed.data.records[0]?.classId },
})
return { success: true, message: `Recorded attendance for ${count} students`, data: count }
return { success: true, message: t("messages.batchRecorded", { count }), data: count }
} catch (e) {
if (e instanceof PermissionDeniedError) return { success: false, message: e.message }
if (e instanceof Error) return { success: false, message: e.message }
return { success: false, message: "Unexpected error" }
return handleActionError(e)
}
}
@@ -149,11 +151,12 @@ export async function updateAttendanceAction(
formData: FormData
): Promise<ActionState<string>> {
try {
const t = await getTranslations("attendance")
const ctx = await requirePermission(Permissions.ATTENDANCE_MANAGE)
const ownership = await assertRecordOwnership(id, ctx)
if (!ownership.ok) {
return { success: false, message: ownership.message ?? "Ownership check failed" }
return { success: false, message: ownership.message ?? t("messages.ownershipCheckFailed") }
}
const parsed = UpdateAttendanceSchema.safeParse({
@@ -165,7 +168,7 @@ export async function updateAttendanceAction(
if (!parsed.success) {
return {
success: false,
message: "Invalid form data",
message: t("errors.invalidForm"),
errors: parsed.error.flatten().fieldErrors,
}
}
@@ -179,11 +182,9 @@ export async function updateAttendanceAction(
targetType: "attendance_record",
properties: { status: parsed.data.status },
})
return { success: true, message: "Attendance updated" }
return { success: true, message: t("messages.updated") }
} catch (e) {
if (e instanceof PermissionDeniedError) return { success: false, message: e.message }
if (e instanceof Error) return { success: false, message: e.message }
return { success: false, message: "Unexpected error" }
return handleActionError(e)
}
}
@@ -191,11 +192,12 @@ export async function deleteAttendanceAction(
id: string
): Promise<ActionState<string>> {
try {
const t = await getTranslations("attendance")
const ctx = await requirePermission(Permissions.ATTENDANCE_MANAGE)
const ownership = await assertRecordOwnership(id, ctx)
if (!ownership.ok) {
return { success: false, message: ownership.message ?? "Ownership check failed" }
return { success: false, message: ownership.message ?? t("messages.ownershipCheckFailed") }
}
await deleteAttendanceRecord(id)
@@ -206,11 +208,9 @@ export async function deleteAttendanceAction(
targetId: id,
targetType: "attendance_record",
})
return { success: true, message: "Attendance record deleted" }
return { success: true, message: t("messages.deleted") }
} catch (e) {
if (e instanceof PermissionDeniedError) return { success: false, message: e.message }
if (e instanceof Error) return { success: false, message: e.message }
return { success: false, message: "Unexpected error" }
return handleActionError(e)
}
}
@@ -219,6 +219,7 @@ export async function saveAttendanceRulesAction(
formData: FormData
): Promise<ActionState<string>> {
try {
const t = await getTranslations("attendance")
const ctx = await requirePermission(Permissions.ATTENDANCE_MANAGE)
const parsed = AttendanceRuleSchema.safeParse({
@@ -231,14 +232,14 @@ export async function saveAttendanceRulesAction(
if (!parsed.success) {
return {
success: false,
message: "Invalid form data",
message: t("errors.invalidForm"),
errors: parsed.error.flatten().fieldErrors,
}
}
const ownership = await assertClassOwnership(parsed.data.classId, ctx)
if (!ownership.ok) {
return { success: false, message: ownership.message ?? "Ownership check failed" }
return { success: false, message: ownership.message ?? t("messages.ownershipCheckFailed") }
}
const id = await upsertAttendanceRules(parsed.data)
@@ -250,10 +251,8 @@ export async function saveAttendanceRulesAction(
targetType: "attendance_rule",
properties: { classId: parsed.data.classId },
})
return { success: true, message: "Attendance rules saved", data: id }
return { success: true, message: t("messages.rulesSaved"), data: id }
} catch (e) {
if (e instanceof PermissionDeniedError) return { success: false, message: e.message }
if (e instanceof Error) return { success: false, message: e.message }
return { success: false, message: "Unexpected error" }
return handleActionError(e)
}
}