additional prescription fields, improved display of clients and prescriptions

svn path=/trunk/; revision=87

diff --git a/templates/attendees.css.sh b/templates/attendees.css.sh
index 758b1d1a0f977e1f249cdad47a927fc347c131de..036ad0428c66226337fb33a38f5d9d5def0b7d46 100755 (executable)
--- a/templates/attendees.css.sh
+++ b/templates/attendees.css.sh
@@ -142,11 +142,13 @@ cat <<EOF
 
 .card .section.prescriptions ul { margin: 0; padding: 0; }
 .card .section.prescriptions ul li {
-  display: inline-block;
+  display: block;
   word-wrap: break-word;
   margin: 0 .25ex;
 }
 
+.card .section.prescriptions { width: 40ex;}
+
 form.card .section input[type=text],
 form.card .section input:not([type]),
 form.card .section textarea,

diff --git a/templates/edit_prescription.sh b/templates/edit_prescription.sh
index 85eeb20b3aa7051f2c9249a6ae30e2014ddeb1c5..b9162582b9d2bfafae735d058999c9522c925361 100755 (executable)
--- a/templates/edit_prescription.sh
+++ b/templates/edit_prescription.sh
@@ -41,10 +41,15 @@ cat <<END_HTML
 
 <label for="addcontrib">$(l10n addcontrib)</label>
 <input id="addcontrib" name="addcontrib" value="${mpx[addcontrib]}" placeholder="$(l10n addcontrib)">
-<input type="checkbox" id="contribconfirm" name="contribconfirm" value="true" ${mpx[contribconfirm]:+checked}>
 <label for="contribconfirm">$(l10n contribconfirm)</label>
+<input id="contribconfirm" name="contribconfirm" value="${mpx[contribconfirm]}" placeholder="$(l10n contribconfirm)">
+<input type="checkbox" id="contribreceipt" name="contribreceipt" value="true" ${mpx[contribreceipt]:+checked}>
+<label for="contribreceipt">$(l10n contribreceipt)</label>
 </fieldset>
 
+<input type="checkbox" id="prescreviewed" name="prescreviewed" value="true" ${mpx[prescreviewed]:+checked}>
+<label for="prescreviewed">$(l10n prescreviewed)</label>
+
 <fieldset class="catalogue">
 <h2>$(l10n prescription_by_catalogue)</h2>
 <input type="radio" id="prescfirst" name="prescno" value="first" $(check "$mpx[prescno]" first)>
@@ -56,11 +61,11 @@ cat <<END_HTML
 <input type="radio" id="prescfollow2" name="prescno" value="follow2" $(check "$mpx[prescno]" follow2)>
 <label for="prescfollow2">$(l10n prescfollow2)</label>
 <br>
-<input type="radio" id="presccontinual" name="prescno" value="continual" $(check "$mpx[prescno]" continual)>
-<label for="presccontinual">$(l10n presccontinual)</label>
-<br>
 <input type="radio" id="prescother" name="prescno" value="other" $(check "$mpx[prescno]" other)>
 <label for="prescother">$(l10n prescother)</label>
+<br>
+<input type="radio" id="presccontinual" name="prescno" value="continual" $(check "$mpx[prescno]" continual)>
+<label for="presccontinual">$(l10n presccontinual)</label>
 
 <br>
 <input type="checkbox" id="grouptherapy" name="grouptherapy" value="true" ${mpx[grouptherapy]:+checked}>
@@ -96,9 +101,6 @@ cat <<END_HTML
 <input id="icd10" name="icd10" value="${mpx[icd10]}" placeholder="$(l10n icd10)">
 </fieldset>
 
-<input type="checkbox" id="prescreviewed" name="prescreviewed" value="true" ${mpx[prescreviewed]:+checked}>
-<label for="prescreviewed">$(l10n prescreviewed)</label>
-
 <fieldset class="controls">
 <button type="submit" name="action" value="save">$(l10n save)</button>
 <button type="submit" name="action" value="cancel">$(l10n cancel)</button>

diff --git a/templates/prescriptions.css.sh b/templates/prescriptions.css.sh
index 91afffa891795ad6a6bdca0eb575e4aae4ab1427..3374f9832c6933608166cf32d49c669c5ed37330 100755 (executable)
--- a/templates/prescriptions.css.sh
+++ b/templates/prescriptions.css.sh
@@ -142,10 +142,24 @@ cat <<EOF
     width: 100%;
   }
   .misc label[for=addcontrib],
