diff --git a/velconnect/routes/api.py b/velconnect/routes/api.py index 2155e2f..6383a03 100644 --- a/velconnect/routes/api.py +++ b/velconnect/routes/api.py @@ -158,8 +158,7 @@ def set_headset_details_user_color(hw_id): conn, curr = connectToDB() query = """ UPDATE `Headset` - SET `user_color` = %(user_color)s, - `last_modified = CURRENT_TIMESTAMP + SET `user_color` = %(user_color)s WHERE `hw_id` = %(hw_id)s; """ data = request.json @@ -207,12 +206,13 @@ def set_room_details_db(room_id, data): conn.commit() curr.close() return {'room_id': room_id} - + def create_room(room_id): conn, curr = connectToDB() query = """ - INSERT IGNORE INTO `Room` VALUES( + INSERT IGNORE INTO `Room`(room_id) + VALUES( %(room_id)s ); """ @@ -221,6 +221,7 @@ def create_room(room_id): curr.close() return {'room_id': room_id} + @bp.route('/set_room_details//tv_url', methods=['POST']) @require_api_key(10) def set_room_details_tv_url(room_id): @@ -228,7 +229,7 @@ def set_room_details_tv_url(room_id): query = """ UPDATE `Room` SET `tv_url` = %(tv_url)s, - `last_modified = CURRENT_TIMESTAMP + `last_modified` = CURRENT_TIMESTAMP WHERE `room_id` = %(room_id)s; """ data = request.json @@ -246,7 +247,7 @@ def set_room_details_carpet_color(room_id): query = """ UPDATE `Room` SET `tv_url` = %(tv_url)s, - `last_modified = CURRENT_TIMESTAMP + `last_modified` = CURRENT_TIMESTAMP WHERE `room_id` = %(room_id)s; """ data = request.json diff --git a/velconnect/templates/index.jinja b/velconnect/templates/index.jinja index d0461fc..e7ea056 100644 --- a/velconnect/templates/index.jinja +++ b/velconnect/templates/index.jinja @@ -142,11 +142,11 @@ writeValue('current_room', respData['user']['current_room']); writeClass('date_created', respData['user']['date_created']); writeClass('last_used', respData['user']['last_used']); - writeClass('user_color', respData['user']['user_color']); - writeClass('user_name', respData['user']['user_name']); + writeValue('user_color', respData['user']['user_color']); + writeValue('user_name', respData['user']['user_name']); if (respData['room']) { - writeClass('tv_url', respData['room']['tv_url']); - writeClass('carpet_color', respData['room']['carpet_color']); + writeValue('tv_url', respData['room']['tv_url']); + writeValue('carpet_color', respData['room']['carpet_color']); } headset_details.style.display = "block"; @@ -154,25 +154,32 @@ failure.style.display = "block"; }); - function setData(endpoint, data) { + function setUserData(endpoint, data) { httpPostAsync('/api/set_headset_details/' + hw_id + '/' + endpoint, data, (resp) => {console.log('success');}, (status) => {console.log('fail');} ); } + function setRoomData(endpoint, data) { + httpPostAsync('/api/set_room_details/' + current_room.value + '/' + endpoint, + data, + (resp) => {console.log('success');}, + (status) => {console.log('fail');} + ); + } set_room_id.addEventListener('click', () => { - setData('current_room', {"current_room": current_room.value}); - }); - document.getElementById('set_tv_url').addEventListener('click', () => { - setData('tv_url', {"tv_url": document.getElementById('tv_url').value}); + setUserData('current_room', {"current_room": current_room.value}); }); document.getElementById('set_user_color').addEventListener('click', () => { - setData('user_color', {"user_color": document.getElementById('user_color').value}); + setUserData('user_color', {"user_color": document.getElementById('user_color').value}); + }); + document.getElementById('set_tv_url').addEventListener('click', () => { + setRoomData('tv_url', {"tv_url": document.getElementById('tv_url').value}); }); document.getElementById('set_carpet_color').addEventListener('click', () => { - setData('carpet_color', {"carpet_color": document.getElementById('carpet_color').value}); + setRoomData('carpet_color', {"carpet_color": document.getElementById('carpet_color').value}); }); } else {