X-Git-Url: http://www.average.org/gitweb/?p=pulsecounter.git;a=blobdiff_plain;f=web%2Findex.html;h=bec6537b40c7ffd188a961a7d90d9a2d4e2a6eab;hp=72bd9f9d5f5edb5fd425f9d823044af77d6f3ea6;hb=5cfa02e2570dc338060dc713ff386670c7a25660;hpb=fcca95634eda4df11fc367c294e34203ad3bc934

diff --git a/web/index.html b/web/index.html
index 72bd9f9..bec6537 100644
--- a/web/index.html
+++ b/web/index.html
@@ -13,6 +13,11 @@
   var xzero = 20, yzero = 20;
   var cold_d = [], hot_d = [];
 
+  function showdate(utime) {
+    var dt = new Date(utime*1000);
+    return dt.toLocaleDateString() + " " + dt.toLocaleTimeString();
+  }
+
   function getcomb(lo, hi) {
     var comb = [], lb = [];
     var d = hi - lo;
@@ -20,16 +25,16 @@
     var scl = Math.floor(d / ord);
     var inc, inc2, first, x, lb;
 
-    if (scl < 2) { inc = 0.1; inc2 = 0.5; }
-    else if (scl < 5) { inc = 0.2; inc2 = 1; }
-    else { inc = 0.5; inc2 = 2; }
+    if (scl < 2) { inc = 0.1; inc2 = 0.2; }
+    else if (scl < 5) { inc = 0.1; inc2 = 0.2; }
+    else { inc = 0.5; inc2 = 1; }
     inc *= ord;
     inc2 *= ord;
     first = (Math.floor(lo / inc) + 1) * inc;
-    for (x = 0; x < (d / inc) - 1.5; x++)
+    for (x = 0; x < (d / inc) - 1.2; x++)
       comb.push(first + inc * x);
     first = (Math.floor(lo / inc2) + 1) * inc2;
-    for (x = 0; x < (d / inc2) - 1.5; x++)
+    for (x = 0; x < (d / inc2) - 1.2; x++)
       lb.push(first + inc2 * x);
     //dbg.innerHTML = "ord=" + ord + "<br>inc=" + inc + "<br>"
     //              + comb + "<br>" + lb;
@@ -50,6 +55,13 @@
     ctx.lineTo(px(tmax), py(0));
     ctx.strokeStyle = "black";
     ctx.stroke();
+
+    ctx.fillStyle = "black";
+    ctx.font = "bold 8px Courier";
+    ctx.textAlign = "left";
+    ctx.fillText(showdate(tmin), px(tmin), py(0) + 16);
+    ctx.textAlign = "right";
+    ctx.fillText(showdate(tmax), px(tmax), py(0) + 16);
   }
 
   function yaxis() {
@@ -72,10 +84,12 @@
 
     ctx.fillStyle = "black";
     ctx.font = "bold 8px Courier";
-    ctx.fillText(0, px(tmin) - 8, py(0));
+    ctx.textAlign = "right";
+    ctx.fillText(0, px(tmin) - 2, py(0));
     for (i = 0; comb[1][i]; i++) {
-      ctx.fillText(comb[1][i], px(tmin) - xzero + 2, py(comb[1][i]));
+      ctx.fillText(comb[1][i].toFixed(1), px(tmin) - 2, py(comb[1][i]));
     }
+    ctx.textAlign = "left";
     ctx.fillText("l/h", px(tmin) + 2, py(hmax) + 8);
   }
 
@@ -93,7 +107,7 @@
         res.push([times[i][0], v]);
       }
     }
-    res.push([times[i][0], v]);
+    if (i) res.push([times[i][0], v]);
 
     return res;
   }
@@ -114,7 +128,16 @@
   function showloading() {
     ctx.fillStyle = "green";
     ctx.font = "bold 16px Courier";
-    ctx.fillText("loading", (ww / 2) - 40 , (wh / 2) + 8);
+    ctx.textAlign="center";
+    ctx.fillText("...loading...", (ww / 2) , (wh / 2) + 8);
+  }
+
+  function showempty() {
+    ctx.fillStyle = "red";
+    ctx.font = "bold 24px Courier";
+    ctx.textAlign="center";
+    ctx.fillText("No data for the requested time interval",
+                 (ww / 2) , (wh / 2) + 8);
   }
 
   function clearplot() {
@@ -122,16 +145,16 @@
   }
 
   function redraw() {
-    if (cold_d.length && hot_d.length) {
+    clearplot();
+    if (cold_d.length || hot_d.length) {
       tfact = (ww - xzero) / (tmax - tmin);
       hfact = (wh - yzero) / hmax;
-      clearplot();
       xaxis();
       yaxis();
       drawplot(cold_d, "blue");
       drawplot(hot_d, "red");
     } else {
-      showloading();
+      showempty();
     }
   }
 
@@ -142,6 +165,8 @@
       (data.current.hot / 100).toFixed(2);
     tmin = data.range.lo;
     tmax = data.range.hi;
+    //dbg.innerHTML = "from " + tmin + " to " + tmax
+    //              + "<br>from " + showdate(tmin) + " to " + showdate(tmax);
     /* differetiate() updates hmax */
     hmax = 0;
     cold_d = differentiate(data.cold);
@@ -151,11 +176,14 @@
     redraw();
   }
 
