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

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

Browse Source
This commit is contained in:
Bram Barbieri
2024-04-02 11:49:54 +02:00
parent f044891ed8 30d8543ff4
commit c66bd305bb
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/Flask/queries.py
View File

@@ -13,6 +13,8 @@ def get_query(node, dataType, MAC, questionID, replies, dateStart, dateEnd):
WHERE TimeStamp BETWEEN '{dateStart}' AND '{dateEnd}';''' WHERE TimeStamp BETWEEN '{dateStart}' AND '{dateEnd}';'''
elif node and dataType: elif node and dataType:
query = f"SELECT * FROM Measurement WHERE NodeID = {node} AND Type = '{dataType}'" query = f"SELECT * FROM Measurement WHERE NodeID = {node} AND Type = '{dataType}'"
elif MAC == "*":
query = "SELECT * FROM Node"
elif node: elif node:
query = f"SELECT * FROM Measurement WHERE NodeID = {node}" query = f"SELECT * FROM Measurement WHERE NodeID = {node}"
elif dataType: elif dataType: