adaption for changes in shcgi external

[confetti] / templates / edit_course.sh

diff --git a/templates/edit_course.sh b/templates/edit_course.sh
index ff932a1d5150e6e7461edc9d5d8f6b25d6bcb79f..c1deb5a622f0fa85673b8005071408871e4667f4 100755 (executable)
--- a/templates/edit_course.sh
+++ b/templates/edit_course.sh
@@ -1,6 +1,22 @@
+# Copyright 2014 Paul Hänsch
+#
+# This file is part of Confetti.
+# 
+# Confetti is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# Confetti is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+# 
+# You should have received a copy of the GNU Affero General Public License
+# along with Confetti.  If not, see <http://www.gnu.org/licenses/>. 
 
 SUP_FIELDS=(SUMMARY COMMENT)
-[ -z "$values[UID]" ] && values[UID]="$(dbus-uuidgen)"
+[ -z "$values[UID]" ] && values[UID]="$(uuidgenerator)"
 
 dtstart="$values[DTSTART]"
 [ -z "$dtstart" ] && dtstart=$(date +%Y%m%dT%H%M%S)
@@ -42,7 +58,7 @@ else
 fi
 
 echo '<div id="'${id}'" class="course">'
-echo '<form action="/?action=update_course" method="POST">'
+echo '<form action="?action=update_course" method="POST">'
 echo '<input type="hidden" name="course" value="'${id}'"/>'
 echo '  <div class="section basic">'
 echo '    <span class="sectitle">'$(l10n SUMMARY)'</span>'
@@ -67,18 +83,17 @@ done
 echo '    </select>'
 echo '    <button class="DTS" type="submit" name="DTS" value="update">'$(l10n edit_dtscal)'</button>'
 for wd in mon tue wed thu fri sat sun; do
-  echo '    <span class="DTSCALHEAD">'$(date -d $wd +%a)'</span>'
+  echo -n '<span class="DTSCALHEAD">'$(date -d $wd +%a)'</span>'
 done
 fdom=$(date -d ${dts_year}-${dts_month}-1 +%u)
 while [ "$fdom" -gt 1 ]; do
-  echo '    <span class="DTSCAL"></span>'
+  echo -n '<span class="DTSCAL"></span>'
   fdom=$(($fdom - 1))
 done
-echo '<input type="hidden" name="DTSDAY" value="'$dts_dom'">'
 cnt=$(date -d ${dts_year}-${dts_month}-1 +%s)
 while [ "$(date -d @$cnt +%m)" = "$dts_month" ]; do
   dn=$(date -d @$cnt +%d)
-  echo '    <button class="DTSCAL '$( [ $dn = $dts_dom ] && echo selected)'" type="submit" name="DTSDAY" value="'$dn'">'$dn'</button>'
+  echo -n '<input type="radio" class="DTSCAL" name="DTSDAY" value="'$dn'" id="DTSCAL_'$dn'" '$([ $dn = $dts_dom ] && echo checked)'><label for="DTSCAL_'$dn'" class="DTSCAL">'$dn'</label>'
   cnt=$(($cnt + 86400))
 done
 echo '    <br />'
@@ -132,6 +147,21 @@ done
 echo '    </select>'
 echo '  </div>'
 
+echo '  <div class="section select_attendance">'
+echo '    <span class="sectitle">'$(l10n course_attendance)'</span>'
+echo '    <select class="item attendance" name="attendance" multiple="multiple">'
+listcards |while read card; do
+  cfile="$_DATA/vcard/$card"
+  aname=$(sed -rn 's:^N(;[^"\:]+|;"[^"]+")*\:([^;]*)(\;[^;]*)(\;[^;]*)?(\;[^;]*)?(\;[^;]*)?$:\5 \3 \4 \2 \6:p' "$cfile" \
+          |sed -r 's:,: :;s:\;: :g;s: +: :g' \
+          |tr -d '\r'
+         )
+  selected=$(sed -rn "s:^$id\t$card\$:selected=\"selected\":p" $_DATA/mappings/attendance)
+  echo '    <option value="'$card'" '$selected'>'$aname'</option>'
+done
+echo '    </select>'
+echo '  </div>'
+
 echo '  <div class="section control">'
 echo '    <button class="item control" type="submit" name="action" value="addfield">'$(l10n edit_addfield)'</button>'
 echo '    <select class="item control" name="newfield">'