improved styling for attendance list

[confetti] / cards / list.sh

diff --git a/cards/list.sh b/cards/list.sh
index ab67fbd4edefcef625c3980dd003a64e385eb5cc..0ed8af46297cc72abe6ae1202869e21db1501c3c 100755 (executable)
--- a/cards/list.sh
+++ b/cards/list.sh
@@ -34,25 +34,27 @@ 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
            [div .item .delete label="$(l10n edit_delete)"
@@ -95,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
@@ -121,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"
            )^"
 
@@ -134,6 +161,8 @@ filter_cards(){
     case $f in
       '') break
         ;;
+      COURSE:*) fatt="${fatt}${fatt:+ }${f#*:}"
+        ;;
       ANY:*) fex="/\n.*(\;[^:]*)?:[^\n]*(${f#*:})[^\n]*\r?\n/{${fex}}"
         ;;
       NAME:*) fex="/\n(N|FN|NICKNAME)(\;[^:]*)?:[^\n]*(${f#*:})[^\n]*\r?\n/{${fex}}"
@@ -145,11 +174,12 @@ filter_cards(){
     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 -nE ':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"
 }