course attendance in attendees list

svn path=/trunk/; revision=34

diff --git a/actions/update_attendee.sh b/actions/update_attendee.sh
index 1fcd3ec54f62e1c1cb4a89704c1fbcc6a7493dd4..078d0966b232427c45a97381086ae440983044de 100644 (file)
--- a/actions/update_attendee.sh
+++ b/actions/update_attendee.sh
@@ -8,8 +8,9 @@ filtertype="&filtertype=$_REF[\"filtertype\"]"
 order="&order=$_REF[\"order\"]"
 
 card="$_POST[\"card\"]"
 order="&order=$_REF[\"order\"]"
 
 card="$_POST[\"card\"]"

-tempfile="temp/$card"
-cardfile="vcard/$card"
+tempfile="$_DATA/temp/$card"
+cardfile="$_DATA/vcard/$card"
+attfile="$_DATA/mappings/attendance"

 
 echo "BEGIN:VCARD\r" >"$tempfile"
 echo "VERSION:4.0\r" >>"$tempfile"
 
 echo "BEGIN:VCARD\r" >"$tempfile"
 echo "VERSION:4.0\r" >>"$tempfile"


@@ -33,6 +34,18 @@ case "$_POST[\"action\"]" in
     echo -n "Location: http://$HTTP_HOST/?page=attendees${filter}${filtertype}${order}&edit=$card\n\n"
     ;;
   update)
     echo -n "Location: http://$HTTP_HOST/?page=attendees${filter}${filtertype}${order}&edit=$card\n\n"
     ;;
   update)

+    attendance=()
+    for att in attendance attendance{0..100}; do
+      [ -n "$_POST[\"$att\"]" ] && attendance+=("$_POST[\"$att\"]")
+    done
+    sed -rn 's:^(.+)'$card'$:\1:p' "$attfile" |while read course; do
+      touch "$_DATA/ical/$course"
+    done
+    sed -i -r '/^(.+)\t'$card'$/d' "$attfile"
+    for each in $attendance; do
+      echo "$each\t$card" >>"$attfile"
+    done
+

     echo "END:VCARD\r" >>"$tempfile"
     mv "$tempfile" "$cardfile"
     echo -n "Location: http://$HTTP_HOST/?page=attendees${filter}${filtertype}${order}#$card\n\n"
     echo "END:VCARD\r" >>"$tempfile"
     mv "$tempfile" "$cardfile"
     echo -n "Location: http://$HTTP_HOST/?page=attendees${filter}${filtertype}${order}#$card\n\n"

diff --git a/index.cgi b/index.cgi
index 427307118ba657f56ceb7e6bad18087393e6a897..119228e116befd523332bcf4137d719f4beb2f6e 100755 (executable)
--- a/index.cgi
+++ b/index.cgi
@@ -25,10 +25,11 @@ _DATA="$(dirname "$call")"  #storage directory
 [ -w "$_DATA" ] && [ -d "$_DATA" ] || die "storage directory must be writable"
 
 # create directories for object storage
 [ -w "$_DATA" ] && [ -d "$_DATA" ] || die "storage directory must be writable"
 
 # create directories for object storage

-for each in "$_DATA"/{vcard,ical,cache,temp}; do
+for each in "$_DATA"/{vcard,ical,cache,temp,mappings}; do

   [ ! -e "$each" ] && mkdir "$each"
   [ -w "$each" ] && [ -d "$each" ] || die "storage $each must be a writable directory"
 done
   [ ! -e "$each" ] && mkdir "$each"
   [ -w "$each" ] && [ -d "$each" ] || die "storage $each must be a writable directory"
 done

+touch "$_DATA/mappings/attendance"

 
 # create htaccess file
 [ -f .htaccess ] || cat >.htaccess <<EOF
 
 # create htaccess file
 [ -f .htaccess ] || cat >.htaccess <<EOF

diff --git a/pages/attendees.sh b/pages/attendees.sh
index a8a22c720475d1f8f758d63a9299c2d56e11d2e1..9d03cadfdc4a9037c2373e783b5e7957fb7fb995 100755 (executable)
--- a/pages/attendees.sh
+++ b/pages/attendees.sh
@@ -2,6 +2,13 @@
 
 [ -z "$_GET[\"order\"]" ] && _GET["order"]=firstname
 
 
 [ -z "$_GET[\"order\"]" ] && _GET["order"]=firstname
 

+listcourses() {
+  ls -1 ${_DATA}/ical/*ics |while read file; do
+    icstime="$(sed -rn 's:^DTSTART\:(TZID=.*\:)?([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2})([0-9]{2})([0-9]{2})Z?\r$:\2-\3-\4 \5\:\6\:\7:p' "$file")"
+    echo "$(date -d "$icstime" "+%u %H%M%S")\t$file"
+  done |sort |sed -r 's:^.*\t(.*/)([^/]+)$:\2:'
+}
+

 listcards() {
   case "$_GET[\"filtertype\"]" in
     any)
 listcards() {
   case "$_GET[\"filtertype\"]" in
     any)

diff --git a/templates/attendees.css.sh b/templates/attendees.css.sh
index 2639fdb53b35a334ada70c600759820739791465..006bd95763b19b16ad16a0ba09247bd40850eff0 100644 (file)
--- a/templates/attendees.css.sh
+++ b/templates/attendees.css.sh
@@ -68,10 +68,24 @@ cat <<EOF
   display: inline-block;
   float:left;
   width: 20ex;
   display: inline-block;
   float:left;
   width: 20ex;

