Changeset 15155 for trunk/FACT++/www/shift

Timestamp:

03/26/13 17:16:15 (12 years ago)

Author:

tbretz

Message:

Implemented a new 'user' which can be used to add entries for debugging to be able to seperate them from normal shift entries.

Location:

trunk/FACT++/www/shift

Files:

• calendar.js (modified) (5 diffs)
• calendar.php (modified) (2 diffs)

trunk/FACT++/www/shift/calendar.js

@@ -52 +52 @@
 }
 
-var institutes= ["User", "EPFL", "ETHZ", "ISDC", "UNIDO", "UNIGE", "UNIWUE" ];
+var institutes= ["Shift", "Debug", "EPFL", "ETHZ", "ISDC", "UNIDO", "UNIGE", "UNIWUE" ];
 
 function CalendarJS()
@@ -492 +492 @@
         var user = document.getElementById("body").getAttribute("data-user");
         var uri = "calendar.php?toggle&y="+td.yy+"&m="+td.mm+"&d="+td.dd;
-        if (user!="User")
+        if (user!="Shift" && user!="Debug")
             uri += "&u="+user;
+        else
+            uri += "&x="+(user=="Debug"?1:0);
 
         var xmlHttp = new XMLHttpRequest();
@@ -515 +517 @@
             {
                 var x = lines[i].split('\t');
-                if (x.length!=2)
+                if (x.length!=3)
                     continue;
 
                 var div = document.createElement("div");
                 div.style.fontWeight="normal";
-                div.appendChild(document.createTextNode(x[1]));
+                div.appendChild(document.createTextNode(x[2]=="1"?'('+x[1]+')':x[1]));
                 td.appendChild(div);
 
@@ -674 +676 @@
             {
                 var x = lines[i].split('\t');
-                if (x.length!=2)
+                if (x.length!=3)
                     continue;
 
@@ -681 +683 @@
                 var div = document.createElement("div");
                 div.style.fontWeight="normal";
-                div.appendChild(document.createTextNode(x[1]));
+                div.appendChild(document.createTextNode(x[2]=="1"?'('+x[1]+')':x[1]));
                 td.appendChild(div);
 

trunk/FACT++/www/shift/calendar.php

@@ -142 +142 @@
     if (mysql_affected_rows()==0)
     {
-        if (!mysql_query("INSERT Data SET y=".$y.", m=".$m.", d=".$d.", u='".$u."'"))
+        $x = $_GET['x'];
+        if (!mysql_query("INSERT Data SET y=".$y.", m=".$m.", d=".$d.", x=".$x.", u='".$u."'"))
             return header('HTTP/1.0 500 '.mysql_error());
     }
 }
 
-$query = "SELECT d, u FROM Data WHERE y=".$y." AND m=".$m;
+$query = "SELECT d, u, x FROM Data WHERE y=".$y." AND m=".$m;
 if (isset($_GET['d']))
     $query .= " AND d=".$_GET['d'];
@@ -156 +157 @@
 
 while ($row = mysql_fetch_array($result, MYSQL_NUM))
-    print($row[0]."\t".$row[1]."\n");
+    print($row[0]."\t".$row[1]."\t".$row[2]."\n");
 ?>