+  function iso2qu(idate) {
+    return idate.replace("T", "+").replace("0Z", "");
+  }
+
   function sendquery(lo, hi) {
-    var url = "query.cgi";
+    var url = "query.cgi" + "?lo=" + iso2qu(lo) + "&hi=" + iso2qu(hi);
 
-    if (lo && hi) url += "?lo=" + lo + "&" + hi;
-    else url = "query.cgi?lo=2015-12-19+00:00:00&hi=2015-12-20+00:00:00"; //FIX
+    //dbg.innerHTML = url;
     xmlhttp.onreadystatechange = function() {
       if (xmlhttp.readyState == 4 && xmlhttp.status == 200) {
         // dbg.innerHTML = xmlhttp.responseText;
@@ -164,6 +192,8 @@
       }
     }
     xmlhttp.open("GET", url, true);
+    clearplot();
+    showloading();
     xmlhttp.send();
   }
 
@@ -178,13 +208,70 @@
     redraw();
   }
 
+  function daystart(date) {
+    date.setMilliseconds(0);
+    date.setSeconds(0);
+    date.setMinutes(0);
+    date.setHours(0);
+    return date;
+  }
+
+  function prevweek() {
+    var tdy = daystart(new Date());
+    var dow = tdy.getDay();
+    var wstart, wend;
+
+    wstart = new Date(1*tdy - 86400000 * (dow + 7));
+    wend = new Date(1*wstart + 86400000 * 7);
+    xmlhttp = new XMLHttpRequest();
+    sendquery(wstart.toISOString(), wend.toISOString());
+  }
+
+  function thisweek() {
+    var tdy = daystart(new Date());
+    var dow = tdy.getDay();
+    var wstart, wend;
+
+    wstart = new Date(1*tdy - 86400000 * dow);
+    wend = new Date(1*wstart + 86400000 * 7);
+    xmlhttp = new XMLHttpRequest();
+    sendquery(wstart.toISOString(), wend.toISOString());
+  }
+
+  function beforeyesterday() {
+    var tdy = daystart(new Date());
+    var ytd = new Date(1*tdy - 86400000);
+    var byd = new Date(1*ytd - 86400000);
+    xmlhttp = new XMLHttpRequest();
+    sendquery(byd.toISOString(), ytd.toISOString());
+  }
+
+  function yesterday() {
+    var tdy = daystart(new Date());
+    var ytd = new Date(1*tdy - 86400000);
+    xmlhttp = new XMLHttpRequest();
+    sendquery(ytd.toISOString(), tdy.toISOString());
+  }
+
+  function today() {
+    var tdy = daystart(new Date());
+    var tmr = new Date(1*tdy + 86400000);
+    xmlhttp = new XMLHttpRequest();
+    sendquery(tdy.toISOString(), tmr.toISOString());
+  }
+
   function initialize() {
     dbg = document.getElementById("debug");
     canvas = document.getElementById("plot");
     ctx = canvas.getContext("2d");
-    xmlhttp = new XMLHttpRequest();
     resize();
-    sendquery();
+    today();
+    
+    document.getElementById("today").onclick = today;
+    document.getElementById("yesterday").onclick = yesterday;
+    document.getElementById("beforeyesterday").onclick = beforeyesterday;
+    document.getElementById("thisweek").onclick = thisweek;
+    document.getElementById("prevweek").onclick = prevweek;
   }
 
   /* Set up */
@@ -197,8 +284,18 @@
   }
 </script>
 <style>
+@font-face {
+  font-family: PipeDream;
+  src: url('PIPED.TTF') format('truetype');
+  /* Free to use font from http://www.mlink.net/~paterson/jpfonts.htm */
+}
 h1 {
+  margin-top: 5px;
   text-align: center;
+  font-family: PipeDream;
+  font-size: 64px;
+  font-weight: normal;
+  background-color: lightgray;
 }
 br {
   clear: both;
@@ -231,7 +328,26 @@ canvas#plot {
   display: block;
   width: 640px;
   height: 320px;
+  /*border: solid 1px black;*/
+}
+div#queries {
+  margin-left: auto;
+  margin-right: auto;
+  margin-bottom: 10px;
+  text-align: center;
+}
+div.query {
+  display: inline-block;
+  width: 8em;
+  height: 8em;
   border: solid 1px black;
+  background-color: lightgray;
+  cursor: pointer;
+  vertical-align: middle;
+}
+span.query {
+  display: inline-block;
+  vertical-align: middle;   /* does not work for some reason */
 }
 body {
   margin: 0px;
@@ -239,7 +355,7 @@ body {
 </style>
 <title>Water Meters</title>
 </head><body>
-<h1>Water Meters</h1>
+<h1>WATER METERS</h1>
 <div id="currentvals">
   Current Values
   <div class="current" id="cold">cold</div>
@@ -248,6 +364,14 @@ body {
 <br />
 <canvas id="plot" width="640" height = "320"></canvas>
 <br />
-<div id=debug>
+<div id="queries">
+ <div class="query" id="prevweek"><span class="query">PREVIOUS WEEK</span></div>
+ <div class="query" id="beforeyesterday"><span class="query">DAY
+   BEFORE YESTERDAY</span></div>
+ <div class="query" id="yesterday"><span class="query">YESTERDAY</span></div>
+ <div class="query" id="today"><span class="query">TODAY</span></div>
+ <div class="query" id="thisweek"><span class="query">THIS WEEK</span></div>
 </div>
+<br />
+<div id="debug"></div>
 </body>