improved blackboard submits.

diff --git a/admin/blackboard.php b/admin/blackboard.php
index 814a879744a782c327dedf6839ae6602c38c74ca..9642c591e6d59f3fad0360a184c4e92ebdc91773 100644 (file)
--- a/admin/blackboard.php
+++ b/admin/blackboard.php
@@ -3,11 +3,14 @@
   require 'include/db.inc';
   require 'include/common.inc';
   
   require 'include/db.inc';
   require 'include/common.inc';
   

-  if($_GET['mnumber']!="") {
-    // would be better to store timestamp in blackboard db!
-    if( time()-$_GET['tstamp'] < 5 ) {
-      $db->query("UPDATE students SET blackboard=blackboard+1 WHERE mnumber=" . trim($_GET['mnumber']));
-      block("lightgreen", "added blackboard");
+  if($_GET['mnumber']!="" &&
+     $db->query("SELECT COUNT(*) FROM students WHERE mnumber=" . trim($_GET['mnumber']) . " AND lastblackboard=" . trim($_GET['tstamp']))->fetch(PDO::FETCH_NUM)[0] == 0) {
+     
+    if( $_GET['sign'] == 0 ) {
+      $db->query("UPDATE students SET blackboard=blackboard+1, lastblackboard=" . $_GET['tstamp'] . " WHERE mnumber=" . trim($_GET['mnumber']));
+    }
+    else {
+      $db->query("UPDATE students SET blackboard=blackboard-1, lastblackboard=" . $_GET['tstamp'] . " WHERE mnumber=" . trim($_GET['mnumber']));

     }
   }
 
     }
   }
 


@@ -30,7 +33,8 @@
     print "<td>" . $student['lastname'] . "&nbsp;&nbsp;</td>";
     print "<td>" . $student['mnumber'] . "&nbsp;&nbsp;</td>";
     print "<td>" . $student['blackboard'] . "&nbsp;&nbsp;</td>";
     print "<td>" . $student['lastname'] . "&nbsp;&nbsp;</td>";
     print "<td>" . $student['mnumber'] . "&nbsp;&nbsp;</td>";
     print "<td>" . $student['blackboard'] . "&nbsp;&nbsp;</td>";

-    print "<td>" . "<a href='blackboard.php?mnumber=" . $student['mnumber'] . "&tstamp=" . time() . "'>+1" . "</a></td>";
+    print "<td>" . "<a href='blackboard.php?mnumber=" . $student['mnumber'] . "&tstamp=" . time() . "&sign=0'>+1" . "</a></td>";
+    print "<td>" . "<a href='blackboard.php?mnumber=" . $student['mnumber'] . "&tstamp=" . time() . "&sign=1'>-1" . "</a></td>";

     print "</tr>";
   }
   print "</table>";
     print "</tr>";
   }
   print "</table>";

diff --git a/admin/nextsession.php b/admin/nextsession.php
index 18efdc49f27c71ba50d65f2de549f69f1f036df6..ee94d5077a9317ecde6c0ff7bca7eaefe4857b62 100644 (file)
--- a/admin/nextsession.php
+++ b/admin/nextsession.php
@@ -11,7 +11,7 @@
 
   block("black", "summary for session " . $SESSIONS[$SESSIONS_actual]['timestr'] . " (" . $SESSIONS[$SESSIONS_actual]['examples'] . ")");
 
 
   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");
+  $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 "<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>";

diff --git a/admin/summary.php b/admin/summary.php
index cac27fcf28a672bc6065396ff3f1a0c4a1963940..68c026fd5dc0e0bbadd3c21680f78e79386b7c51 100644 (file)
--- a/admin/summary.php
+++ b/admin/summary.php
@@ -11,7 +11,7 @@
 
   block("black", "summary of everything for " . date("d.m.Y H:i"));
 
 
   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 "<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>";

diff --git a/include/db.inc b/include/db.inc
index 3612374f3200e4062b111864a5ac7d0bb8912fbd..90ce96a118c72316d81938dd33cb1b10722e6f47 100644 (file)
--- a/include/db.inc
+++ b/include/db.inc
@@ -2,7 +2,7 @@
   if (! isset($db)) {
     if ($db = new PDO('sqlite:banane.db')) {
       $db->query('CREATE TABLE IF NOT EXISTS students 
   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))');
+         (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)');
       $db->query('CREATE TABLE IF NOT EXISTS prefs
       $db->query('CREATE TABLE IF NOT EXISTS workdone
           (mnumber int, session int, manydone int, thisdone string)');
       $db->query('CREATE TABLE IF NOT EXISTS prefs