support for joining and leaving date, default data fields for attendees

svn path=/trunk/; revision=48

diff --git a/constants.sh b/constants.sh
index dee33a914dd1a6ed34a11a8f6f6e077ab3896752..66369d3835a6e3d4456c1ca161b863440c2d138d 100644 (file)
--- 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 3fd109afaff844bef2cbc62218595036b6072d81..e00db8d9ba54afea2342cf98474d359211e491db 100755 (executable)
--- 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 '    <input class="item N" name="1N" placeholder="'$(l10n n_first)'" value=
 echo '    <input class="item N" name="2N" placeholder="'$(l10n n_middle)'" value="'$n_middle'" />'
 echo '    <input class="item N" name="0N" placeholder="'$(l10n n_last)'" value="'$n_last'" />'
 echo '    <input class="item N" name="4N" placeholder="'$(l10n n_post)'" value="'$n_post'" />'
-if [ -n "$values[GENDER]" ]; then
-  echo '    <select class="item GENDER" name="GENDER">'
-  echo '      <option value="" disabled="disabled">'$(l10n GENDER)'</option>'
-  echo '      <option value="female" '$(check_gen female)'>'$(l10n gender_female)'</option>'
-  echo '      <option value="male" '$(check_gen male)'>'$(l10n gender_male)'</option>'
-  echo '      <option value="other" '$(check_gen other)'>'$(l10n gender_other)'</option>'
-  echo '      <option value="none" '$(check_gen none)'>'$(l10n gender_none)'</option>'
-  echo '    </select>'
-fi
+
+echo '    <select class="item GENDER" name="GENDER">'
+echo '      <option value="" disabled="disabled">'$(l10n GENDER)'</option>'
+echo '      <option value="female" '$(check_gen female)'>'$(l10n gender_female)'</option>'
+echo '      <option value="male" '$(check_gen male)'>'$(l10n gender_male)'</option>'
+echo '      <option value="other" '$(check_gen other)'>'$(l10n gender_other)'</option>'
+echo '      <option value="none" '$(check_gen none)'>'$(l10n gender_none)'</option>'
+echo '    </select>'
+
 for n in NICKNAME NICKNAME{0..10}; do [ -n "$values[$n]" ] &&\
   echo '    <input class="item NICKNAME" name="NICKNAME" placeholder="'$(l10n NICKNAME)'" value="'$values[$n]'" />'
 done
-if [ -n "$values[BDAY]" ]; then
-  echo '    <span class="sectitle">'$(l10n BDAY)'</span>'
-  echo '    <input class="item BDAY" name="BDAY" value="'$values[BDAY]'" />'
+
+echo '    <span class="sectitle">'$(l10n BDAY)'</span>'
+echo '    <input class="item BDAY" name="BDAY" value="'$values[BDAY]'" />'
+
+echo '    <span class="sectitle">'$(l10n X-ZACK-JOINDATE)'</span>'
+echo '    <input class="item X-ZACK-LEAVEDATE" name="X-ZACK-JOINDATE" value="'$values[X-ZACK-JOINDATE]'" />'
+if [ -n "$values[X-ZACK-LEAVEDATE]" ]; then
+  echo '    <span class="sectitle">'$(l10n X-ZACK-LEAVEDATE)'</span>'
+  echo '    <input class="item X-ZACK-LEAVEDATE" name="X-ZACK-LEAVEDATE" value="'$values[X-ZACK-LEAVEDATE]'" />'
 fi
+
 if [ -n "$values[SOUND]" ]; then
   echo '    <audio controls="controls" class="item SOUND">'
   echo '      <source type="audio/ogg" src="data:audio/ogg;base64,'$values[SOUND]'" />'
@@ -54,14 +61,16 @@ echo '  </div>'
 echo ''
 echo '  <div class="section phone">'
 echo '    <span class="sectitle">'$(l10n TEL)'</span>'
