From a1a14b5aafc60b9fb9032172a927c40f410d2f07 Mon Sep 17 00:00:00 2001 From: Peter Stockings Date: Tue, 7 Mar 2023 23:45:03 +1100 Subject: [PATCH] Beta: Switch to using static site instead(doesnt yet post data back to server) --- app.py | 10 +- templates/attemptv2.html | 302 +++++++++++++++++++++++++++++++++++++++ templates/overview.html | 3 + 3 files changed, 312 insertions(+), 3 deletions(-) create mode 100644 templates/attemptv2.html diff --git a/app.py b/app.py index a7de128..854ed3b 100644 --- a/app.py +++ b/app.py @@ -1,4 +1,5 @@ from datetime import datetime, date, timedelta +import decimal import json from urllib import response from dateutil.relativedelta import relativedelta @@ -37,7 +38,7 @@ def response_minify(response): @ app.route("/") def home(): - return render_template('base.html') + return render_template('attemptv2.html') @ app.route("/devices") @@ -63,11 +64,14 @@ def overview(device_id): last_cadence = cadences[-1]['rpm'] + power = round(decimal.Decimal(0.0011)*last_cadence ** 3 + decimal.Decimal( + 0.0026) * last_cadence ** 2 + decimal.Decimal(0.5642)*last_cadence) + graph_data = generate_sparkline_graph( [c['rpm'] for c in cadences[-100:]]) - return render_template('overview.html', last_cadence=last_cadence, duration=duration, cadences=cadences[-15:], graph_data=graph_data) - return render_template('overview.html', last_cadence=0, duration=duration, cadences=[], graph_data='') + return render_template('overview.html', last_cadence=last_cadence, power=power, duration=duration, cadences=cadences[-15:], graph_data=graph_data) + return render_template('overview.html', last_cadence=0, power=0, duration=duration, cadences=[], graph_data='') @ app.route("/cadence", methods=['POST']) diff --git a/templates/attemptv2.html b/templates/attemptv2.html new file mode 100644 index 0000000..4cd7eb9 --- /dev/null +++ b/templates/attemptv2.html @@ -0,0 +1,302 @@ + + + + + Exercise Bike Display + + + + + + + + + +
+
+
+
+

RPM

+

0

+
+
+

Power

+

0

+
+
+

Duration

+

00:00

+
+
+
+ +
+
+ +
+ +
+
+
+
+ + + + + + + \ No newline at end of file diff --git a/templates/overview.html b/templates/overview.html index 4a0d128..3c5fe95 100644 --- a/templates/overview.html +++ b/templates/overview.html @@ -1,6 +1,9 @@

{{last_cadence}} rpm

+

+ {{power}} Watts

{{duration}}