Changeset 40427 for trunk

Timestamp:

May 15, 2018, 9:46:33 AM (8 years ago)

Author:

eugene

Message:

add column of exposures which have been dropped or manually excluded

File:

• trunk/ippMonitor/raw/czartool_labels.php (modified) (3 diffs)

trunk/ippMonitor/raw/czartool_labels.php

@@ -357 +357 @@
     echo $table;
     echo "<tr>";
-    createTableTitle("Status of last night's data", 3);
+    createTableTitle("Status of last night's data", 4);
     echo "<tr>";
     createTableColumnHeader("Exposure type");
     createTableColumnHeader("At summit");
     createTableColumnHeader("Registered at MHPCC");
+    createTableColumnHeader("At summit (Dropped)");
 
     $msg = "No science images taken since $date";
@@ -368 +369 @@
     while ($qry->fetchInto($expType)) {
 
-        $sql = "SELECT COUNT(*) FROM summitExp WHERE dateobs > '$date' AND exp_type = '$expType[0]'";
+        $sql = "SELECT COUNT(*) FROM summitExp left join pzDownloadExp using (summit_id) WHERE dateobs > '$date' AND exp_type = '$expType[0]' and (state != 'drop' or state is null) and fault != 1042";
+#       $sql = "SELECT COUNT(*) FROM summitExp WHERE dateobs > '$date' AND exp_type = '$expType[0]'";
         $qry2 = $projectdb->query($sql);
         $qry2->fetchInto($summit);
+
         $sql = "SELECT COUNT(*) FROM summitExp JOIN rawExp ON summitExp.exp_name = rawExp.exp_name WHERE summitExp.dateobs > '$date' AND rawExp.dateobs > '$date' AND summitExp.exp_type = '$expType[0]'";
         $qry2 = $projectdb->query($sql);
         $qry2->fetchInto($mhpcc);
 
+        $sql = "SELECT COUNT(*) FROM summitExp join pzDownloadExp using (summit_id) WHERE dateobs > '$date' AND exp_type = '$expType[0]' and state = 'drop'";
+        $qry2 = $projectdb->query($sql);
+        $qry2->fetchInto($dropped);
+
         echo "<tr>";
 
@@ -382 +389 @@
         echo "<td>$expType[0]</td>";
         echo "<td>$summit[0]</td>";
-        
         createFormattedTableCell("", "", $mhpcc[0], $error, 0);
+        echo "<td>$dropped[0]</td>";
 
         echo "</tr>";