X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=templates%2Fedit_attendee.sh;h=679a7bd249fd06644a1bcbc7ad0e2e524a0cbe75;hp=13b550a407ee446482203f9668b3050ca3d31a7a;hb=be5f12e43f464b3ca924b2131fe74d6cf24981a1;hpb=8b887633d34fe136ffba19a29290ec095c310331
diff --git a/templates/edit_attendee.sh b/templates/edit_attendee.sh
index 13b550a..679a7bd 100755
--- a/templates/edit_attendee.sh
+++ b/templates/edit_attendee.sh
@@ -1,25 +1,39 @@
+check_gen() {
+ [ "$value[GENDER]" = "$1" ] && echo 'selected="selected"'
+}
+
edit_card() {
- n_last="$(echo "$values[N]" |sed -r 's:^([^;]*;){0} *([^;]*);.*$:\2:')"
- n_first="$(echo "$values[N]" |sed -r 's:^([^;]*;){1} *([^;]*);.*$:\2:')"
- n_middle="$(echo "$values[N]" |sed -r 's:^([^;]*;){2} *([^;]*);.*$:\2:')"
- n_pre="$(echo "$values[N]" |sed -r 's:^([^;]*;){3} *([^;]*);.*$:\2:')"
- n_post="$(echo "$values[N]" |sed -r 's:^([^;]*;){4} *([^;]*);*$:\2:')"
+ n_last="$(echo "$values[N]" |sed -rn 's:^([^;]*;){0} *([^;]*).*$:\2:p')"
+ n_first="$(echo "$values[N]" |sed -rn 's:^([^;]*;){1} *([^;]*).*$:\2:p')"
+ 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')"
+ [ -z "$values[UID]" ] && values[UID]="$(dbus-uuidgen)"
echo '
'
- echo '
'$(l10n NAME)''
+ echo '
'$(l10n N)''
echo '
'
echo '
'
echo '
'
echo '
'
echo '
'
- [ -n "$value[GENDER]" ] && \
- echo '
'$(l10n $values[GENDER])''
+ if [ -n "$value[GENDER]" ]; then
+ echo '
'
+ echo '
'
+ fi
for n in NICKNAME NICKNAME{0..10}; do [ -n "$values[$n]" ] &&\
- echo '
aka. '$values[$n]''
+ echo '
'
done
- [ -n "$values[BDAY]" ] &&\
- echo '
*: '$values[BDAY]''
+ if [ -n "$values[BDAY]" ]; then
+ echo '
'$(l10n BDAY)''
+ echo '
'
+ fi
if [ -n "$values[SOUND]" ]; then
echo '
'
+ echo '
'
}
edit_attendee() { #Parameter: Cardfile
@@ -96,7 +111,7 @@ edit_attendee() { #Parameter: Cardfile
if [ -z "$key" ]; then
eval "$line"
else
- values[$key]="$value"
+ [ -n "$value" ] && values[$key]="$value" || values[$key]='\r'
for t in ${(k)tag}; do
tags[${key}_$t]="$tag[$t]"
done