260630_01_ENH: 배정 반려 기능 추가로 인한 후처리 작업
This commit is contained in:
@@ -11,14 +11,14 @@ import {DataTableColumn} from "@/components/data-table/DataTable.type";
|
||||
import {SmsSendDialog} from "@/components/dialog/SmsSendDialog";
|
||||
import {AssignMonitoringDialog} from "@/components/dialog/AssignMonitoringDialog";
|
||||
import {useCodesQuery} from "@/query/code";
|
||||
import {usePerformanceListQuery} from "@/query/performance";
|
||||
import {usePerformanceDetailQuery, usePerformanceListQuery} from "@/query/performance";
|
||||
import {
|
||||
useMonitoringApplyUserCountsQuery,
|
||||
useMonitoringApplyUsersQuery,
|
||||
useSaveMonitoringAssignMutation,
|
||||
} from "@/query/assign";
|
||||
import {filterPerformance, getCodeLabel} from "@/lib/gwcf/view";
|
||||
import {MONITORING_ASSIGN_TYPE} from "@/lib/gwcf/performance-status";
|
||||
import {isAssignConfirmed, MONITORING_ASSIGN_TYPE} from "@/lib/gwcf/performance-status";
|
||||
import {PerformanceAssign, PerformanceFull} from "@/types/gwcf";
|
||||
import {useDialog} from "@/hooks/useDialog";
|
||||
import {useMounted} from "@/hooks/useMounted";
|
||||
@@ -148,9 +148,11 @@ const AssignPage = () => {
|
||||
{id: "monitoringTime", header: PERFORMANCE_FIELD_LABELS.monitoringTimeInfo, cell: ({row}) => row.original.performanceMonitoringSchedule?.monitoringTimeInfo ?? ""},
|
||||
{id: "applyCount", header: "신청자 수", accessorFn:((row) => applyCountMap.get(String(row.id)) ?? 0), cell: ({row}) => applyCountMap.get(String(row.original.id)) ?? 0},
|
||||
{id: "requestCount", header: "확정요청 수", accessorFn:((row) => getMonitoringAssigns(row).length), cell: ({row}) => getMonitoringAssigns(row.original).length},
|
||||
{id: "confirmedCount", header: "확정인원 수", accessorFn:((row) => getMonitoringAssigns(row).filter((assign) => assign.assignConfirm ).length), cell: ({row}) => getMonitoringAssigns(row.original).filter((assign) => assign.assignConfirm).length},
|
||||
{id: "confirmedCount", header: "확정인원 수", accessorFn:((row) => getMonitoringAssigns(row).filter(isAssignConfirmed).length), cell: ({row}) => getMonitoringAssigns(row.original).filter(isAssignConfirmed).length},
|
||||
], [applyCountMap, codes]);
|
||||
|
||||
const {data: detailData} = usePerformanceDetailQuery(selected?.id ?? 0, Boolean(selected?.id && assignOpen));
|
||||
|
||||
if(!mounted) return <LoadingOverlay force={true} />
|
||||
|
||||
return (
|
||||
@@ -185,7 +187,7 @@ const AssignPage = () => {
|
||||
hideDialog("assignMonitoringDialog");
|
||||
refreshAssignList();
|
||||
}}
|
||||
selected={selected}
|
||||
selected={detailData ?? selected}
|
||||
codes={codes}
|
||||
applyUsers={applyUsers}
|
||||
isSavingAssign={saveAssignMutation.isPending}
|
||||
|
||||
@@ -17,7 +17,7 @@ import {useMounted} from "@/hooks/useMounted";
|
||||
import {LoadingOverlay} from "@/components/common/LoadingOverlay";
|
||||
import {toLocalDateString} from "@/lib/gwcf/date";
|
||||
import {
|
||||
getMonitoringDisplayRow, getMonitoringDisplayStatus,
|
||||
getMonitoringDisplayRow, getMonitoringDisplayStatus, isAssignConfirmed,
|
||||
} from "@/lib/gwcf/performance-status";
|
||||
import {PERFORMANCE_FIELD_LABELS} from "@/lib/gwcf/field-labels";
|
||||
import {getCodeLabel} from "@/lib/gwcf/view";
|
||||
@@ -87,7 +87,7 @@ const MonitoringPage = () => {
|
||||
const assignedItems = useMemo(() => {
|
||||
if (!userId) return [];
|
||||
return data.filter((item) =>
|
||||
item.performanceAssignList?.some((assign) => assign.assignUser === userId && assign.assignConfirm)
|
||||
item.performanceAssignList?.some((assign) => assign.assignUser === userId && isAssignConfirmed(assign))
|
||||
);
|
||||
}, [data, userId]);
|
||||
|
||||
|
||||
@@ -57,6 +57,12 @@ export const POST = async (
|
||||
);
|
||||
return NextResponse.json(result, { status: 200 });
|
||||
}
|
||||
if (action === "reject" && second && third && slug.length === 3) {
|
||||
const result = await backApi.post<string>(
|
||||
`/assign/reject/${encodeURIComponent(second)}/${encodeURIComponent(third)}`
|
||||
);
|
||||
return NextResponse.json(result, { status: 200 });
|
||||
}
|
||||
|
||||
if(action === "written" && second === "excel-template"){
|
||||
const result = await backApi.post<ArrayBuffer>(
|
||||
|
||||
@@ -78,6 +78,13 @@ export const POST = async (
|
||||
return withCors(NextResponse.json(result, { status: 200 }));
|
||||
}
|
||||
|
||||
if(action === "assign-reject" && slug.length === 3) {
|
||||
const result = await backApi.post<string>(
|
||||
`/assign/reject/${encodeURIComponent(slug[1])}/${encodeURIComponent(slug[2])}`
|
||||
);
|
||||
return withCors(NextResponse.json(result, { status: 200 }));
|
||||
}
|
||||
|
||||
if(action === "performance" && slug.length === 2) {
|
||||
const result = await backApi.get<PerformanceFull>(`/performance/${encodeURIComponent(slug[1])}`)
|
||||
return withCors(NextResponse.json(result, { status: 200 }));
|
||||
|
||||
@@ -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>;
|
||||
},
|
||||
},
|
||||
|
||||
@@ -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">
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import {Code, PerformanceAssign, PerformanceFull, PerformanceMonitoringVisit, PerformanceReview, UserCompact} from "@/types/gwcf";
|
||||
import type {StatusPillVariant} from "@/components/gwcf/StatusPill";
|
||||
import {ASSIGN_STATUS, AssignStatus} from "@/types/gwcf";
|
||||
|
||||
export const LOCAL_GOVERNMENT_REVIEW_TYPE = 3;
|
||||
export const MONITORING_ASSIGN_TYPE = 1;
|
||||
@@ -49,6 +50,18 @@ export const STATUS_FILTER = {
|
||||
DONE: "-1007",
|
||||
} as const;
|
||||
|
||||
export const isAssignConfirmed = (assign?: Pick<PerformanceAssign, "assignStatus">) => {
|
||||
return assign?.assignStatus === ASSIGN_STATUS.CONFIRMED;
|
||||
};
|
||||
|
||||
export const isAssignRejected = (assign?: Pick<PerformanceAssign, "assignStatus">) => {
|
||||
return assign?.assignStatus === ASSIGN_STATUS.REJECTED;
|
||||
};
|
||||
|
||||
export const isNotAssignRejected = (assign?: Pick<PerformanceAssign, "assignStatus">) => {
|
||||
return assign?.assignStatus !== ASSIGN_STATUS.REJECTED;
|
||||
};
|
||||
|
||||
export const makeStatusOption = (value: string, label: string): Code => ({
|
||||
codeGroup: "status_filter",
|
||||
codeValue: Number(value),
|
||||
@@ -94,7 +107,7 @@ const getMonitoringTimeline = (visits: PerformanceMonitoringVisit[]): Monitoring
|
||||
|
||||
export const getMonitoringSlots = (performance: Partial<PerformanceFull>): [MonitoringSlot, MonitoringSlot] => {
|
||||
const confirmedAssigns = (performance.performanceAssignList ?? [])
|
||||
.filter((assign) => assign.assignType === MONITORING_ASSIGN_TYPE && assign.assignConfirm)
|
||||
.filter((assign) => assign.assignType === MONITORING_ASSIGN_TYPE && isAssignConfirmed(assign))
|
||||
.sort((a, b) => a.assignOrder - b.assignOrder || a.id - b.id);
|
||||
|
||||
const visits = performance.performanceMonitoringVisitMap ?? {};
|
||||
@@ -310,8 +323,8 @@ export const getMonitoringDisplayStatus = (
|
||||
return getMonitoringStatusDisplay(visitLabel, row.slot);
|
||||
};
|
||||
|
||||
export const getAssignStatusDisplay = (confirmed: boolean): StatusDisplay => {
|
||||
return confirmed
|
||||
? {label: "확정", variant: "done"}
|
||||
: {label: "요청", variant: "inprogress"};
|
||||
export const getAssignStatusDisplay = (status: AssignStatus): StatusDisplay => {
|
||||
if (status === ASSIGN_STATUS.CONFIRMED) return {label: "확정", variant: "done"};
|
||||
if (status === ASSIGN_STATUS.REJECTED) return {label: "포기", variant: "danger"};
|
||||
return {label: "요청", variant: "inprogress"};
|
||||
};
|
||||
|
||||
@@ -91,19 +91,6 @@ export function useAssignCancelMutation() {
|
||||
});
|
||||
}
|
||||
|
||||
export function useKonAssignConfirmMutation() {
|
||||
const qc = useQueryClient();
|
||||
|
||||
return useMutation({
|
||||
mutationFn: ({performanceId, userId}: {performanceId: number; userId: string}) =>
|
||||
nextApi.post<string>(`/assign/confirm/${performanceId}/${encodeURIComponent(userId)}`),
|
||||
onSuccess: (_res, {performanceId, userId}) => {
|
||||
qc.invalidateQueries({ queryKey: qk.assignConfirm(performanceId, userId) });
|
||||
qc.invalidateQueries({ queryKey: ["performance", "list"] });
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
export function useUploadWrittenAssignExcelMutation() {
|
||||
const qc = useQueryClient();
|
||||
|
||||
|
||||
@@ -26,13 +26,21 @@ export type Code = {
|
||||
memo: string;
|
||||
};
|
||||
|
||||
export const ASSIGN_STATUS = {
|
||||
REQUESTED: 0,
|
||||
CONFIRMED: 1,
|
||||
REJECTED: 9,
|
||||
} as const;
|
||||
|
||||
export type AssignStatus = typeof ASSIGN_STATUS[keyof typeof ASSIGN_STATUS];
|
||||
|
||||
export type PerformanceAssign = {
|
||||
id: number;
|
||||
performanceId: number;
|
||||
assignType: number;
|
||||
assignOrder: number;
|
||||
assignUser: string;
|
||||
assignConfirm: boolean;
|
||||
assignStatus: AssignStatus;
|
||||
};
|
||||
|
||||
export type MonitoringApplyUser = {
|
||||
|
||||
Reference in New Issue
Block a user