diff --git a/appserver/rooms.json b/appserver/rooms.json index e0d54b4..1b0c745 100644 --- a/appserver/rooms.json +++ b/appserver/rooms.json @@ -83,6 +83,54 @@ "Roomconditions": "ชำรุด", "status": "waiting" }, + { + "index": 8, + "floor": 2, + "numberRoom": 3, + "ranks": "", + "firstName": "", + "laststName": "", + "Affiliation": "", + "typeRoom": "ช2", + "Roomconditions": "ปกติ", + "status": "free" + }, + { + "index": 5, + "floor": 1, + "numberRoom": 5, + "ranks": "", + "firstName": "", + "laststName": "", + "Affiliation": "", + "typeRoom": "ช1", + "Roomconditions": "ปกติ", + "status": "free" + }, + { + "index": 6, + "floor": 2, + "numberRoom": 1, + "ranks": "ส.ต.ต.", + "firstName": "ปิติ9", + "laststName": "มีดี", + "Affiliation": "ฝอ. 1", + "typeRoom": "ช3", + "Roomconditions": "ปกติ", + "status": "special" + }, + { + "index": 7, + "floor": 2, + "numberRoom": 2, + "ranks": "ส.ต.ต.", + "firstName": "ปิติ6", + "laststName": "มีดี", + "Affiliation": "ฝอ. 7", + "typeRoom": "ช2", + "Roomconditions": "ชำรุด", + "status": "waiting" + }, { "index": 8, "floor": 2, diff --git a/appserver/server.js b/appserver/server.js index 3a7e94d..dbd9946 100644 --- a/appserver/server.js +++ b/appserver/server.js @@ -60,6 +60,11 @@ app.put('/users/:id', (req, res) => { if (req.body.status) parsedData.status = req.body.status if (req.body.typeAffiliation) parsedData.typeAffiliation = req.body.typeAffiliation if (req.body.typeRanks) parsedData.typeRanks = req.body.typeRanks + if (req.body.queue) parsedData.queue = req.body.queue + if (req.body.no) parsedData.no = req.body.no + if (req.body.bookNumber) parsedData.bookNumber = req.body.bookNumber + if (req.body.pickedBook) parsedData.pickedBook = req.body.pickedBook + if (req.body.typeRoom) parsedData.typeRoom = req.body.typeRoom filterdata.push(parsedData) fs.writeFile('./users.json', JSON.stringify(filterdata, null, 2), (err) => { if (err) { diff --git a/webapp/src/views/Queue/QueueView.vue b/webapp/src/views/Queue/QueueView.vue index 63ae921..f942bc7 100644 --- a/webapp/src/views/Queue/QueueView.vue +++ b/webapp/src/views/Queue/QueueView.vue @@ -69,9 +69,9 @@ export default { if (e.target) this.typeroomByqueue = e.target.value; }, - editTypeRoom(event){ + editTypeRoom(event) { console.log(event); - this.typeroomByqueue = event + this.typeroomByqueue = event; }, queuefilter(e) { @@ -401,7 +401,7 @@ export default {
- +
@@ -534,7 +534,6 @@ export default {
-