From 4aeafcfa650ee66302e90f299215d52e943c775d Mon Sep 17 00:00:00 2001 From: "rnjsals0905@gmail.com" <rnjsals0905@ajou.ac.kr> Date: Thu, 30 Nov 2023 15:10:57 +0900 Subject: [PATCH] =?UTF-8?q?[EDIT]=20UserTimeInfo=20=EC=83=81=ED=83=9C=20?= =?UTF-8?q?=EB=B0=98=EC=98=81=20=EC=8B=9C=EA=B0=84=20=EA=B3=84=EC=82=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/CalendarWeek2.jsx | 2 +- react-whenMeet/src/routes/UserTimeInfo.js | 25 ++++++++++++++++--- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/react-whenMeet/src/components/CalendarWeek2.jsx b/react-whenMeet/src/components/CalendarWeek2.jsx index 983aab5..7fd0474 100644 --- a/react-whenMeet/src/components/CalendarWeek2.jsx +++ b/react-whenMeet/src/components/CalendarWeek2.jsx @@ -47,7 +47,7 @@ function CaculateWeek({ nowYear, nowMonth, week, availableTimes, setAvailableTim const handleClick = () => { for(let day = fDay; day <= eDay; day+=(60*60*24*1000)){ - for(let indx = 0; indx < 10; indx++){ + for(let indx = startTime; indx <= endTime; indx++){ const elm = document.getElementById(day + indx); elm.classList.remove("dragging") } diff --git a/react-whenMeet/src/routes/UserTimeInfo.js b/react-whenMeet/src/routes/UserTimeInfo.js index c0fd680..ce1fd93 100644 --- a/react-whenMeet/src/routes/UserTimeInfo.js +++ b/react-whenMeet/src/routes/UserTimeInfo.js @@ -12,10 +12,10 @@ function UserTimeInfo() { const {id} = useParams(); const [startTime, setStartTime] = useState(0); - const [endTime, setEndTiem] = useState(48); + const [endTime, setEndTiem] = useState(10); const [today, setToday] = useState(new Date()); const [startDate, setStartDate] = useState(new Date(2023,10,30)); - const [endDate, setEndDate] = useState(new Date(2023,11,4)); + const [endDate, setEndDate] = useState(new Date(2023,11,2)); const handleState = () => { @@ -38,8 +38,25 @@ function UserTimeInfo() { }, [id]); const handleAlert = () => { - let sat = [...availableTimes].sort(); - console.log(availableTimes); + // let sat = [...availableTimes].sort(); + const sat = []; + // state에 따라서 가능한 시간을 선택한 거라면 그냥 넘어가고 + // 불가능한 시간을 선택한 거라면 전부 날짜 범위에 맞춰서 뒤집어줘야 한다. + // 여기 수정해야함 + if(!state){ + for(let day = startDate - 0; day <= endDate - 0; day+=((60*60*24*1000))){ + for(let time = startTime; time < endTime; time++){ + if(!availableTimes.includes(day+time)){ + sat.push(day+time); + } + } + } + } + else{ + sat.push(...availableTimes); + } + sat.sort(); + console.log(state, sat); const aa = []; let t = []; -- GitLab