Changeset 18207

Timestamp:

06/15/15 00:04:50 (9 years ago)

Author:

Daniela Dorner

Message:

adapted to ignore moon-entries

File:

• trunk/www/dch/shifteval.php (modified) (5 diffs)

trunk/www/dch/shifteval.php

@@ -107 +107 @@
         $queryusers="SELECT uid FROM calendar.Data LEFT JOIN logbook.users ON calendar.Data.u=logbook.users.username ";
         $queryusers.="WHERE CONCAT(y,LPAD(m+1,2,0),LPAD(d,2,0))=".$starttimestamp->format('Ymd');
-        $queryusers.=" AND u NOT IN ('ETHZ', 'ISDC', 'UNIDO', 'UNIWUE')";
+        $queryusers.=" AND u NOT IN ('ETHZ','ISDC','UNIWUE','TUDO','moon')";
         // get shifthours per user and institute
         $queryshifters=$queryusers." AND x=0";
@@ -167 +167 @@
 
     echo "<br>\n<br>\n";
-    echo "Remark: Debugging times before 2013/02 are not taken into account, i.e. first 16 months of debugging is missing in the automatic evaluation system.";
-    echo "<br>\n<br>\n";
     echo "<b>Total number of hours:</b> ".$hourstotal." h.";
     echo "<table>\n";
@@ -174 +172 @@
     foreach ($institutenames as $id=>$name)
     {
-        if (!$institutetotalhours[$id])
-            continue;
+        //if (!$institutetotalhours[$id])
+        //    continue;
         echo "<tr><td>";
         echo $name;//."(".$id.")";
@@ -184 +182 @@
         echo "</td></tr>\n";
     }
-    echo "</table>\n";
+    echo "</table><br>\n";
 
     echo "<table>\n";
@@ -199 +197 @@
     }
     echo "</table>\n<br>\n";
+    echo "Remark: Debugging times before 2013/02 are not taken into account, i.e. first 16 months of debugging is missing in the automatic evaluation system.";
+    echo "<br>\n<br>\n";
 
     echo "</form>\n";