diff --git a/velconnect/routes/api.py b/velconnect/routes/api.py index 944e43e..f417275 100644 --- a/velconnect/routes/api.py +++ b/velconnect/routes/api.py @@ -92,7 +92,7 @@ def get_headset_details(hw_id): if len(values) == 1: return jsonify(values[0]) else: - return jsonify({'error', "Can't find headset with that id."}), 400 + return jsonify({'error': "Can't find headset with that id."}), 400 def get_headset_details_db(hw_id): @@ -113,15 +113,12 @@ def set_headset_details(hw_id): def set_headset_details_db(hw_id, data): + logger.error(data) conn, curr = connectToDB() query = """ - INSERT INTO `Headset`( - `hw_id`, - `current_room` - ) VALUES( - %(hw_id)s, - %(current_room)s - ); + UPDATE `Headset` + SET `current_room` = %(current_room)s + WHERE `hw_id` = %(hw_id)s; """ data['hw_id'] = hw_id curr.execute(query, data) diff --git a/velconnect/static/js/util.js b/velconnect/static/js/util.js index 3d94740..fda7514 100644 --- a/velconnect/static/js/util.js +++ b/velconnect/static/js/util.js @@ -27,8 +27,8 @@ function httpPostAsync(theUrl, data, callback, failCallback) { } } xmlHttp.open("POST", theUrl, true); // true for asynchronous - http.setRequestHeader('Content-type', 'application/json'); - xmlHttp.send(data); + xmlHttp.setRequestHeader('Content-type', 'application/json'); + xmlHttp.send(JSON.stringify(data)); } function getCookie(cname) { @@ -66,6 +66,17 @@ function writeId(idName, data) { document.getElementById(idName).innerHTML = data; } +function writeValue(className, data) { + if (data == undefined || data == null || data.toString() == 'undefined') { + data = ""; + } + + let elements = document.getElementsByClassName(className); + Array.from(elements).forEach(e => { + e.value = data; + }); +} + function writeSrc(className, data) { if (data == undefined || data == null || data.toString() == 'undefined') { @@ -76,4 +87,4 @@ function writeSrc(className, data) { Array.from(elements).forEach(e => { e.src = data; }); -} \ No newline at end of file +} diff --git a/velconnect/templates/index.jinja b/velconnect/templates/index.jinja index ae0e46b..50fe406 100644 --- a/velconnect/templates/index.jinja +++ b/velconnect/templates/index.jinja @@ -49,11 +49,11 @@