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]);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user