X-Git-Url: http://www.average.org/gitweb/?p=pulsecounter.git;a=blobdiff_plain;f=web%2Findex.html;h=af389ee758a574c1cc40ceb273405683a5cd3565;hp=fcad1c30a6f30cef8b52aa58cea457e4e117cb92;hb=71c083c347c1b099600423bda09dc2a409596857;hpb=f38bcf760eab6faa9f69a6989bdffd83ec1791d8

diff --git a/web/index.html b/web/index.html
index fcad1c3..af389ee 100644
--- a/web/index.html
+++ b/web/index.html
@@ -5,12 +5,11 @@
 <head>
 <script>
   var dbg;
-  var xmlhttp;
   var canvas, ctx;
   var ww, wh;
   var hmax, hfact;
   var tmin, tmax, tfact;
-  var xzero = 20, yzero = 20;
+  var xzero = 40, yzero = 48;
   var cold_d = [], hot_d = [];
 
   function showdate(utime) {
@@ -18,38 +17,74 @@
     return dt.toLocaleDateString() + " " + dt.toLocaleTimeString();
   }
 
-  function getcomb(lo, hi) {
+  function px(x) {
+    return xzero + ((x - tmin) * tfact);
+  }
+
+  function py(y) { return wh - yzero - (y * hfact);
+  }
+
+  const dow = ["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
+  const mn = ["Jan", "Feb", "Mar", "Apr", "May", "Jun",
+              "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
+
+  function getcombx(lo, hi) {
     var comb = [], lb = [];
-    var d = hi - lo;
-    var ord = Math.pow(10, Math.floor(Math.log10(d)));
-    var scl = Math.floor(d / ord);
-    var inc, inc2, first, x, lb;
+    var trange = tmax - tmin;
+    var inc, inc2, base, t, dt;
+    var label = function(t) { return "<<" + t.toFixed(1) + ">>"; }
+    function tohour(t) { var dt = new Date(t*1000); return dt.getHours(); }
+    function todow(t) { var dt = new Date(t*1000); return dow[dt.getDay()]; }
+    function todom(t) { var dt = new Date(t*1000); return dt.getDate(); }
+    function tomonth(t) { var dt = new Date(t*1000); return mn[dt.getMonth()]; }
+
+    if (trange < 172800) { /* two days -> one hour */
+      inc = 3600;
+      inc2 = 21600;
+      label = tohour;
+    }
+    else if (trange < 864000) { /* 10 days -> six hours */
+      inc = 21600;
+      inc2 = 86400;
+      label = todow;
+    }
+    else if (trange < 2678400) { /* 31 days -> 1 day */
+      inc = 86400;
+      inc2 = 86400;
+      label = todom;
+    }
+    else { /* ~ one month */
+      /* TODO: make this a separate case with loop over months rather than
+         fixed number of seconds. */
+      inc = 2592000;
+      inc2 = 2592000;
+      label = tomonth;
+    }
 
-    if (scl < 2) { inc = 0.1; inc2 = 0.5; }
-    else if (scl < 5) { inc = 0.2; inc2 = 1; }
-    else { inc = 0.5; inc2 = 2; }
-    inc *= ord;
-    inc2 *= ord;
-    first = (Math.floor(lo / inc) + 1) * inc;
-    for (x = 0; x < (d / inc) - 1.5; x++)
-      comb.push(first + inc * x);
-    first = (Math.floor(lo / inc2) + 1) * inc2;
-    for (x = 0; x < (d / inc2) - 1.5; x++)
-      lb.push(first + inc2 * x);
+    dt = new Date(tmin*1000);
+    base = (Math.floor(tmin / inc) + 1) * inc + 60 * dt.getTimezoneOffset();
+    for (t = base; t < tmax; t += inc)
+      comb.push(t);
+    base = (Math.floor(tmin / inc2) + 1) * inc2 + 60 * dt.getTimezoneOffset();
+    for (t = base; t < tmax; t += inc2)
+      lb.push([t, label(t)]);
     //dbg.innerHTML = "ord=" + ord + "<br>inc=" + inc + "<br>"
     //              + comb + "<br>" + lb;
     return [comb, lb];
   }
 
-  function px(x) {
-    return xzero + ((x - tmin) * tfact);
-  }
+  function xaxis() {
+    var comb = getcombx(0, hmax);
+    var i;
 
-  function py(y) {
-    return wh - yzero - (y * hfact);
-  }
+    ctx.beginPath();
+    for (i = 0; comb[0][i]; i++) {
+      ctx.moveTo(px(comb[0][i]), py(0) + 5);
+      ctx.lineTo(px(comb[0][i]), py(0));
+    }
+    ctx.strokeStyle = "gray";
+    ctx.stroke();
 
-  function xaxis() {
     ctx.beginPath();
     ctx.moveTo(px(tmin), py(0));
     ctx.lineTo(px(tmax), py(0));
@@ -57,15 +92,49 @@
     ctx.stroke();
 
     ctx.fillStyle = "black";
-    ctx.font = "bold 8px Courier";
+    ctx.font = "bold 16px Courier";
+    ctx.textAlign = "center";
+    ctx.beginPath();
+    for (i = 0; comb[1][i]; i++) {
+      ctx.fillText(comb[1][i][1], px(comb[1][i][0]), py(0) + 20);
+      ctx.moveTo(px(comb[1][i][0]), py(0) + 5);
+      ctx.lineTo(px(comb[1][i][0]), py(0));
+    }
+    ctx.strokeStyle = "black";
+    ctx.stroke();
+
+    ctx.fillStyle = "black";
     ctx.textAlign = "left";
-    ctx.fillText(showdate(tmin), px(tmin), py(0) + 16);
+    ctx.fillText(showdate(tmin), px(tmin), py(0) + 40);
     ctx.textAlign = "right";
-    ctx.fillText(showdate(tmax), px(tmax), py(0) + 16);
+    ctx.fillText(showdate(tmax), px(tmax), py(0) + 40);
+  }
+
+  function getcomby(lo, hi) {
+    var comb = [], lb = [];
+    var d = hi - lo;
+    var ord = Math.pow(10, Math.floor(Math.log10(d)));
+    var scl = Math.floor(d / ord);
+    var inc, inc2, first, x, lb;
+
+    if (scl < 2) { inc = 0.1; inc2 = 0.2; }
+    else if (scl < 5) { inc = 0.1; inc2 = 0.5; }
+    else { inc = 0.5; inc2 = 1; }
+    inc *= ord;
+    inc2 *= ord;
+    first = (Math.floor(lo / inc) + 1) * inc;
+    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.2; x++)
+      lb.push(first + inc2 * x);
+    //dbg.innerHTML = "ord=" + ord + "<br>inc=" + inc + "<br>"
+    //              + comb + "<br>" + lb;
+    return [comb, lb];
   }
 
   function yaxis() {
-    var comb = getcomb(0, hmax);
+    var comb = getcomby(0, hmax);
     var i;
 
     ctx.beginPath();
@@ -83,14 +152,20 @@
     ctx.stroke();
 
     ctx.fillStyle = "black";
-    ctx.font = "bold 8px Courier";
+    ctx.font = "bold 16px Courier";
     ctx.textAlign = "right";
-    ctx.fillText(0, px(tmin) - 2, py(0));
+    ctx.fillText(0, px(tmin) - 6, py(0));
+    ctx.beginPath();
     for (i = 0; comb[1][i]; i++) {
-      ctx.fillText(comb[1][i], px(tmin) - 2, py(comb[1][i]));
+      ctx.fillText(comb[1][i].toFixed(1), px(tmin) - 6, py(comb[1][i]));
+      ctx.moveTo(px(tmin) - 5, py(comb[1][i]));
+      ctx.lineTo(px(tmax), py(comb[1][i]));
     }
+    ctx.strokeStyle = "gray";
+    ctx.stroke();
+
     ctx.textAlign = "left";
-    ctx.fillText("l/h", px(tmin) + 2, py(hmax) + 8);
+    ctx.fillText("l/min", px(tmin) + 4, py(hmax) + 12);
   }
 
   /* @ updates global var `hmax` */
@@ -102,7 +177,7 @@
       dv = times[i+1][1] - times[i][1];
       dt = times[i+1][0] - times[i][0];
       if (dt != 0 && dv != 0) {
-        v = (dv / dt) * 360 ; /* Litres per hour */
+        v = (dv / dt) * 600 ; /* Litres per min */
         if (hmax < v) hmax = v;
         res.push([times[i][0], v]);
       }
@@ -176,12 +251,9 @@
     redraw();
   }
 
-  function iso2qu(idate) {
-    return idate.replace("T", "+").replace("0Z", "");
-  }
-
-  function sendquery(lo, hi) {
-    var url = "query.cgi" + "?lo=" + iso2qu(lo) + "&hi=" + iso2qu(hi);
+  function sendreq(qstr) {
+    var url = "query.cgi" + qstr;
+    var xmlhttp = new XMLHttpRequest();
 
     //dbg.innerHTML = url;
     xmlhttp.onreadystatechange = function() {
@@ -197,6 +269,14 @@
     xmlhttp.send();
   }
 
+  function iso2qu(idate) {
+    return idate.replace("T", "+").replace("0Z", "");
+  }
+
+  function sendquery(lo, hi) {
+    return sendreq("?lo=" + iso2qu(lo) + "&hi=" + iso2qu(hi));
+  }
+
   function resize() {
     ww = window.innerWidth - 4;
     if (ww > window.innerHeight) ww = window.innerHeight;
@@ -223,7 +303,6 @@
 
     wstart = new Date(1*tdy - 86400000 * (dow + 7));
     wend = new Date(1*wstart + 86400000 * 7);
-    xmlhttp = new XMLHttpRequest();
     sendquery(wstart.toISOString(), wend.toISOString());
   }
 
@@ -234,7 +313,6 @@
 
     wstart = new Date(1*tdy - 86400000 * dow);
     wend = new Date(1*wstart + 86400000 * 7);
-    xmlhttp = new XMLHttpRequest();
     sendquery(wstart.toISOString(), wend.toISOString());
   }
 
@@ -242,30 +320,30 @@
     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() {
+    var qstr = window.location.search;
+
     dbg = document.getElementById("debug");
     canvas = document.getElementById("plot");
     ctx = canvas.getContext("2d");
     resize();
-    today();
+    if (qstr) sendreq(qstr);
+    else today();
     
     document.getElementById("today").onclick = today;
     document.getElementById("yesterday").onclick = yesterday;
@@ -275,13 +353,8 @@
   }
 
   /* Set up */
-  if(window.attachEvent) {
-    window.attachEvent('onload', initialize);
-    window.attachEvent('onresize', resize);
-  } else {
-    window.onload = initialize;
-    window.onresize = resize;
-  }
+  window.onload = initialize;
+  window.onresize = resize;
 </script>
 <style>
 @font-face {
@@ -328,7 +401,7 @@ canvas#plot {
   display: block;
   width: 640px;
   height: 320px;
-  /*border: solid 1px black;*/
+  /* border: solid 1px black; */
 }
 div#queries {
   margin-left: auto;
@@ -338,16 +411,20 @@ div#queries {
 }
 div.query {
   display: inline-block;
+  position: relative;
   width: 8em;
   height: 8em;
   border: solid 1px black;
+  border-radius: 1em;
   background-color: lightgray;
   cursor: pointer;
-  vertical-align: middle;
 }
-span.query {
-  display: inline-block;
-  vertical-align: middle;   /* does not work for some reason */
+div.label {
+  display: block;
+  width: 100%;
+  position: absolute;
+  top: 50%;
+  transform: translate(0, -50%);
 }
 body {
   margin: 0px;
@@ -365,12 +442,12 @@ body {
 <canvas id="plot" width="640" height = "320"></canvas>
 <br />
 <div id="queries">
- <div class="query" id="prevweek"><span class="query">PREV 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 class="query" id="prevweek"><div class="label">PREVIOUS WEEK</div></div>
+ <div class="query" id="beforeyesterday"><div class="label">DAY
+   BEFORE YESTERDAY</div></div>
+ <div class="query" id="yesterday"><div class="label">YESTERDAY</div></div>
+ <div class="query" id="today"><div class="label">TODAY</div></div>
+ <div class="query" id="thisweek"><div class="label">THIS WEEK</div></div>
 </div>
 <br />
 <div id="debug"></div>
