X-Git-Url: http://git.plutz.net/?a=blobdiff_plain;f=templates%2Fview_attendee.sh;h=bdfdc6a621ebe2fe5ebfb0335f072d353d5c3352;hb=bafaa4cafbc86cc32e11e24b3f34033ffd84905b;hp=d54c11f28b6af16c5627e42f8d71859b658dace5;hpb=793cb4fe08df6131b64ddbbf6cc6cb89201f1bd4;p=confetti
diff --git a/templates/view_attendee.sh b/templates/view_attendee.sh
index d54c11f..bdfdc6a 100755
--- a/templates/view_attendee.sh
+++ b/templates/view_attendee.sh
@@ -1,4 +1,4 @@
-# Copyright 2014 Paul Hänsch
+# Copyright 2014, 2015 Paul Hänsch
#
# This file is part of Confetti.
#
@@ -15,82 +15,72 @@
# You should have received a copy of the GNU Affero General Public License
# along with Confetti. If not, see .
-echo '
'
-echo '
'
-echo '
'$values[FN]' '
-[ -n "$values[GENDER]" ] && \
- echo '
'$(l10n $values[GENDER])' '
-for n in NICKNAME NICKNAME{0..10}; do [ -n "$values[$n]" ] &&\
- echo '
aka. '$values[$n]' '
-done
-[ -n "$values[BDAY]" ] &&\
- echo '
*: '$values[BDAY]''
+n=$(printf %s "$values[N]" \
+ | sed -rn 's:^([^;]*)(\;[^;]*)(\;[^;]*)?(\;[^;]*)?(\;[^;]*)?$:\4 \2 \3 \1 \5:gp' \
+ | sed -r 's:,: :;s:\;: :g;s: +: :g;s:^ $::;'
+ )
+fullname="${n:-${values[FN]:-${values[NICKNAME]}}}"
-[ -n "$values[X-ZACK-JOINDATE]" ] &&\
- echo '
'$(l10n label_join)': '$values[X-ZACK-JOINDATE]''
-[ -n "$values[X-ZACK-LEAVEDATE]" ] &&\
- echo '
'$(l10n label_leave)': '$values[X-ZACK-LEAVEDATE]''
+cat <
+ $fullname
+ ${values[GENDER]:+$(l10n $values[GENDER]) }
-if [ -n "$values[SOUND]" ]; then
- echo ' '
- echo ' '
- echo ' '
-fi
-[ -n "$values[PHOTO]" ] &&\
- echo ' '
-[ -n "$values[LOGO]" ] &&\
- echo ' '
-echo ' '
-echo ''
-echo '
'
-echo '
'$(l10n TEL)' '
-for n in TEL TEL{0..10}; do [ -n "$values[$n]" ] &&\
- echo ' '$tags[${n}_TYPE]' '$values[$n]' '
-done
-echo ' '
-echo ''
-echo '
'
-[ -n "$values[EMAIL]" ] && \
- echo '
'$(l10n EMAIL)' '
-for n in EMAIL EMAIL{0..10}; do [ -n "$values[$n]" ] &&\
- echo '
'$values[$n]' '
-done
-[ -n "$values[IMPP]" ] && \
- echo '
'$(l10n IMPP)' '
-for n in IMPP IMPP{0..10}; do [ -n "$values[$n]" ] &&\
- echo '
'$tags[${n}_TYPE]' '$values[$n]' '
-done
-echo '
'
-echo ''
-echo '
'
-echo '
'$(l10n ADR)' '
-for n in ADR ADR{0..10}; do [ -n "$values[$n]" ] &&\
- echo '
'$values[$n]' '
-done
-[ -n "$values[URL]" ] && \
- echo '
'$(l10n URL)' '
-for n in URL URL{0..10}; do [ -n "$values[$n]" ] &&\
- echo '
'$values[$n]' '
-done
-echo '
'
-echo ''
-echo '
'
-echo '
'$(l10n NOTE)' '
-for n in NOTE NOTE{0..10}; do [ -n "$values[$n]" ] &&\
- echo ' '$values[$n]' '
-done
-echo ' '
-echo ''
-echo '
'
-echo '
'$(l10n course_attendance)' '
-sed -rn 's:(.*)\t'$id'$:\1:p' "$_DATA/mappings/attendance" |while read each; do
- cname="$(sed -rn 's:^SUMMARY\:(.*)$:\1:p' "$_DATA/ical/$each")"
- echo '
'$cname' '
-done
-echo '
'
-echo ''
-echo '
'
-echo '
'
+ $(for n in NICKNAME NICKNAME{0..10}; do
+ echo "${values[$n]:+aka. $values[$n] }"
+ done)
+
+ ${values[BDAY]:+*: $values[BDAY] }
+ ${values[X-ZACK-JOINDATE]:+$(l10n label_join): $values[X-ZACK-JOINDATE] }
+ ${values[X-ZACK-LEAVEDATE]:+$(l10n label_leave): $values[X-ZACK-LEAVEDATE] }
+ ${values[SOUND]:+ }
+ ${values[PHOTO]:+ }
+ ${values[LOGO]:+ }
+
+
$(l10n TEL)
+ $(for n in TEL TEL{0..10}; do
+ echo "${values[$n]:+$tags[${n}_TYPE] $values[$n] }"
+ done)
+
+ ${values[EMAIL]:+
$(l10n EMAIL) }
+ $(for n in EMAIL EMAIL{0..10}; do
+ echo "${values[$n]:+
$values[$n] }"
+ done)
+ ${values[IMPP]:+
$(l10n IMPP) }
+ $(for n in IMPP IMPP{0..10}; do
+ echo "${values[$n]:+
$tags[${n}_TYPE] $values[$n] }"
+ done)
+
+
$(l10n ADR)
+ $(for n in ADR ADR{0..10}; do
+ echo "${values[$n]:+
$values[$n] }"
+ done)
+ ${values[URL]:+
$(l10n URL) }
+ $(for n in URL URL{0..10}; do
+ echo "${values[$n]:+
$values[$n] }"
+ done)
+
+
$(l10n NOTE)
+ $(for n in NOTE NOTE{0..10}; do
+ echo "${values[$n]:+$values[$n] }"
+ done)
+
+
$(l10n course_attendance)
+
+ $(sed -rn 's:(.*)\t'$id'$:\1:p' "$_DATA/mappings/attendance" |while read each; do
+ cname="$(sed -rn 's:^SUMMARY\:(.*)$:\1:p' "$_DATA/ical/$each")"
+ echo ' '$cname' '
+ done)
+
+
+END_HTML