From 1385ecdb5c29614b2b0bc5a89d7e93bd63587b2e Mon Sep 17 00:00:00 2001
From: "rnjsals0905@gmail.com" <rnjsals0905@ajou.ac.kr>
Date: Sat, 2 Dec 2023 16:55:03 +0900
Subject: [PATCH] =?UTF-8?q?[ADD]=20UserTimeInfo=20=ED=88=AC=ED=91=9C=20?=
=?UTF-8?q?=EC=8B=9C=EA=B0=84=20=EC=84=A4=EC=A0=95=20=EB=B0=98=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/components/CalendarWeek2.jsx | 2 +-
.../src/components/HomeParticipateForm.js | 8 +++++--
react-whenMeet/src/routes/UserTimeInfo.js | 22 ++++++++++++++++---
3 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/react-whenMeet/src/components/CalendarWeek2.jsx b/react-whenMeet/src/components/CalendarWeek2.jsx
index 175d5a9..9aa194d 100644
--- a/react-whenMeet/src/components/CalendarWeek2.jsx
+++ b/react-whenMeet/src/components/CalendarWeek2.jsx
@@ -83,7 +83,7 @@ function CaculateWeek({ nowYear, nowMonth, week, availableSchedules, availableTi
const d = (week - 1) * 7 + j - firstDay+1;
const newDate = new Date(nowYear, nowMonth-1, d,9);
- if(i===0){
+ if(i===startTime){
let cn = "cella";
if(d < 1)cn = "cellb"
else if(d > lastDate)cn = "cellb"
diff --git a/react-whenMeet/src/components/HomeParticipateForm.js b/react-whenMeet/src/components/HomeParticipateForm.js
index 4e2eee2..912536f 100644
--- a/react-whenMeet/src/components/HomeParticipateForm.js
+++ b/react-whenMeet/src/components/HomeParticipateForm.js
@@ -57,10 +57,12 @@ function HomeParticipateForm() {
const response = await axios.get(`http://localhost:3000/meetings/${id}/`);
const startDate = response.data.startDate;
const endDate = response.data.endDate;
+ const startTime = response.data.availableVotingStartTime;
+ const endTime = response.data.availableVotingEndTime;
try{
const response = await axios.get(`http://localhost:3000/meetings/${id}/my/schedules`);
// console.log(startDate, endDate);
- navigate('UserTimeInfo', { state: { id:id, startDate: startDate, endDate: endDate, schedules:response.data.schedules }});
+ navigate('UserTimeInfo', { state: { id:id, startTime:startTime, endTime:endTime, startDate: startDate, endDate: endDate, schedules:response.data.schedules }});
}
catch(e){
console.log(e);
@@ -114,10 +116,12 @@ function HomeParticipateForm() {
const response = await axios.get(`http://localhost:3000/meetings/${id}/`);
const startDate = response.data.startDate;
const endDate = response.data.endDate;
+ const startTime = response.data.availableVotingStartTime;
+ const endTime = response.data.availableVotingEndTime;
try{
const response = await axios.get(`http://localhost:3000/meetings/${id}/my/schedules`);
// console.log(startDate, endDate);
- navigate('UserTimeInfo', { state: { id:id, startDate: startDate, endDate: endDate, schedules:response.data.schedules }});
+ navigate('UserTimeInfo', { state: { id:id, startTime:startTime, endTime:endTime, startDate: startDate, endDate: endDate, schedules:response.data.schedules }});
}
catch(e){
console.log(e);
diff --git a/react-whenMeet/src/routes/UserTimeInfo.js b/react-whenMeet/src/routes/UserTimeInfo.js
index 50497a5..67fa435 100644
--- a/react-whenMeet/src/routes/UserTimeInfo.js
+++ b/react-whenMeet/src/routes/UserTimeInfo.js
@@ -21,8 +21,23 @@ function UserTimeInfo() {
const [availableTimes, setAvailableTimes] = useState(at);
const {id} = useParams();
- const [startTime, setStartTime] = useState(0);
- const [endTime, setEndTime] = useState(10);
+ let st = 0;
+ let et = 48;
+
+ if(location.state.startTime){
+ st = location.state.startTime;
+ const sta = st.split(':');
+ st = sta[0]*2+sta[1]/30;
+ }
+ if(location.state.endTime){
+ et = location.state.endTime;
+ const eta = et.split(':');
+ et = eta[0]*2+eta[1]/30;
+ }
+
+ const [startTime, setStartTime] = useState(st);
+ const [endTime, setEndTime] = useState(et);
+
const [today, setToday] = useState(new Date(location.state.startDate));
const [startDate, setStartDate] = useState(new Date(location.state.startDate));
@@ -69,7 +84,6 @@ function UserTimeInfo() {
sat.push(...availableTimes);
}
sat.sort();
- console.log(state, sat);
const aa = [];
let t = [];
@@ -104,6 +118,7 @@ function UserTimeInfo() {
const response = await axios.put(`http://localhost:3000/meetings/${id}/my/schedules/bulk`,{
schedules: compressedData
});
+ alert("�쒖텧 �꾨즺");
}
catch (error) {
if (error.response) {
@@ -121,6 +136,7 @@ function UserTimeInfo() {
} else {
console.error(error);
}
+ alert("�쒖텧 �ㅽ뙣");
}
}
--
GitLab