From 9cc867e8a2a6209cd71796b8e29cf5bf34444cba Mon Sep 17 00:00:00 2001
From: CHAERIN KIM <sag06078@korea.ac.kr>
Date: Sat, 31 Oct 2020 02:56:04 +0900
Subject: [PATCH] =?UTF-8?q?=EC=8A=B9=EC=9D=B8=20=EB=AF=B8=EC=8A=B9?=
 =?UTF-8?q?=EC=9D=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/client/src/Pages/ACheckPage.js | 58 ++++++++++++++++-----------
 1 file changed, 35 insertions(+), 23 deletions(-)

diff --git a/server/client/src/Pages/ACheckPage.js b/server/client/src/Pages/ACheckPage.js
index aac64d5..c7bb255 100644
--- a/server/client/src/Pages/ACheckPage.js
+++ b/server/client/src/Pages/ACheckPage.js
@@ -8,12 +8,12 @@ function ACheck(props) {
   const [state, setState] = useState()
   const [reserve, setReserve] = useState([]);
   useEffect(() => {
-    getReserve(); 
+    getReserve();
   }, [])
 
   function getReserve() {
-    axios.get(`/users/admin/${props.match.params.id}`, { 
-       headers: { authorization: localStorage.getItem('token') },
+    axios.get(`/users/admin/${props.match.params.id}`, {
+      headers: { authorization: localStorage.getItem('token') },
     })
       .then(res => {
         if (res.status === 404) {
@@ -30,10 +30,19 @@ function ACheck(props) {
   if (state) return <Redirect to="/home" />;
 
   function remove(index) {
-    axios.delete(`/reserves/${reserve[index]._id}`)
+    // axios.delete(`/reserves/${reserve[index]._id}`)
+    //   .then(res => {
+    //     if (res.status === 404) return alert(res.data.error)
+    //     alert("삭제되었습니다!");
+    //     getReserve();
+    //   })
+    //   .catch(err => {
+    //     alert(err.error)
+    //   });
+    axios.put(`/reserves/${reserve[index]._id}`)
       .then(res => {
         if (res.status === 404) return alert(res.data.error)
-        alert("삭제되었습니다!");
+        alert("승인을 거절했습니다!");
         getReserve();
       })
       .catch(err => {
@@ -42,7 +51,9 @@ function ACheck(props) {
   };
 
   function admit(index) {
-    axios.put(`/reserves/${reserve[index]._id}`)
+    axios.put(`/reserves/${reserve[index]._id}`, {
+      approve: true,
+    })
       .then(res => {
         if (res.status === 404) return alert(res.data.error)
         alert("승인되었습니다!");
@@ -69,25 +80,26 @@ function ACheck(props) {
             </tr>
           </thead>
           <tbody>
-            {reserve.map((reserve, index) => {
-              return (
-                <tr key={index}>
-                  <td>{reserve.user.name}</td>
-                  <td>{reserve.date}</td>
-                  <td>{reserve.time}</td>
-                  <td>{reserve.room}</td>
-                  <td>{reserve.num}</td>
-                  <td>
-                    <button onClick={() => admit(index)} className="btn btn-primary">
-                      승인
+            {reserve != "" ? (
+              reserve.map((reserve, index) => {
+                return (
+                  <tr key={index}>
+                    <td>{reserve.user.name}</td>
+                    <td>{reserve.date}</td>
+                    <td>{reserve.starttime}시~{(Number(reserve.starttime) + reserve.usetime)}시</td>
+                    <td>{reserve.room}</td>
+                    <td>{reserve.num}</td>
+                    <td>
+                      <button onClick={() => admit(index)} className="btn btn-primary">
+                        승인
                     </button>
-                    <button onClick={() => remove(index)} className="btn btn-danger">
-                      거절
+                      <button onClick={() => remove(index)} className="btn btn-danger">
+                        거절
                     </button>
-                  </td>
-                </tr>
-              )
-            })}
+                    </td>
+                  </tr>
+                )
+              })) : <div>최근 대관 신청 내역이 없습니다.</div>}
           </tbody>
         </table>
 
-- 
GitLab