From bbf67f5768f27ae9a9147cb006b41a231883132e Mon Sep 17 00:00:00 2001 From: Peter Stockings Date: Tue, 24 Jan 2023 20:51:53 +1100 Subject: [PATCH] Change flow so home page is device select from where you can browse to overview --- app.py | 13 ++++++--- db.py | 4 +-- templates/base.html | 60 ++++++++++++++++++++++++++++++++++++------ templates/device.html | 16 +++++++++++ templates/devices.html | 53 +++++++++++++++++++------------------ 5 files changed, 107 insertions(+), 39 deletions(-) create mode 100644 templates/device.html diff --git a/app.py b/app.py index 0f57c57..7a271c5 100644 --- a/app.py +++ b/app.py @@ -56,10 +56,15 @@ def devices(): return render_template('devices.html', devices=devices) -@app.route("/overview") -def overview(): - cadences = db.get_all_cadences() - last_cadence = cadences[-1]['rpm'] +@ app.route("/device/") +def device(device_id): + return render_template('device.html', device_id=device_id) + + +@app.route("/overview/") +def overview(device_id): + cadences = db.get_all_cadences(device_id) + last_cadence = cadences[-1]['rpm'] if cadences else 0 graph_data = generate_graph([c['logged_at'] for c in cadences[::2]], [ ("RPM", [c['rpm'] for c in cadences[::2]])]) diff --git a/db.py b/db.py index 9ca250a..a79b13e 100644 --- a/db.py +++ b/db.py @@ -40,8 +40,8 @@ class DataBase(): self.execute('INSERT INTO cadence (rpm, device_id) VALUES (%s, %s)', [rpm, device_id], commit=True) - def get_all_cadences(self): - return self.execute('SELECT * FROM cadence') + def get_all_cadences(self, device_id): + return self.execute('SELECT * FROM cadence WHERE device_id = %s', [device_id]) def get_devices(self): return self.execute(""" diff --git a/templates/base.html b/templates/base.html index 809079f..ae27728 100644 --- a/templates/base.html +++ b/templates/base.html @@ -12,15 +12,59 @@ -
-
-
-
-
-
-
-
+
+
+ +
+
+
+
+
+
+ + Loading... +
+
+
+ +
diff --git a/templates/device.html b/templates/device.html new file mode 100644 index 0000000..d51d1f1 --- /dev/null +++ b/templates/device.html @@ -0,0 +1,16 @@ +
+
+
+ + Loading... +
+
+
\ No newline at end of file diff --git a/templates/devices.html b/templates/devices.html index 8a3dbf9..deb56cd 100644 --- a/templates/devices.html +++ b/templates/devices.html @@ -1,26 +1,29 @@ -
- - - - - - - - - {% for d in devices %} - - - - - {% endfor %} - -
- Name - - Status -
- {{d['name']}} - - {{d['is_active']}} -
+
+
+ + + + + + + + + {% for d in devices %} + + + + + {% endfor %} + +
+ Name + + Status +
+ {{d['name']}} + + {{d['is_active']}} +
+
\ No newline at end of file