added exams

diff --git a/admin/include/db.inc b/admin/include/db.inc
index 9bce2c3541fe9a9ed7649008e8beaa79e60f5bbe..7c4da1d54ee759b10d4dfe0a64a819f2284a69be 100644 (file)
--- a/admin/include/db.inc
+++ b/admin/include/db.inc
@@ -1,14 +1,18 @@
 <?php
   if (! isset($db)) {
     if ($db = new PDO('sqlite:banane.db')) {
-      $db->query('CREATE TABLE IF NOT EXISTS students 
-         (mnumber int, firstname string, lastname string, email string, password string, blackboard int DEFAULT 0, PRIMARY KEY (mnumber))');
+      $db->query('CREATE TABLE IF NOT EXISTS students   
+         (mnumber int, firstname string, lastname string, email string, password string, blackboard int DEFAULT 0, lastblackboard TIMESTAMP, PRIMARY KEY (mnumber))');
       $db->query('CREATE TABLE IF NOT EXISTS workdone
-          (mnumber int, session int, manydone int, thisdone string)');
+          (mnumber int, session int, manydone int, thisdone string, tstamp TIMESTAMP)');
       $db->query('CREATE TABLE IF NOT EXISTS prefs
           (key string, value string, PRIMARY KEY (key))');
       $db->query('CREATE TABLE IF NOT EXISTS sessions
-          (id int NOT NULL, timestr string NOT NULL, PRIMARY KEY (id))'); 
+          (id int NOT NULL, examples string, nexamples int, PRIMARY KEY (id))');
+      $db->query('CREATE TABLE IF NOT EXISTS exams
+          (id int NOT NULL, score string, PRIMARY KEY (id))'); 
+      $db->query('CREATE TABLE IF NOT EXISTS examscore
+          (mnumber int, exam int, scorestr string, tstamp TIMESTAMP)');
     }
   }
 ?>

diff --git a/admin/include/nav.inc b/admin/include/nav.inc
index 1aa06bbc5681f4d315e9823248a995cb50fe05d6..b4b7df8bb96fc50ae3cf982633c65878993fd173 100644 (file)
--- a/admin/include/nav.inc
+++ b/admin/include/nav.inc
@@ -8,12 +8,16 @@
 
 <a href="sessionoverview.php">session overview</a>
  |
+<a href="examoverview.php">exam overview</a>
+ |
 <a href="summary.php">summary</a>
  | 
 <a href="blackboard.php">blackboard</a>
  | 
 <a href="sessions.php">sessions</a>
  | 
+<a href="exams.php">exams</a>
+ | 
 <a href="prefs.php">preferences</a>
  | 
 <a href="password.php">password</a>

diff --git a/admin/summary.php b/admin/summary.php
index 71ea0619a84df3d07dad6c4abc54bf6af70fe88e..3ed725d516ec6ae8b38078df1a4af47cf91da748 100644 (file)
--- a/admin/summary.php
+++ b/admin/summary.php
@@ -2,6 +2,7 @@
   require 'include/head.inc';
   require 'include/db.inc';
   require 'include/session.inc';
+  require 'include/exams.inc';
   require 'include/common.inc';
 
   if ($db->query("SELECT COUNT(*) FROM students")->fetch(PDO::FETCH_NUM)[0] == 0) {
@@ -14,21 +15,42 @@
   $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>";
+  print "<td><b>First name&nbsp;</b></td><td><b>Last name&nbsp;</b></td><td><b>Matr.nummer&nbsp;</b></td><td><b>Blackboard&nbsp;</b></td><td><b>Examples&nbsp;</b></td><td><b>Exams&nbsp;</b></td>";
+
   while ($student = $result->fetch(PDO::FETCH_ASSOC)) {
     $totexdone = 0;
     if( $db->query("SELECT COUNT(*) FROM workdone WHERE mnumber=" . $student['mnumber'])->fetch(PDO::FETCH_NUM)[0] > 0 ) { 
       $exdone = $db->query("SELECT manydone FROM workdone WHERE mnumber=" . $student['mnumber']);                 
       while ( $subdone = $exdone->fetch(PDO::FETCH_NUM) ) { $totexdone += $subdone[0]; }                          
     }
+    
+    $examscore=0;
+    foreach ($EXAMS as $exam) {
+      $scorestr = $db->query("SELECT scorestr FROM examscore WHERE mnumber=" . $student['mnumber'] . " AND exam=" . $exam['id'])->fetch(PDO::FETCH_NUM)[0];
+      if ($scorestr != "") {
+        $singlescore = 0;
+        foreach (explode(',',$scorestr) as $points) { $singlescore = $singlescore + $points; }
+       $examscore = $examscore + $singlescore/$exam['totscore']; 
+      }
+    }
+    $examscore = ($examscore / $EXAMS_n)*100;
+
     print "<tr>";
     print "<td>" . $student['firstname'] . "</td>";
     print "<td>" . $student['lastname'] . "</td>";
     print "<td>" . $student['mnumber'] . "</td>";
-    print "<td>" . $totexdone . "/" . $SESSIONS_totex_nextinc . "</td>";
-    print "<td>" . $student['blackboard'] . "</td>";
+    print "<td>"; 
+    print($student['blackboard']); 
+    print "</td>";
+    print "<td>";
+    printf("%3d", round(100 * floatval($totexdone) / floatval($SESSIONS_totex_nextinc)));
+    print "%</td>";
+    print "<td>"; 
+    printf("%3d", round($examscore)); 
+    print "%</td>";
     print "</tr>";
   }
+
   print "</table>";
 
 ?>
\ No newline at end of file

diff --git a/include/db.inc b/include/db.inc
index 16e36f9bc4bbbbf91a308e200414aff684e3c8b8..efd7aae6a678270247a0f81b65f5c51bb6a15d50 100644 (file)
--- a/include/db.inc
+++ b/include/db.inc
@@ -8,7 +8,11 @@
       $db->query('CREATE TABLE IF NOT EXISTS prefs
           (key string, value string, PRIMARY KEY (key))');
       $db->query('CREATE TABLE IF NOT EXISTS sessions
-          (id int NOT NULL, examples string, nexamples int, PRIMARY KEY (id))'); 
+          (id int NOT NULL, examples string, nexamples int, PRIMARY KEY (id))');
+      $db->query('CREATE TABLE IF NOT EXISTS exams
+          (id int NOT NULL, score string, PRIMARY KEY (id))'); 
+      $db->query('CREATE TABLE IF NOT EXISTS examscore
+          (mnumber int, exam int, scorestr string, tstamp TIMESTAMP)');
     }
   }
 ?>

diff --git a/summary.php b/summary.php
index d63c765add8912c4629db9b331cf90d7fc8e4cb4..3ebfea99d39671a3731789f68f943f3a6c42ea19 100644 (file)
--- a/summary.php
+++ b/summary.php
@@ -3,6 +3,7 @@
   require 'include/db.inc';
   require 'include/session.inc';
   require 'include/common.inc';
+  require 'include/exams.inc';
 
   if(isset($_POST['submit']) && $_POST['mnumber']!="") {
     $mnumber = trim($_POST['mnumber']);
@@ -55,13 +56,45 @@
       }
     }
     print "<tr>";
-    print "<td></td><td></td><td><b>" . $tot_done . "/" . $SESSIONS_totex . "</b></td>";
+    print "<td></td><td></td><td><b>" . $tot_done . "/" . $SESSIONS_totex . " ==> " . round(100 * $tot_done / $SESSIONS_totex) . "%</b></td>";
     print "</tr>";
 
     print "</table>";
 
     print "<br>";
 
+    print "<b>Exams</b><br>";
+
+    print "<table>";
+
+    $examscore=0;
+    foreach ($EXAMS as $exam) {
+      $scorestr = $db->query("SELECT scorestr FROM examscore WHERE mnumber=" . $mnumber . " AND exam=" . $exam['id'])->fetch(PDO::FETCH_NUM)[0];
+      $singlescore = 0;
+      if ($scorestr != "") {
+        foreach (explode(',',$scorestr) as $points) { $singlescore = $singlescore + $points; }
+       $examscore = $examscore + $singlescore/$exam['totscore']; 
+      }
+      
+      print "<tr>";
+      print "<td>" . $exam['timestr'] . "&nbsp;&nbsp;</td>";
+      print "<td>{" . $scorestr . "}=" . $singlescore . "/" . $exam['totscore'] . "&nbsp;&nbsp;</td>";
+      print "<td>" . round(100*$singlescore/$exam['totscore']) . "%&nbsp;&nbsp;</td>";
+      print "</tr>";
+    }
+    $examscore = ($examscore / $EXAMS_n)*100;
+
+    if ($EXAMS_n > 0 ) {
+      print "<tr>";
+      print "<td></td><td></td>";
+      print "<td><b>" . round($examscore) . "%</b></td>";           
+      print "</tr>";
+    }
+
+    print "</table>";
+
+    print "<br>";
+
     print "<b>Blackboard</b>";
     $blackdone = $db->query("SELECT blackboard FROM students WHERE mnumber=" . $mnumber)->fetch(PDO::FETCH_NUM)[0];