From df45b811ebb98a50732e5eb8a4fb23bf5cd14dc6 Mon Sep 17 00:00:00 2001
From: kamoa457 <kamoa457@cubes.postbox.in.th>
Date: Thu, 9 Nov 2023 14:37:44 +0700
Subject: [PATCH] update code

---
 appserver/rooms.json                         | 46 ++++++++++----------
 appserver/server.js                          |  2 +
 webapp/src/views/Restroom/DetailRoomPage.vue |  1 +
 webapp/src/views/Restroom/UpdateRoom.vue     | 27 +++++++++++-
 4 files changed, 52 insertions(+), 24 deletions(-)

diff --git a/appserver/rooms.json b/appserver/rooms.json
index dab0cb7..20fc983 100644
--- a/appserver/rooms.json
+++ b/appserver/rooms.json
@@ -261,29 +261,6 @@
     "roomStatus": "free",
     "pickedBook": "2023-11-02T14:10:26.374Z"
   },
-  {
-    "buildingId": "8bc8b393-8ae2-4e65-9a35-32c0e76545b3",
-    "id": "76f80b9e-a31e-4e7a-92d2-6d857c90fc81",
-    "name": "023",
-    "floor": 1,
-    "index": 4,
-    "numberRoom": 4,
-    "ranks": "",
-    "firstName": "มานี",
-    "laststName": "",
-    "Affiliation": "",
-    "typeRoom": "ช2",
-    "roomconditions": "ปกติ",
-    "roomStatus": "unavailable",
-    "lastName": "มานอน",
-    "affiliation": "ลูกจ้าง",
-    "idcard": "134044411441178",
-    "phone": "0325647845",
-    "status": "สมรส",
-    "typeAffiliation": "ลูกจ้าง",
-    "typeRanks": "ประทวน",
-    "pickedBook": "2023-11-02T14:10:26.374Z"
-  },
   {
     "buildingId": "8bc8b393-8ae2-4e65-9a35-32c0e76545b3",
     "id": "728100ee-a335-4c77-a226-a63c4de6088a",
@@ -395,5 +372,28 @@
     "roomconditions": "ปกติ",
     "roomStatus": "free",
     "pickedBook": "2023-11-02T14:10:26.374Z"
+  },
+  {
+    "buildingId": "8bc8b393-8ae2-4e65-9a35-32c0e76545b3",
+    "id": "76f80b9e-a31e-4e7a-92d2-6d857c90fc81",
+    "name": "023",
+    "floor": 1,
+    "index": 4,
+    "numberRoom": 4,
+    "ranks": " ",
+    "firstName": " ",
+    "laststName": "",
+    "Affiliation": "",
+    "typeRoom": "ช2",
+    "roomconditions": "ปกติ",
+    "roomStatus": "free",
+    "lastName": "มานอน",
+    "affiliation": "ลูกจ้าง",
+    "idcard": "134044411441178",
+    "phone": "0325647845",
+    "status": "สมรส",
+    "typeAffiliation": "ลูกจ้าง",
+    "typeRanks": "ประทวน",
+    "pickedBook": "2023-11-02T14:10:26.374Z"
   }
 ]
\ No newline at end of file
diff --git a/appserver/server.js b/appserver/server.js
index db5c855..e1f9f7d 100644
--- a/appserver/server.js
+++ b/appserver/server.js
@@ -66,6 +66,7 @@ app.put('/users/:id', (req, res) => {
     if (req.body.pickedBook) parsedData.pickedBook = req.body.pickedBook
     if (req.body.typeRoom) parsedData.typeRoom = req.body.typeRoom
     if (req.body.roomconditions) parsedData.roomconditions = req.body.roomconditions
+    if (req.body.Checkintime) parsedData.Checkintime = req.body.Checkintime
     filterdata.push(parsedData)
     fs.writeFile('./users.json', JSON.stringify(filterdata, null, 2), (err) => {
         if (err) {
@@ -172,6 +173,7 @@ app.put('/rooms/:id', (req, res) => {
     if (req.body.typeRoom) parsedData.typeRoom = req.body.typeRoom
     if (req.body.pickedBook) parsedData.pickedBook = req.body.pickedBook
     if (req.body.roomconditions) parsedData.roomconditions = req.body.roomconditions
+    if (req.body.Checkintime) parsedData.Checkintime = req.body.Checkintime
     filterdata.push(parsedData)
     fs.writeFile('./rooms.json', JSON.stringify(filterdata, null, 2), (err) => {
         if (err) {
diff --git a/webapp/src/views/Restroom/DetailRoomPage.vue b/webapp/src/views/Restroom/DetailRoomPage.vue
index 510fbfd..80e7b9f 100644
--- a/webapp/src/views/Restroom/DetailRoomPage.vue
+++ b/webapp/src/views/Restroom/DetailRoomPage.vue
@@ -127,6 +127,7 @@ export default {
       let body = {
         ...this.userByid,
         queue: "inroom",
+        Affiliation: this.Affiliation,
         contract: this.contract,
         checkintime: this.Checkintime,
         maintenance: this.Maintenance,
diff --git a/webapp/src/views/Restroom/UpdateRoom.vue b/webapp/src/views/Restroom/UpdateRoom.vue
index 4228ec9..6ebd6e8 100644
--- a/webapp/src/views/Restroom/UpdateRoom.vue
+++ b/webapp/src/views/Restroom/UpdateRoom.vue
@@ -194,6 +194,31 @@ export default {
           console.log(err);
         });
     },
+
+    returnsubmitForm() {
+      let body = {
+        roomStatus: 'free',
+        firstName: " ",
+        laststName: " ",
+        ranks: " ",
+        Affiliation: " "
+      };
+      axios
+        .put(`http://localhost:3001/rooms/${this.id}`, body, {
+          headers: {
+            // remove headers
+            "Access-Control-Allow-Origin": "*",
+            "Content-Type": "application/json",
+          },
+        })
+        .then((res) => {
+          this.getRooms(this.id);
+          this.$router.push({ path: `/room/`});
+        })
+        .catch((err) => {
+          console.log(err);
+        });
+    },
   },
 };
 </script>
@@ -551,7 +576,7 @@ export default {
                       <MaterialButton
                         variant="gradient"
                         color="success"
-                        @click="submitForm"
+                        @click="returnsubmitForm"
                         html-type="submit"
                         >บันทึก</MaterialButton
                       >