From 081b53945aeeeb39101888bce0311612c512362a Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Wed, 12 Aug 2026 08:41:27 +0900 Subject: [PATCH] =?UTF-8?q?260812=5F01=5FENH:=20=EB=B0=B0=EC=A0=95=C2=B7?= =?UTF-8?q?=EC=A7=84=ED=96=89=20=ED=98=84=ED=99=A9=20=EA=B0=9C=EC=84=A0=20?= =?UTF-8?q?=EB=B0=8F=20=EC=98=88=EC=95=BD/=EC=9D=B4=EB=B2=A4=ED=8A=B8=20?= =?UTF-8?q?=EC=9D=B4=EB=A0=A5=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 프로젝트별 외주사·필드워커 배정 현황 및 미배정 건수 UI 추가 - 현장 면접 진행 여부와 사용자 권한에 따른 배정 탭·필터·컬럼 노출 제어 - 컨택 마지막 이벤트 일자 필터·정렬 및 결과/일자 컬럼 분리 - 컨택·면접·발송 현황의 날짜 범위 선택 optional 처리 - 진행 현황의 미배정 표시 및 일자별 미사용 결과 제외 - 전역 예약 기간 조회·이동 및 5분 단위 예약 알림 추가 - 내부 관리자용 이벤트 이력 단건 삭제 기능 추가 - 리스트 필터 UI 및 일반 헤더 정렬 기준 개선 - 프로젝트 저장 시 선택 프로젝트 정보 동기화 --- src/app/(pages)/(main)/assign/list/page.tsx | 65 ++++++-- .../(pages)/(main)/assign/project/page.tsx | 7 +- src/app/(pages)/(main)/list/contact/page.tsx | 24 +-- src/app/(pages)/(main)/list/manage/page.tsx | 2 + .../(pages)/(main)/progress/message/page.tsx | 17 +- src/app/(pages)/(main)/project/info/page.tsx | 12 +- src/app/api/assign/[[...slug]]/route.ts | 20 +++ src/app/api/list-hist/[[...slug]]/route.ts | 17 ++ src/app/api/reserve/[[...slug]]/route.ts | 20 +++ src/app/globals.css | 1 + src/components/app-shell/AppHeader.tsx | 7 +- src/components/app-shell/AppMainLayout.tsx | 5 + src/components/assign/AssignTargetList.tsx | 127 +++++++++++++-- src/components/common/KriDateTimePicker.tsx | 2 +- src/components/dialog/ListFilterDialog.tsx | 110 +++---------- .../dialog/ListHeaderManageDialog.tsx | 13 +- .../dialog/ReservationListDialog.tsx | 91 ----------- src/components/dialog/ReserveSearchDialog.tsx | 150 ++++++++++++++++++ .../list-contact/ListContactEventPanel.tsx | 49 +++++- src/components/list/ListSearchTable.tsx | 111 ++++++++++--- .../progress/ProgressPageContent.tsx | 31 ++-- src/components/progress/UserProgressTable.tsx | 9 +- src/components/providers/AppProvider.tsx | 2 + .../providers/ReserveNotificationSync.tsx | 8 + .../table-column/ListTableColumn.tsx | 27 +++- .../table-column/ProjectTableColumn.tsx | 3 +- src/hooks/useReserveNotification.tsx | 85 ++++++++++ src/query/assign.ts | 21 ++- src/query/key/keys.ts | 9 +- src/query/list.ts | 32 ++-- src/query/project.ts | 36 +++++ src/query/reserve.ts | 30 ++++ src/store/jotai/dialog.ts | 2 +- src/types/list.ts | 38 ++++- 34 files changed, 852 insertions(+), 331 deletions(-) delete mode 100644 src/components/dialog/ReservationListDialog.tsx create mode 100644 src/components/dialog/ReserveSearchDialog.tsx create mode 100644 src/components/providers/ReserveNotificationSync.tsx create mode 100644 src/hooks/useReserveNotification.tsx create mode 100644 src/query/reserve.ts diff --git a/src/app/(pages)/(main)/assign/list/page.tsx b/src/app/(pages)/(main)/assign/list/page.tsx index 043e8cb..91ce3e7 100644 --- a/src/app/(pages)/(main)/assign/list/page.tsx +++ b/src/app/(pages)/(main)/assign/list/page.tsx @@ -1,6 +1,6 @@ 'use client' -import { useMemo, useState } from 'react' +import { useEffect, useMemo, useState } from 'react' import { useMounted } from '@kri/common/hooks' import { LoadingOverlayAdapter } from '@/components/app-shell/LoadingOverlayAdapter' import { useAuth } from '@/hooks/useAuth' @@ -17,6 +17,7 @@ import { useResetListAssignMutation, useUpsertListAssignMutation } from '@/query import { ListHeaderAssignConst, LIST_HEADER_TYPE_LABEL } from '@/const/listConst' import { createEmptyListFilter, type ListFilter, type ListHeaderAssignType, type listHeader } from '@/types/list' import type { ResultCode } from '@/types/project' +import { isExternalManager } from '@/utils/userRole' const ASSIGN_TAB_TYPES: ListHeaderAssignType[] = [ ListHeaderAssignConst.CONTACT_INTERVIEWER, @@ -36,8 +37,15 @@ const ListAssignPage = () => { const prjctIdx = selectedProject?.prjctIdx ?? 0 const enabled = mounted && prjctIdx > 0 const userRole = auth?.user?.userRole ?? 0 + const isExternalUser = isExternalManager(userRole) const [assignType, setAssignType] = useState(ListHeaderAssignConst.CONTACT_INTERVIEWER) + const effectiveAssignType = + selectedProject?.ff === false && assignType === ListHeaderAssignConst.FIELD_INTERVIEWER + ? ListHeaderAssignConst.CONTACT_INTERVIEWER + : isExternalUser && assignType === ListHeaderAssignConst.OUTSOURCE + ? ListHeaderAssignConst.CONTACT_INTERVIEWER + : assignType const [selectedAssignId, setSelectedAssignId] = useState(undefined) const [assignFilterIds, setAssignFilterIds] = useState([]) const [transferResve, setTransferResve] = useState(false) @@ -49,11 +57,34 @@ const ListAssignPage = () => { const listHeaderQuery = useListHeaderQuery(prjctIdx, enabled) const upsertListAssignMutation = useUpsertListAssignMutation(prjctIdx) const resetListAssignMutation = useResetListAssignMutation(prjctIdx) - const assignTargetRows = useAssignTargetRows({ prjctIdx, enabled, assignType }) + const assignTargetRows = useAssignTargetRows({ prjctIdx, enabled, assignType: effectiveAssignType }) const resultCodeArray = useMemo(() => resultCodesQuery.data ?? [], [resultCodesQuery.data]) const surveyArray = useMemo(() => projectInfoQuery.data?.surveys ?? [], [projectInfoQuery.data]) const listHeaders = useMemo(() => listHeaderQuery.data ?? [], [listHeaderQuery.data]) + const assignTabTypes = useMemo( + () => + ASSIGN_TAB_TYPES.filter((type) => { + if (type === ListHeaderAssignConst.FIELD_INTERVIEWER && selectedProject?.ff === false) return false + if (type === ListHeaderAssignConst.OUTSOURCE && isExternalUser) return false + return true + }), + [selectedProject?.ff, isExternalUser], + ) + + useEffect(() => { + if (selectedProject?.ff === false && assignType === ListHeaderAssignConst.FIELD_INTERVIEWER) { + setAssignType(ListHeaderAssignConst.CONTACT_INTERVIEWER) + setSelectedAssignId(undefined) + setAssignFilterIds([]) + return + } + if (isExternalUser && assignType === ListHeaderAssignConst.OUTSOURCE) { + setAssignType(ListHeaderAssignConst.CONTACT_INTERVIEWER) + setSelectedAssignId(undefined) + setAssignFilterIds([]) + } + }, [assignType, selectedProject?.ff, isExternalUser]) const handleTabChange = (value: string) => { setAssignType(Number(value) as ListHeaderAssignType) @@ -81,13 +112,13 @@ const ListAssignPage = () => { const externalAssignFilter = useMemo(() => { if (assignFilterIds[0] === ASSIGNED_SENTINEL) { - return { type: assignType, values: [] as string[], condition: 'assigned' as const } + return { type: effectiveAssignType, values: [] as string[], condition: 'assigned' as const } } if (assignFilterIds[0] === UNASSIGNED_SENTINEL) { - return { type: assignType, values: [] as string[], condition: 'unassigned' as const } + return { type: effectiveAssignType, values: [] as string[], condition: 'unassigned' as const } } - return { type: assignType, values: assignFilterIds } - }, [assignType, assignFilterIds]) + return { type: effectiveAssignType, values: assignFilterIds } + }, [effectiveAssignType, assignFilterIds]) const hasNoAppliedFilter = () => filterSummary.length === 0 && assignFilterIds.length === 0 @@ -103,8 +134,8 @@ const ListAssignPage = () => { await upsertListAssignMutation.mutateAsync({ assignId: selectedAssignId, request: { - assignType, - transferResve: assignType === ListHeaderAssignConst.OUTSOURCE? false : transferResve, + assignType: effectiveAssignType, + transferResve: effectiveAssignType === ListHeaderAssignConst.OUTSOURCE? false : transferResve, listFilter: currentListFilter, }, }) @@ -118,7 +149,7 @@ const ListAssignPage = () => { if (!confirm('정말 배정을 초기화 하시겠습니까?')) return await resetListAssignMutation.mutateAsync({ - assignType, + assignType: effectiveAssignType, listFilter: currentListFilter, }) alert('배정이 초기화 되었습니다.') @@ -129,9 +160,9 @@ const ListAssignPage = () => { return (
- - - {ASSIGN_TAB_TYPES.map((type) => ( + + + {assignTabTypes.map((type) => ( {LIST_HEADER_TYPE_LABEL[type]} @@ -142,7 +173,8 @@ const ListAssignPage = () => { @@ -158,10 +190,11 @@ const ListAssignPage = () => { resultCodes={resultCodeArray} surveys={surveyArray} listHeaders={listHeaders} + fieldInterviewEnabled={selectedProject.ff !== false} selectMode="none" onCurrentFilterChange={setCurrentListFilter} onFilterSummaryChange={setFilterSummary} - excludeFilterHeaderTypes={[assignType]} + excludeFilterHeaderTypes={[effectiveAssignType]} externalAssignFilter={externalAssignFilter} filterActions={ { onChange={handleAssignFilterChange} getValue={(item) => item.id} getLabel={(item) => item.name} - placeholder={`${LIST_HEADER_TYPE_LABEL[assignType]} 필터`} + placeholder={`${LIST_HEADER_TYPE_LABEL[effectiveAssignType]} 필터`} widthClassName="w-56" heightClassName="h-9" /> } rightActions={ <> - {assignType === ListHeaderAssignConst.CONTACT_INTERVIEWER && ( + {effectiveAssignType === ListHeaderAssignConst.CONTACT_INTERVIEWER && (
) } diff --git a/src/app/(pages)/(main)/list/manage/page.tsx b/src/app/(pages)/(main)/list/manage/page.tsx index 0bd2ffa..9c76a74 100644 --- a/src/app/(pages)/(main)/list/manage/page.tsx +++ b/src/app/(pages)/(main)/list/manage/page.tsx @@ -68,6 +68,7 @@ const downloadArrayBuffer = (buffer: ArrayBuffer, filename: string, type = 'appl const createEmptySearchUiState = (): ListSearchUiState => ({ searchText: '', searchContactResult: [], + searchContactDateRange: { from: '', to: '' }, searchInterviewResult: [], surveyResultSelections: {}, filterRows: [], @@ -284,6 +285,7 @@ const ListManagePage = () => { resultCodes={resultCodeArray} surveys={surveyArray} listHeaders={headerManageRows} + fieldInterviewEnabled={selectedProject?.ff !== false} enableBatchEdit={canManageList} selectMode={canManageList ? 'multi' : 'click-event'} refreshKey={listRefreshKey} diff --git a/src/app/(pages)/(main)/progress/message/page.tsx b/src/app/(pages)/(main)/progress/message/page.tsx index fbb70b0..4fb395b 100644 --- a/src/app/(pages)/(main)/progress/message/page.tsx +++ b/src/app/(pages)/(main)/progress/message/page.tsx @@ -49,28 +49,15 @@ const buildRows = (data: SendResultSummaryResponse[]): SummaryRow[] => const moneyUnit = (value: number) => `${value.toLocaleString()}원`; const caseUnit = (value: number) => `${value.toLocaleString()}건`; -const getFirstDayOfMonth = (date: Date) => { - const d = new Date(date.getFullYear(), date.getMonth(), 1); - return d.toISOString().slice(0, 10); -}; - -const getLastDayOfMonth = (date: Date) => { - const d = new Date(date.getFullYear(), date.getMonth() + 1, 0); - return d.toISOString().slice(0, 10); -}; - const MessageProgressPage = () => { const mounted = useMounted(); const { selectedProject } = useSelectedProject(); - const [dateRange, setDateRange] = useState(() => { - const now = new Date(); - return { from: getFirstDayOfMonth(now), to: getLastDayOfMonth(now) }; - }); + const [dateRange, setDateRange] = useState({ from: "", to: "" }); const prjctCd = selectedProject?.prjctCd ?? ""; const itrntPrjctCd = selectedProject?.itrntPrjctCd ?? ""; - const enabled = mounted && !!prjctCd && !!dateRange.from && !!dateRange.to; + const enabled = mounted && !!prjctCd; const summaryQuery = useSendResultSummaryQuery( { diff --git a/src/app/(pages)/(main)/project/info/page.tsx b/src/app/(pages)/(main)/project/info/page.tsx index 58e86f4..daa2074 100644 --- a/src/app/(pages)/(main)/project/info/page.tsx +++ b/src/app/(pages)/(main)/project/info/page.tsx @@ -333,7 +333,7 @@ const SurveyCard = ({ survey, index, itrntPrjctCd, userTeam, invalidField, onReg const ProjectInfoPage = () => { const router = useRouter(); const mounted = useMounted(); - const {selectedProject} = useSelectedProject(); + const {selectedProject, setSelectedProject} = useSelectedProject(); const {isDialogOpen, showDialog, hideDialog} = useDialog(); const {users} = useItrntUserList(); const {auth} = useAuth(); @@ -544,6 +544,16 @@ const ProjectInfoPage = () => { } await updateMutation.mutateAsync(requestUpdateProject); + const savedProjectInfo = requestUpdateProject.projectInfo; + setSelectedProject({ + prjctIdx: savedProjectInfo.prjctIdx, + prjctCd: savedProjectInfo.prjctCd, + prjctName: savedProjectInfo.prjctName, + itrntPrjctCd: savedProjectInfo.itrntPrjctCd, + ownerDept: savedProjectInfo.ownerDept, + ownerFw: savedProjectInfo.ownerFw, + ff: savedProjectInfo.ff, + }); initialProjectInfoRef.current = projectInfo; alert("저장되었습니다."); } diff --git a/src/app/api/assign/[[...slug]]/route.ts b/src/app/api/assign/[[...slug]]/route.ts index 5dd82d1..a4bc663 100644 --- a/src/app/api/assign/[[...slug]]/route.ts +++ b/src/app/api/assign/[[...slug]]/route.ts @@ -2,6 +2,7 @@ import {RouteContext} from "@/types/common"; import {createContactApi} from "@/lib/http-server"; import {errorToResponse} from "@kri/common/http"; +import type {ProjectCompanyAssignSummary, ProjectFieldworkAssignSummary} from "@/types/list"; export const GET = async (req: NextRequest, context: RouteContext) => { try { @@ -19,6 +20,25 @@ export const GET = async (req: NextRequest, context: RouteContext) => { return NextResponse.json(result, { status: 200 }); } + if (action === "prjct-cmpn-summary" && slug.length === 2) { + const result = await contactApi.get(`/assign/prjct-cmpn-summary/${slug[1]}`); + return NextResponse.json(result, { status: 200 }); + } + + if (action === "prjct-fieldwork-summary" && slug.length === 2) { + const assignType = req.nextUrl.searchParams.get("assignType"); + const cmpnIds = req.nextUrl.searchParams.get("cmpnIds"); + if (!assignType) { + return NextResponse.json({ message: "assignType이 필요합니다." }, { status: 400 }); + } + + const query = `?assignType=${assignType}${cmpnIds ? `&cmpnIds=${encodeURIComponent(cmpnIds)}` : ""}`; + const result = await contactApi.get( + `/assign/prjct-fieldwork-summary/${slug[1]}${query}`, + ); + return NextResponse.json(result, { status: 200 }); + } + return NextResponse.json({ message: "Not found" }, { status: 404 }); } catch (error: unknown) { return errorToResponse(error); diff --git a/src/app/api/list-hist/[[...slug]]/route.ts b/src/app/api/list-hist/[[...slug]]/route.ts index 5292002..3aed8c5 100644 --- a/src/app/api/list-hist/[[...slug]]/route.ts +++ b/src/app/api/list-hist/[[...slug]]/route.ts @@ -30,6 +30,23 @@ export const GET = async (req: NextRequest, context: RouteContext) => { } }; +export const DELETE = async (req: NextRequest, context: RouteContext) => { + try { + const { slug = [] } = await context.params; + const [action] = slug; + const contactApi = await createContactApi(); + + if (action === "event" && slug.length === 2) { + await contactApi.del(`/list-hist/event/${slug[1]}`); + return new NextResponse(null, { status: 204 }); + } + + return NextResponse.json({ message: "Not found" }, { status: 404 }); + } catch (error: unknown) { + return errorToResponse(error); + } +}; + export const PUT = async (req: NextRequest, context: RouteContext) => { try { const { slug = [] } = await context.params; diff --git a/src/app/api/reserve/[[...slug]]/route.ts b/src/app/api/reserve/[[...slug]]/route.ts index 7f15f83..a2d4fa2 100644 --- a/src/app/api/reserve/[[...slug]]/route.ts +++ b/src/app/api/reserve/[[...slug]]/route.ts @@ -17,11 +17,31 @@ export const GET = async (req: NextRequest, context: RouteContext) => { return NextResponse.json(result, { status: 200 }); } + if (action === "user" && slug.length === 3 && slug[2] === "search") { + const fromDt = req.nextUrl.searchParams.get("fromDt"); + const toDt = req.nextUrl.searchParams.get("toDt"); + if (!fromDt || !toDt) { + return NextResponse.json({ message: "fromDt, toDt가 필요합니다." }, { status: 400 }); + } + + const result = await contactApi.get( + `/reserve/user/${encodeURIComponent(slug[1])}/search?fromDt=${fromDt}&toDt=${toDt}`, + ); + return NextResponse.json(result, { status: 200 }); + } + if (action === "user" && slug.length === 3) { const result = await contactApi.get(`/reserve/${slug[1]}/user/${slug[2]}`); return NextResponse.json(result, { status: 200 }); } + if (action === "user" && slug.length === 2) { + const requestPast = req.nextUrl.searchParams.get("requestPast"); + const query = requestPast !== null ? `?requestPast=${requestPast}` : ""; + const result = await contactApi.get(`/reserve/user/${encodeURIComponent(slug[1])}${query}`); + return NextResponse.json(result, { status: 200 }); + } + return NextResponse.json({ message: "Not found" }, { status: 404 }); } catch (error: unknown) { return errorToResponse(error); diff --git a/src/app/globals.css b/src/app/globals.css index b313134..87a41f9 100644 --- a/src/app/globals.css +++ b/src/app/globals.css @@ -251,3 +251,4 @@ .ProseMirror [data-resize-container][data-resize-state="resizing"] { outline: 1px dashed #0ea5e9; } + diff --git a/src/components/app-shell/AppHeader.tsx b/src/components/app-shell/AppHeader.tsx index 047e7f0..d5ccf1f 100644 --- a/src/components/app-shell/AppHeader.tsx +++ b/src/components/app-shell/AppHeader.tsx @@ -1,7 +1,7 @@ "use client"; import Image from "next/image"; -import { LogOut, ZoomIn, ZoomOut } from "lucide-react"; +import { CalendarClock, LogOut, ZoomIn, ZoomOut } from "lucide-react"; import { Button } from "@/components/ui/button"; import { KriHeader } from "@/components/layout/KriHeader"; import type { TopMenuItem } from "@/config/menu.types"; @@ -21,6 +21,7 @@ interface AppHeaderProps { onNavigate: (path: string) => void; decreaseFontSize: () => void; increaseFontSize: () => void; + onOpenReserveSearch: () => void; } export function AppHeader({ @@ -37,6 +38,7 @@ export function AppHeader({ onNavigate, decreaseFontSize, increaseFontSize, + onOpenReserveSearch, }: AppHeaderProps) { return (
+ {userInfo?.userName || ""} - ) })} - - ) } diff --git a/src/components/dialog/ListHeaderManageDialog.tsx b/src/components/dialog/ListHeaderManageDialog.tsx index f66c4f8..388640d 100644 --- a/src/components/dialog/ListHeaderManageDialog.tsx +++ b/src/components/dialog/ListHeaderManageDialog.tsx @@ -49,6 +49,8 @@ type ListHeaderRowProps = { onDelete: (id: number) => void } +const COMMON_GRADE_ORDER_START = 101 + const isCommonGrade = (grade: ListHeaderGrade) => grade === ListHeaderGrade.COMMON const isImmutableGrade = (grade: ListHeaderGrade) => grade === ListHeaderGrade.IMMUTABLE @@ -328,11 +330,12 @@ const ListHeaderManageDialog = ({ setSubmitting(true) try { - const orderedRows = localRows.map((row, index) => ({ - ...row, - prjctIdx: row.prjctIdx ?? prjctIdx, - listHderOrder: index + 1, - })) + let defaultOrder = 0 + let commonOrder = COMMON_GRADE_ORDER_START - 1 + const orderedRows = localRows.map((row) => { + const listHderOrder = isCommonGrade(row.listHderGrad) ? (commonOrder += 1) : (defaultOrder += 1) + return { ...row, prjctIdx: row.prjctIdx ?? prjctIdx, listHderOrder } + }) await onConfirm(orderedRows) handleOpenChange(false) } finally { diff --git a/src/components/dialog/ReservationListDialog.tsx b/src/components/dialog/ReservationListDialog.tsx deleted file mode 100644 index e33b21f..0000000 --- a/src/components/dialog/ReservationListDialog.tsx +++ /dev/null @@ -1,91 +0,0 @@ -'use client' - -import { KriDialog } from '@/components/common/KriDialog' -import { useDialog } from '@/hooks/useDialog' -import type { DialogId } from '@/store/jotai/dialog' -import type { ListReserve } from '@/types/list' -import { formatKst } from '@kri/common' - -export type ReservationListDialogProps = { - dialogId?: DialogId - open?: boolean - onOpenChange?: (open: boolean) => void - reservations: ListReserve[] - onSelectReservation: (sid: string) => void -} - -// 오늘과 가장 가까운(과거/미래 무관) 예약의 sid를 찾는다. -export const findClosestReservationSid = (reservations: ListReserve[], now: Date = new Date()): string | null => { - if (reservations.length === 0) return null - - return reservations.reduce((closest, current) => { - const closestDiff = Math.abs(new Date(closest.resveDt).getTime() - now.getTime()) - const currentDiff = Math.abs(new Date(current.resveDt).getTime() - now.getTime()) - return currentDiff < closestDiff ? current : closest - }, reservations[0]).sid -} - -const ReservationListDialog = ({ - dialogId = 'reservationListDialog', - open, - onOpenChange, - reservations, - onSelectReservation, -}: ReservationListDialogProps) => { - const { isDialogOpen, showDialog, hideDialog } = useDialog() - const resolvedOpen = open ?? isDialogOpen(dialogId) - const closestSid = findClosestReservationSid(reservations) - - const handleOpenChange = (nextOpen: boolean) => { - onOpenChange?.(nextOpen) - if (nextOpen) { - showDialog(dialogId) - return - } - hideDialog(dialogId) - } - - const handleSelect = (sid: string) => { - onSelectReservation(sid) - handleOpenChange(false) - } - - return ( - 예약리스트 조회} - contentClassName="sm:max-w-[480px]" - showDefaultFooter - > -
- {reservations.length === 0 ? ( -
예약된 리스트가 없습니다.
- ) : ( - - - - - - - - - {reservations.map((item) => ( - handleSelect(item.sid)} - > - - - - ))} - -
SID예약 일시
{item.sid}{formatKst(item.resveDt, 'dateHourMin')}
- )} -
-
- ) -} - -export default ReservationListDialog diff --git a/src/components/dialog/ReserveSearchDialog.tsx b/src/components/dialog/ReserveSearchDialog.tsx new file mode 100644 index 0000000..51fbb02 --- /dev/null +++ b/src/components/dialog/ReserveSearchDialog.tsx @@ -0,0 +1,150 @@ +'use client' + +import { useState } from 'react' +import { useRouter } from 'next/navigation' +import { useQueryClient } from '@tanstack/react-query' +import { formatKst } from '@kri/common' +import { KriDialog } from '@/components/common/KriDialog' +import { KriDateRangePicker, type KriDateRange } from '@/components/common/KriDateRangePicker' +import { useDialog } from '@/hooks/useDialog' +import { useAuth } from '@/hooks/useAuth' +import { useSelectedProject } from '@/hooks/useSelectedProject' +import { useCtiCallPhase } from '@/hooks/useCtiCallPhase' +import { CTI_CALL_PHASE } from '@/const/ctiConst' +import { useReserveSearchQuery } from '@/query/reserve' +import { nextApi } from '@/lib/http-client' +import { qk } from '@/query/key/keys' +import type { DialogId } from '@/store/jotai/dialog' +import type { SelectedProject } from '@/store/jotai/project' +import type { ProjectInfo } from '@/types/project' + +export type ReserveSearchDialogProps = { + dialogId?: DialogId + open?: boolean + onOpenChange?: (open: boolean) => void +} + +const toDateInput = (date: Date) => { + const year = date.getFullYear() + const month = String(date.getMonth() + 1).padStart(2, '0') + const day = String(date.getDate()).padStart(2, '0') + return `${year}-${month}-${day}` +} + +const todayRange = (): KriDateRange => { + const today = toDateInput(new Date()) + return { from: today, to: today } +} + +const ReserveSearchDialog = ({ + dialogId = 'reserveSearchDialog', + open, + onOpenChange, +}: ReserveSearchDialogProps) => { + const router = useRouter() + const queryClient = useQueryClient() + const { isDialogOpen, showDialog, hideDialog } = useDialog() + const { auth } = useAuth() + const { setSelectedProject } = useSelectedProject() + const ctiCallPhase = useCtiCallPhase() + const shouldBlockNavigation = CTI_CALL_PHASE.includes(ctiCallPhase) + + const [range, setRange] = useState(todayRange) + const [navigatingSid, setNavigatingSid] = useState(null) + + const resolvedOpen = open ?? isDialogOpen(dialogId) + const userId = auth.user?.userId ?? '' + const enabled = resolvedOpen && !!userId && !!range.from && !!range.to + + const reserveSearchQuery = useReserveSearchQuery(userId, range.from, range.to, enabled) + const reservations = reserveSearchQuery.data ?? [] + + const handleOpenChange = (nextOpen: boolean) => { + onOpenChange?.(nextOpen) + if (nextOpen) { + showDialog(dialogId) + return + } + hideDialog(dialogId) + } + + const handleRowClick = async (prjctIdx: number, sid: string) => { + if (shouldBlockNavigation) { + alert('통화 중에는 이동할 수 없습니다.') + return + } + + setNavigatingSid(sid) + try { + const projectInfo = await queryClient.fetchQuery({ + queryKey: qk.projectInfo(prjctIdx), + queryFn: () => nextApi.get(`/project/info/${prjctIdx}`), + }) + + setSelectedProject({ + prjctIdx: projectInfo.prjctIdx, + prjctCd: projectInfo.prjctCd, + prjctName: projectInfo.prjctName, + itrntPrjctCd: projectInfo.itrntPrjctCd, + ownerDept: projectInfo.ownerDept, + ownerFw: projectInfo.ownerFw, + ff: projectInfo.ff, + } as SelectedProject) + + handleOpenChange(false) + router.push(`/list/contact?sid=${encodeURIComponent(sid)}`) + } finally { + setNavigatingSid(null) + } + } + + return ( + 예약 내역 조회} + contentClassName="sm:max-w-[860px]" + showDefaultFooter + > +
+ + +
+ {reserveSearchQuery.isLoading ? ( +
불러오는 중...
+ ) : reservations.length === 0 ? ( +
예약된 내역이 없습니다.
+ ) : ( + + + + + + + + + + {reservations.map((item) => ( + handleRowClick(item.prjctIdx, item.sid)} + > + + + + + ))} + +
프로젝트SID예약 일시
{item.prjctName}{item.sid} + {formatKst(item.resveDt, 'dateHourMin')} + {navigatingSid === item.sid ? ' (이동 중...)' : ''} +
+ )} +
+
+
+ ) +} + +export default ReserveSearchDialog diff --git a/src/components/list-contact/ListContactEventPanel.tsx b/src/components/list-contact/ListContactEventPanel.tsx index e53dd98..c6c17b0 100644 --- a/src/components/list-contact/ListContactEventPanel.tsx +++ b/src/components/list-contact/ListContactEventPanel.tsx @@ -1,12 +1,12 @@ 'use client' import { useState } from 'react' -import { RefreshCw } from 'lucide-react' +import { RefreshCw, Trash2 } from 'lucide-react' import { Button } from '@/components/ui/button' import { RadioGroup, RadioGroupItem } from '@/components/ui/radio-group' import { KriDateTimePicker } from '@/components/common/KriDateTimePicker' import CollapsibleHistorySection from '@/components/list-contact/CollapsibleHistorySection' -import { useAddListEventMutation, useListEventHistoryQuery, useReserveMutation } from '@/query/list' +import { useAddListEventMutation, useDeleteListEventMutation, useListEventHistoryQuery, useReserveMutation } from '@/query/list' import { useSendResultBySidQuery } from '@/query/message' import { useInternalInfoQuery } from '@/query/internal' import { clientEnv } from '@/lib/env.client' @@ -24,6 +24,7 @@ import type { listHeader, ListSearchWithFullResult } from '@/types/list' import { buildListContactVariableValues } from '@/components/list-contact/listContactVariables' import { escapeHtml, substituteVariables } from '@/lib/variableSubstitution' import { sanitizeHtml } from '@/components/kri-editor/utils/sanitizeHtml' +import { isInternalManager } from '@/utils/userRole' const RefreshIconButton = ({ onRefresh, isFetching }: { onRefresh: () => void; isFetching: boolean }) => ( + + ) : null} ))} @@ -118,6 +146,7 @@ const ContactEventSection = ({ showInput = true, submitting, onSubmit, + canDelete, }: ContactEventSectionProps) => { const [resultCd, setResultCd] = useState('') const [memo, setMemo] = useState('') @@ -130,6 +159,7 @@ const ContactEventSection = ({ const historyQuery = useListEventHistoryQuery(prjctIdx, sid, true) const ctiLastCallHistId = useCtiLastCallHistId(prjctIdx, sid) const listCallHistIdx = isContactType ? ctiLastCallHistId : null + const deleteEventMutation = useDeleteListEventMutation(prjctIdx, sid) const handleResultCdChange = (next: string) => { setResultCd(next) @@ -179,7 +209,7 @@ const ContactEventSection = ({ /> {showReservation && isReservationSelected ? ( - + ) : null} + + ), + { id: RESERVE_NOTIFICATION_TOAST_ID, duration: Infinity }, + ); + }; + + const poll = async (requestPast: boolean) => { + try { + const reservations = await fetchReserveNotifications(userId, requestPast); + if (cancelled || reservations.length === 0) return; + + showNotification(); + } catch (error) { + console.error("[reserve-notification] 예약 알림 조회 실패", error); + } + }; + + void poll(true); + + const alignTimeoutId = setTimeout(() => { + if (cancelled) return; + void poll(false); + intervalId = setInterval(() => void poll(false), FIVE_MINUTES_MS); + }, msUntilNextFiveMinuteMark(new Date())); + + return () => { + cancelled = true; + clearTimeout(alignTimeoutId); + if (intervalId) clearInterval(intervalId); + }; + }, [userId, showDialog]); +} diff --git a/src/query/assign.ts b/src/query/assign.ts index 922b623..15f157d 100644 --- a/src/query/assign.ts +++ b/src/query/assign.ts @@ -2,15 +2,27 @@ import { useMutation, useQueryClient } from "@tanstack/react-query"; import { nextApi } from "@/lib/http-client"; +import { qk } from "@/query/key/keys"; import type { ListAssignRequest, ListAssignResetRequest } from "@/types/list"; +const invalidateAssignSummaries = (qc: ReturnType, prjctIdx: number) => + Promise.all([ + qc.invalidateQueries({ queryKey: qk.projectAssignCmpnSummary(prjctIdx) }), + qc.invalidateQueries({ queryKey: ["assign", "prjct-fieldwork-summary", prjctIdx] }), + ]); + export function useUpsertListAssignMutation(prjctIdx: number) { const qc = useQueryClient(); return useMutation({ mutationFn: ({ assignId, request }: { assignId: string; request: ListAssignRequest }) => nextApi.put(`/assign/list/${prjctIdx}/${encodeURIComponent(assignId)}`, request), - onSuccess: () => qc.invalidateQueries({ queryKey: ["list", "search-filter"] }), + onSuccess: async () => { + await Promise.all([ + qc.invalidateQueries({ queryKey: ["list", "search-filter"] }), + invalidateAssignSummaries(qc, prjctIdx), + ]); + }, }); } @@ -20,6 +32,11 @@ export function useResetListAssignMutation(prjctIdx: number) { return useMutation({ mutationFn: (request: ListAssignResetRequest) => nextApi.del(`/assign/list/reset/${prjctIdx}`, { json: request }), - onSuccess: () => qc.invalidateQueries({ queryKey: ["list", "search-filter"] }), + onSuccess: async () => { + await Promise.all([ + qc.invalidateQueries({ queryKey: ["list", "search-filter"] }), + invalidateAssignSummaries(qc, prjctIdx), + ]); + }, }); } diff --git a/src/query/key/keys.ts b/src/query/key/keys.ts index 33c0a0b..5dd854c 100644 --- a/src/query/key/keys.ts +++ b/src/query/key/keys.ts @@ -30,6 +30,9 @@ export const qk = { /********** 배정 관련 **********/ projectAssignFieldwork: (prjctIdx: number) => ["assign", "prjct-fieldwork", prjctIdx] as const, projectAssignCmpn: (prjctIdx: number) => ["assign", "prjct-cmpn", prjctIdx] as const, + projectAssignCmpnSummary: (prjctIdx: number) => ["assign", "prjct-cmpn-summary", prjctIdx] as const, + projectAssignFieldworkSummary: (prjctIdx: number, assignType: number, cmpnIds: string[]) => + ["assign", "prjct-fieldwork-summary", prjctIdx, assignType, [...cmpnIds].sort()] as const, /********** 배정 관련 **********/ /********** KON, KIWI 프로젝트 관련 KART에서 받아옴 **********/ @@ -58,9 +61,13 @@ export const qk = { listEventHistory: (prjctIdx: number, sid: string) => ["list", "event-history", prjctIdx, sid] as const, listUpdateHistory: (prjctIdx: number, sid: string) => ["list", "update-history", prjctIdx, sid] as const, listReserveBySid: (prjctIdx: number, sid: string) => ["list", "reserve", "sid", prjctIdx, sid] as const, - listReserveByUser: (prjctIdx: number, userId: string) => ["list", "reserve", "user", prjctIdx, userId] as const, /********** 리스트 관련 **********/ + /********** 예약 알림 관련 **********/ + reserveSearch: (userId: string, fromDt: string, toDt: string) => + ["reserve", "search", userId, fromDt, toDt] as const, + /********** 예약 알림 관련 **********/ + /********** 템플릿 및 발송 관련 **********/ mainTemplate: (prjctIdx: number, chnnlTy: ChannelType) => ["project", "main-template", prjctIdx, chnnlTy] as const, diff --git a/src/query/list.ts b/src/query/list.ts index 06dcab4..d7f941d 100644 --- a/src/query/list.ts +++ b/src/query/list.ts @@ -52,6 +52,9 @@ const serializeListSearchRequest = (request: ListSearchRequest) => ({ [ResultCodeType.INTERVIEW]: [], }, surveyResultConditions: request.listFilter.surveyResultConditions ?? [], + ...(request.listFilter.lastEventDateRange?.length + ? { lastEventDateRange: request.listFilter.lastEventDateRange } + : {}), memoConditions: request.listFilter.memoConditions ?? [], otherItemConditions: request.listFilter.otherItemConditions ?? [], }, @@ -122,26 +125,15 @@ export function useListReserveBySidQuery(prjctIdx: number, sid: string, enabled: }); } -export function useListReserveByUserQuery(prjctIdx: number, userId: string, enabled: boolean) { - return useQuery({ - queryKey: qk.listReserveByUser(prjctIdx, userId), - queryFn: () => nextApi.get(`/reserve/user/${prjctIdx}/${userId}`), - enabled, - staleTime: 0, - refetchOnMount: "always", - meta: { ignoreGlobalLoading: true }, - }); -} - export function useReserveMutation(prjctIdx: number, sid: string) { const queryClient = useQueryClient(); return useMutation({ mutationFn: (request: ListReserveRequest) => nextApi.put(`/reserve`, request), - onSuccess: async (_result, request) => { + onSuccess: async () => { await Promise.all([ queryClient.invalidateQueries({ queryKey: qk.listReserveBySid(prjctIdx, sid) }), - queryClient.invalidateQueries({ queryKey: qk.listReserveByUser(prjctIdx, request.userId) }), + queryClient.invalidateQueries({ queryKey: ["reserve", "search"] }), ]); }, }); @@ -260,6 +252,20 @@ export function useAddListEventMutation(prjctIdx: number, sid: string) { }); } +export function useDeleteListEventMutation(prjctIdx: number, sid: string) { + const queryClient = useQueryClient(); + + return useMutation({ + mutationFn: (listEventHistIdx: number) => nextApi.del(`/list-hist/event/${listEventHistIdx}`), + onSuccess: async () => { + await Promise.all([ + queryClient.invalidateQueries({ queryKey: qk.listDetail(prjctIdx, sid) }), + queryClient.invalidateQueries({ queryKey: qk.listEventHistory(prjctIdx, sid) }), + ]); + }, + }); +} + export function useDownloadListMutation(prjctIdx: number) { return useMutation({ mutationFn: (listFilter: ListFilter) => diff --git a/src/query/project.ts b/src/query/project.ts index 9655f45..54dc3f1 100644 --- a/src/query/project.ts +++ b/src/query/project.ts @@ -11,6 +11,7 @@ import type { ProjectListRequest, ProjectOwnerResponse, ProjectUpdateRequest, ResultCode } from "@/types/project"; +import type { ListHeaderAssignType, ProjectCompanyAssignSummary, ProjectFieldworkAssignSummary } from "@/types/list"; import type { PageRequest, PageResponse } from "@kri/common"; export function useProjectOwnerListQuery(enabled: boolean = true) { @@ -166,6 +167,41 @@ export function useAssignedFieldworkIdsQuery(prjctIdx: number, enabled: boolean) }); } +/** + * 프로젝트의 외주사별 배정 현황(총 개수/미배정 개수/외주사별 배정 개수) + */ +export function useAssignedCmpnSummaryQuery(prjctIdx: number, enabled: boolean) { + return useQuery({ + queryKey: qk.projectAssignCmpnSummary(prjctIdx), + queryFn: () => nextApi.get(`/assign/prjct-cmpn-summary/${prjctIdx}`), + enabled, + staleTime: 0, + refetchOnMount: "always", + }); +} + +/** + * 프로젝트의 컨택원/면접원별 배정 현황(총 개수/미배정 개수/사람별 배정 개수) + * cmpnIds를 지정하면 해당 외주사 소속 인원 범위로 카운트가 재계산된다(외주사 계정은 서버에서 본인 회사로 강제됨). + */ +export function useAssignedFieldworkSummaryQuery( + prjctIdx: number, + assignType: ListHeaderAssignType, + cmpnIds: string[], + enabled: boolean, +) { + return useQuery({ + queryKey: qk.projectAssignFieldworkSummary(prjctIdx, assignType, cmpnIds), + queryFn: () => { + const query = `?assignType=${assignType}${cmpnIds.length > 0 ? `&cmpnIds=${cmpnIds.join(",")}` : ""}`; + return nextApi.get(`/assign/prjct-fieldwork-summary/${prjctIdx}${query}`); + }, + enabled, + staleTime: 0, + refetchOnMount: "always", + }); +} + export function useCreateProjectMutation() { const qc = useQueryClient(); diff --git a/src/query/reserve.ts b/src/query/reserve.ts new file mode 100644 index 0000000..823fe92 --- /dev/null +++ b/src/query/reserve.ts @@ -0,0 +1,30 @@ +"use client"; + +import { useQuery } from "@tanstack/react-query"; +import { nextApi } from "@/lib/http-client"; +import { qk } from "@/query/key/keys"; +import type { ListReserve } from "@/types/list"; + +/** + * 헤더의 예약 조회 다이얼로그용: 전체 프로젝트 대상, 날짜 range로 조회. + */ +export function useReserveSearchQuery(userId: string, fromDt: string, toDt: string, enabled: boolean) { + return useQuery({ + queryKey: qk.reserveSearch(userId, fromDt, toDt), + queryFn: () => + nextApi.get(`/reserve/user/${encodeURIComponent(userId)}/search?fromDt=${fromDt}&toDt=${toDt}`), + enabled, + staleTime: 0, + refetchOnMount: "always", + meta: { ignoreGlobalLoading: true }, + }); +} + +/** + * 5분 정각 폴링용: react-query 캐시 없이 그때그때 호출한다(useReserveNotification 훅 전용). + */ +export function fetchReserveNotifications(userId: string, requestPast: boolean) { + return nextApi.get( + `/reserve/user/${encodeURIComponent(userId)}?requestPast=${requestPast}`, + ); +} diff --git a/src/store/jotai/dialog.ts b/src/store/jotai/dialog.ts index 06b11ed..93f90a3 100644 --- a/src/store/jotai/dialog.ts +++ b/src/store/jotai/dialog.ts @@ -15,5 +15,5 @@ export type DialogId = | "messageSendDialog" | "messageHistoryDialog" | "surveyQrDialog" - | "reservationListDialog" + | "reserveSearchDialog" | "singleMessageSendDialog"; diff --git a/src/types/list.ts b/src/types/list.ts index 51c1f95..11ba3ea 100644 --- a/src/types/list.ts +++ b/src/types/list.ts @@ -46,7 +46,7 @@ export enum ListEventHistoryBase { LATEST = 2, } -export type FilterOperator = 'eq' | 'neq' | 'contains' | 'notContains' | 'empty' | 'notEmpty'; +export type FilterOperator = 'eq' | 'neq' | 'contains' | 'notContains' | 'empty' | 'notEmpty' | 'none'; export type FilterValueOption = { value: string; @@ -57,6 +57,7 @@ export type FilterHeaderOption = { id: number; label: string; allowedOperators: FilterOperator[]; + defaultOperator: FilterOperator; valueOptions?: FilterValueOption[]; disabled?: boolean; }; @@ -120,6 +121,13 @@ export type SurveyResultCondition = { resultCodes: number[]; }; +export interface LastEventDateRange { + resultCodeType: 21 | 22 | 91; + prjctSurveyIdx?: number | null; + startDate?: string | null; + endDate?: string | null; +} + export type ListFilter = { sidSet: string[]; listUseSet: ListIsUse[]; @@ -128,6 +136,7 @@ export type ListFilter = { assignConditions: ListAssignFilterCondition[]; resultCodeMap: Record, number[]>; surveyResultConditions: SurveyResultCondition[]; + lastEventDateRange?: LastEventDateRange[]; memoConditions: ListFilterCondition[]; otherItemConditions: ListOtherItemFilterCondition[]; }; @@ -160,6 +169,7 @@ export type SurveyResultSelections = Record; export type ListSearchUiState = { searchText: string; searchContactResult: string[]; + searchContactDateRange: { from: string; to: string }; searchInterviewResult: string[]; surveyResultSelections: SurveyResultSelections; filterRows: FilterRow[]; @@ -252,6 +262,7 @@ export type ListUpdateHistory = { export type ListReserve = { listResveIdx: number; prjctIdx: number; + prjctName: string; sid: string; memo?: string; cnfirm: boolean; @@ -310,6 +321,31 @@ export type ListAssignResetRequest = { listFilter: ListFilter; }; +export type CompanyAssignSummaryItem = { + cmpnId: string; + cmpnAlias: string; + assignedCount: number; +}; + +export type ProjectCompanyAssignSummary = { + totalCount: number; + unassignedCount: number; + assignees: CompanyAssignSummaryItem[]; +}; + +export type FieldworkAssignSummaryItem = { + userId: string; + userName: string; + userCmpn: string; + assignedCount: number; +}; + +export type ProjectFieldworkAssignSummary = { + totalCount: number; + unassignedCount: number; + assignees: FieldworkAssignSummaryItem[]; +}; + export type ListResetRequest = { resetMode: ListResetMode; listFilter: ListFilter;