X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=templates%2Fview_course.sh;h=107fc799dea1b23092b62e171724aa2e1640ec4f;hp=883baeea5d8f10dfa7063ff02fed3a9359214c9c;hb=41083d642a4468fbec3146c3b1c71dc9c1179fe2;hpb=0a131a90c111856e8ef6e96f6da4105e19598cff

diff --git a/templates/view_course.sh b/templates/view_course.sh
index 883baee..107fc79 100755
--- a/templates/view_course.sh
+++ b/templates/view_course.sh
@@ -71,23 +71,13 @@ echo '  </div>'
 
 echo '  <div class="section attendance">'
 echo '    <span class="sectitle">'$(l10n course_attendance)'</span>'
-sed -rn 's:'$id'\t(.+)$:\1:p' "$_DATA/mappings/attendance" |while read each; do
-  n_last="$(  sed -rn 's:^N(;.+)*\:([^;]*;){0} *([^;]*).*$:\3:p' "$_DATA/vcard/$each")"
-  n_first="$( sed -rn 's:^N(;.+)*\:([^;]*;){1} *([^;]*).*$:\3:p' "$_DATA/vcard/$each")"
-  n_middle="$(sed -rn 's:^N(;.+)*\:([^;]*;){2} *([^;]*).*$:\3:p' "$_DATA/vcard/$each")"
-  n_pre="$(   sed -rn 's:^N(;.+)*\:([^;]*;){3} *([^;]*).*$:\3:p' "$_DATA/vcard/$each")"
-  n_post="$(  sed -rn 's:^N(;.+)*\:([^;]*;){4} *([^;]*).*$:\3:p' "$_DATA/vcard/$each")"
-  aname="${n_pre} ${n_first} ${n_middle} ${n_last} ${n_post}"
-  echo '    <a class="attendance" href="/?page=attendees#'$each'">'$aname'</a>'
-
-  coursemail="$coursemail$(sed -rn 's:^EMAIL(;.+)*\:(.+)\r$:\2,:p' "$_DATA/vcard/$each")"
-done
+list_attendance "$id" |sort -k 2 |sed -r 's:^([^ ]+) (.*)$:<a class="attendance" href="/?page=attendees#\1">\2</a>:'
 echo '  </div>'
 
 echo '  <div class="section control">'
 echo '    <a class="item control" href="?action=edit_course&course='${id}'">'$(l10n edit)'</a>'
 echo '    <a class="item control" href="?export=ical&course='${id}'">'$(l10n ics_export)'</a>'
-echo '    <a class="item control" href="mailto:noone@vuesch.de?bcc='$coursemail'">'$(l10n course_mail)'</a>'
+echo '    <a class="item control" href="mailto:zack@vuesch.org?bcc='$(course_mail "$id")'">'$(l10n course_mail)'</a>'
 echo '  </div>'
 echo '<input type="hidden" name="UID" value="'$values["UID"]'"/>'
 echo '</form>'