X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=pages%2Fattendees.sh;h=e3e27c2d9d0b9c5d0ffd3aaf4491f67e906b92ac;hp=aecc95d26c4bc9c5fc324ffb0f857c0b9e518a40;hb=3badbe5f34b9a481f43f83d07d4cd28a3aa7798b;hpb=d959549ee6cec995f6e8975002b3bc0e9375e564

diff --git a/pages/attendees.sh b/pages/attendees.sh
index aecc95d..e3e27c2 100755
--- a/pages/attendees.sh
+++ b/pages/attendees.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
-[ "$_GET[\"action\"]" = "del_filter" ] && _GET["filter"]="" && _GET["filtertype"]="" 
+[ "$_GET[\"choice\"]" = "del_filter" ] && _GET["filter"]="" && _GET["filtertype"]="" 
 listcards() {
-  case "$_GET["filtertype"]" in
+  case "$_GET[\"filtertype\"]" in
     any)
        grep -il "$_GET[\"filter\"]" ${_DATA}/vcard/*vcf
       ;;
@@ -25,7 +25,29 @@ listcards() {
       ;;
     *) ls -1 ${_DATA}/vcard/*vcf
       ;;
-  esac
+  esac |case "$_GET[\"order\"]" in
+    firstname)
+      while read file; do
+        fn=$(sed -rn 's:^N(;.+)*\:([^;]*;){1} *([^;]*).*$:\3:p' "$file")
+	echo "$fn\t$file"
+      done
+      ;;
+    lastname)
+      while read file; do
+        ln=$(sed -rn 's:^N(;.+)*\:([^;]*;){0} *([^;]*).*$:\3:p' "$file")
+	echo "$ln\t$file"
+      done
+      ;;
+    bdate)
+      while read file; do
+        bd=$(sed -rn 's:^BDAY(;.+)*\:(.*)$:\2:p' "$file")
+	echo "$bd\t$file"
+      done
+      ;;
+    *)
+      sed -r 's:^.*$:x\t&:'
+      ;;
+  esac |sort |sed -r 's:^.*\t(.*/)([^/]+)$:\2:'
 }
 
 vcf_parse() {
@@ -35,8 +57,8 @@ vcf_parse() {
     s:^X-MS-CARDPICTURE:001 PHOTO:p;
     s:^LOGO:002 LOGO:p;
     s:^FN:003 FN:p;
+    s:^N[\:;]:004 &:p
     s:^NICKNAME:005 NICKNAME:p;
-    s:^N:004 N:p
     s:^SOUND:006 SOUND:p;
     s:^GENDER:007 GENDER:p;
     s:^X-GENDER:007 GENDER:p;
@@ -67,6 +89,7 @@ vcf_parse() {
     s:^X-EVOLUTION-BLOG-URL:021 URL:p;
     s:^LANG:022 LANG:p;
     s:^NOTE:023 NOTE:p;
+    s:^UID:026 UID:p;
 
     s:^RELATED:025 RELATED:p;
     s:^AGENT:025 RELATED\;TYPE=agent:p;
@@ -96,13 +119,12 @@ vcf_parse() {
     s:^SORT-STRING.*$::;
     s:^SOURCE.*$::;
     s:^TZ.*$::;
-    s:^UID.*$::;
     s:^VERSION.*$:000 VERSION\:4.0:p;
     s:^XML.*$::;
 
     s:^([A-Z].*)$:024 \1:p;
     ' \
-  | sort |while read -r line; do
+  |sort |while read -r line; do
     case "$line" in
       00[012]*)
 	echo -E "$line"
@@ -124,7 +146,7 @@ vcf_parse() {
 	;;
       *)
         [ -n "$n" ] && fn="$n"
-	[ -n "$fn" -a -n "$nick" ] && fn="$fn aka. $nick"
+	#[ -n "$fn" -a -n "$nick" ] && fn="$fn aka. $nick"
 	[ -n "$fn" ] && echo -E "003 FN:$fn" \
 	 	      || echo -E "003 FN:$nick"
 	echo -E "$line"
@@ -156,6 +178,82 @@ vcf_parse() {
   done
 }
 
+view_attendee() {  #Parameter: Cardfile
+  id="$1"
+  cardfile="$_DATA/vcard/${id}"
+  cachefile="$_DATA/cache/${id}.cache"
+  unset key
+  if [ "$cachefile" -nt "$cardfile" ]; then
+    cat "$cachefile"
+  else
+    declare -A tags
+    declare -A values
+    vcf_parse "$cardfile" |while read -r line; do
+      declare -A tag
+      case "$line" in
+        value*) eval "$line";;
+        tag*)   eval "$line";;
+        key*)
+          if [ -z "$key" ]; then
+            eval "$line"
+          else
+            values[$key]="$value"
+            for t in ${(k)tag}; do
+              tags[${key}_$t]="$tag[$t]"
+            done
+            eval "$line"
+            if [ -n "$values[$key]" ]; then
+              n=0
+              while [ -n "$values[$key$n]" ]; do n=$(($n + 1)); done
+              key=$key$n
+            fi
+            unset value
+            unset tag
+          fi
+        ;;
+      esac
+    done
+    . ${_EXEC}/templates/view_attendee.sh |tee "$cachefile"
+  fi
+}
+
+edit_attendee() {  #Parameter: Cardfile
+  id="$1"
+  cardfile="$_DATA/vcard/$id"
+  tempfile="$_DATA/temp/$id"
+  [ -f "$tempfile" ] && cardfile="$tempfile"
+  unset key
+
+  declare -A tags
+  declare -A values
+  vcf_parse "$cardfile" |while read -r line; do
+    declare -A tag
+    case "$line" in
+      value*) eval "$line";;
+      tag*)   eval "$line";;
+      key*)
+        if [ -z "$key" ]; then
+          eval "$line"
+        else
+          [ -n "$value" ] && values[$key]="$value" || values[$key]='\r'
+          for t in ${(k)tag}; do
+            tags[${key}_$t]="$tag[$t]"
+          done
+          eval "$line"
+          if [ -n "$values[$key]" ]; then
+            n=0
+            while [ -n "$values[${key}${n}]" ]; do n=$(($n + 1)); done
+            key=$key$n
+          fi
+            unset value
+            unset tag
+        fi
+      ;;
+    esac
+  done
+  . ${_EXEC}/templates/edit_attendee.sh
+}
+
 case "$1" in
   title)
     echo "Teilnehmende"
@@ -164,6 +262,7 @@ case "$1" in
     . ${_EXEC}/templates/attendees.css.sh
   ;;
   body)
+    . ${_EXEC}/templates/text_attendee.sh
     . ${_EXEC}/templates/attendees.html.sh
   ;;
 esac