From 4aaa2c65a2591f3526e5ac3960c4d38a15be041d Mon Sep 17 00:00:00 2001 From: paul Date: Tue, 8 Apr 2014 13:13:00 +0000 Subject: [PATCH] support for joining and leaving date, default data fields for attendees svn path=/trunk/; revision=48 --- constants.sh | 2 +- templates/edit_attendee.sh | 45 ++++++++++++++++++++++++-------------- templates/text_attendee.sh | 5 +++++ templates/view_attendee.sh | 6 +++++ 4 files changed, 40 insertions(+), 18 deletions(-) diff --git a/constants.sh b/constants.sh index dee33a9..66369d3 100644 --- a/constants.sh +++ b/constants.sh @@ -1,3 +1,3 @@ #!/bin/zsh -VCF_FIELDS=(PHOTO LOGO FN NICKNAME SOUND GENDER KIND TITLE ROLE ORG MEMBER CATEGORIES ANNIVERSARY BDAY EMAIL TEL IMPP ADR URL LANG NOTE RELATED) +VCF_FIELDS=(PHOTO LOGO FN NICKNAME SOUND GENDER KIND TITLE ROLE ORG MEMBER CATEGORIES ANNIVERSARY BDAY EMAIL TEL IMPP ADR URL LANG NOTE RELATED X-ZACK-JOINDATE X-ZACK-LEAVEDATE) diff --git a/templates/edit_attendee.sh b/templates/edit_attendee.sh index 3fd109a..e00db8d 100755 --- a/templates/edit_attendee.sh +++ b/templates/edit_attendee.sh @@ -11,7 +11,7 @@ n_middle="$(echo "$values[N]" |sed -rn 's:^([^;]*;){2} *([^;]*).*$:\2:p')" n_pre="$(echo "$values[N]" |sed -rn 's:^([^;]*;){3} *([^;]*).*$:\2:p')" n_post="$(echo "$values[N]" |sed -rn 's:^([^;]*;){4} *([^;]*)*$:\2:p')" -SUP_FIELDS=(N NICKNAME GENDER BDAY EMAIL TEL IMPP ADR URL NOTE) +SUP_FIELDS=(N NICKNAME GENDER BDAY X-ZACK-JOINDATE X-ZACK-LEAVEDATE EMAIL TEL IMPP ADR URL NOTE) [ -z "$values[UID]" ] && values[UID]="$(dbus-uuidgen)" @@ -25,22 +25,29 @@ echo ' ' echo ' ' echo ' ' -if [ -n "$values[GENDER]" ]; then - echo ' ' -fi + +echo ' ' + for n in NICKNAME NICKNAME{0..10}; do [ -n "$values[$n]" ] &&\ echo ' ' done -if [ -n "$values[BDAY]" ]; then - echo ' '$(l10n BDAY)'' - echo ' ' + +echo ' '$(l10n BDAY)'' +echo ' ' + +echo ' '$(l10n X-ZACK-JOINDATE)'' +echo ' ' +if [ -n "$values[X-ZACK-LEAVEDATE]" ]; then + echo ' '$(l10n X-ZACK-LEAVEDATE)'' + echo ' ' fi + if [ -n "$values[SOUND]" ]; then echo '