X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=templates%2Ftherapy.html.sh;h=7d42aff111e893f384e3b8effb3f5ebcb1b81c67;hb=3ed59adf9bde7e038389d6b21c7e221abf6b3b28;hp=e9781e9bc52f7c27ad47b66e112e21b35bab0ac2;hpb=a9d6bfdfa84de24b8800b6d34b24c28cbdb2feb4;p=confetti

diff --git a/templates/therapy.html.sh b/templates/therapy.html.sh
index e9781e9..7d42aff 100755
--- a/templates/therapy.html.sh
+++ b/templates/therapy.html.sh
@@ -79,7 +79,7 @@ cat <<EOF
  --><span class=signature><input type=checkbox name="${sid}_signature" value=pos $sigcheck><button type=submit name=${sid}_sigset value=$sig></button></span>
   </label>
   <div class=tab>
-    <input class="dotmark ov" type="image" name=dotmark value="$sid" src="/therapies/${id%.tpy}_${sid}.png" alt="">
+    <img class="dotmark ov" src="/therapies/${id%.tpy}_${sid}.png" alt="">
     $(n=1; while [ -n "${tpy[${sid}_note${n}]+x}" ]; do
       t_session_note $session_n $n
       n=$(($n+1))
@@ -103,10 +103,10 @@ therapy_sessions(){
 
 cat <<EOF
   <fieldset class="tab">
-    <span class=no>…</span><!--
+    <button class=no type=submit name=new_session value=$sid>+</button><!--
  --><input class=date name=${sid}_date value="" placeholder="$(l10n date)" /><!--
  --><input class=therapist name=${sid}_therapist value="" placeholder="$(l10n therapist)" /><!--
- --><button type=submit name=new_session value=$sid>+</button></span>
+ --><span class=signature><span></span>
     <input type=hidden name="${sid}_note1" value="">
   </fieldset>
 EOF
@@ -135,6 +135,7 @@ cat <<EOF
   <div class="prescription">
     <h2>$(l10n therapy_prescription)</h2>
     <span class="insurance">${mpx[insurance]}</span>
+    <span class="date">${mpx[date]}</span>
     <label class="checkbox ${mpx[prescreviewed]:+checked}" for="prescreviewed">
       $([ -n "${mpx[prescreviewed]}" ] && printf %s "$(l10n prescreviewed)" \
                                        || printf %s "$(l10n prescreview)" )
@@ -156,10 +157,10 @@ cat <<EOF
   <input type="hidden" name="id" value="${id}">
 
   <label class="tab heading">
-    <span class=no>Nr.</span><!--
- --><span class=date>Datum</span><!--
- --><span class=therapist>Therapeut</span><!--
- --><span class=signature>Sig.</span>
+    <span class=no>$(l10n number)</span><!--
+ --><span class=date>$(l10n date)</span><!--
+ --><span class=therapist>$(l10n therapist)</span><!--
+ --><span class=signature>$(l10n signature)</span>
   </label>
 
   $(therapy_sessions)
@@ -174,7 +175,7 @@ cat <<EOF
     <input class=color type=radio name=color onclick="javascript:setcol('#AA0')" value="#AA0" id=c110 $c6><label for=c110></label>
     <input class=color type=radio name=color onclick="javascript:setcol('#FFF')" value="#FFF" id=c111 $c7><label for=c111></label>
   </fieldset>
-  <img class="dotmark bg" src="?action=static_file&amp;name=therapy_background.png" alt="">
+  <img class="dotmark bg" src="?static=therapy_background.png" alt="WARNING: Background Image not available!">
   <canvas id="canvas" class="dotmark ov" width="${bg_dim%x*}" height="${bg_dim#*x}"></canvas>
 
   <input type=hidden id=image_serialize name=imagedata value="">
@@ -190,39 +191,54 @@ cat <<EOF
   data=document.getElementById("image_serialize")
 
   function setcol(c) {
-    image.fillStyle = c
-    image_serialize += " fill " + c
+    image.strokeStyle = c
+    image.lineWidth = 2
+    image_serialize += " stroke " + c
   }
 
   setcol("$tpy[color]")
 
-  function circle(x, y) {
-    sx=Math.floor(cscaleW * (x - canvas.offsetLeft + body.scrollLeft))
-    sy=Math.floor(cscaleH * (y - canvas.offsetTop + body.scrollTop))
-
-    image.beginPath()
-    image.arc( sx, sy, 5, 0, 2 * Math.PI )
-    image.fill()
-    image.closePath()
-
-    image_serialize += " circle " + sx + "," + sy + " " + (sx-5) + "," + sy
+  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 + body.scrollLeft))
+        sy=Math.floor(cscaleH * (y - canvas.offsetTop + body.scrollTop))
+      }
+      image.lineTo( sx, sy )
+      image.stroke()
+
+      image_serialize += " " + sx + "," + sy
+    }
   }
 
-  window.addEventListener( 'mouseup', function() { mouse = 0
-   dbg.innerHTML = image_serialize
-   data.value = image_serialize
-   } )
-  canvas.addEventListener( 'mousedown', function(e) {
+  function drawstart(x, y) {
     mouse = 1
 
     cscaleW = canvas.width / canvas.clientWidth
     cscaleH = canvas.height / canvas.clientHeight
 
-    circle(e.clientX, e.clientY)
-  } )
-  canvas.addEventListener( 'mousemove', function(e) {
-    if ( mouse == 1 ) { circle(e.clientX, e.clientY) }
-  } )
+    image_serialize += " polyline"
+    image.beginPath()
+    draw(x, y)
+  }
+  function drawstop() {
+   mouse = 0
+   image.closePath()
+   dbg.innerHTML = image_serialize
+   data.value = image_serialize
+  }
+
+  window.addEventListener( 'mouseup',   function()   { drawstop() } )
+  canvas.addEventListener( 'mousedown', function(e)  { drawstart(e.clientX, e.clientY) } )
+  canvas.addEventListener( 'mousemove', function(e)  {      draw(e.clientX, e.clientY) } )
+
+  window.addEventListener( 'touchend',   function()  { drawstop() } )
+  canvas.addEventListener( 'touchstart', function(e) { drawstart(e.touches[0].clientX, e.touches[0].clientY) } )
+  canvas.addEventListener( 'touchmove',  function(e) { e.preventDefault(); draw(e.touches[0].clientX, e.touches[0].clientY) } )
+
   --></script>
 </form>