-
-
{t("title.edit")}
-
{t("description.edit")}
+
+
-
-
+
)
}
diff --git a/src/app/(dashboard)/admin/announcements/loading.tsx b/src/app/(dashboard)/admin/announcements/loading.tsx
index 4ca3b4d..7d27fd7 100644
--- a/src/app/(dashboard)/admin/announcements/loading.tsx
+++ b/src/app/(dashboard)/admin/announcements/loading.tsx
@@ -1,40 +1,5 @@
-import { Card, CardContent, CardHeader } from "@/shared/components/ui/card"
-import { Skeleton } from "@/shared/components/ui/skeleton"
+import { AnnouncementListSkeleton } from "@/modules/announcements/components/announcement-list-skeleton"
export default function AdminAnnouncementsLoading() {
- return (
-
-
-
-
-
-
-
-
- {Array.from({ length: 6 }).map((_, i) => (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ))}
-
-
- )
+ return
}
diff --git a/src/app/(dashboard)/admin/attendance/error.tsx b/src/app/(dashboard)/admin/attendance/error.tsx
index d5ca91d..91c29b3 100644
--- a/src/app/(dashboard)/admin/attendance/error.tsx
+++ b/src/app/(dashboard)/admin/attendance/error.tsx
@@ -1,24 +1,7 @@
"use client"
-import { AlertCircle } from "lucide-react"
-import { useTranslations } from "next-intl"
-
-import { EmptyState } from "@/shared/components/ui/empty-state"
+import { RouteErrorBoundary } from "@/shared/components/route-error"
export default function AdminAttendanceError({ reset }: { error: Error & { digest?: string }; reset: () => void }) {
- const t = useTranslations("attendance")
- return (
-
- reset(),
- }}
- className="border-none shadow-none h-auto"
- />
-
- )
+ return
}
diff --git a/src/app/(dashboard)/admin/attendance/page.tsx b/src/app/(dashboard)/admin/attendance/page.tsx
index 0408528..6dc1669 100644
--- a/src/app/(dashboard)/admin/attendance/page.tsx
+++ b/src/app/(dashboard)/admin/attendance/page.tsx
@@ -1,5 +1,4 @@
import Link from "next/link"
-import type { Metadata } from "next"
import type { JSX } from "react"
import { BarChart3, ClipboardList } from "lucide-react"
import { getTranslations } from "next-intl/server"
@@ -10,17 +9,22 @@ import { requirePermission, getAuthContext } from "@/shared/lib/auth-guard"
import { Permissions } from "@/shared/types/permissions"
import { getSearchParam, type SearchParams } from "@/shared/lib/utils"
import { getAdminClasses } from "@/modules/classes/data-access"
+import { getGrades } from "@/modules/school/data-access"
import { getAttendanceRecords, getAttendanceStats } from "@/modules/attendance/data-access"
+import { getClassComparison } from "@/modules/attendance/data-access-stats"
+import { getAttendanceGradeCorrelation } from "@/modules/attendance/data-access-correlation"
import { AttendanceFilters } from "@/modules/attendance/components/attendance-filters"
import { AttendanceStatsCards } from "@/modules/attendance/components/attendance-stats-cards"
import { AttendanceRecordList } from "@/modules/attendance/components/attendance-record-list"
import { AttendancePageLayout } from "@/modules/attendance/components/attendance-page-layout"
+import { ClassComparisonCard } from "@/modules/attendance/components/class-comparison-card"
+import { AttendanceGradeCorrelationCard } from "@/modules/attendance/components/attendance-grade-correlation-card"
import type { AttendanceStatus } from "@/modules/attendance/types"
export const dynamic = "force-dynamic"
const isValidAttendanceStatus = (v?: string): v is AttendanceStatus =>
- v === "present" || v === "absent" || v === "late" || v === "early_leave" || v === "excused"
+ v === "present" || v === "absent" || v === "late" || v === "early_leave" || v === "excused" || v === "school_activity"
export default async function AdminAttendancePage({
searchParams,
@@ -37,24 +41,46 @@ export default async function AdminAttendancePage({
const status =
statusParam && statusParam !== "all" && isValidAttendanceStatus(statusParam) ? statusParam : undefined
const date = getSearchParam(sp, "date")
+ // L-7：跨班级对比的年级选择
+ const gradeId = getSearchParam(sp, "gradeId")
+ const startDate = getSearchParam(sp, "startDate")
+ const endDate = getSearchParam(sp, "endDate")
const classes = await getAdminClasses()
const classOptions = classes.map((c) => ({ id: c.id, name: c.name }))
- const result = await getAttendanceRecords({
- scope: ctx.dataScope,
- currentUserId: ctx.userId,
- classId: classId && classId !== "all" ? classId : undefined,
- status,
- date: date && date.length > 0 ? date : undefined,
- })
+ // 并行获取：记录、统计、年级列表、对比汇总
+ const [result, stats, grades, comparison, correlation] = await Promise.all([
+ getAttendanceRecords({
+ scope: ctx.dataScope,
+ currentUserId: ctx.userId,
+ classId: classId && classId !== "all" ? classId : undefined,
+ status,
+ date: date && date.length > 0 ? date : undefined,
+ }),
+ getAttendanceStats({
+ scope: ctx.dataScope,
+ currentUserId: ctx.userId,
+ classId: classId && classId !== "all" ? classId : undefined,
+ date: date && date.length > 0 ? date : undefined,
+ }),
+ getGrades(),
+ // L-7：若指定 gradeId 则获取对比汇总
+ gradeId
+ ? getClassComparison(gradeId, startDate ?? undefined, endDate ?? undefined)
+ : Promise.resolve(null),
+ // L-9：考勤-成绩关联分析（仅当指定班级时）
+ classId && classId !== "all"
+ ? getAttendanceGradeCorrelation(
+ classId,
+ startDate ?? undefined,
+ endDate ?? undefined,
+ ctx.dataScope
+ )
+ : Promise.resolve(null),
+ ])
- const stats = await getAttendanceStats({
- scope: ctx.dataScope,
- currentUserId: ctx.userId,
- classId: classId && classId !== "all" ? classId : undefined,
- date: date && date.length > 0 ? date : undefined,
- })
+ const gradeOptions = grades.map((g) => ({ id: g.id, name: g.name }))
const header = (
@@ -77,15 +103,29 @@ export default async function AdminAttendancePage({
stats={
}
filters={
}
>
- {result.items.length === 0 && !classId && !status && !date ? (
-
+ {result.items.length === 0 && !classId && !status && !date ? (
+
+ ) : (
+
+ )}
+
+
- ) : (
-
- )}
+
+ {/* L-9：考勤与成绩关联分析（仅当指定班级时显示） */}
+ {classId && classId !== "all" && (
+
+ )}
+
)
}
+
diff --git a/src/app/(dashboard)/admin/audit-logs/data-changes/error.tsx b/src/app/(dashboard)/admin/audit-logs/data-changes/error.tsx
new file mode 100644
index 0000000..ce7b83c
--- /dev/null
+++ b/src/app/(dashboard)/admin/audit-logs/data-changes/error.tsx
@@ -0,0 +1,26 @@
+"use client"
+
+import { AlertCircle } from "lucide-react"
+import { useTranslations } from "next-intl"
+
+import { EmptyState } from "@/shared/components/ui/empty-state"
+
+export default function DataChangeLogsError({
+ reset,
+}: {
+ error: Error & { digest?: string }
+ reset: () => void
+}) {
+ const t = useTranslations("audit")
+ return (
+
+ reset() }}
+ className="border-none shadow-none h-auto"
+ />
+
+ )
+}
diff --git a/src/app/(dashboard)/admin/audit-logs/data-changes/loading.tsx b/src/app/(dashboard)/admin/audit-logs/data-changes/loading.tsx
new file mode 100644
index 0000000..f3534be
--- /dev/null
+++ b/src/app/(dashboard)/admin/audit-logs/data-changes/loading.tsx
@@ -0,0 +1,16 @@
+import { AuditLogTableSkeleton } from "@/modules/audit/components/audit-log-table-skeleton"
+
+export default function DataChangeLogsLoading() {
+ return (
+
+ )
+}
diff --git a/src/app/(dashboard)/admin/audit-logs/data-changes/page.tsx b/src/app/(dashboard)/admin/audit-logs/data-changes/page.tsx
index fc8ce12..4e2d6d9 100644
--- a/src/app/(dashboard)/admin/audit-logs/data-changes/page.tsx
+++ b/src/app/(dashboard)/admin/audit-logs/data-changes/page.tsx
@@ -10,8 +10,9 @@ import {
getDataChangeStats,
getDataChangeTableOptions,
} from "@/modules/audit/data-access"
-import { DataChangeLogTable } from "@/modules/audit/components/data-change-log-table"
+import { DataChangeLogView } from "@/modules/audit/components/data-change-log-view"
import { AuditLogExportButton } from "@/modules/audit/components/audit-log-export-button"
+import { AuditErrorBoundary } from "@/modules/audit/components/audit-error-boundary"
import type { DataChangeAction } from "@/modules/audit/types"
export async function generateMetadata(): Promise
{
@@ -40,11 +41,12 @@ export default async function DataChangeLogsPage({
const tableName = getSearchParam(params, "tableName") ?? undefined
const actionParam = getSearchParam(params, "action")
const action = isValidDataChangeAction(actionParam) ? actionParam : undefined
+ const userId = getSearchParam(params, "userId") ?? undefined
const startDate = getSearchParam(params, "startDate") ?? undefined
const endDate = getSearchParam(params, "endDate") ?? undefined
const [result, tableOptions, stats] = await Promise.all([
- getDataChangeLogs({ page, tableName, action, startDate, endDate }),
+ getDataChangeLogs({ page, tableName, action, userId, startDate, endDate }),
getDataChangeTableOptions(),
getDataChangeStats(),
])
@@ -52,6 +54,7 @@ export default async function DataChangeLogsPage({
const exportParams: Record = {}
if (tableName) exportParams.tableName = tableName
if (action) exportParams.action = action
+ if (userId) exportParams.userId = userId
if (startDate) exportParams.startDate = startDate
if (endDate) exportParams.endDate = endDate
@@ -64,15 +67,17 @@ export default async function DataChangeLogsPage({