From 96520d3128d75f977a2743896ced8594ade72343 Mon Sep 17 00:00:00 2001 From: Timotheus Pokorra Date: Sat, 30 Jan 2021 21:56:50 +0100 Subject: [PATCH] show diff in percentage per graph period --- apps/monitor/calc.py | 3 ++- apps/monitor/templates/monitor.html | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/apps/monitor/calc.py b/apps/monitor/calc.py index 364a8bf..c828389 100644 --- a/apps/monitor/calc.py +++ b/apps/monitor/calc.py @@ -52,7 +52,8 @@ class Calc: return {"startdate": startRate[0], "startvalue": startRate[1], "curdate": endRate[0], "curvalue": endRate[1], "mindate": minRate[0], "minvalue": minRate[1], - "maxdate": maxRate[0], "maxvalue": maxRate[1]} + "maxdate": maxRate[0], "maxvalue": maxRate[1], + "diffPercentage": (Decimal(endRate[1])-Decimal(startRate[1]))/Decimal(startRate[1])*100} return None diff --git a/apps/monitor/templates/monitor.html b/apps/monitor/templates/monitor.html index c7d5c9f..1dfc8de 100644 --- a/apps/monitor/templates/monitor.html +++ b/apps/monitor/templates/monitor.html @@ -101,10 +101,11 @@

{{ g.label }}


- Start: {{ g.startdate }} {{ g.startvalue|floatformat:2 }} EUR
- Min: {{ g.mindate }} {{ g.minvalue|floatformat:2 }} EUR
- Max: {{ g.maxdate }} {{ g.maxvalue|floatformat:2 }} EUR
- Now: {{ g.curdate }} {{ g.curvalue|floatformat:2 }} EUR
+ Start: {{ g.startdate }} {{ g.startvalue|floatformat:0 }} EUR
+ Min: {{ g.mindate }} {{ g.minvalue|floatformat:0 }} EUR
+ Max: {{ g.maxdate }} {{ g.maxvalue|floatformat:0 }} EUR
+ Now: {{ g.curdate }} {{ g.curvalue|floatformat:0 }} EUR
+ Diff: {{ g.diffPercentage|floatformat:1 }} %
{% endfor %}