-  .misc #addcontrib {width: 100%;}
-  .misc #addcontrib {text-align: right;}
+  .misc label[for=contribconfirm] {width: 100%;}
+  .misc #addcontrib,
+  .misc #contribconfirm {width: 100%; text-align: right;}
+
+.prescription label[for=prescreviewed] {
+  margin-left: 1ex;
+  font-weight: bold;
+  text-decoration: underline;
+  background-color: #FCC;
+}
+.prescription label[for=prescreviewed].checked,
+.prescription :checked + label[for=prescreviewed] {
+  font-weight: normal;
+  text-decoration: none;
+  background-color: #CFF;
+}
 
-.prescription .catalogue { width: 60%; }
+.prescription .catalogue { width: 100%; }
 
   .catalogue h2:nth-of-type(1) {
     font-weight: bold;
@@ -154,11 +168,12 @@ cat <<EOF
   }
   .catalogue label {
     display: inline-block;
-    width: 50%;
+    width: 33%;
     margin-right: -.625ex;
     margin-top: .25em;
     vertical-align: top;
   }
+  .catalogue label[for=presccontinual] { margin-right: 33%;}
 
 .prescription .description { width: 100%; }
   .description * { margin-right: -.625ex; vertical-align: top;}
@@ -182,8 +197,6 @@ cat <<EOF
   .description #icd10,
   .description #indicator {width: 20%; text-align: right;}
 
-.prescription label[for=prescreviewed] { margin-left: 1ex; }
-
 .prescription .controls { width: 100%; }
   .controls a.button,
   .controls button[value=save],

diff --git a/templates/text_prescriptions.sh b/templates/text_prescriptions.sh
index 77c04217efe4c259d161c0c0f7394f6be8be24df..047dc49ab076548be6a078b388890bb981213c47 100755 (executable)
--- a/templates/text_prescriptions.sh
+++ b/templates/text_prescriptions.sh
@@ -25,14 +25,16 @@ item_name[date]="Datum"
 item_name[name]="Name d. Versicherten"
 item_name[bday]="geb. am"
 item_name[addcontrib]="Zuzahlung"
-item_name[contribconfirm]="Zuzahlung erfolgt"
+item_name[contribconfirm]="Zuzahlung erfolgt am..."
+item_name[contribreceipt]="Quit­tung heraus­ge­ge­ben"
 item_name[prescreviewed]="Verordnung geprüft"
+item_name[prescreview]="Verordnung prüfen!"
 item_name[quantity]="Ver­ord­nungs­men­ge"
 item_name[remidy]="Heil­mit­tel nach Maß­ga­be des Ka­ta­lo­ges"
 item_name[prescfirst]="Erst­ver­ord­nung"
-item_name[prescfollow1]="1. Folge­ver­ord­nung"
-item_name[prescfollow2]="2. Folge­ver­ord­nung"
-item_name[prescother]="Ver­ord­nung außer­halb des Re­gel­falls"
+item_name[prescfollow1]="1. Folge-­VO"
+item_name[prescfollow2]="2. Folge-­VO"
+item_name[prescother]="VO außer­halb des Re­gel­falls"
 item_name[presccontinual]="Lang­frist­ver­ord­nung"
 item_name[grouptherapy]="Grup­pen­the­ra­pie"
 item_name[housecall]="Haus­be­such"

diff --git a/templates/view_client.sh b/templates/view_client.sh
index c1e3987c09dc7807fdc8ae92d637004b6754fddc..4b06268260d2dcd5de483967dd50ffc1f7877052 100755 (executable)
--- a/templates/view_client.sh
+++ b/templates/view_client.sh
@@ -36,14 +36,10 @@ cat <<END_HTML
     done)
 
     ${values[BDAY]:+<span class="item BDAY"><label>*:</label> ${values[BDAY]}</span>}
-    ${values[X-ZACK-JOINDATE]:+<span class="item X-ZACK-JOINDATE"><label>$(l10n label_join):</label> $values[X-ZACK-JOINDATE]</span>}
-    ${values[X-ZACK-LEAVEDATE]:+<span class="item X-ZACK-LEAVEDATE"><label>$(l10n label_leave):</label> $values[X-ZACK-LEAVEDATE]</span>}
     ${values[SOUND]:+<audio controls="controls" class="item SOUND"><source type="audio/ogg" src="data:audio/ogg;base64,$values[SOUND]" /></audio>}
     ${values[PHOTO]:+<img class="item PHOTO" src="data:image/$tags[PHOTO_TYPE];base64,$values[PHOTO]" />}
     ${values[LOGO]:+<img class="item LOGO" src="data:image/$tags[LOGO_TYPE];base64,$values[LOGO]" />}
