X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=templates%2Ftherapy.html.sh;h=6e61ccd9e74235cdad1e38a752bd77cc0c777f0d;hp=ce97dfb0ea959f6ae1ddef33dd5e2eea34e92b17;hb=73e1291b6d0d15ba93d78e7eb167a1eb30347db3;hpb=9f7782b085e44a2ecb656674f48be0e2b20fc31c

diff --git a/templates/therapy.html.sh b/templates/therapy.html.sh
index ce97dfb..6e61ccd 100755
--- a/templates/therapy.html.sh
+++ b/templates/therapy.html.sh
@@ -77,7 +77,7 @@ cat <<EOF
   </label>
   <div class=tab>
     <img class="dotmark ov" src="/therapies/${id%.tpy}_${sid}.png" alt="">
-    $( for n in {1..50}; do t_session_note $session_n $n; done )
+    $( for n in {1..10}; do t_session_note $session_n $n; done )
 
     <button class=delete type=submit name=delete_session value=${session_n}>$(l10n delete_session)</button>
   </div>
@@ -154,9 +154,13 @@ cat <<EOF
                                       || printf %s "$(l10n addcontrib)" )
   </label>
   }
+
+  <input class="tab" type="checkbox" id="indicator_reading">
+  <label class="tab" for="indicator_reading">$(l10n indicator_reading)</label>
+  <div class="tab">${mpx[indicator_reading]}</div>
 </div>
 
-<form method="POST" action="?action=update_therapy">
+<form id="report" method="POST" action="?action=update_therapy">
   <input type="hidden" name="id" value="${id}">
 
   <input class="stickynote" type="checkbox" name="c_stickynote" id="show_stickynote">
@@ -166,6 +170,10 @@ cat <<EOF
     <button type=submit>$(l10n save)</button>
   </fieldset>
 
+  <!--input class="tab" type="checkbox" id="lookout">
+  <label class="tab" for="lookout">$(l10n indicator_reading)</label>
+  <div class="tab"><textarea name="lookout">${mpx[lookout]}</textarea -->
+
   <label class="tab heading">
     <span class=no>$(l10n number)</span><!--
  --><span class=date>$(l10n date)</span><!--
@@ -191,42 +199,61 @@ cat <<EOF
   <canvas id="canvas" class="dotmark ov" width="${bg_dim%x*}" height="${bg_dim#*x}"></canvas>
 
   <input type=hidden id=image_serialize name=imagedata value="">
-  <span id="jsdebug" style="display: none; position: fixed; right:0; bottom:0">Debug</span>
 
   <button type="submit">$(l10n save)</button>
 </form>
 
+<span id="jsdebug" style="display: none; position: fixed; right:0; bottom:0">Debug</span>
+
 <script><!--
 body = document.body
-canvas = document.getElementById("canvas")
 dbg = document.getElementById("jsdebug")
+canvas = document.getElementById("canvas")
+data=document.getElementById("image_serialize")
+
 image = canvas.getContext("2d")
 mouse = 0
 image_serialize=""
-data=document.getElementById("image_serialize")
+
+// start and current coordinates of a draw
+// serves for tracking, whether path ends close to its beginning
+stx=0, sty=0
+cux=0, cuy=0
 
 function setcol(c) {
+  this.c = c
   image.strokeStyle = c
+  image.fillStyle =  c
   if ( c == "#FFF" ) image.lineWidth = 32
   else image.lineWidth = 4
-  image_serialize += " stroke " + c + " stroke-width " + image.lineWidth
+  data.value += " stroke " + c + " stroke-width " + image.lineWidth
 }
 
 setcol("$tpy[color]")
 
+function relX(x){
+  if ( body.clientWidth >= 800 ){
+    return Math.floor(cscaleW * (x - canvas.offsetLeft))
+  } else { 
+    return Math.floor(cscaleW * (x - canvas.offsetLeft + window.pageXOffset))
+  }
+}
+function relY(y){
+  if ( body.clientWidth >= 800 ){
+    return Math.floor(cscaleH * (y - canvas.offsetTop))
+  } else { 
+    return Math.floor(cscaleH * (y - canvas.offsetTop + window.pageYOffset))
+  }
+}
+
 function draw(x, y) {
   if ( mouse == 1){
-    if ( body.clientWidth >= 800 ){
-      sx=Math.floor(cscaleW * (x - canvas.offsetLeft))
-      sy=Math.floor(cscaleH * (y - canvas.offsetTop))
-    } else { 
-      sx=Math.floor(cscaleW * (x - canvas.offsetLeft + window.pageXOffset))
-      sy=Math.floor(cscaleH * (y - canvas.offsetTop + window.pageYOffset))
-    }
-    image.lineTo( sx, sy )
+    cux=relX(x), cuy=relY(y)
+
+    image.lineTo( cux, cuy )
     image.stroke()
 
-    image_serialize += " " + sx + "," + sy
+    image_serialize += " " + cux + "," + cuy
   }
 }
 
@@ -236,15 +263,35 @@ function drawstart(x, y) {
   cscaleW = canvas.width / canvas.clientWidth
   cscaleH = canvas.height / canvas.clientHeight
 
-  image_serialize += " polyline"
+  stx=relX(x), sty=relY(y)
+
   image.beginPath()
-  draw(x, y)
+  draw(x, y)  // why must this not use relative Coords ???
+
+  image_serialize = " polyline"
 }
+
 function drawstop() {
- mouse = 0
- image.closePath()
- //dbg.innerHTML = image_serialize
- data.value = image_serialize
+ 
+  // if path ends close to beginning ( < 50 px); then close path and fill
+  if ( mouse == 1 && Math.sqrt( Math.pow(stx - cux, 2) + Math.pow(sty - cuy, 2)) <= 50 && c !== "#FFF" ){
+    image.lineTo( stx, sty )
+    image.stroke()
+
+    image.globalAlpha = .5
+    image.fill()
+    image.globalAlpha = 1
+
+    image_serialize += " " + stx + "," + sty
+    data.value += " fill " + c + "8" + image_serialize
+  } else if (mouse == 1)  {
+    data.value += " fill #0000 " + image_serialize
+  }
+  dbg.innerHTML = " stx: " + stx + " cux: " + cux + " sty: " + sty + " cuy: " + cuy
+ 
+  image.closePath()
+  image_serialize = ""
+  mouse = 0
 }
 
 window.addEventListener( 'mouseup',   function()   { drawstop() } )