X-Git-Url: https://git.treefish.org/banana.git/blobdiff_plain/78533c089d9413327f981cb2b20090a28f25e5e5..df32c63a6e9666eb062f806262aa23ed43c6eb99:/admin/summary.php

diff --git a/admin/summary.php b/admin/summary.php
index cac27fc..3ed725d 100644
--- 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) {
@@ -11,22 +12,45 @@
 
   block("black", "summary of everything for " . date("d.m.Y H:i"));
 
-  $result = $db->query("SELECT firstname, lastname, mnumber, blackboard FROM students ORDER BY lastname");
+  $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)) {
-    $exdone = $db->query("SELECT manydone FROM workdone WHERE mnumber=" . $student['mnumber'])->fetch(PDO::FETCH_NUM);
     $totexdone = 0;
-    foreach($exdone as $subdone) { $totexdone += $subdone; }
+    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