additional prescription fields, improved display of clients and prescriptions

[confetti] / templates / view_client.sh

diff --git a/templates/view_client.sh b/templates/view_client.sh
index 47d6d219b5ce8eb1ae2757b64b0b22986f454c89..4b06268260d2dcd5de483967dd50ffc1f7877052 100755 (executable)
--- a/templates/view_client.sh
+++ b/templates/view_client.sh
@@ -21,8 +21,10 @@ n=$(printf %s "$values[N]" \
    )
 fullname="${n:-${values[FN]:-${values[NICKNAME]}}}"
 
-hi_number="${values[X-HEALTH-INSURANCE]%;*}"
-hi_company="${values[X-HEALTH-INSURANCE]#*;}"
+hi_company="$(printf %s "${values[X-HEALTH-INSURANCE]}" |cut -d\; -f1)"
+hi_number="$(printf %s "${values[X-HEALTH-INSURANCE]}" |cut -d\; -f2)"
+hi_status="$(printf %s "${values[X-HEALTH-INSURANCE]}" |cut -d\; -f3)"
+
 
 cat <<END_HTML
   <div class="section basic">
@@ -34,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>}"
@@ -71,6 +69,7 @@ cat <<END_HTML
     <h3>$(l10n X-HEALTH-INSURANCE)</h3>
     ${hi_company:+<span class="item hi_comapany">${hi_company}</span>}
     ${hi_number:+<span class="item hi_number"><label>$(l10n hi_number):</label> ${hi_number}</span>}
+    ${hi_status:+<span class="item hi_status"><label>$(l10n hi_status):</label> ${hi_status}</span>}
   </div><!--
 
   --><div class="section note">
@@ -87,10 +86,17 @@ cat <<END_HTML
   --><div class="section prescriptions">
     <h3>$(l10n prescriptions)</h3>
     <ul>
-    $(sed -rn 's:(.*)\t'$id'$:\1:p' "$_DATA/mappings/attendance" |while read each; do
-      cname="$(sed -rn 's:^SUMMARY\:(.*)$:\1:p' "$_DATA/ical/$each")"
-      echo '   <li><a class="item attendance" href="?p=courses#'$each'">'$cname'</a></li>'
-    done)
+    $(find "$_DATA/prescriptions/" -name "${id%.vcf}.*.mpx" \
+      | while read pfile; do
+        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