From cac09770351150f568953a6e297c5dc9bd3d495b Mon Sep 17 00:00:00 2001 From: Sietse Jonker Date: Tue, 2 Apr 2024 11:43:29 +0200 Subject: [PATCH] Add query to select all nodes when MAC is "*" and update background color in dashboard styles --- server/Flask/queries.py | 2 ++ web/newWebsite/styles/dashboard-styles.css | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/server/Flask/queries.py b/server/Flask/queries.py index 0211c8d..c423711 100644 --- 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: diff --git a/web/newWebsite/styles/dashboard-styles.css b/web/newWebsite/styles/dashboard-styles.css index f00eca5..50eeefe 100644 --- a/web/newWebsite/styles/dashboard-styles.css +++ b/web/newWebsite/styles/dashboard-styles.css @@ -12,22 +12,23 @@ body { margin-top: 8vh; background-color: #f0f0f0; flex-direction: column; - background-color: #afafaf; + background-color: #fff; align-items: center; } .gaugeGroup { + box-shadow: 0 10px 15px -3px rgb(0 0 0 / 0.1), 0 4px 6px -4px rgb(0 0 0 / 0.1); width: 98vw; height: auto; display: flex; flex-direction: column; /* Keep as column */ justify-content: flex-start; - background-color: #333; + background-color: #d3d3d3; color: #fff; padding: 10px; border-radius: 50px; - border: 2px solid #333; + /* border: 2px solid #333; */ clear: both; margin-bottom: 10px; position: relative;