Merge pull request '260707_01_ENH: 모니터링 출발/도착 버튼은 모니터링 일자 이후로 부터 노출되게 수정 및 관리자는 출발 도착 삭제 가능하게 수정' (#7) from develop into master

Reviewed-on: #7
This commit is contained in:
2026-07-07 15:09:06 +09:00
5 changed files with 86 additions and 9 deletions

View File

@@ -27,11 +27,17 @@ const today = toLocalDateString();
const todayTime = new Date(`${today}T00:00:00`).getTime(); const todayTime = new Date(`${today}T00:00:00`).getTime();
const toDateTime = (date?: string | null) => { const toDateTime = (date?: string | null) => {
if (!date) return Number.POSITIVE_INFINITY; const normalizedDate = date?.trim();
const time = new Date(`${date}T00:00:00`).getTime(); if (!normalizedDate) return Number.POSITIVE_INFINITY;
const time = new Date(`${normalizedDate}T00:00:00`).getTime();
return Number.isNaN(time) ? Number.POSITIVE_INFINITY : time; 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 compareMonitoringSchedule = (a: PerformanceFull, b: PerformanceFull) => {
const aTime = toDateTime(a.performanceMonitoringSchedule?.monitoringDate); const aTime = toDateTime(a.performanceMonitoringSchedule?.monitoringDate);
const bTime = toDateTime(b.performanceMonitoringSchedule?.monitoringDate); const bTime = toDateTime(b.performanceMonitoringSchedule?.monitoringDate);
@@ -107,6 +113,7 @@ const MonitoringPage = () => {
}, [selected, userId]); }, [selected, userId]);
const hasDeparture = Boolean(selectedMonitoringRow?.slot.timeline.departure || selectedMonitoringRow?.slot.visit?.length); const hasDeparture = Boolean(selectedMonitoringRow?.slot.timeline.departure || selectedMonitoringRow?.slot.visit?.length);
const hasArrival = Boolean(selectedMonitoringRow?.slot.timeline.arrival); const hasArrival = Boolean(selectedMonitoringRow?.slot.timeline.arrival);
const canSaveVisit = canSaveMonitoringVisit(selected?.performanceMonitoringSchedule?.monitoringDate);
const columns = useMemo<DataTableColumn<PerformanceFull>[]>(() => [ const columns = useMemo<DataTableColumn<PerformanceFull>[]>(() => [
{ {
@@ -269,9 +276,9 @@ const MonitoringPage = () => {
{selected && ( {selected && (
<div> <div>
{!hasDeparture ? ( {!hasDeparture ? (
<Button type="button" className="w-full" onClick={() => openVisit("departure")}>출발</Button> <Button type="button" className="w-full" disabled={!canSaveVisit} onClick={() => openVisit("departure")}>출발</Button>
) : ( ) : (
<Button type="button" className="w-full" disabled={hasArrival} onClick={() => openVisit("arrival")}>도착</Button> <Button type="button" className="w-full" disabled={!canSaveVisit || hasArrival} onClick={() => openVisit("arrival")}>도착</Button>
)} )}
</div> </div>
)} )}

View File

@@ -98,3 +98,26 @@ export const POST = async (
return errorToResponse(error); 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<void>(
`/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);
}
};

View File

@@ -13,7 +13,7 @@ import {CodeGroup} from "@/query/code";
import {getCodeLabel, getDetailValue} from "@/lib/gwcf/view"; import {getCodeLabel, getDetailValue} from "@/lib/gwcf/view";
import { import {
getAssignStatusDisplay, getAssignStatusDisplay,
isAssignConfirmed, isAssignRejected, isAssignConfirmed, isAssignRejected, isAssignRequested,
isNotAssignRejected, isNotAssignRejected,
MONITORING_ASSIGN_TYPE MONITORING_ASSIGN_TYPE
} from "@/lib/gwcf/performance-status"; } from "@/lib/gwcf/performance-status";
@@ -57,7 +57,7 @@ export function AssignMonitoringDialog({
setCheckedIds(monitoringAssigns.filter(isNotAssignRejected).map((item) => item.assignUser)); setCheckedIds(monitoringAssigns.filter(isNotAssignRejected).map((item) => item.assignUser));
}, [monitoringAssigns, open, selected?.id]); }, [monitoringAssigns, open, selected?.id]);
const confirmRequestCount = monitoringAssigns.length; const confirmRequestCount = monitoringAssigns.filter(isAssignRequested).length;
const confirmedCount = monitoringAssigns.filter(isAssignConfirmed).length; const confirmedCount = monitoringAssigns.filter(isAssignConfirmed).length;
const assignSmsTargetIds = checkedIds.filter( const assignSmsTargetIds = checkedIds.filter(
(userId) => !monitoringAssigns.some((assign) => assign.assignUser === userId && isAssignConfirmed(assign)) (userId) => !monitoringAssigns.some((assign) => assign.assignUser === userId && isAssignConfirmed(assign))

View File

@@ -1,7 +1,7 @@
"use client"; "use client";
import {ReactNode, useEffect, useMemo, useRef, useState} from "react"; 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 {Button} from "@/components/ui/button";
import {Input} from "@/components/ui/input"; import {Input} from "@/components/ui/input";
import {Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle} from "@/components/ui/dialog"; import {Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle} from "@/components/ui/dialog";
@@ -27,7 +27,7 @@ import {
useReviewFileQuery, useReviewFileQuery,
useUploadReviewFileMutation, useUploadReviewFileMutation,
} from "@/query/review"; } from "@/query/review";
import {useDownloadEvidenceZipMutation, useMonitoringEvidenceQuery} from "@/query/monitoring"; import {useDownloadEvidenceZipMutation, useMonitoringEvidenceQuery, useResetMonitoringVisitMutation} from "@/query/monitoring";
import {useUsersQuery} from "@/query/user"; import {useUsersQuery} from "@/query/user";
import {useLoading} from "@/hooks/useLoading"; import {useLoading} from "@/hooks/useLoading";
import { import {
@@ -46,6 +46,7 @@ import {PERFORMANCE_FIELD_LABELS, USER_FIELD_LABELS} from "@/lib/gwcf/field-labe
type CodeMap = Partial<Record<CodeGroup, Code[]>>; type CodeMap = Partial<Record<CodeGroup, Code[]>>;
type PerformanceDetail = PerformanceCompact["performanceDetail"]; type PerformanceDetail = PerformanceCompact["performanceDetail"];
type MonitoringVisitResetStatus = "departure" | "arrival";
function DetailRow({label, children}: {label: string; children: ReactNode}) { function DetailRow({label, children}: {label: string; children: ReactNode}) {
return ( return (
@@ -270,11 +271,25 @@ function MonitoringStatusRow({
const row = getMonitoringDisplayRow(performance as PerformanceFull, index); const row = getMonitoringDisplayRow(performance as PerformanceFull, index);
const user = row.userId ? userMap.get(row.userId) : undefined; const user = row.userId ? userMap.get(row.userId) : undefined;
const latestVisit = row.slot.visit?.[0]; const latestVisit = row.slot.visit?.[0];
const resetMutation = useResetMonitoringVisitMutation();
const display = getMonitoringDisplayStatus( const display = getMonitoringDisplayStatus(
row, row,
getCodeLabel(codes, "monitoring_visit_status", latestVisit?.monitoringVisitStatus), getCodeLabel(codes, "monitoring_visit_status", latestVisit?.monitoringVisitStatus),
getCodeLabel(codes, "review_status", row.review?.reviewStatus) 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 ( return (
<div className="space-y-2 border-b p-3"> <div className="space-y-2 border-b p-3">
@@ -282,7 +297,25 @@ function MonitoringStatusRow({
<div className="grid gap-1 text-sm"> <div className="grid gap-1 text-sm">
<AssignedUserInfo userId={row.userId} user={user} codes={codes} type="monitoring" /> <AssignedUserInfo userId={row.userId} user={user} codes={codes} type="monitoring" />
<div className="flex flex-wrap items-center gap-2 mb-2"> <div className="flex flex-wrap items-center gap-2 mb-2">
<StatusPill variant={display.variant}>{display.label}</StatusPill> <StatusPill variant={display.variant}>
<span className="inline-flex items-center gap-1">
{display.label}
{canResetMonitoringVisit && (
<button
type="button"
aria-label={`${display.label} 상태 취소`}
className="inline-flex h-4 w-4 items-center justify-center rounded-full text-red-600 hover:bg-red-50 hover:text-red-700 disabled:pointer-events-none disabled:opacity-50 cursor-pointer"
disabled={resetMutation.isPending}
onClick={(event) => {
event.stopPropagation();
resetMonitoringVisit();
}}
>
<X className="h-3 w-3" />
</button>
)}
</span>
</StatusPill>
<ReviewFileActions <ReviewFileActions
performanceId={performance.id} performanceId={performance.id}
reviewType={row.reviewType} reviewType={row.reviewType}

View File

@@ -56,3 +56,17 @@ export function useDownloadEvidenceZipMutation() {
), ),
}); });
} }
export function useResetMonitoringVisitMutation() {
const qc = useQueryClient();
return useMutation({
mutationFn: ({performanceId, userId}: {performanceId: number; userId: string}) =>
nextApi.del<void>(`/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) });
},
});
}