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

diff --git a/web/index.html b/web/index.html
index 24d58a7..bec6537 100644
--- a/web/index.html
+++ b/web/index.html
@@ -25,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;
@@ -87,7 +87,7 @@
     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) - 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);
@@ -216,6 +216,28 @@
     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);
@@ -248,8 +270,8 @@
     document.getElementById("today").onclick = today;
     document.getElementById("yesterday").onclick = yesterday;
     document.getElementById("beforeyesterday").onclick = beforeyesterday;
-    //document.getElementById("thisweek").onclick = thisweek;
-    //document.getElementById("lastweek").onclick = lastweek;
+    document.getElementById("thisweek").onclick = thisweek;
+    document.getElementById("prevweek").onclick = prevweek;
   }
 
   /* Set up */
@@ -306,7 +328,7 @@ canvas#plot {
   display: block;
   width: 640px;
   height: 320px;
-  border: solid 1px black;
+  /*border: solid 1px black;*/
 }
 div#queries {
   margin-left: auto;
@@ -343,7 +365,7 @@ 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="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>