peterstockings/cardio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only fetch last 100 cadence readings and display as sparklines graph

Browse Source
This commit is contained in:
Peter Stockings
2023-01-30 22:12:10 +11:00
parent cf2dc204e7
commit fa3a8990cf
4 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app.py
View File

@@ -10,7 +10,7 @@ import minify_html
from urllib.parse import urlparse from urllib.parse import urlparse
from db import DataBase from db import DataBase
from graph import generate_graph from graph import generate_graph, generate_sparkline_graph
app = Flask(__name__) app = Flask(__name__)
# TODO CHANGE SECRET KEY TO ENVIRONMENT VARIABLE # TODO CHANGE SECRET KEY TO ENVIRONMENT VARIABLE
@@ -57,8 +57,7 @@ def overview(device_id):
cadences = db.get_all_cadences(device_id) cadences = db.get_all_cadences(device_id)
last_cadence = cadences[-1]['rpm'] if cadences else 0 last_cadence = cadences[-1]['rpm'] if cadences else 0
graph_data = generate_graph([c['logged_at'] for c in cadences[::2]], [ graph_data = generate_sparkline_graph([c['rpm'] for c in cadences])
("RPM", [c['rpm'] for c in cadences[::2]])])
return render_template('overview.html', last_cadence=last_cadence, cadences=cadences[-15:], graph_data=graph_data) return render_template('overview.html', last_cadence=last_cadence, cadences=cadences[-15:], graph_data=graph_data)

2
db.py
View File

@@ -41,7 +41,7 @@ class DataBase():
[rpm, device_id], commit=True) [rpm, device_id], commit=True)
def get_all_cadences(self, device_id): def get_all_cadences(self, device_id):
return self.execute("""SELECT LOGGED_AT, RPM FROM cadence WHERE device_id = %s AND (NOW() < (LOGGED_AT + (INTERVAL '3 hour')))""", [device_id]) return self.execute("""SELECT LOGGED_AT, RPM FROM cadence WHERE device_id = %s AND (NOW() < (LOGGED_AT + (INTERVAL '3 hour'))) LIMIT 100""", [device_id])
def get_devices(self): def get_devices(self):
return self.execute(""" return self.execute("""

8
graph.py
View File

@@ -26,3 +26,11 @@ def generate_graph(x_labels, data, style=custom_style):
graph.add(title, values) graph.add(title, values)
graph_data = graph.render_data_uri() graph_data = graph.render_data_uri()
return graph_data return graph_data
def generate_sparkline_graph(data, style=custom_style):
chart = pygal.Line(show_y_guides=False,
show_legend=False, style=style)
chart.add('', data)
return chart.render_sparkline(disable_xml_declaration=True)

7
templates/overview.html
View File

@@ -2,8 +2,11 @@
class="mb-4 text-4xl font-extrabold leading-none tracking-tight text-gray-900 md:text-5xl lg:text-6xl dark:text-white text-center"> class="mb-4 text-4xl font-extrabold leading-none tracking-tight text-gray-900 md:text-5xl lg:text-6xl dark:text-white text-center">
{{last_cadence}} rpm</h1> {{last_cadence}} rpm</h1>
<div class="lg:flex"> <div class="flex flex-col items-center">
<img type="image/svg+xml" src={{graph_data|safe}} class="lg:w-3/4 sm:w-full h-1/4" />
<div>
{{graph_data|safe}}
</div>
<div class="relative overflow-x-auto"> <div class="relative overflow-x-auto">
<table class="lg:w-1/4 sm:w-full text-sm text-left text-gray-500 dark:text-gray-400"> <table class="lg:w-1/4 sm:w-full text-sm text-left text-gray-500 dark:text-gray-400">