260630_01_ENH: 배정 반려 기능 추가로 인한 후처리 작업

This commit is contained in:
2026-06-30 17:42:56 +09:00
parent 28d6969cde
commit 0f407e3656
9 changed files with 67 additions and 35 deletions

View File

@@ -11,7 +11,12 @@ import {StatusPill} from "@/components/gwcf/StatusPill";
import {Code, MonitoringApplyUser, PerformanceFull} from "@/types/gwcf";
import {CodeGroup} from "@/query/code";
import {getCodeLabel, getDetailValue} from "@/lib/gwcf/view";
import {getAssignStatusDisplay, MONITORING_ASSIGN_TYPE} from "@/lib/gwcf/performance-status";
import {
getAssignStatusDisplay,
isAssignConfirmed, isAssignRejected,
isNotAssignRejected,
MONITORING_ASSIGN_TYPE
} from "@/lib/gwcf/performance-status";
import {PERFORMANCE_FIELD_LABELS, USER_FIELD_LABELS} from "@/lib/gwcf/field-labels";
type CodeMap = Partial<Record<CodeGroup, Code[]>>;
@@ -49,13 +54,13 @@ export function AssignMonitoringDialog({
return;
}
setCheckedIds(monitoringAssigns.map((item) => item.assignUser));
setCheckedIds(monitoringAssigns.filter(isNotAssignRejected).map((item) => item.assignUser));
}, [monitoringAssigns, open, selected?.id]);
const confirmRequestCount = monitoringAssigns.length;
const confirmedCount = monitoringAssigns.filter((item) => item.assignConfirm).length;
const confirmedCount = monitoringAssigns.filter(isAssignConfirmed).length;
const assignSmsTargetIds = checkedIds.filter(
(userId) => !monitoringAssigns.some((assign) => assign.assignUser === userId && assign.assignConfirm)
(userId) => !monitoringAssigns.some((assign) => assign.assignUser === userId && isAssignConfirmed(assign))
);
const updateChecked = (applyUser: MonitoringApplyUser, checked: boolean) => {
@@ -69,15 +74,19 @@ export function AssignMonitoringDialog({
return;
}
if(isAssignRejected(currentAssign)) {
if (!confirm("이미 포기한 사용자 입니다. 정말로 다시 배정하시겠습니까?")) return;
}
const next = Array.from(new Set([...checkedIds, applyUser.userId]));
setCheckedIds(next);
return;
}
if (currentAssign?.assignConfirm) {
if (!confirm("이미 승인된 상태입니다. 정말로 취소 하시 겠습니까?")) return;
} else if (currentAssign) {
if (!confirm("이미 문자 발송된 상태입니다. 정말로 취소 하시 겠습니까?")) return;
if (isAssignConfirmed(currentAssign)) {
if (!confirm("이미 승인된 상태입니다. 정말로 취소하시겠습니까?")) return;
} else if (isNotAssignRejected(currentAssign) && currentAssign) {
if (!confirm("이미 문자 발송된 상태입니다. 정말로 취소하시겠습니까?")) return;
}
const next = checkedIds.filter((userId) => userId !== applyUser.userId);
@@ -136,7 +145,7 @@ export function AssignMonitoringDialog({
const assigned = monitoringAssigns.find((item) => item.assignUser === row.original.userId);
if (!assigned) return null;
const display = getAssignStatusDisplay(assigned.assignConfirm);
const display = getAssignStatusDisplay(assigned.assignStatus);
return <StatusPill variant={display.variant}>{display.label}</StatusPill>;
},
},

View File

@@ -240,7 +240,7 @@ export function MonitoringPerformanceDetailDialog({
<MobileDetailRow label={PERFORMANCE_FIELD_LABELS.monitoringDate}>{performance.performanceMonitoringSchedule?.monitoringDate ?? ""}</MobileDetailRow>
<MobileDetailRow label={PERFORMANCE_FIELD_LABELS.monitoringTimeInfo}>{performance.performanceMonitoringSchedule?.monitoringTimeInfo}</MobileDetailRow>
<MobileDetailRow label={PERFORMANCE_FIELD_LABELS.monitoringAddress}>{performance.performanceMonitoringSchedule?.monitoringAddress}</MobileDetailRow>
<MobileDetailRow label={PERFORMANCE_FIELD_LABELS.performanceMemo}>{performance.performanceMemo}</MobileDetailRow>
{/*<MobileDetailRow label={PERFORMANCE_FIELD_LABELS.performanceMemo}>{performance.performanceMemo}</MobileDetailRow>*/}
</section>
<section className="space-y-3 rounded-md border p-3">