...

diff --git a/admin/include/nav.inc b/admin/include/nav.inc
index d473d97c333d0f36e28b481fc4f0d102206ed581..896f85c737e336f37fd71b0ab03a3ba13a975160 100644 (file)
--- a/admin/include/nav.inc
+++ b/admin/include/nav.inc
@@ -6,6 +6,8 @@
   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="summary.php">summary</a>
  | 
 <a href="blackboard.php">blackboard</a>
 <a href="summary.php">summary</a>
  | 
 <a href="blackboard.php">blackboard</a>

diff --git a/admin/nextsession.php b/admin/nextsession.php
new file mode 100644 (file)
index 0000000..ca467fd
--- /dev/null
+++ b/admin/nextsession.php
@@ -0,0 +1,30 @@
+<?php
+  require 'include/head.inc';
+  require 'include/db.inc';
+  require 'include/session.inc';
+  require 'include/common.inc';
+
+  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 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/admin/summary.php b/admin/summary.php
index 345f5a03cbc48906df9095398818ee16aba4a562..0cd54671f019ea7e3d981ac5d638990a9ba230d2 100644 (file)
--- a/admin/summary.php
+++ b/admin/summary.php
@@ -18,7 +18,7 @@
     print "<td>" . $student['firstname'] . "</td>";
     print "<td>" . $student['lastname'] . "</td>";
     print "<td>" . $student['mnumber'] . "</td>";
     print "<td>" . $student['firstname'] . "</td>";
     print "<td>" . $student['lastname'] . "</td>";
     print "<td>" . $student['mnumber'] . "</td>";

-    print "<td>" . $totexdone . "/" . $SESSIONS_totex . "</td>";
+    print "<td>" . $totexdone . "/" . $SESSIONS_totex_nextinc . "</td>";

     print "<td>" . $student['blackboard'] . "</td>";
     print "</tr>";
   }
     print "<td>" . $student['blackboard'] . "</td>";
     print "</tr>";
   }

diff --git a/include/session.inc b/include/session.inc
index 7b5b7984a5f7db00d81ba92107acb331668b5c12..c31441ebf07d2dfae9d591df0091ee8c22ea8e9f 100644 (file)
--- a/include/session.inc
+++ b/include/session.inc
@@ -1,6 +1,8 @@
 <?php
   $result=$db->query("SELECT id,examples,nexamples FROM sessions ORDER BY id");
   $SESSIONS_next = -1;
 <?php
   $result=$db->query("SELECT id,examples,nexamples FROM sessions ORDER BY id");
   $SESSIONS_next = -1;

+  $SESSIONS_actual = -1;
+  

   while ($session = $result->fetch(PDO::FETCH_ASSOC)) {
     $SESSIONS[$session['id']] = array("id" => $session['id'], "timestr" => date("d.m.Y H:i", $session['id']),
       "workdone" => $db->query("SELECT COUNT(*) FROM workdone WHERE session=" . $session['id'])->fetch(PDO::FETCH_NUM)[0],
   while ($session = $result->fetch(PDO::FETCH_ASSOC)) {
     $SESSIONS[$session['id']] = array("id" => $session['id'], "timestr" => date("d.m.Y H:i", $session['id']),
       "workdone" => $db->query("SELECT COUNT(*) FROM workdone WHERE session=" . $session['id'])->fetch(PDO::FETCH_NUM)[0],


@@ -8,6 +10,9 @@
     if ( strtotime("now") < $session['id'] && ( $SESSIONS_next==-1 || $SESSIONS_next > $session['id'] )  ) {
       $SESSIONS_next = $session['id'];
     }
     if ( strtotime("now") < $session['id'] && ( $SESSIONS_next==-1 || $SESSIONS_next > $session['id'] )  ) {
       $SESSIONS_next = $session['id'];
     }

+    if ( strtotime("now") < $session['id'] + 3600  && ( $SESSIONS_actual==-1 || $SESSIONS_actual > $session['id'] )  ) {
+      $SESSIONS_actual = $session['id'];
+    }

   }
   if($SESSIONS_next == -1) unset($SESSIONS_next);
 
   }
   if($SESSIONS_next == -1) unset($SESSIONS_next);
 


@@ -15,4 +20,9 @@
   foreach ($SESSIONS as $session) {
     if($session['id'] < $SESSIONS_next) { $SESSIONS_totex += $session['nexamples']; }
   }
   foreach ($SESSIONS as $session) {
     if($session['id'] < $SESSIONS_next) { $SESSIONS_totex += $session['nexamples']; }
   }

+
+  $SESSIONS_totex_nextinc = 0;
+  foreach ($SESSIONS as $session) {
+    if($session['id'] <= $SESSIONS_next) { $SESSIONS_totex_nextinc += $session['nexamples']; }
+  }

 ?>
 ?>