From cc79bc12ac14fb1bfb0177b85b496d1037f837e6 Mon Sep 17 00:00:00 2001 From: Eugene Crosser Date: Fri, 25 Dec 2015 23:26:44 +0300 Subject: [PATCH] Show total usage for the displayed period --- web/index.html | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/web/index.html b/web/index.html index af389ee..1bdb731 100644 --- a/web/index.html +++ b/web/index.html @@ -234,10 +234,16 @@ } function gotdata(data) { - document.getElementById("cold").innerHTML = + document.getElementById("curcold").innerHTML = (data.current.cold / 100).toFixed(2); - document.getElementById("hot").innerHTML = + document.getElementById("curhot").innerHTML = (data.current.hot / 100).toFixed(2); + + document.getElementById("totcold").innerHTML = + ((data.cold[data.cold.length - 1][1] - data.cold[0][1]) * 10); + document.getElementById("tothot").innerHTML = + ((data.hot[data.hot.length - 1][1] - data.hot[0][1]) * 10); + tmin = data.range.lo; tmax = data.range.hi; //dbg.innerHTML = "from " + tmin + " to " + tmax @@ -381,17 +387,25 @@ div#currentvals { text-align: center; font-size: 150%; } +div#totalvals { + width: 18em; + margin-left: auto; + margin-right: auto; + margin-bottom: 10px; + text-align: center; + font-size: 100%; +} div.current { position: relative; padding: 0.2em; border: solid 1px black; margin: 0.2em; } -div#cold { +div.cold { float: left; background-color: #d0e0ff; } -div#hot { +div.hot { float: right; background-color: #ffd0e0; } @@ -434,13 +448,19 @@ body {

WATER METERS

- Current Values -
cold
-
hot
+ Current Readings (m3) +
cold
+
hot


+
+ Total for the period (l) +
cold
+
hot
+
+
PREVIOUS WEEK
DAY -- 2.39.2