X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=cards%2Flist.sh;h=0ed8af46297cc72abe6ae1202869e21db1501c3c;hp=1c602913244d34882771c6d0b318f5d85a70e65f;hb=670da503edafe7206002ccf2c469285ee8f61bda;hpb=0bb22396a89ab7a8d79f765a63d1714054c54052

diff --git a/cards/list.sh b/cards/list.sh
index 1c60291..0ed8af4 100755
--- a/cards/list.sh
+++ b/cards/list.sh
@@ -34,36 +34,43 @@ edit_card(){
 	  [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" \
+	    [h3 $(l10n course_attendance) ] [div .attendance $(
+            list_courses |while IFS=/ read course coursename; do
+              courseH="$(HTML "$course")"
+	      printf '[input type="checkbox" id="cour%s" name="attendance" value="%s" %s][label for="cour%s" . %s]' \
+                     "$courseH" "$courseH" \
+	             "$(grep -qF "${course}	${cardfile##*/}" "$_DATA/mappings/attendance" \
 	                && printf 'checked="checked"'
 	               )" \
-	             "$(pdi_value "$(pdi_load "$course")" SUMMARY || l10n "(unnamed course)" |unescape |HTML)"
-	    done)
-	    [h3 $(l10n CATEGORIES) ] $(
+                     "$courseH" "$coursename"
+	    done)]
+	    [h3 $(l10n CATEGORIES) ] [div .categories $(
 	    grep -xE '[^ ]+' "$_DATA"/mappings/categories |while read -r cat; do
-	      printf '[label [input type="checkbox" name="CATEGORIES" value="%s" %s] %s]' \
-	             "$(HTML "$cat")" \
+              catH="$(HTML "$cat")"
+	      printf '[input type="checkbox" id="cat%s" name="CATEGORIES" value="%s" %s][label for="cat%s" . %s]' \
+	             "$catH" "$catH" \
 	             "$(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)
+	             "$catH" "$catH"
+	    done)]
 	  ]
 	  [div .control
-	    [select .item name="newfield"
-	      [option value="" disabled="disabled" selected="selected" $(l10n edit_addfieldtext)]
-	      $(for f in NICKNAME EMAIL TEL IMPP ADR URL NOTE; do
-	        printf '[option value="%s" %s] ' "$f" "$(l10n "$f")"
-	      done)
-	   ][button .item type="submit" name="action" value="addfield" $(l10n edit_addfield)]
+	    [div .item .delete label="$(l10n edit_delete)"
+              [input type="checkbox" #delete]
+              [label for="delete" $(l10n edit_delete)]
+	      [button type="submit" name="action" value="delete" $(l10n edit_delete)]
+            ]
+            [div .item .newfield
+              [select name="newfield"
+	        [option value="" disabled="disabled" selected="selected" $(l10n edit_addfieldtext)]
+	        $(for f in NICKNAME EMAIL TEL IMPP ADR URL NOTE; do
+	          printf '[option value="%s" %s] ' "$f" "$(l10n "$f")"
+	        done)
+	      ][button type="submit" name="action" value="addfield" $(l10n edit_addfield)]
+            ]
 	    [button .item type="submit" name="action" value="update"   $(l10n edit_update)]
-	    [input type="checkbox" #delete] [label .item for="delete" $(l10n edit_delete)]
-	      [button .item type="submit" name="action" value="delete"]
 	    [button .item type="submit" name="action" value="cancel"   $(l10n edit_cancel)]
 	  ]
 	  [input type="hidden" name="UID" value="$(pdi_value "$card" UID |HTML)"]
@@ -90,12 +97,12 @@ print_card(){
           printf '[li [a .item .attendance href="/courses#%s" . %s]]' \
                  "$each" \
                  "$(pdi_value "$(pdi_load "$_DATA/ical/$each")" SUMMARY || l10n "(unnamed course)" |unescape |HTML)"
-        done)]
+        done |sort -k7)]
         $(card_item "$card" CATEGORIES)
       ]
       [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)]
