reverse session list - newest first

[lobster] / cards / list.sh

diff --git a/cards/list.sh b/cards/list.sh
index 6c0f18b229961a4ecff5dee7aab91ecb3e52b12b..33ca99110ebdb4cf37ee81e9d42f00b816f3d146 100755 (executable)
--- 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,24 +56,17 @@ 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/?x=${cardfile##*/}" $(l10n vcf_export)]
+        [a .item href="/cards/export_card.sh?card=${cardfile##*/}" $(l10n vcf_export)]
       ]
     ]
        EOF
@@ -126,25 +97,25 @@ filter_cards(){
 
   while [ "$filter" ]; do
     f="${filter%%^*}" filter="${filter#*^}"
+    debug "Filter: $f"
     case $f in
       '') break
         ;;
       ANY:*) fex="/\n.*(\;[^:]*)?:.*(${f#*:}).*\r?\n/{${fex}}"
         ;;
-      NAME:*) fex="/\n(N|FN|NICKNAME)(\;[^:]*)?:.*(${f#*:}).*\r?\n/{${fex}}"
+      NAME:*) fex="/\n(N|FN|NICKNAME)(\;[^:]*)?:[^\n]*(${f#*:}).*\r?\n/{${fex}}"
         ;;
-      STREET:*|ZIP:*) fex="/\nADR(\;[^:]*)?:.*(${f#*:}).*\r?\n/{${fex}}"
+      STREET:*|ZIP:*) fex="/\nADR(\;[^:]*)?:[^\n]*(${f#*:}).*\r?\n/{${fex}}"
         ;;
-      *) fex="/\n${f%%:*}(\;[^:]*)?:.*(${f#*:}).*\r?\n/{${fex}}"
+      *) fex="/\n${f%%:*}(\;[^:]*)?:[^\n]*(${f#*:}).*\r?\n/{${fex}}"
         ;;
     esac
   done
 
   for cardfile in "${_DATA}"/vcard/*.vcf; do
-    printf '%s\n' "$cardfile"
-    cat "$cardfile"
+    printf '%s\n' "$cardfile" "$(grep -vxE " *${CR}?" "$cardfile")"
   done \
-  | sed -En ':X; /\nEND:VCARD\r?$/!{ N; bX; }; h; s;\n.*$;;; x; s;^[^\n]+\n;;;
+  | sed -En ':X; /\nEND;?:VCARD\r?$/!{ N; bX; }; h; s;\n.*$;;; x; s;^[^\n]+\n;;;
              '"$upcase""$fex"
 }