diff --git a/src/app/(pages)/(main)/monitoring/page.tsx b/src/app/(pages)/(main)/monitoring/page.tsx index 12694fc..1c20967 100644 --- a/src/app/(pages)/(main)/monitoring/page.tsx +++ b/src/app/(pages)/(main)/monitoring/page.tsx @@ -17,9 +17,11 @@ import {useMounted} from "@/hooks/useMounted"; import {LoadingOverlay} from "@/components/common/LoadingOverlay"; import {toLocalDateString} from "@/lib/gwcf/date"; import { - getMonitoringDisplayRow, + getMonitoringDisplayRow, getMonitoringDisplayStatus, } from "@/lib/gwcf/performance-status"; import {PERFORMANCE_FIELD_LABELS} from "@/lib/gwcf/field-labels"; +import {getCodeLabel} from "@/lib/gwcf/view"; +import {StatusPill} from "@/components/gwcf/StatusPill"; const today = toLocalDateString(); const todayTime = new Date(`${today}T00:00:00`).getTime(); @@ -112,15 +114,34 @@ const MonitoringPage = () => { const hasDeparture = Boolean(selectedMonitoringRow?.slot.timeline.departure || selectedMonitoringRow?.slot.visit?.length); const hasArrival = Boolean(selectedMonitoringRow?.slot.timeline.arrival); + + const columns = useMemo[]>(() => [ { accessorKey: "performanceName", header: PERFORMANCE_FIELD_LABELS.performanceName, - cell: ({row}) => ( -
- {row.original.performanceName} + cell: ({row}) => { + if (!row.original || !userId) return undefined; + const prow = ([0, 1] as const) + .map((index) => getMonitoringDisplayRow(row.original, index)) + .find((item) => item.userId === userId); + + const latestVisit = prow?.slot.visit?.[0]; + const status = prow + ? getMonitoringDisplayStatus( + prow, + getCodeLabel(codes, "monitoring_visit_status", latestVisit?.monitoringVisitStatus), + getCodeLabel(codes, "review_status", prow?.review?.reviewStatus) + ) + : {label: "미배치", variant: "danger" as const}; + + return ( +
+ {row.original.performanceName}
+ {status.label}
- ), + ) + }, }, { id: "monitoringDate",