X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=templates%2Fview_client.sh;h=47d6d219b5ce8eb1ae2757b64b0b22986f454c89;hp=700420ce85e2ae80f12de92ae02f1cc3b9c6cf6f;hb=2805ee334bead55e2ab08b7c4dbdbf07dcebf8e9;hpb=3df0e6c3d9ff72b4ace395bb78582765ef4bc6fb

diff --git a/templates/view_client.sh b/templates/view_client.sh
index 700420c..47d6d21 100755
--- a/templates/view_client.sh
+++ b/templates/view_client.sh
@@ -15,18 +15,27 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with Confetti.  If not, see <http://www.gnu.org/licenses/>. 
 
+n=$(printf %s "$values[N]" \
+    | sed -rn 's:^([^;]*)(\;[^;]*)(\;[^;]*)?(\;[^;]*)?(\;[^;]*)?$:\4 \2 \3 \1 \5:gp' \
+    | sed -r 's:,: :;s:\;: :g;s: +: :g;s:^ $::;'
+   )
+fullname="${n:-${values[FN]:-${values[NICKNAME]}}}"
+
+hi_number="${values[X-HEALTH-INSURANCE]%;*}"
+hi_company="${values[X-HEALTH-INSURANCE]#*;}"
+
 cat <<END_HTML
   <div class="section basic">
-    <h2 class="item FN">$values[FN]</h2>
+    <h2 class="item FN">$fullname</h2>
     ${values[GENDER]:+<span class="item GENDER">$(l10n $values[GENDER])</span>}
 
     $(for n in NICKNAME NICKNAME{0..10}; do
       echo "${values[$n]:+<span class="item NICKNAME">aka. $values[$n]</span>}"
     done)
 
-    ${values[BDAY]:+<span class="item BDAY"><b>*:</b> $values[BDAY]</span>}
-    ${values[X-ZACK-JOINDATE]:+<span class="item X-ZACK-JOINDATE"><b>$(l10n label_join):</b> $values[X-ZACK-JOINDATE]</span>}
-    ${values[X-ZACK-LEAVEDATE]:+<span class="item X-ZACK-LEAVEDATE"><b>$(l10n label_leave):</b> $values[X-ZACK-LEAVEDATE]</span>}
+    ${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]" />}
@@ -60,6 +69,8 @@ cat <<END_HTML
 
   --><div class="section insurance">
     <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>}
   </div><!--
 
   --><div class="section note">