UI improvements

raspberry-backend/app.py

@@ -25,7 +25,6 @@ TABLE_NAME = 'hev_monitor'  # name of the table to be created
 N = 300 # number of entries to request for alarms and data (300 = 60 s of data divided by 0.2 s interval)
 
 
-
 def getList(dict):
     return [*dict]
 
@@ -101,12 +100,27 @@ def data_handler():
 
     return render_template('index.html', result=live_data(), patient=patient_name)
 
+def number_rows(table_name):
+    conn = sqlite3.connect(sqlite_file)
+    c = conn.cursor()    			
+    #get the count of tables with the name
+    c.execute(''' SELECT count(*) FROM {tn} '''.format(tn=table_name))  
+
+    values = c.fetchone()
+    print(values[0])
+
+    #commit the changes to db			
+    conn.commit()
+    #close the connection
+    conn.close()
+    return values[0]
+
+
 def check_table(table_name):
     conn = sqlite3.connect(sqlite_file)
     c = conn.cursor()    			
     #get the count of tables with the name
-    c.execute(''' SELECT count(name) FROM sqlite_master WHERE type='table' AND name='{tn}' '''.format(tn=table_name))
-    
+    c.execute(''' SELECT count(name) FROM sqlite_master WHERE type='table' AND name='{tn}' '''.format(tn=table_name))  
     existence = False
 
     #if the count is 1, then table exists
@@ -141,7 +155,6 @@ def last_N_data():
     Query the sqlite3 table for variables
     Output in json format
     """
-    N = 300 #update interval is 200 ms and there are 300 entries in 60 seconds
 
     list_variables = []
     list_variables.append("created_at")
@@ -151,7 +164,7 @@ def last_N_data():
 
     fetched_all = []
     
-    if check_table(TABLE_NAME):
+    if check_table(TABLE_NAME) and number_rows(TABLE_NAME) > N:
         with sqlite3.connect(sqlite_file) as conn:
             cursor = conn.cursor()
             cursor.execute(" SELECT {var} "

raspberry-backend/static/js/Chart-display.js

@@ -109,7 +109,8 @@ $(document).ready(function() {
             datasets: [{
                 data: initial_yaxis_pressure,
                 label: "Var1",
-                borderColor: "#3e95cd",
+                borderColor: "#0049b8",
+                borderWidth: 4,
                 fill: false
               }
             ]
@@ -185,7 +186,9 @@ $(document).ready(function() {
             datasets: [{
                 data: initial_yaxis_flow,
                 label: "Var1",
-                borderColor: "#3e95cd",
+                //borderColor: "#3e95cd",
+                borderColor: "#000000",
+                borderWidth: 4,
                 fill: false
             }]
         },
@@ -259,7 +262,8 @@ $(document).ready(function() {
             datasets: [{
                 data: initial_yaxis_volume,
                 label: "Var1",
-                borderColor: "#3e95cd",
+                borderColor: "#ba0202",
+                borderWidth: 4,
                 fill: false
             }]
         },