provide info about health insurance in card view

svn path=/trunk/; revision=79

diff --git a/actions/update_card.sh b/actions/update_card.sh
index 1be16765cd20e8f0bf9340679e1da274606e5edf..a810476a5ca3e6d66d71915d246852cd3f8e0977 100755 (executable)
--- a/actions/update_card.sh
+++ b/actions/update_card.sh
@@ -34,8 +34,10 @@ _POST[1N]="${_POST[1N]//;/,}"
 _POST[2N]="${_POST[2N]//;/,}"
 _POST[3N]="${_POST[3N]//;/,}"
 _POST[4N]="${_POST[4N]//;/,}"
 _POST[2N]="${_POST[2N]//;/,}"
 _POST[3N]="${_POST[3N]//;/,}"
 _POST[4N]="${_POST[4N]//;/,}"

-[ -n "${_POST[hi_number]}" -o -n "${_POST[hi_company]}" ] \
-&& _POST[X-HEALTH-INSURANCE]="${_POST[hi_number]//;/,};${_POST[hi_company]//;/,}"
+
+[ "$_POST[hi_select]" = "list" ] && hi_company="${_POST[hi_company]}" || hi_company="${_POST[hi_other]}"
+[ -n "${_POST[hi_company]}${_POST[hi_number]}${_POST[hi_status]}" ] \
+&& _POST[X-HEALTH-INSURANCE]="${hi_company//;/,};${_POST[hi_number]//;/,};${_POST[hi_status]//;/,}"

 
 sed -r 's;$;\r;' >"$tempfile" <<EOF
 BEGIN:VCARD
 
 sed -r 's;$;\r;' >"$tempfile" <<EOF
 BEGIN:VCARD

diff --git a/pages/cards.sh b/pages/cards.sh
index c045b5bfd09cc3a0fbd7c1bbc58d8efbb5e6c2d5..d1170b0ada1f5cb767e4f04af476b2fcc6b6029d 100755 (executable)
--- a/pages/cards.sh
+++ b/pages/cards.sh
@@ -26,6 +26,10 @@ listcourses() {
   done |sort |sed -r 's:^.*\t(.*/)([^/]+)$:\2:'
 }
 
   done |sort |sed -r 's:^.*\t(.*/)([^/]+)$:\2:'
 }
 

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

 listcards() {
   case "${_GET[filtertype]}" in
     any)
 listcards() {
   case "${_GET[filtertype]}" in
     any)

diff --git a/templates/attendees.css.sh b/templates/attendees.css.sh
index 58896fadb2a13d08cbe055164f89d04287c41ec2..1544d8682725e24e97b2e55345d58f913289574a 100755 (executable)
--- a/templates/attendees.css.sh
+++ b/templates/attendees.css.sh
@@ -143,6 +143,11 @@ cat <<EOF
   word-wrap: break-word;
 }
 
   word-wrap: break-word;
 }
 

+form.card .section input[type=text],
+form.card .section input:not([type]),
+form.card .section textarea,
+form.card .section select {width: 100%;}
+

 form.card .attendance {
   min-width: 66%;
 }
 form.card .attendance {
   min-width: 66%;
 }


@@ -157,6 +162,32 @@ form.card .attendance label input[type=checkbox] {
   margin-left: -3ex;
 }
 
   margin-left: -3ex;
 }
 

