issuer field on prescription document

[confetti] / templates / view_prescription.sh

diff --git a/templates/view_prescription.sh b/templates/view_prescription.sh
index d31accaef86ee12cdbc881de544d43d009922a90..0fdd871691c7ce1ea4bb86b425ec36c55025af05 100755 (executable)
--- a/templates/view_prescription.sh
+++ b/templates/view_prescription.sh
@@ -18,31 +18,40 @@
 check(){ [ "$1" = "$2" ] && printf checked}
 
 cat <<END_HTML
-<div class="prescription">
-<h1>$(l10n therapy_prescription)</h1>
-
+<div class="prescription ${mpx[presctype]%_*} ${mpx[presctype]#*_}">
+<fieldset class="baseinfo">
 <label for="insurance">$(l10n insurance)</label>
 <span id="insurance">${mpx[insurance]}</span>
 <br>
 <label for="name">$(l10n name)</label>
-<span id="name">${mpx[name]}</span>
-<br>
 <label for="bday">$(l10n bday)</label>
+<span id="name">${mpx[name]}</span>
 <span id="bday">${mpx[bday]}</span>
 
 <br>
 <label for="date">$(l10n date)</label>
 <span id="date">${mpx[date]}</span>
+</fieldset>
 
+<fieldset class="misc">
+<h1 id="${mpx[prescription]}">$(l10n therapy_prescription)</h1>
 <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>
 <br>
-<input type="radio" id="prescfollow1" name="prescno" value="follow1" $(check "$mpx[prescno]" follow1)>
 <label class="radio $(check "$mpx[prescno]" follow1)" for="prescfollow1">$(l10n prescfollow1)</label>
 <br>
 <label class="radio $(check "$mpx[prescno]" follow2)" for="prescfollow2">$(l10n prescfollow2)</label>
@@ -57,39 +66,47 @@ cat <<END_HTML
 <label class="checkbox ${mpx[housecall]:+checked}" for="housecall">$(l10n housecall)</label>
 <br>
 <label class="checkbox ${mpx[report]:+checked}" for="report">$(l10n report)</label>
+</fieldset>
 
-<br>
-<label for="remidy">$(l10n remidy)</label>
-<span id="remidy">${mpx[remidy]}</span>
-<br>
-<label for="quantity">$(l10n quantity)</label>
-<span id="quantity">${mpx[quantity]}</span>
-<br>
-<label for="quantity_weekly">$(l10n quantity_weekly)</label>
-<span id="quantity_weekly">${mpx[quantity_weekly]}</span>
+<fieldset class="description">
+  <label for="quantity">$(l10n quantity)</label>
+  <label for="remidy">$(l10n remidy)</label>
+  <label for="quantity_weekly">$(l10n quantity_weekly)</label>
+  <span id="quantity">${mpx[quantity]}</span>
+  <span id="remidy">${mpx[remidy]}</span>
+  <span id="quantity_weekly">${mpx[quantity_weekly]}</span>
+$( for n in {0..10}; do
+  [ -n "${mpx[quantity$n]}" -o -n "${mpx[remidy$n]}" -o -n "${mpx[quantity_weekly$n]}" ] \
+  && printf '
+    <span id="quantity">%s</span>
+    <span id="remidy">%s</span>
+    <span id="quantity_weekly">%s</span>
+    ' "${mpx[quantity$n]}" "${mpx[remidy$n]}" "${mpx[quantity_weekly$n]}"
+done )
+<br>
+<p class="indicator_codes">
+  <label for="indicator">$(l10n indicator)</label>
+  <span id="indicator">${mpx[indicator]}</span>
+  <br>
+  <label for="icd10">$(l10n icd10)</label>
+  <span id="icd10">${mpx[icd10]}</span>
+</p>
+<br>
+<p class="indicator_reading">
+  <label for="indicator_reading">$(l10n indicator_reading)</label>
+  <span id="indicator_reading">${mpx[indicator_reading]}</span>
+</p>
+<p class="issuer">
+  <label>$(l10n issuer)</label>
+  <span id="issuer">$mpx[issuer]</span>
+</p>
 
-<br>
-<label for="remidy1">$(l10n remidy)</label>
-<span id="remidy1">${mpx[remidy1]}</span>
-<br>
-<label for="quantity1">$(l10n quantity)</label>
-<span id="quantity1">${mpx[quantity1]}</span>
-<br>
-<label for="quantity_weekly1">$(l10n quantity_weekly)</label>
-<span id="quantity_weekly1">${mpx[quantity_weekly1]}</span>
-
-<br>
-<label for="indicator">$(l10n indicator)</label>
-<span id="indicator">${mpx[indicator]}</span>
-<br>
-<label for="icd10">$(l10n icd10)</label>
-<span id="icd10">${mpx[icd10]}</span>
-
-<br>
-<label class="checkbox ${mpx[prescreviewed]:+checked}" for="prescreviewed">$(l10n prescreviewed)</label>
+</fieldset>
 
-<br>
-<a class="button" href="?p=prescriptions&amp;edit=${mpx[prescription]}">$(l10n edit)</a>
+<fieldset class="controls">
+<a class="button" href="?p=prescriptions&amp;edit=${mpx[prescription]}#${mpx[prescription]}">$(l10n edit)</a>
+<a class="button" href="?p=therapy&amp;id=${mpx[prescription]%.mpx}.tpy">$(l10n therapy)</a>
+</fieldset>
 
 </div>
 END_HTML