X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=cards%2Fwidgets.sh;h=76057a6a61f6968cc6b40b9bd05b162745ec69d1;hp=5a80ae71ca127ad66e65c6c1f686659d1eceed45;hb=516b1d6b0427b42924a60bd63ed48d8087a9e4e8;hpb=d5fb0b81bce3f19153b9c74f4bc17fe7a3043a7c

diff --git a/cards/widgets.sh b/cards/widgets.sh
index 5a80ae7..76057a6 100755
--- a/cards/widgets.sh
+++ b/cards/widgets.sh
@@ -15,26 +15,29 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with Confetti.  If not, see <http://www.gnu.org/licenses/>. 
 
+list_categories() {
+  grep -vxE '^[ 	]*$' "${_DATA}/mappings/categories"
+}
+
 w_filter_item() {
+n=$3
 cat <<EOF
   [fieldset .item
     [legend $(l10n filter_item):]
-    [input type="hidden" name="filter${n}" value="^"]
 
     $(for field in any name street zip TEL BDAY CATEGORIES; do
-      printf '[input id="%s%i" type="radio" name="filter%i" value="%s" %s]
-              [label for="%s%i" %s]' \
-              "$field" "$n" "$((n + 1))" "$field" "$([ "$1" = "$field" ] && printf checked )" \
+      printf '[input id="%s%i" type="radio" name="filter_type%i" value="%s" %s]
+              [label for="%s%i" %s ]' \
+              "$field" "$n" "$n" "$field" "$([ "$1" = "$field" ] && printf checked )" \
               "$field" "$n" "$(l10n filter_$field)"
     done)
-    [input type="text" name="filter$((n + 2))" value="$([ "$1" = CATEGORIES ] || HTML "$2")" placeholder="$(l10n filter_placeholder)"]
+    [input type="text" name="filter_text$n" value="$([ "$1" = CATEGORIES ] || HTML "$2")" placeholder="$(l10n filter_placeholder)"]
     [fieldset .categories
-      $(m=3; list_categories | while read cat; do
-          printf '[label [checkbox "filter%i" "|%s" %s] %s ]' \
-                 "$((n + m))" "$(HTML "$cat")" \
-                 "$(printf %s "$cat" |grep -qEx "$2" && printf checked )" \
+      $(list_categories | while read cat; do
+          printf '[label [checkbox "filter_cat%i" "|%s" %s] %s ]' \
+                 "$n" "$(HTML "$cat")" \
+                 "$(printf %s "$cat" |grep -qxEe "$2" && printf checked )" \
                  "$(HTML "$cat")"
-          m=$((m + 1))
       done)
       [a href="?p=categories" $(l10n edit_categories)]
     ]
@@ -48,14 +51,13 @@ w_filter_diag(){
     [h1 $(l10n filter_label)]
     [input type="hidden" name="page" value="cards"]
   
-    $(
-    n=0; m="$(list_categories |wc -l)"
-    printf '%s\n' "$filter" |tr '^' '\n' \
-    | while read filter; do
-      [ -n "$filter" ] && w_filter_item "${filter%%:*}" "${filter#*:}" "$n"
-      n=$((n + 3 + m))
-    done
-    w_filter_item any '' "$n"
+    $(n=0; filter="${filter}^"
+      while [ "${filter#^}" ]; do
+        fil="${filter%%^*}" filter="${filter#*^}"
+        w_filter_item "${fil%%:*}" "${fil#*:}" $n
+        n=$((n + 1))
+      done
+      w_filter_item any '' $n
     )
   
     [fieldset class="order"