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

2024-04-02 11:49:54 +02:00
parent f044891ed8 30d8543ff4
commit c66bd305bb
1 changed files with 2 additions and 0 deletions
--- a/server/Flask/queries.py
+++ b/server/Flask/queries.py
@@ -13,6 +13,8 @@ def get_query(node, dataType, MAC, questionID, replies, dateStart, dateEnd):
               WHERE TimeStamp BETWEEN '{dateStart}' AND '{dateEnd}';'''
 elif node and dataType:
    query = f"SELECT * FROM Measurement WHERE NodeID = {node} AND Type = '{dataType}'"
+ elif MAC == "*":
+      query = "SELECT * FROM Node"
 elif node:
    query = f"SELECT * FROM Measurement WHERE NodeID = {node}"
 elif dataType: