...

diff --git a/admin/include/nav.inc b/admin/include/nav.inc
index 896f85c737e336f37fd71b0ab03a3ba13a975160..1aa06bbc5681f4d315e9823248a995cb50fe05d6 100644 (file)
--- a/admin/include/nav.inc
+++ b/admin/include/nav.inc
@@ -6,7 +6,7 @@
   a:focus { text-decoration:none; font-weight:normal; color:blue; }
 </style>
 
   a:focus { text-decoration:none; font-weight:normal; color:blue; }
 </style>
 

-<a href="nextsession.php">next session</a>
+<a href="sessionoverview.php">session overview</a>

  |
 <a href="summary.php">summary</a>
  | 
  |
 <a href="summary.php">summary</a>
  | 

diff --git a/admin/index.php b/admin/index.php
index 254993a5db6b04bcec1a5d2260f332366cf5c4d6..a4f44329fbdb5b26c80dc4274183f1e952530612 120000 (symlink)
--- 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 (file)
index ee94d50..0000000
--- a/admin/nextsession.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-  require 'include/head.inc';
-  require 'include/db.inc';
-  require 'include/session.inc';
-  require 'include/common.inc';
-
-  if (! isset($SESSIONS_actual)) {
-    block("red", "no next session");
-    exit;
-  }
-
-  block("black", "summary for session " . $SESSIONS[$SESSIONS_actual]['timestr'] . " (" . $SESSIONS[$SESSIONS_actual]['examples'] . ")");
-
-  $result = $db->query("SELECT firstname, lastname, mnumber, blackboard FROM students ORDER BY LOWER(lastname)");
-
-  print "<table>";
-  print "<td><b>First name&nbsp;</b></td><td><b>Last name&nbsp;</b></td><td><b>Matr.nummer&nbsp;</b></td><td><b>Examples&nbsp;</b></td><td><b>Blackboard&nbsp;</b></td>";
-  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 "<tr>";
-    print "<td>" . $student['firstname'] . "</td>";
-    print "<td>" . $student['lastname'] . "</td>";
-    print "<td>" . $student['mnumber'] . "</td>";
-    print "<td>" . $thisdone . " (" . $exdone . "/" . $SESSIONS[$SESSIONS_actual]['nexamples'] . ")</td>";
-    print "<td>" . $student['blackboard'] . "</td>";
-    print "</tr>";
-  }
-  print "</table>";
-?>
\ No newline at end of file

diff --git a/include/session.inc b/include/session.inc
index dc90943d66b9418f6777a1c3df82a498274282b9..288c7984ecd3cbb0e4208e356f342dd292bc88ef 100644 (file)
--- 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(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']; }

       }
     }
 
       }
     }