260625_01_ENH: 연구, 실사 수정사항 적용 1차

This commit is contained in:
2026-06-25 13:05:37 +09:00
parent 8e3c4302c5
commit 29dd9d628e
15 changed files with 197 additions and 65 deletions

View File

@@ -26,7 +26,7 @@ import {StatusPill} from "@/components/gwcf/StatusPill";
const today = toLocalDateString();
const todayTime = new Date(`${today}T00:00:00`).getTime();
const toDateTime = (date?: string) => {
const toDateTime = (date?: string | null) => {
if (!date) return Number.POSITIVE_INFINITY;
const time = new Date(`${date}T00:00:00`).getTime();
return Number.isNaN(time) ? Number.POSITIVE_INFINITY : time;
@@ -78,7 +78,6 @@ const MonitoringPage = () => {
const userId = auth.user?.userId;
const [selectedId, setSelectedId] = useState<number | null>(null);
const [detailId, setDetailId] = useState<number | null>(null);
const [visitMode, setVisitMode] = useState<"departure" | "arrival">("departure");
const refreshMonitoringList = () => {
@@ -100,11 +99,6 @@ const MonitoringPage = () => {
return sortedItems.find((item) => item.id === selectedId) ?? sortedItems[0] ?? null;
}, [selectedId, sortedItems]);
const detailSelected = useMemo(() => {
if (!detailId) return null;
return sortedItems.find((item) => item.id === detailId) ?? null;
}, [detailId, sortedItems]);
const selectedMonitoringRow = useMemo(() => {
if (!selected || !userId) return undefined;
return ([0, 1] as const)
@@ -114,8 +108,6 @@ const MonitoringPage = () => {
const hasDeparture = Boolean(selectedMonitoringRow?.slot.timeline.departure || selectedMonitoringRow?.slot.visit?.length);
const hasArrival = Boolean(selectedMonitoringRow?.slot.timeline.arrival);
const columns = useMemo<DataTableColumn<PerformanceFull>[]>(() => [
{
accessorKey: "performanceName",
@@ -146,18 +138,18 @@ const MonitoringPage = () => {
{
id: "monitoringDate",
header: PERFORMANCE_FIELD_LABELS.monitoringDate,
cell: ({row}) => row.original.performanceMonitoringSchedule?.monitoringDate?.slice(5) || "-",
cell: ({row}) => row.original.performanceMonitoringSchedule?.monitoringDate?.slice(5) ?? "",
},
{
id: "monitoringTime",
header: PERFORMANCE_FIELD_LABELS.monitoringTimeInfo,
cell: ({row}) => row.original.performanceMonitoringSchedule?.monitoringTimeInfo || "-",
},
], []);
], [codes]);
const visitOpen = isDialogOpen("monitoringVisitDialog");
const detailOpen = isDialogOpen("monitoringDetailDialog");
const {data: detailData} = usePerformanceDetailQuery(detailId ?? 0, Boolean(detailId && detailOpen));
const {data: detailData} = usePerformanceDetailQuery(selectedId ?? 0, Boolean(selectedId && detailOpen));
const openVisit = (mode: "departure" | "arrival") => {
setVisitMode(mode);
@@ -261,7 +253,7 @@ const MonitoringPage = () => {
{selected && (
<section className="rounded-md border">
<div className="border-b bg-muted px-3 py-2 text-center font-semibold">
{selected.performanceMonitoringSchedule?.monitoringDate} {selected.performanceMonitoringSchedule?.monitoringTimeInfo}
{[selected.performanceMonitoringSchedule?.monitoringDate, selected.performanceMonitoringSchedule?.monitoringTimeInfo].filter(Boolean).join(" ")}
</div>
<div className="grid grid-cols-[80px_1fr] border-b">
<div className="bg-muted px-3 py-2 text-sm font-semibold">{PERFORMANCE_FIELD_LABELS.performanceName}</div>
@@ -292,7 +284,7 @@ const MonitoringPage = () => {
getRowId={(row) => String(row.id)}
selectMode="click-event"
onRowClick={(item) => {
setDetailId(item.id);
setSelectedId(item.id);
showDialog("monitoringDetailDialog");
}}
highlightRowIds={selected ? [String(selected.id)] : []}
@@ -329,10 +321,9 @@ const MonitoringPage = () => {
}
hideDialog("monitoringDetailDialog");
setDetailId(null);
refreshMonitoringList();
}}
performance={detailData ?? detailSelected}
performance={detailData ?? selected}
codes={codes}
userId={userId}
/>