+form.card .insurance input[type=radio] {display: none;}
+form.card .insurance input[type=radio] + label {
+  display: inline-block;
+  width: 50%;
+  padding: .25ex 0;
+  text-align: center;
+  border: 1px solid black;
+  
+}
+form.card .insurance input[type=radio]:checked + label {
+  font-weight: bold;
+  background-color: #FFF;
+  border-width: 1px 1px 0 1px;
+}
+form.card .insurance input[type=radio] + label + input + label + select,
+form.card .insurance input[type=radio] + label + select + input {display: none;}
+form.card .insurance input[type=radio]:checked + label + input + label + select,
+form.card .insurance input[type=radio]:checked + label + select + input {
+  display: block;
+  border: 1px solid black;
+  border-width: 0 1px 1px 1px;
+  padding: .25ex 0;
+  margin-top: -1px;
+  background-color: #FFF;
+}
+

 .card .section .item {
   display: block;
   max-width: 100%;
 .card .section .item {
   display: block;
   max-width: 100%;


@@ -178,7 +209,6 @@ form.card .attendance label input[type=checkbox] {
   max-height: 10em;
 }
 
   max-height: 10em;
 }
 

-

 EOF
 
 # vi:set filetype=css:
 EOF
 
 # vi:set filetype=css:

diff --git a/templates/edit_client.sh b/templates/edit_client.sh
index 049f251da7a56e804ffb32f9e0ba427aab308562..586fa697b074d2d1502f79807ae175ae2438a64b 100755 (executable)
--- a/templates/edit_client.sh
+++ b/templates/edit_client.sh
@@ -28,8 +28,9 @@ n_middle="$(printf %s "$values[N]" |sed -rn 's:^([^;]*;){2} *([^;]*).*$:\2:p')"
 n_pre="$(printf %s "$values[N]" |sed -rn 's:^([^;]*;){3} *([^;]*).*$:\2:p')"
 n_post="$(printf %s "$values[N]" |sed -rn 's:^([^;]*;){4} *([^;]*)*$:\2:p')"
 
 n_pre="$(printf %s "$values[N]" |sed -rn 's:^([^;]*;){3} *([^;]*).*$:\2:p')"
 n_post="$(printf %s "$values[N]" |sed -rn 's:^([^;]*;){4} *([^;]*)*$:\2:p')"
 

-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)"

 
 SUP_FIELDS=(N NICKNAME GENDER BDAY ADR TEL EMAIL X-HEALTH-INSURANCE X-HEALTH-INSURANCE-NOCONTRIB IMPP URL NOTE X-CLIENT-REFERRAL)
 
 
 SUP_FIELDS=(N NICKNAME GENDER BDAY ADR TEL EMAIL X-HEALTH-INSURANCE X-HEALTH-INSURANCE-NOCONTRIB IMPP URL NOTE X-CLIENT-REFERRAL)
 


@@ -59,7 +60,7 @@ cat <<END_HTML
     done)
 
     <h3>$(l10n BDAY)</h3>
     done)
 
     <h3>$(l10n BDAY)</h3>

-    <input class="item BDAY" name="BDAY" value="$values[BDAY]" />
+    <input class="item BDAY" name="BDAY" value="$values[BDAY]" placeholder="YYYY-MM-DD" />

 
     $(if [ -n "$values[SOUND]" ]; then
       echo '    <audio controls="controls" class="item SOUND">'
 
     $(if [ -n "$values[SOUND]" ]; then
       echo '    <audio controls="controls" class="item SOUND">'


@@ -100,11 +101,19 @@ cat <<END_HTML
 
   <div class="section insurance">
     <h3>$(l10n X-HEALTH-INSURANCE)</h3>
 
   <div class="section insurance">
     <h3>$(l10n X-HEALTH-INSURANCE)</h3>

+    <input type="radio" name="hi_select" value="list" id="hi_select_list" checked /><label for="hi_select_list">$(l10n hi_from_list)</label><!--
+    --><input type="radio" name="hi_select" value="other" id="hi_other"><label for="hi_other">$(l10n hi_other)</label>

     <select class="item" name="hi_company">
     <select class="item" name="hi_company">

-      <option value="" disabled="disabled" selected="selected">$(l10n hi_company)</option>
-      $(list_hi_companies |while read f; do echo "<option value=\"$f\">$(l10n $f)</option>"; done)
+      <option value="" disabled="disabled" ${hi_company:-selected}>$(l10n hi_company)</option>
+      $(list_hi_companies |while read f; do
+        [ "$f" = "$hi_company" ] \
+        && printf '<option value="%s" selected>%s</option>' "$f" "$f" \
+        || printf '<option value="%s">%s</option>' "$f" "$f"
+      done)

     </select>
     </select>

-    <input class="item hi_number" name="hi_number" value="$hi_number" placeholder="$(l10n hi_number)" />
+    <input type="text" name="hi_other" value="$hi_company" placeholder="$(l10n hi_company)" />
+    <input name="hi_number" value="$hi_number" placeholder="$(l10n hi_number)" />
+    <input name="hi_status" value="$hi_status" placeholder="$(l10n hi_status)" />

 
   </div>
 
 
   </div>
 

diff --git a/templates/view_client.sh b/templates/view_client.sh
index 47d6d219b5ce8eb1ae2757b64b0b22986f454c89..4860e853ff91c87534dcfa42ef207eba2f6fe0a3 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]}}}"
 
    )
 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">
 
 cat <<END_HTML
   <div class="section basic">


@@ -71,6 +73,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>}
     <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">
   </div><!--
 
   --><div class="section note">