X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=cards%2Flist.sh;h=9224ace75460e82691b865dcb970b27c36910643;hb=245152b9bb6939b087fc622336bfa0dd74149bb2;hp=f2f4a4be0707bf97798cc094be4d9a31d9aaf572;hpb=f685a02e05355cf8016351d1c1ba1413cd44f0c7;p=lobster

diff --git a/cards/list.sh b/cards/list.sh
index f2f4a4b..9224ace 100755
--- a/cards/list.sh
+++ b/cards/list.sh
@@ -20,40 +20,18 @@ edit_card(){
 	    [ "$(pdi_count "$card" NICKNAME)" -gt 0 ] \
 	    && edit_item "$card" NICKNAME
 	    edit_item "$card" BDAY
-	    edit_item "$card" X-ZACK-JOINDATE
-	    [ "$(pdi_count "$card" X-ZACK-LEAVEDATE)" -gt 0 ] \
-	    && edit_item "$card" X-ZACK-LEAVEDATE
 	    card_item "$card" SOUND PHOTO LOGO
 	  )]
-	  [div .section .phone   $(edit_item "$card" TEL)]
-	  [div .section .message $(
-	    edit_item "$card" EMAIL
-	    [ $(pdi_count "$card" IMPP) -gt 0 ] && edit_item "$card" IMPP
-	    [ $(pdi_count "$card" URL ) -gt 0 ] && edit_item "$card" URL
-	  )]
+	  [div .section .phone   $(
+            edit_item "$card" TEL EMAIL
+	    [ $(pdi_count "$card" IMPP) -gt 0 ] \
+            && edit_item "$card" IMPP
+	    [ $(pdi_count "$card" URL ) -gt 0 ] \
+            && edit_item "$card" URL
+          )]
 	  [div .section .address $(edit_item "$card" ADR)]
-	  [div .section .note    $(edit_item "$card" NOTE)]
-	  [div .section .attendance
-	    [h3 $(l10n course_attendance) ] $(
-	    for course in "$_DATA"/ical/*.ics; do
-	      printf '[label [input type="checkbox" name="attendance" value="%s" %s] %s]' \
-	             "${course##*/}" \
-	             "$(grep -qF "${course##*/}	${cardfile##*/}" "$_DATA/mappings/attendance" \
-	                && printf 'checked="checked"'
-	             )" \
-	             "$(pdi_value "$(pdi_load "$course")" SUMMARY |unescape |HTML)"
-	    done)
-	    [h3 $(l10n CATEGORIES) ] $(
-	    grep -xE '[^ ]+' "$_DATA"/mappings/categories |while read -r cat; do
-	      printf '[label [input type="checkbox" name="attendance" value="%s" %s] %s]' \
-	             "$(HTML "$cat")" \
-	             "$(seq 1 $(pdi_count "$card" CATEGORIES) |while read c; do
-	               pdi_value "$card" CATEGORIES $c |grep -qxF "$cat" \
-	               && printf 'checked="checked"' && break
-	             done)" \
-	             "$(HTML "$cat")"
-	    done)
-	  ]
+	  [div .section .insurance $(edit_item "$card" X-HEALTH-INSURANCE)]
+	  [div .section .note    $(edit_item "$card" NOTE X-CLIENT-REFERRAL)]
 	  [div .control
 	    [select .item name="newfield"
 	      [option value="" disabled="disabled" selected="selected" $(l10n edit_addfieldtext)]
@@ -78,21 +56,14 @@ print_card(){
   local card="$(pdi_load "$cardfile")"
   cat <<-EOF
     [div .card #${cardfile##*/}
-      [div .section .basic &shy;$(
+      [div .section .basic $(
         card_item "$card" FN GENDER NICKNAME BDAY X-ZACK-JOINDATE X-ZACK-LEAVEDATE SOUND PHOTO LOGO
       )]
-      [div .section .phone   &shy;$(card_item "$card" TEL)]
-      [div .section .message &shy;$(card_item "$card" EMAIL IMPP URL)]
-      [div .section .address &shy;$(card_item "$card" ADR)]
-      [div .section .note    &shy;$(card_item "$card" NOTE)]
-      [div .section .attendance [h3 $(l10n course_attendance) ] [ul &shy;
-        $(grep -F "	${cardfile##*/}" "$_DATA/mappings/attendance" |while read each discard; do
-          printf '[li [a .item .attendance href="/courses#%s" &shy;%s]]' \
-                 "$each" \
-                 "$(pdi_value "$(pdi_load "$_DATA/ical/$each")" SUMMARY |unescape |HTML)"
-        done)]
-        $(card_item "$card" CATEGORIES)
-      ]
+      [div .section .address   $(card_item "$card" ADR)]
+      [div .section .phone     $(card_item "$card" TEL EMAL IMPP URL)]
+      [div .section .insurance $(card_item "$card" X-HEALTH-INSURANCE)]
+      [div .section .note      $(card_item "$card" NOTE X-CLIENT-REFERRAL)]
+      [div .section .therapies $(card_item "$card" therapies)]
       [div .control
         [a .item href="/cards/edit_card.sh?card=${cardfile##*/}" $(l10n edit)]
         [a .item href="/cards/export_card.sh?card=${cardfile##*/}" $(l10n vcf_export)]