From 60995fb958d7953b070acd3d644c052af40abe72 Mon Sep 17 00:00:00 2001 From: dooohun Date: Sun, 7 Apr 2024 20:46:28 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EB=AA=A8=EB=8B=AC=EC=97=90=20=EC=A0=9C?= =?UTF-8?q?=EB=8C=80=EB=A1=9C=20=EC=B6=9C=EB=A0=A5=EB=90=98=EC=A7=80=20?= =?UTF-8?q?=EC=95=8A=EB=8A=94=20=EC=97=90=EB=9F=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/page/Reservation/view/Week/index.tsx | 25 ++++++++---------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/src/page/Reservation/view/Week/index.tsx b/src/page/Reservation/view/Week/index.tsx index 8471896..c2d6d99 100644 --- a/src/page/Reservation/view/Week/index.tsx +++ b/src/page/Reservation/view/Week/index.tsx @@ -94,23 +94,15 @@ export default function Week({ currentDate, setCurrentDate }: WeekProps) { // 드래그한 범위의 시작 시간과 종료 시간을 정렬 useEffect(() => { if (!dragStart || !dragEnd) return; - const [startHour, startMinute] = dragStart.timeFrom.split(':').map(Number); - let [endHour, endMinute] = dragEnd.timeTo.split(':').map(Number); - if (endMinute >= 60) { - endMinute -= 60; - endHour += 1; - } - if (endHour >= 24) { - endHour = 0; - } - const startTime = startHour * 60 + startMinute; - const endTime = endHour * 60 + endMinute; - const newEndTime = `${String(endHour).padStart(2, '0')}:${String(endMinute).padStart(2, '0')}`; - if (startTime <= endTime) { + const [startHourFrom, startMinuteFrom] = dragStart.timeFrom.split(':').map(Number); + const [startHourTo, startMinuteTo] = dragStart.timeTo.split(':').map(Number); + const [endHourFrom, endMinuteFrom] = dragEnd.timeFrom.split(':').map(Number); + const [endHourTo, endMinuteTo] = dragEnd.timeTo.split(':').map(Number); + if (startHourFrom < endHourTo || (startHourFrom === endHourTo && startMinuteFrom <= endMinuteTo)) { startDateTime.current = `${selectedYear}-${dragStart.day} ${dragStart.timeFrom}`; - endDateTime.current = `${selectedYear}-${dragEnd.day} ${newEndTime}`; - } else { - startDateTime.current = `${selectedYear}-${dragEnd.day} ${newEndTime}`; + endDateTime.current = `${selectedYear}-${dragEnd.day} ${dragEnd.timeTo}`; + } else if (endHourFrom < startHourTo || (endHourFrom === startHourTo && endMinuteFrom <= startMinuteTo)) { + startDateTime.current = `${selectedYear}-${dragEnd.day} ${dragEnd.timeFrom}`; endDateTime.current = `${selectedYear}-${dragStart.day} ${dragStart.timeTo}`; } }, [dragStart, dragEnd, selectedYear]); @@ -213,7 +205,6 @@ export default function Week({ currentDate, setCurrentDate }: WeekProps) { } }; - console.log(selectionRange); return (