From: Alexander Schmidt Date: Mon, 8 Oct 2012 15:20:04 +0000 (+0200) Subject: ... X-Git-Url: https://git.treefish.org/banana.git/commitdiff_plain/a4f105d41d06053ff3a7b52572bd818b1a027149?ds=sidebyside;hp=e9f2c65e4da44066cf3af72622127eaf2ea61909 ... --- diff --git a/admin/include/nav.inc b/admin/include/nav.inc index 896f85c..1aa06bb 100644 --- a/admin/include/nav.inc +++ b/admin/include/nav.inc @@ -6,7 +6,7 @@ a:focus { text-decoration:none; font-weight:normal; color:blue; } -next session +session overview | summary | diff --git a/admin/index.php b/admin/index.php index 254993a..a4f4432 120000 --- a/admin/index.php +++ b/admin/index.php @@ -1 +1 @@ -nextsession.php \ No newline at end of file +sessionoverview.php \ No newline at end of file diff --git a/admin/nextsession.php b/admin/nextsession.php deleted file mode 100644 index ee94d50..0000000 --- a/admin/nextsession.php +++ /dev/null @@ -1,35 +0,0 @@ -query("SELECT firstname, lastname, mnumber, blackboard FROM students ORDER BY LOWER(lastname)"); - - print ""; - print ""; - while ($student = $result->fetch(PDO::FETCH_ASSOC)) { - $result2 = $db->query("SELECT manydone, thisdone FROM workdone WHERE mnumber=" . $student['mnumber'] . " AND session=" . $SESSIONS_actual)->fetch(PDO::FETCH_NUM); - - $exdone = $result2[0]; - if ($exdone == "") { $exdone=0; } - - $thisdone = $result2[1]; - - print ""; - print ""; - print ""; - print ""; - print ""; - print ""; - print ""; - } - print "
First name Last name Matr.nummer Examples Blackboard 
" . $student['firstname'] . "" . $student['lastname'] . "" . $student['mnumber'] . "" . $thisdone . " (" . $exdone . "/" . $SESSIONS[$SESSIONS_actual]['nexamples'] . ")" . $student['blackboard'] . "
"; -?> \ No newline at end of file diff --git a/include/session.inc b/include/session.inc index dc90943..288c798 100644 --- a/include/session.inc +++ b/include/session.inc @@ -26,6 +26,7 @@ if(isset($SESSIONS)) { foreach ($SESSIONS as $session) { if($session['id'] < $SESSIONS_next || (! isset($SESSIONS_next)) ) { $SESSIONS_totex += $session['nexamples']; } + if( $session['id'] != $SESSIONS_actual ) { $SESSIONS_last = $session['id']; } } }