From b61dc5ec70826ed57d91a6be0023c35b8fa07b35 Mon Sep 17 00:00:00 2001 From: KUcodemaster Date: Fri, 7 Apr 2023 19:35:12 +0900 Subject: [PATCH 1/3] =?UTF-8?q?Fix:=20=ED=86=B5=EA=B3=84=20=ED=85=8C?= =?UTF-8?q?=EC=9D=B4=EB=B8=94=EC=9D=98=20=EC=8B=9C=EC=9E=91=20=EC=8B=9C?= =?UTF-8?q?=EA=B0=84=EC=9D=84=20=ED=88=AC=ED=91=9C=20=EA=B0=80=EB=8A=A5?= =?UTF-8?q?=ED=95=9C=20=EC=8B=9C=EC=9E=91=20=EC=8B=9C=EA=B0=84=EB=B6=80?= =?UTF-8?q?=ED=84=B0=20=EC=B6=9C=EB=A0=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/event/View/ViewTable.tsx | 27 +++++++++++++++---- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/meezzle-front/components/event/View/ViewTable.tsx b/meezzle-front/components/event/View/ViewTable.tsx index 3f471cd..85236a4 100644 --- a/meezzle-front/components/event/View/ViewTable.tsx +++ b/meezzle-front/components/event/View/ViewTable.tsx @@ -90,8 +90,7 @@ const ViewTable = ({ const ref = useRef(false); useEffect(() => { - // 가상의 fetch - // setRows([]); + const timeBlockStart: number = checkableTimes[0] % 100; // 선택 가능한 최초 시간대 const makeRows = (info: any, r: number) => { return (
@@ -102,7 +101,7 @@ const ViewTable = ({ ? false : true; - return ( + return key % 100 >= timeBlockStart ? ( + ) : ( + false ); })}
@@ -130,8 +131,25 @@ const ViewTable = ({ return
{e}
; }) ); + + const makeTimeRow = (hour: number) => { + const startTime: number = Math.floor(timeBlockStart / 2); + const isHalfTime: number = timeBlockStart % 2; + const min: number | string = isHalfTime ? 30 : "00"; + + if (hour === 24 && min === 30) return false; // 24:30 제외 + + if (hour >= startTime) { + return ( + + {hour}:{min} + + ); + } else return false; + }; + for (let i = 0; i <= 24; i++) { - setTime((time) => [...time, {i}:00]); + setTime((time) => [...time, makeTimeRow(i)]); } }, []); @@ -217,7 +235,6 @@ const TimeBlock = styled.span<{ const Time = styled.div` display: block; width: 8%; - height: 646px; font-size: 9px; margin-top: 14px; From 3f043466a40cc837c96ec99d600218c8ca7c9aa3 Mon Sep 17 00:00:00 2001 From: KUcodemaster Date: Fri, 7 Apr 2023 23:40:25 +0900 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=ED=86=B5=EA=B3=84=20=ED=85=8C?= =?UTF-8?q?=EC=9D=B4=EB=B8=94=20=EB=B7=B0=20=EC=84=A0=ED=83=9D=20=EA=B0=80?= =?UTF-8?q?=EB=8A=A5=ED=95=9C=20=EB=A7=88=EC=A7=80=EB=A7=89=20=EC=8B=9C?= =?UTF-8?q?=EA=B0=84=20=EC=9D=B4=ED=9B=84=20=EC=95=88=EB=B3=B4=EC=9D=B4?= =?UTF-8?q?=EA=B2=8C=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/event/View/ViewTable.tsx | 29 ++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/meezzle-front/components/event/View/ViewTable.tsx b/meezzle-front/components/event/View/ViewTable.tsx index 85236a4..5f1b3c6 100644 --- a/meezzle-front/components/event/View/ViewTable.tsx +++ b/meezzle-front/components/event/View/ViewTable.tsx @@ -88,9 +88,9 @@ const ViewTable = ({ }; const ref = useRef(false); - + const timeBlockStart: number = checkableTimes[0] % 100; // 선택 가능한 최초 시간대 + const timeBlockEnd: number = Math.max(...checkableTimes) % 100; // 선택 가능한 최후 시간대 useEffect(() => { - const timeBlockStart: number = checkableTimes[0] % 100; // 선택 가능한 최초 시간대 const makeRows = (info: any, r: number) => { return (
@@ -101,7 +101,14 @@ const ViewTable = ({ ? false : true; - return key % 100 >= timeBlockStart ? ( + if ( + key % 100 < timeBlockStart || + key % 100 > timeBlockEnd || + isNaN(timeBlockStart) + ) + return false; + + return ( - ) : ( - false ); })}
@@ -132,14 +137,19 @@ const ViewTable = ({ }) ); + const startTime: number = Math.floor(timeBlockStart / 2); + const isHalfTime: number = timeBlockStart % 2; + const min: number | string = isHalfTime ? 30 : "00"; + const endTime: number = isHalfTime + ? Math.floor(timeBlockEnd / 2) + : Math.ceil(timeBlockEnd / 2); + const makeTimeRow = (hour: number) => { - const startTime: number = Math.floor(timeBlockStart / 2); - const isHalfTime: number = timeBlockStart % 2; - const min: number | string = isHalfTime ? 30 : "00"; + console.log(startTime, endTime, timeBlockEnd); if (hour === 24 && min === 30) return false; // 24:30 제외 - if (hour >= startTime) { + if (hour >= startTime && hour <= endTime) { return ( {hour}:{min} @@ -147,7 +157,6 @@ const ViewTable = ({ ); } else return false; }; - for (let i = 0; i <= 24; i++) { setTime((time) => [...time, makeTimeRow(i)]); } From b08fc54d371026c76dfb6c600e9df1b393a18b4d Mon Sep 17 00:00:00 2001 From: KUcodemaster Date: Fri, 7 Apr 2023 23:41:05 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20=ED=86=B5=EA=B3=84=20=ED=85=8C?= =?UTF-8?q?=EC=9D=B4=EB=B8=94=20=EB=B7=B0=20=EC=84=A0=ED=83=9D=20=EA=B0=80?= =?UTF-8?q?=EB=8A=A5=ED=95=9C=20=EB=A7=88=EC=A7=80=EB=A7=89=20=EC=8B=9C?= =?UTF-8?q?=EA=B0=84=20=EC=9D=B4=ED=9B=84=20=EC=95=88=EB=B3=B4=EC=9D=B4?= =?UTF-8?q?=EA=B2=8C=20=EC=84=A4=EC=A0=95,=20=EC=B5=9C=EC=A0=81=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- meezzle-front/components/event/View/ViewTable.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/meezzle-front/components/event/View/ViewTable.tsx b/meezzle-front/components/event/View/ViewTable.tsx index 5f1b3c6..14cf64c 100644 --- a/meezzle-front/components/event/View/ViewTable.tsx +++ b/meezzle-front/components/event/View/ViewTable.tsx @@ -145,8 +145,6 @@ const ViewTable = ({ : Math.ceil(timeBlockEnd / 2); const makeTimeRow = (hour: number) => { - console.log(startTime, endTime, timeBlockEnd); - if (hour === 24 && min === 30) return false; // 24:30 제외 if (hour >= startTime && hour <= endTime) {