Add query to select all nodes when MAC is "*" and update background color in dashboard styles
This commit is contained in:
@@ -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:
|
||||||
|
@@ -12,22 +12,23 @@ body {
|
|||||||
margin-top: 8vh;
|
margin-top: 8vh;
|
||||||
background-color: #f0f0f0;
|
background-color: #f0f0f0;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
background-color: #afafaf;
|
background-color: #fff;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.gaugeGroup {
|
.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;
|
width: 98vw;
|
||||||
height: auto;
|
height: auto;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column; /* Keep as column */
|
flex-direction: column; /* Keep as column */
|
||||||
justify-content: flex-start;
|
justify-content: flex-start;
|
||||||
background-color: #333;
|
background-color: #d3d3d3;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
padding: 10px;
|
padding: 10px;
|
||||||
border-radius: 50px;
|
border-radius: 50px;
|
||||||
border: 2px solid #333;
|
/* border: 2px solid #333; */
|
||||||
clear: both;
|
clear: both;
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
position: relative;
|
position: relative;
|
||||||
|
Reference in New Issue
Block a user