-  </div><!--
 
-  --><div class="section address">
     <h3>$(l10n ADR)</h3>
     $(for n in ADR ADR{0..10}; do
       echo "${values[$n]:+<span class="item ADR">$values[$n]</span>}"
@@ -92,12 +88,15 @@ cat <<END_HTML
     <ul>
     $(find "$_DATA/prescriptions/" -name "${id%.vcf}.*.mpx" \
       | while read pfile; do
-        printf '%s\t%s\t%s\n' "$(grep '^date' "$pfile")" "$(sed -nr 's;^icd10:(.*)$;\1;p' "$pfile")"
-      done \
-      | sort -r | cut -f2 \
-      | while read icd; do
-        printf '<li><a href="?p=prescriptions&amp;client=%s" >%s</a></li>' "${id}" "${icd:-$(l10n no_icd)}"
-      done)
+        printf '%s\t%s\t%s\n'  
+        printf '<li><a href="?p=prescriptions&amp;client=%s" >%s: %s - %s%s</a></li>' \
+          "${id}" \
+          "$(sed -nr 's;^date:(.+)$;\1;p' "$pfile")" \
+          "$(sed -nr 's;^indicator:(.+)$;\1;p' "$pfile")" \
+          "$(sed -nr 's;^quantity:(.+) ?$;\1x ;p' "$pfile")$(sed -nr 's;^remidy:(.+)$;\1;p' "$pfile")" \
+          "$(sed -nr 's;^quantity1:(.+) ?$;,\1x ;p' "$pfile")$(sed -nr 's;^remidy1:(.+)$;\1;p' "$pfile")"
+      done |sort -r
+    )
     </ul>
   </div>
 END_HTML

diff --git a/templates/view_prescription.sh b/templates/view_prescription.sh
index c11bd9de731cd03bcb9d24fe0c1a9d673df7aca1..57ff0b624f36bcd9cecb5449aaf8b7a38d3c4b6c 100755 (executable)
--- a/templates/view_prescription.sh
+++ b/templates/view_prescription.sh
@@ -38,9 +38,16 @@ cat <<END_HTML
 <br>
 <label for="addcontrib">$(l10n addcontrib)</label>
 <span id="addcontrib">${mpx[addcontrib]}</span>
-<label class="checkbox ${mpx[contribconfirm]:+checked}" for="contribconfirm">$(l10n contribconfirm)</label>
+<label for="contribconfirm">$(l10n contribconfirm)</label>
+<span id="contribconfirm">${mpx[contribconfirm]}</span>
+<label class="checkbox ${mpx[contribreceipt]:+checked}" for="contribreceipt">$(l10n contribreceipt)</label>
 </fieldset>
 
+<label class="checkbox ${mpx[prescreviewed]:+checked}" for="prescreviewed">
+  $([ -n "${mpx[prescreviewed]}" ] && printf %s "$(l10n prescreviewed)" \
+                                   || printf %s "$(l10n prescreview)" )
+</label>
+
 <fieldset class="catalogue">
 <h2>$(l10n prescription_by_catalogue)</h2>
 <label class="radio $(check "$mpx[prescno]" first)" for="prescfirst">$(l10n prescfirst)</label>
@@ -49,9 +56,9 @@ cat <<END_HTML
 <br>
 <label class="radio $(check "$mpx[prescno]" follow2)" for="prescfollow2">$(l10n prescfollow2)</label>
 <br>
-<label class="radio $(check "$mpx[prescno]" continual)" for="presccontinual">$(l10n presccontinual)</label>
-<br>
 <label class="radio $(check "$mpx[prescno]" other)" for="prescother">$(l10n prescother)</label>
+<br>
+<label class="radio $(check "$mpx[prescno]" continual)" for="presccontinual">$(l10n presccontinual)</label>
 
 <br>
 <label class="checkbox ${mpx[grouptherapy]:+checked}" for="grouptherapy">$(l10n grouptherapy)</label>
@@ -85,8 +92,6 @@ cat <<END_HTML
 <span id="icd10">${mpx[icd10]}</span>
 </fieldset>
 
-<label class="checkbox ${mpx[prescreviewed]:+checked}" for="prescreviewed">$(l10n prescreviewed)</label>
-
 <fieldset class="controls">
 <a class="button" href="?p=prescriptions&amp;edit=${mpx[prescription]}">$(l10n edit)</a>
 <a class="button" href="?p=therapy&amp;id=${mpx[prescription]%.mpx}.tpy">$(l10n therapy)</a>