Smikkelbakje/J1B3-Sensor-boxes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of ssh://gitlab.fdmci.hva.nl/propedeuse-hbo-ict/onderwijs/2023-2024/out-a-se-ti/blok-3/qaajeeqiinii59

Browse Source
This commit is contained in:
sietse jonker
2024-03-30 22:57:45 +01:00
parent a381fa1ee1 66793a12fc
commit eea0828b37
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/Flask/main.py
View File

@@ -69,9 +69,9 @@ def getNodeInfo(macAdress):
return result return result
def getQuestionData(): def getQuestionData(questionID, replies):
mydb = loginDB() mydb = loginDB()
query = get_query(False, False, False, True, False) query = get_query(False, False, False, questionID, replies)
cursor = mydb.cursor(dictionary=True) # Enable dictionary output cursor = mydb.cursor(dictionary=True) # Enable dictionary output
cursor.execute(query) cursor.execute(query)
result = cursor.fetchall() # Fetch the results result = cursor.fetchall() # Fetch the results

2
server/Flask/queries.py
View File

@@ -8,7 +8,7 @@ def get_query(node, dataType, MAC, questionID, replies):
elif MAC: elif MAC:
query = f"SELECT * FROM Node WHERE MAC = '{MAC}'" query = f"SELECT * FROM Node WHERE MAC = '{MAC}'"
elif replies and questionID: elif replies and questionID:
query = f"SELECT * FROM Reply WHERE QuestionID = '{questionID}'" query = f"SELECT * FROM Reply WHERE replies = '{replies}' AND QuestionID = '{questionID}'"
elif questionID: elif questionID:
query = f"SELECT * FROM Question" query = f"SELECT * FROM Question"
elif replies: elif replies: