X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=cards%2Fwidgets.sh;h=463a64814cf0afaa8dd72e74fe23bbca8a9a2fa0;hp=376199efe24397931c22c921de5b2f271d32678c;hb=625d391932052a4d1514c754b1262b5791207474;hpb=79a7bb3560f305a48ecd2b2f2b9957c206fa6792

diff --git a/cards/widgets.sh b/cards/widgets.sh
index 376199e..463a648 100755
--- a/cards/widgets.sh
+++ b/cards/widgets.sh
@@ -19,6 +19,19 @@ list_categories() {
   grep -vxE '^[ 	]*$' "${_DATA}/mappings/categories"
 }
 
+list_courses() {
+  local file name cachefile="${_DATA}/cache/courses.ui.cache"
+  if [ $cachefile -nt "${_DATA}/ical" ]; then
+    cat "$cachefile"
+  else
+    for file in "$_DATA/ical"/*.ics; do
+      name="$(pdi_value "$(pdi_load "$file")" SUMMARY |HTML)"
+      printf '%s	%s\n' "$file" "$name"
+    done \
+    | sort -k2 |tee "$cachefile"
+  fi
+}
+
 w_filter_item() {
 n=$3
 cat <<EOF
@@ -33,7 +46,7 @@ cat <<EOF
     [input type="text" name="filter_text$n" value="$([ "$1" = CATEGORIES -o "$1" = course ] || HTML "$2")" placeholder="$(l10n filter_placeholder)"]
     [fieldset .categories
       $(list_categories | while read cat; do
-          printf '[label [checkbox "filter_cat%i" "|%s" %s] %s ]' \
+          printf '[label [checkbox "filter_cat%i" "|%s" %s] %s ] ' \
                  "$n" "$(HTML "$cat")" \
                  "$(printf %s "$cat" |grep -qxEe "$2" && printf checked )" \
                  "$(HTML "$cat")"
@@ -41,11 +54,11 @@ cat <<EOF
       [a href="/categories/" $(l10n edit_categories)]
     ]
     [fieldset .courses
-      $(for course in "$_DATA/ical"/*.ics; do
-        printf '[label [checkbox "filter_course%i" "|%s" %s] %s ]' \
+      $(list_courses | while read course coursename; do
+        printf '[label [checkbox "filter_course%i" "|%s" %s] %s ] ' \
                "$n" "$(HTML "${course##*/}")" \
                "$(printf %s "${course##*/}" |grep -qxEe "$2" && printf checked )" \
-               "$(pdi_value "$(pdi_load "$course")" SUMMARY |HTML)"
+               "$coursename"
       done)
     ]
   ]
@@ -75,6 +88,7 @@ w_filter_diag(){
     ]
     [button type="submit" name="choice" value="filter" $(l10n filter_apply)]
     [button type="submit" name="choice" value="del_filter" $(l10n filter_cancel)]
+    [button type="submit" name="choice" value="export_csv" $(l10n export_csv)]
   ]
 EOF
 }
@@ -153,6 +167,13 @@ card_item(){
                     "$(pdi_value "$card" TEL $c |unescape |HTML)"
         done
         ;;
+      ADR)[ $cnt -gt 0 ] && printf '[h3 %s]' "$(l10n "$item")"
+        shy="$(printf '\302\255')"
+        seq 1 $cnt |while read c; do
+          printf '[span .item .%s . %s]' "$item" \
+                 "$(pdi_value "$card" "$item" $c |sed -r "s;(straße|weg|damm|allee|ufer);${shy}\1;g" |unescape |HTML)"
+        done
+        ;;
       *)[ $cnt -gt 0 ] && printf '[h3 %s]' "$(l10n "$item")"
         seq 1 $cnt |while read c; do
           printf '[span .item .%s . %s]' "$item" \