-  margin: .125em .5ex .5ex .5ex;
+  margin: .125em .25ex .5ex .25ex;

   padding: 0 .2em .2em .2em;
   background: #EEE;
 }
   padding: 0 .2em .2em .2em;
   background: #EEE;
 }

+.cardlist .card .section a.attendance {
+  display: inline-block;
+  margin-right: 1ex;
+  word-wrap: break-word;
+}
+
+.cardlist .card .attendance {
+  width: 83.5ex;
+}
+.cardlist .card .attendance .check {
+  display: inline-block;
+  width: 27ex;
+}
+

 .cardlist .card .control {
   float: right;
   text-align: right;
 .cardlist .card .control {
   float: right;
   text-align: right;

diff --git a/templates/edit_attendee.sh b/templates/edit_attendee.sh
index 004f690e48cfcfd0fab9cc450d602619f37a29cd..357e2bfaccad22f293519093ddbd09422403cd23 100755 (executable)
--- a/templates/edit_attendee.sh
+++ b/templates/edit_attendee.sh
@@ -1,6 +1,9 @@
 check_gen() {
   [ "$value[GENDER]" = "$1" ] && echo 'selected="selected"'
 }
 check_gen() {
   [ "$value[GENDER]" = "$1" ] && echo 'selected="selected"'
 }

+check_a() {
+  egrep -q "^${1}.${id}$" "$_DATA/mappings/attendance" && echo 'checked="checked"'
+}

 
 n_last="$(echo "$values[N]" |sed -rn 's:^([^;]*;){0} *([^;]*).*$:\2:p')"
 n_first="$(echo "$values[N]" |sed -rn 's:^([^;]*;){1} *([^;]*).*$:\2:p')"
 
 n_last="$(echo "$values[N]" |sed -rn 's:^([^;]*;){0} *([^;]*).*$:\2:p')"
 n_first="$(echo "$values[N]" |sed -rn 's:^([^;]*;){1} *([^;]*).*$:\2:p')"


@@ -87,6 +90,14 @@ for n in NOTE NOTE{0..10}; do [ -n "$values[$n]" ] &&\
 done
 echo '  </div>'
 echo ''
 done
 echo '  </div>'
 echo ''

+echo '  <div class="section attendance">'
+echo '    <span class="sectitle">'$(l10n course_attendance)'</span>'
+listcourses |while read each; do
+  cname="$(sed -rn 's:^SUMMARY\:(.*)$:\1:p' "$_DATA/ical/$each")"
+  echo '    <span class="check attendance"><input type="checkbox" name="attendance" value="'$each'" '$(check_a "$each")'/>'$cname'</span>'
+done
+echo '  </div>'
+echo ''

 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">'
 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">'

diff --git a/templates/text_attendee.sh b/templates/text_attendee.sh
index 5efbb8030d1794d8607bdb92049f68d5fd5c566a..132cc4262225db9ca8ebf7bea50907ce052adfe7 100755 (executable)
--- a/templates/text_attendee.sh
+++ b/templates/text_attendee.sh
@@ -76,6 +76,7 @@ item_name[filter_course]="Kurs"
 item_name[filter_apply]="Filtern"
 item_name[filter_cancel]="Filter löschen"
 item_name[newcard]="Neuen Eintrag anlegen"
 item_name[filter_apply]="Filtern"
 item_name[filter_cancel]="Filter löschen"
 item_name[newcard]="Neuen Eintrag anlegen"

+item_name[course_attendance]="Kursteilnahme"

 
 l10n() {
   [ -n "$item_name[$1]" ] && echo -n "$item_name[$1]" || echo -n "$1"
 
 l10n() {
   [ -n "$item_name[$1]" ] && echo -n "$item_name[$1]" || echo -n "$1"

diff --git a/templates/view_attendee.sh b/templates/view_attendee.sh
index 53c508c2a22a1e08bd83f7471de68e0a213c3c1f..685ea8a4a46ac57ce44b735dbe791d6234e4103a 100755 (executable)
--- a/templates/view_attendee.sh
+++ b/templates/view_attendee.sh
@@ -58,6 +58,14 @@ for n in NOTE NOTE{0..10}; do [ -n "$values[$n]" ] &&\
 done
 echo '  </div>'
 echo ''
 done
 echo '  </div>'
 echo ''

+echo '  <div class="section">'
+echo '    <span class="sectitle">'$(l10n course_attendance)'</span>'
+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 '    <a class="item attendance" href="/?page=courses#'$each'">'$cname'</a>'
+done
+echo '  </div>'
+echo ''

 echo '  <div class="section control">'
 echo '    <a class="item control" href="?action=edit_attendee&card='${id}'">'$(l10n edit)'</a>'
 echo '    <a class="item control" href="?export=vcard&card='${id}'">'$(l10n vcf_export)'</a>'
 echo '  <div class="section control">'
 echo '    <a class="item control" href="?action=edit_attendee&card='${id}'">'$(l10n edit)'</a>'
 echo '    <a class="item control" href="?export=vcard&card='${id}'">'$(l10n vcf_export)'</a>'