issuer field on prescription document

svn path=/trunk/; revision=118

diff --git a/actions/update_prescription.sh b/actions/update_prescription.sh
index a0d9371b2849400ae6a843ae0dd9ac5b089591b1..aeb499382eeda9c1bad196421f16f898d0d5fccb 100755 (executable)
--- a/actions/update_prescription.sh
+++ b/actions/update_prescription.sh
@@ -31,6 +31,8 @@ if [ -z "$prescription" -o \! -f "$clientfile" ]; then
   exit 0
 fi
 
   exit 0
 fi
 

+[ "$_POST[issuer_select]" = "other" ] && _POST[issuer]="${_POST[issuer_other]}"
+

 # serialize POST array into file
 for key in ${(k)_POST}; do
   printf %s:%s\\n "$key" "${_POST[$key]//$BR/\\n}"
 # serialize POST array into file
 for key in ${(k)_POST}; do
   printf %s:%s\\n "$key" "${_POST[$key]//$BR/\\n}"

diff --git a/pages/cards.sh b/pages/cards.sh
index 056f4d2efc2ae96ec7c7b8a6e93027e291983768..17b8f73c6fdbe60783cc0a75d996c2fb5f9e0e00 100755 (executable)
--- a/pages/cards.sh
+++ b/pages/cards.sh
@@ -47,7 +47,8 @@ listcourses() {
 }
 
 list_hi_companies(){
 }
 
 list_hi_companies(){

-  sed -rn 's;^X-HEALTH-INSURANCE:([^\;]+)\;.*$;\1;p' ${_DATA}/vcard/*vcf
+  sed -rn 's;^X-HEALTH-INSURANCE:([^\;]+)\;.*$;\1;p' ${_DATA}/vcard/*vcf \
+  | sort -u

 }
 
 listcards() {
 }
 
 listcards() {

diff --git a/pages/prescriptions.sh b/pages/prescriptions.sh
index 20b2bc0080e4de6b0d60da24490eaa26d1b1c444..73c5c2ce59512dc1f0c98cab2a7176309dad3962 100755 (executable)
--- a/pages/prescriptions.sh
+++ b/pages/prescriptions.sh
@@ -34,6 +34,12 @@ list_prescriptions(){
   | sort -r | cut -f2
 }
 
   | sort -r | cut -f2
 }
 

+list_prescription_issuers(){
+  sed -rn 's;^issuer:(.+)$;\1;p' ${_DATA}/prescriptions/*.mpx \
+  | sort -u
+}
+
+

 edit_prescription(){
   id="$1"
   prescfile="$_DATA/prescriptions/$id"
 edit_prescription(){
   id="$1"
   prescfile="$_DATA/prescriptions/$id"

diff --git a/templates/edit_prescription.sh b/templates/edit_prescription.sh
index dac7270362fcd58998dae5818bf18866380be51f..b7a9af46341ab513e43430925fefe011d2bed85b 100755 (executable)
--- a/templates/edit_prescription.sh
+++ b/templates/edit_prescription.sh
@@ -135,7 +135,6 @@ $( for n in {0..10}; do
     "$(l10n quantity_weekly)" "${mpx[quantity_weekly$n]}"
 done )
 
     "$(l10n quantity_weekly)" "${mpx[quantity_weekly$n]}"
 done )
 

-

 <br>
 <p class="indicator_codes">
 <label for="indicator">$(l10n indicator)</label>
 <br>
 <p class="indicator_codes">
 <label for="indicator">$(l10n indicator)</label>


@@ -149,6 +148,21 @@ done )
 <label for="indicator_reading">$(l10n indicator_reading)</label>
 <textarea id="indicator_reading" name="indicator_reading" placeholder="$(l10n indicator_reading)">${mpx[indicator_reading]}</textarea>
 </p>
 <label for="indicator_reading">$(l10n indicator_reading)</label>
 <textarea id="indicator_reading" name="indicator_reading" placeholder="$(l10n indicator_reading)">${mpx[indicator_reading]}</textarea>
 </p>

+<br>
+<p class="issuer">
+  <label>$(l10n issuer)</label>
+  <input type="radio" name="issuer_select" value="list" id="issuer_select_list" checked /><label for="issuer_select_list">$(l10n issuer_from_list)</label><!--
+  --><input type="radio" name="issuer_select" value="other" id="issuer_other"><label for="issuer_other">$(l10n issuer_other)</label>
+  <select class="item" name="issuer">
+    <option value="" disabled="disabled" $([ -z "${mpx[issuer]}" ] && printf 'selected' )>$(l10n issuer)...</option>
+    $(list_prescription_issuers |while read f; do
+      [ "$f" = "$mpx[issuer]" ] \
+      && printf '<option value="%s" selected>%s</option>' "$f" "$f" \
+      || printf '<option value="%s">%s</option>' "$f" "$f"
+    done)
+  </select>
+  <input type="text" name="issuer_other" value="" placeholder="$(l10n issuer)..." />
+</p>

 </fieldset>
 
 <fieldset class="controls">
 </fieldset>
 
 <fieldset class="controls">

diff --git a/templates/prescriptions.css.sh b/templates/prescriptions.css.sh
index 0bf19c105d3d493967d8a4a84565c727d42959d5..3810eeb9fe2a63964f00bcf782a97cc1ae597727 100755 (executable)
--- a/templates/prescriptions.css.sh
+++ b/templates/prescriptions.css.sh
@@ -138,13 +138,16 @@ form.prescription { padding-top: 1ex;}
 .prescription input[name=presctype] + label {
   font-size: medium;
   width: 22%;
 .prescription input[name=presctype] + label {
   font-size: medium;
   width: 22%;

-  margin: 0; margin-right: -.75ex;
-  vertical-align: bottom;
-  padding: .125em .5ex .25em 3ex;
+  margin: 0; margin-right: -.5ex;
+  vertical-align: top;
+  padding: .25em .5ex .25em 3ex;
+  height: 2.5em;
+  border-top: 1px solid #DDD;

 }
 .prescription label.presctype {
   text-align: right;
   font-weight: bold;
 }
 .prescription label.presctype {
   text-align: right;
   font-weight: bold;

+  font-size: .875em;

   padding-right: 1ex;
   padding-left: 0;
 }
   padding-right: 1ex;
   padding-left: 0;
 }


@@ -248,6 +251,44 @@ input[name=presctype][value^=altpractition]:checked  ~ fieldset,
   .description #indicator_reading { width: 100%; display: block;}
   .description #indicator_reading { height: 4em;}
 
   .description #indicator_reading { width: 100%; display: block;}
   .description #indicator_reading { height: 4em;}
 

+  .description .issuer { display: inline-block; width: 50%; padding: 0; padding-top: 0; margin-left: 50%;}
+  .description .issuer label:first-of-type {
+     display: block;
+     position: relative;
+     width: 50%; left: -50%; top: 2.25em;
+     font-size: 1em;
+     text-align: right;
+     padding-right: 1ex;
+   }
+  .description .issuer input[type=radio] + label:before { content: none; }
+  .description .issuer input[type=radio] { display: none; }
+  .description .issuer input[type=radio] + label {
+    display: inline-block;
+    width: 50%;
+    padding: .25ex 0; margin: 0;
+    text-align: center;
+    border: 1px solid black;
+  }
+  .description .issuer input[type=radio]:checked + label {
+    font-weight: bold;
+    background-color: #FFF;
+    border-width: 1px;
+    border-bottom: 1px solid #FFF;
+  }
+  .description .issuer input[type=radio] + label + input + label + select,
+  .description .issuer input[type=radio] + label + select + input { display: none; }
+  .description .issuer input[type=radio]:checked + label + input + label + select,
+  .description .issuer input[type=radio]:checked + label + select + input {
+    display: block; width: 100%;
+    border: 1px solid black;
+    background-color: #FFF;
+    border-width: 0 1px 1px 1px;
+    padding: .25ex .5ex;
+    margin-top: -1px;
+  }
+  .description .issuer input[type=radio]:checked + label + input + label + select option { display: block;}
+  .description span#issuer { width: 100%; height: 3em; padding: 1ex 2ex;}
+

 .prescription .controls { width: 100%; }
   .controls a.button,
   .controls button[value=save],
 .prescription .controls { width: 100%; }
   .controls a.button,
   .controls button[value=save],

diff --git a/templates/text_prescriptions.sh b/templates/text_prescriptions.sh
index 4fa02a55c48a9836d6cd63d8293e1648b7464057..56a81a0ac4020020cf1afdedce0facc5b44f3193 100755 (executable)
--- a/templates/text_prescriptions.sh
+++ b/templates/text_prescriptions.sh
@@ -58,3 +58,7 @@ item_name[noprescription]="Ohne Ver­ord­nung"
 item_name[selfpaid]="Selbst­zah­lend"
 item_name[private]="Pri­vat"
 item_name[compulsory]="Ge­setz­lich"
 item_name[selfpaid]="Selbst­zah­lend"
 item_name[private]="Pri­vat"
 item_name[compulsory]="Ge­setz­lich"

+
+item_name[issuer]="Ausgestellt durch"
+item_name[issuer_from_list]="Aus Liste"
+item_name[issuer_other]="Andere"

diff --git a/templates/view_prescription.sh b/templates/view_prescription.sh
index 78f995b97d425aa22ebe9c5df4354368addc4fd2..0fdd871691c7ce1ea4bb86b425ec36c55025af05 100755 (executable)
--- a/templates/view_prescription.sh
+++ b/templates/view_prescription.sh
@@ -85,17 +85,22 @@ $( for n in {0..10}; do
 done )
 <br>
 <p class="indicator_codes">
 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>
+  <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">
 </p>
 <br>
 <p class="indicator_reading">

-<label for="indicator_reading">$(l10n indicator_reading)</label>
-<span id="indicator_reading">${mpx[indicator_reading]}</span>
+  <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>
 </p>

+

 </fieldset>
 
 <fieldset class="controls">
 </fieldset>
 
 <fieldset class="controls">