X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=templates%2Fedit_attendee.sh;h=e00db8d9ba54afea2342cf98474d359211e491db;hp=357e2bfaccad22f293519093ddbd09422403cd23;hb=28c5fc2fa939cc3a2ac0b82287ec38c24c1a0063;hpb=b3ddca9d8e6af72d0e9847b3d5d1f7778ef1f1af

diff --git a/templates/edit_attendee.sh b/templates/edit_attendee.sh
index 357e2bf..e00db8d 100755
--- a/templates/edit_attendee.sh
+++ b/templates/edit_attendee.sh
@@ -1,5 +1,5 @@
 check_gen() {
-  [ "$value[GENDER]" = "$1" ] && echo 'selected="selected"'
+  [ "$values[GENDER]" = "$1" ] && echo 'selected="selected"'
 }
 check_a() {
   egrep -q "^${1}.${id}$" "$_DATA/mappings/attendance" && echo 'checked="checked"'
@@ -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 "$value[GENDER]" ]; then
-  echo '  <div class="section control">'
-  echo '    <select class="item control" name="newfield">'
-  echo '      <option value="" disabled="disabled">'$(l10n GENDER)'</option>'
-  echo '      <option value="female" disabled="disabled" '$(check_gen female)'>'$(l10n female)'</option>'
-  echo '      <option value="male" disabled="disabled"  '$(check_gen male)'>'$(l10n male)'</option>'
-  echo '      <option value="other" disabled="disabled" '$(check_gen other)'>'$(l10n gender_other)'</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>'