+        [a .button .item href="/cards/edit_card.sh?card=${cardfile##*/}" $(l10n edit)]
+        [a .button .item href="/cards/export_card.sh?card=${cardfile##*/}" $(l10n vcf_export)]
       ]
     ]
 	EOF
@@ -116,11 +123,36 @@ print_cards(){
   done
 }
 
+filter_attendance(){
+  fatt="$1"
+  attfile="$_DATA/mappings/attendance"
+
+  if [ ! "$fatt" ]; then
+    # debug 'list all'
+    printf '%s\n' "$_DATA/vcard"/*.vcf
+  elif [ "${fatt#* }" = "${fatt}" ]; then
+    # debug "list $fatt"
+    grep -xiE "(${fatt})	.+vcf" "$attfile" \
+    | while read vcf; do
+      printf '%s/vcard/%s\n' "$_DATA" "${vcf##*	}"
+    done
+  else
+    # debug "filter ${fatt%% *}"
+    filter_attendance "${fatt#* }" \
+    | while read vcf; do
+      grep -xiE "(${fatt%% *})	${vcf##*/}" "$attfile"
+    done \
+    | while read vcf; do
+      printf '%s/vcard/%s\n' "$_DATA" "${vcf##*	}"
+    done
+  fi
+}
+
 filter_cards(){
   local filter f fex='x;p;'
 
   filter="$(printf %s "${filter}" \
-            | sed -E 's;[]\/\(\)\\\$\?\.\+\*\;\[\{\}];\\\\&;g;
+            | sed -E 's;[]\/\(\)\\\$\?\.\+\*\;\[\{\}];\\&;g;
                       '"$upcase"
            )^"
 
@@ -129,22 +161,25 @@ filter_cards(){
     case $f in
       '') break
         ;;
-      ANY:*) fex="/\n.*(\;[^:]*)?:.*(${f#*:}).*\r?\n/{${fex}}"
+      COURSE:*) fatt="${fatt}${fatt:+ }${f#*:}"
+        ;;
+      ANY:*) fex="/\n.*(\;[^:]*)?:[^\n]*(${f#*:})[^\n]*\r?\n/{${fex}}"
         ;;
-      NAME:*) fex="/\n(N|FN|NICKNAME)(\;[^:]*)?:.*(${f#*:}).*\r?\n/{${fex}}"
+      NAME:*) fex="/\n(N|FN|NICKNAME)(\;[^:]*)?:[^\n]*(${f#*:})[^\n]*\r?\n/{${fex}}"
         ;;
-      STREET:*|ZIP:*) fex="/\nADR(\;[^:]*)?:.*(${f#*:}).*\r?\n/{${fex}}"
+      STREET:*|ZIP:*) fex="/\nADR(\;[^:]*)?:[^\n]*(${f#*:})[^\n]*\r?\n/{${fex}}"
         ;;
-      *) fex="/\n${f%%:*}(\;[^:]*)?:.*(${f#*:}).*\r?\n/{${fex}}"
+      *) fex="/\n${f%%:*}(\;[^:]*)?:[^\n]*(${f#*:})[^\n]*\r?\n/{${fex}}"
         ;;
     esac
   done
 
-  for cardfile in "${_DATA}"/vcard/*.vcf; do
+  # for cardfile in "${_DATA}"/vcard/*.vcf; do
+  filter_attendance "$fatt" |while read cardfile; do
     printf '%s\n' "$cardfile"
     cat "$cardfile"
   done \
-  | sed -En ':X; /\nEND:VCARD\r?$/!{ N; bX; }; h; s;\n.*$;;; x; s;^[^\n]+\n;;;
+  | sed -nE ':X; /\nEND\;?:VCARD\r?$/!{ N; bX; }; h; s;\n.*$;;; x; s;^[^\n]+\n;;;
              '"$upcase""$fex"
 }