From 75ff84ee70f1142bf6ea5ce7e3d349b39fabc238 Mon Sep 17 00:00:00 2001 From: sietse jonker Date: Tue, 26 Mar 2024 23:19:15 +0100 Subject: [PATCH 1/4] Refactor database queries and update variable names --- server/data.py | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/server/data.py b/server/data.py index a863857..cb93efa 100644 --- a/server/data.py +++ b/server/data.py @@ -37,13 +37,13 @@ async def processEnqueteNodeData(data, nodeID): mydb = dbLogin() cursor = mydb.cursor() - query = "INSERT INTO `Response` (Node_NodeID, Question_QuestionID, Response) VALUES (%s, %s, %s)" + query = "INSERT INTO `Reply` (Result, Node_NodeID, Question_QuestionID) VALUES (%s, %s, %s)" processedData = json.loads(data) processedQuestionID = (processedData['QuestionID']) processedResponse = (processedData['Response']) - pushingDataArray = [(nodeID, processedQuestionID, processedResponse)] + pushingDataArray = [(processedResponse, nodeID, processedQuestionID)] for i in pushingDataArray: cursor.execute(query, i) @@ -67,8 +67,11 @@ async def receive_data(): processedData = json.loads(data) macAdress = processedData['node'] - type = await getNodeType(macAdress) - + if "Temp" in processedData: + type = 'sensor' + else: + type = 'enquete' + await getNodeInfo('sensor') await getNodeInfo('enquete') @@ -135,7 +138,9 @@ async def getNodeID(macAdress): cursor.execute("""SELECT nodeID FROM Node WHERE MAC = %s""", id) data = cursor.fetchall() - nodeID = data[0][0] + for tuples in data: + for item in tuples: + nodeID = item return nodeID @@ -146,8 +151,10 @@ async def getNodeType(macAdress): cursor.execute("""SELECT Type FROM Node WHERE MAC = %s""", id) data = cursor.fetchall() - Type = data[0][0] - + for tuples in data: + for item in tuples: + Type = item + return Type async def newNode(mac, type): From 5ce77d54efdecd7980c3996256cbde240b607a00 Mon Sep 17 00:00:00 2001 From: sietse jonker Date: Tue, 26 Mar 2024 23:20:05 +0100 Subject: [PATCH 2/4] remove unesecarry code --- server/data.py | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/server/data.py b/server/data.py index cb93efa..c2e7a89 100644 --- a/server/data.py +++ b/server/data.py @@ -143,19 +143,6 @@ async def getNodeID(macAdress): nodeID = item return nodeID - -async def getNodeType(macAdress): - id = (macAdress,) - mydb = dbLogin() - cursor = mydb.cursor() - cursor.execute("""SELECT Type FROM Node WHERE MAC = %s""", id) - data = cursor.fetchall() - - for tuples in data: - for item in tuples: - Type = item - - return Type async def newNode(mac, type): id = (mac, type,) @@ -166,5 +153,4 @@ async def newNode(mac, type): print("new node assigned") mydb.commit() -asyncio.run(main()) - +asyncio.run(main()) \ No newline at end of file From 6735a498ca5a257db6f5a42d8c41d94fe0093965 Mon Sep 17 00:00:00 2001 From: sietse jonker Date: Tue, 26 Mar 2024 23:20:28 +0100 Subject: [PATCH 3/4] Remove unnecessary whitespace in data.py --- server/data.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/server/data.py b/server/data.py index c2e7a89..3157c8a 100644 --- a/server/data.py +++ b/server/data.py @@ -54,8 +54,6 @@ async def processEnqueteNodeData(data, nodeID): cursor.close() mydb.close() - - async def receive_data(): uri = "ws://145.92.8.114/ws" try: From 675cc23665da73ed8ee5bff0b2c9b77d8ef41f7c Mon Sep 17 00:00:00 2001 From: Bram Barbieri Date: Wed, 27 Mar 2024 11:27:34 +0100 Subject: [PATCH 4/4] feedback updated --- docs/brainstorm/Feedback.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/docs/brainstorm/Feedback.md b/docs/brainstorm/Feedback.md index 6bed684..84428c0 100644 --- a/docs/brainstorm/Feedback.md +++ b/docs/brainstorm/Feedback.md @@ -36,7 +36,14 @@ The design will be updated to include: `Remove the lamps on top of the node for less distraction. ### Design questions led by bram -We have a wooden and plastic design. We were wondering wich one is more easy to look at, and wich one can be more distracting. +For the nodes we designed to be placed around the 5th floor we were stuck between two designs: +The wooden design: takes less time to create,is more fragile, and more eco-friendly. +The Plastic: less eco-friendly, takes a longer time, looks objectively better. + +since we can't decide on what we should use, I (Bram) went out to asks the public for their opinion. + +To do this i took the front of the plastic design, and the front of the wooden design. +They lloked like this: 1. which design is more likable