From 3edbbee1032f0f312182aaf719a9a6d36a5734b1 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Tue, 7 Jul 2026 15:06:19 +0900 Subject: [PATCH] =?UTF-8?q?260707=5F01=5FENH:=20=EB=AA=A8=EB=8B=88?= =?UTF-8?q?=ED=84=B0=EB=A7=81=20=EC=B6=9C=EB=B0=9C/=EB=8F=84=EC=B0=A9=20?= =?UTF-8?q?=EB=B2=84=ED=8A=BC=EC=9D=80=20=EB=AA=A8=EB=8B=88=ED=84=B0?= =?UTF-8?q?=EB=A7=81=20=EC=9D=BC=EC=9E=90=20=EC=9D=B4=ED=9B=84=EB=A1=9C=20?= =?UTF-8?q?=EB=B6=80=ED=84=B0=20=EB=85=B8=EC=B6=9C=EB=90=98=EA=B2=8C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=EB=B0=8F=20=EA=B4=80=EB=A6=AC=EC=9E=90?= =?UTF-8?q?=EB=8A=94=20=EC=B6=9C=EB=B0=9C=20=EB=8F=84=EC=B0=A9=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C=20=EA=B0=80=EB=8A=A5=ED=95=98=EA=B2=8C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/(pages)/(main)/monitoring/page.tsx | 15 +++++-- src/app/api/monitoring/[[...slug]]/route.ts | 23 +++++++++++ .../dialog/AssignMonitoringDialog.tsx | 4 +- .../dialog/PerformanceDetailDialog.tsx | 39 +++++++++++++++++-- src/query/monitoring.ts | 14 +++++++ 5 files changed, 86 insertions(+), 9 deletions(-) diff --git a/src/app/(pages)/(main)/monitoring/page.tsx b/src/app/(pages)/(main)/monitoring/page.tsx index f143a2a..812d232 100644 --- a/src/app/(pages)/(main)/monitoring/page.tsx +++ b/src/app/(pages)/(main)/monitoring/page.tsx @@ -27,11 +27,17 @@ const today = toLocalDateString(); const todayTime = new Date(`${today}T00:00:00`).getTime(); const toDateTime = (date?: string | null) => { - if (!date) return Number.POSITIVE_INFINITY; - const time = new Date(`${date}T00:00:00`).getTime(); + const normalizedDate = date?.trim(); + if (!normalizedDate) return Number.POSITIVE_INFINITY; + const time = new Date(`${normalizedDate}T00:00:00`).getTime(); return Number.isNaN(time) ? Number.POSITIVE_INFINITY : time; }; +const canSaveMonitoringVisit = (date?: string | null) => { + const time = toDateTime(date); + return Number.isFinite(time) && todayTime >= time; +}; + const compareMonitoringSchedule = (a: PerformanceFull, b: PerformanceFull) => { const aTime = toDateTime(a.performanceMonitoringSchedule?.monitoringDate); const bTime = toDateTime(b.performanceMonitoringSchedule?.monitoringDate); @@ -107,6 +113,7 @@ const MonitoringPage = () => { }, [selected, userId]); const hasDeparture = Boolean(selectedMonitoringRow?.slot.timeline.departure || selectedMonitoringRow?.slot.visit?.length); const hasArrival = Boolean(selectedMonitoringRow?.slot.timeline.arrival); + const canSaveVisit = canSaveMonitoringVisit(selected?.performanceMonitoringSchedule?.monitoringDate); const columns = useMemo[]>(() => [ { @@ -269,9 +276,9 @@ const MonitoringPage = () => { {selected && (
{!hasDeparture ? ( - + ) : ( - + )}
)} diff --git a/src/app/api/monitoring/[[...slug]]/route.ts b/src/app/api/monitoring/[[...slug]]/route.ts index 8a4b001..b7d8c73 100644 --- a/src/app/api/monitoring/[[...slug]]/route.ts +++ b/src/app/api/monitoring/[[...slug]]/route.ts @@ -98,3 +98,26 @@ export const POST = async ( return errorToResponse(error); } }; + +export const DELETE = async ( + req: NextRequest, + context: RouteContext +) => { + try { + void req; + const {slug = []} = await context.params; + const [action, subAction, performanceId, userId] = slug; + const backApi = await createBackApi(); + + if (action === "visit" && subAction === "reset" && performanceId && userId && slug.length === 4) { + await backApi.del( + `/monitoring/visit/reset/${encodeURIComponent(performanceId)}/${encodeURIComponent(userId)}` + ); + return NextResponse.json(null, { status: 200 }); + } + + return NextResponse.json({ message: "Not found" }, { status: 404 }); + } catch (error: unknown) { + return errorToResponse(error); + } +}; diff --git a/src/components/dialog/AssignMonitoringDialog.tsx b/src/components/dialog/AssignMonitoringDialog.tsx index 9adc108..5d7a77c 100644 --- a/src/components/dialog/AssignMonitoringDialog.tsx +++ b/src/components/dialog/AssignMonitoringDialog.tsx @@ -13,7 +13,7 @@ import {CodeGroup} from "@/query/code"; import {getCodeLabel, getDetailValue} from "@/lib/gwcf/view"; import { getAssignStatusDisplay, - isAssignConfirmed, isAssignRejected, + isAssignConfirmed, isAssignRejected, isAssignRequested, isNotAssignRejected, MONITORING_ASSIGN_TYPE } from "@/lib/gwcf/performance-status"; @@ -57,7 +57,7 @@ export function AssignMonitoringDialog({ setCheckedIds(monitoringAssigns.filter(isNotAssignRejected).map((item) => item.assignUser)); }, [monitoringAssigns, open, selected?.id]); - const confirmRequestCount = monitoringAssigns.length; + const confirmRequestCount = monitoringAssigns.filter(isAssignRequested).length; const confirmedCount = monitoringAssigns.filter(isAssignConfirmed).length; const assignSmsTargetIds = checkedIds.filter( (userId) => !monitoringAssigns.some((assign) => assign.assignUser === userId && isAssignConfirmed(assign)) diff --git a/src/components/dialog/PerformanceDetailDialog.tsx b/src/components/dialog/PerformanceDetailDialog.tsx index 2879adb..caff98c 100644 --- a/src/components/dialog/PerformanceDetailDialog.tsx +++ b/src/components/dialog/PerformanceDetailDialog.tsx @@ -1,7 +1,7 @@ "use client"; import {ReactNode, useEffect, useMemo, useRef, useState} from "react"; -import {Download, ImageIcon, ScanSearch, Upload} from "lucide-react"; +import {Download, ImageIcon, ScanSearch, Upload, X} from "lucide-react"; import {Button} from "@/components/ui/button"; import {Input} from "@/components/ui/input"; import {Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle} from "@/components/ui/dialog"; @@ -27,7 +27,7 @@ import { useReviewFileQuery, useUploadReviewFileMutation, } from "@/query/review"; -import {useDownloadEvidenceZipMutation, useMonitoringEvidenceQuery} from "@/query/monitoring"; +import {useDownloadEvidenceZipMutation, useMonitoringEvidenceQuery, useResetMonitoringVisitMutation} from "@/query/monitoring"; import {useUsersQuery} from "@/query/user"; import {useLoading} from "@/hooks/useLoading"; import { @@ -46,6 +46,7 @@ import {PERFORMANCE_FIELD_LABELS, USER_FIELD_LABELS} from "@/lib/gwcf/field-labe type CodeMap = Partial>; type PerformanceDetail = PerformanceCompact["performanceDetail"]; +type MonitoringVisitResetStatus = "departure" | "arrival"; function DetailRow({label, children}: {label: string; children: ReactNode}) { return ( @@ -270,11 +271,25 @@ function MonitoringStatusRow({ const row = getMonitoringDisplayRow(performance as PerformanceFull, index); const user = row.userId ? userMap.get(row.userId) : undefined; const latestVisit = row.slot.visit?.[0]; + const resetMutation = useResetMonitoringVisitMutation(); const display = getMonitoringDisplayStatus( row, getCodeLabel(codes, "monitoring_visit_status", latestVisit?.monitoringVisitStatus), getCodeLabel(codes, "review_status", row.review?.reviewStatus) ); + const resetStatus: MonitoringVisitResetStatus | null = + display.variant === "departed" ? "departure" : display.variant === "arrived" ? "arrival" : null; + const resetUserId = row.evidenceUserId || row.userId; + const canResetMonitoringVisit = canEdit && Boolean(resetStatus && resetUserId); + + const resetMonitoringVisit = () => { + if (!resetStatus || !resetUserId) return; + if (!confirm("방문 정보를 정말 삭제하시겠습니까?")) return; + resetMutation.mutate({ + performanceId: performance.id, + userId: resetUserId, + }); + }; return (
@@ -282,7 +297,25 @@ function MonitoringStatusRow({
- {display.label} + + + {display.label} + {canResetMonitoringVisit && ( + + )} + + + nextApi.del(`/monitoring/visit/reset/${performanceId}/${encodeURIComponent(userId)}`), + onSuccess: (_res, {performanceId, userId}) => { + qc.invalidateQueries({ queryKey: qk.performance(performanceId) }); + qc.invalidateQueries({ queryKey: qk.performanceList() }); + qc.invalidateQueries({ queryKey: qk.monitoringEvidence(performanceId, userId) }); + }, + }); +} -- 2.49.0.windows.1