-for n in TEL TEL{0..10}; do [ -n "$values[$n]" ] &&\
+  echo '    <input class="item TEL" name="TEL" value="'$values[TEL]'" />'
+for n in TEL{0..10}; do [ -n "$values[$n]" ] &&\
   echo '    <input class="item TEL" name="TEL" value="'$values[$n]'" />'
 done
 echo '  </div>'
 echo ''
 echo '  <div class="section message">'
 echo '    <span class="sectitle">'$(l10n EMAIL)'</span>'
-for n in EMAIL EMAIL{0..10}; do [ -n "$values[$n]" ] &&\
+  echo '    <input class="item EMAIL" name="EMAIL" value="'$values[EMAIL]'" />'
+for n in EMAIL{0..10}; do [ -n "$values[$n]" ] &&\
   echo '    <input class="item EMAIL" name="EMAIL" value="'$values[$n]'" />'
 done
 [ -n "$values[IMPP]" ] && \
@@ -73,7 +82,8 @@ echo '  </div>'
 echo ''
 echo '  <div class="section address">'
 echo '    <span class="sectitle">'$(l10n ADR)'</span>'
-for n in ADR ADR{0..10}; do [ -n "$values[$n]" ] &&\
+echo '    <textarea class="item ADR" name="ADR">'$values[ADR]'</textarea>'
+for n in ADR{0..10}; do [ -n "$values[$n]" ] &&\
   echo '    <textarea class="item ADR" name="ADR">'$values[$n]'</textarea>'
 done
 [ -n "$values[URL]" ] && \
@@ -85,7 +95,8 @@ echo '  </div>'
 echo ''
 echo '  <div class="section note">'
 echo '    <span class="sectitle">'$(l10n NOTE)'</span>'
-for n in NOTE NOTE{0..10}; do [ -n "$values[$n]" ] &&\
+echo '    <textarea class="item NOTE" name="NOTE">'$values[NOTE]'</textarea>'
+for n in NOTE{0..10}; do [ -n "$values[$n]" ] &&\
   echo '    <textarea class="item NOTE" name="NOTE">'$values[$n]'</textarea>'
 done
 echo '  </div>'

diff --git a/templates/text_attendee.sh b/templates/text_attendee.sh
index 647a7e87ab0cc819c1b86d70639af8abeb0ad139..6441d4baf0f28a83f001cf127d9908e41d92a8cc 100755 (executable)
--- a/templates/text_attendee.sh
+++ b/templates/text_attendee.sh
@@ -50,6 +50,11 @@ item_name[UID]=""
 item_name[VERSION]=""
 item_name[XML]=""
 
+item_name[X-ZACK-JOINDATE]="Anmeldedatum"
+item_name[X-ZACK-LEAVEDATE]="Abmeldedatum"
+item_name[label_join]="Anm."
+item_name[label_leave]="Abm."
+
 item_name[edit]="Bearbeiten"
 item_name[vcf_export]="Vcard Exportieren"
 item_name[control]="Aktionen"

diff --git a/templates/view_attendee.sh b/templates/view_attendee.sh
index 35f33f357609d029e48f2032d2e9bfca06ecbd38..cd44259a1afcea3bd8fe5a24fe68d48732606a55 100755 (executable)
--- a/templates/view_attendee.sh
+++ b/templates/view_attendee.sh
@@ -8,6 +8,12 @@ for n in NICKNAME NICKNAME{0..10}; do [ -n "$values[$n]" ] &&\
 done
 [ -n "$values[BDAY]" ] &&\
   echo '    <span class="item BDAY"><b>*:</b> '$values[BDAY]'</span>'
+
+[ -n "$values[X-ZACK-JOINDATE]" ] &&\
+  echo '    <span class="item X-ZACK-JOINDATE"><b>'$(l10n label_join)':</b> '$values[X-ZACK-JOINDATE]'</span>'
+[ -n "$values[X-ZACK-LEAVEDATE]" ] &&\
+  echo '    <span class="item X-ZACK-LEAVEDATE"><b>'$(l10n label_leave)':</b> '$values[X-ZACK-LEAVEDATE]'</span>'
+
 if [ -n "$values[SOUND]" ]; then
   echo '    <audio controls="controls" class="item SOUND">'
   echo '      <source type="audio/ogg" src="data:audio/ogg;base64,'$values[SOUND]'" />'