Changeset 28726

Timestamp:

Jul 28, 2010, 8:47:29 AM (16 years ago)

Author:

rhenders

Message:

Can now plot time series per stage

Location:

trunk/ippMonitor/raw

Files:

• czartool_getplot.php (modified) (1 diff)
• czartool_labels.php (modified) (7 diffs)

trunk/ippMonitor/raw/czartool_getplot.php

@@ -12 +12 @@
 }
 
-$label  = $_GET[label];
 $type = $_GET[type];
+$label = $_GET[label];
+$stage = $_GET[stage];
 
+if ($type=="t")
+$filePath = "/home/panstarrs/rhenders/czarplot_".$label."_".$stage."_".$type.".png";
+else if ($type=="h")
 $filePath = "/home/panstarrs/rhenders/czarplot_".$label."_".$type.".png";
-
 $file = fopen ($filePath, "r");
 if ($file && !$debug) {

trunk/ippMonitor/raw/czartool_labels.php

@@ -28 +28 @@
 $menu = $ID['menu'];
 
+$selectedStage = $_GET[stage];
 $selectedLabel = $_GET[label];
 $selectedServer = $_GET[server];
@@ -35 +36 @@
 
 if ($selectedLabel == "") $selectedLabel = "all_labels";
+if ($selectedStage == "") $selectedStage = "all_stages";
 
 if ($revertStage != "" && $revertMode != "" && $revertServer != "" )
@@ -82 +84 @@
 
     echo "<td> \n";
-      echo "<img src=\"czartool_getplot.php?type=t&label=$selectedLabel\"><br>\n";
+      echo "<img src=\"czartool_getplot.php?type=t&label=$selectedLabel&stage=$selectedStage\"><br>\n";
+      echo "czartool_getplot.php?type=t&label=$selectedLabel&stage=$selectedStage\"<br>\n";
     echo "</td>\n";
 
     echo "<td> \n";
-      createLabelsTable($pass, $proj, $czardb, $stdsLabels, $distLabels, $pubLabels, $stages, $states, "new", $selectedLabel);
+      createLabelsTable($pass, $proj, $czardb, $stdsLabels, $distLabels, $pubLabels, $stages, $states, "new", $selectedLabel, $selectedStage);
     echo "</td>\n";
 
@@ -95 +98 @@
   echo "<tr valign=top>\n";
     echo "<td> \n";
-      echo "<img src=\"czartool_getplot.php?type=h&label=$selectedLabel\"><br>\n";
+      echo "<img src=\"czartool_getplot.php?type=h&label=$selectedLabel&stage=$selectedStage\"><br>\n";
     echo "</td>\n";
     echo "<td> \n";
@@ -197 +200 @@
 #
 ###########################################################################
-function createLabelsTable($pass, $proj, $db, $stdsLabels, $distLabels, $pubLabels, $stages, $states, $selectedState, $selectedLabel) {
+function createLabelsTable($pass, $proj, $db, $stdsLabels, $distLabels, $pubLabels, $stages, $states, $selectedState, $selectedLabel, $selectedStage) {
 
     // set up table columns
@@ -225 +228 @@
     write_header_cell($class, "Distributing?");
     write_header_cell($class, "Publishing?");
-    foreach ($stages as &$stage) write_header_cell($class, $stage);
+    foreach ($stages as &$stage) {
+        
+        if ($stage == $selectedStage) $link = "";
+        else $link = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj . "&label=" . $selectedLabel . "&stage=" . $stage;
+        write_table_cell($class, '%s', $link, $stage);
+//        write_header_cell($class, $stage);
+    }
 
     echo "</tr>\n";
@@ -248 +257 @@
         // create link to label summary page for each label
         if ($stdsLabel == $selectedLabel) $link = "";
-        else $link = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj . "&label=" . $stdsLabel;
+        else $link = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj . "&label=" . $stdsLabel . "&stage=" . $selectedStage;
 
         echo "<tr><td></td>\n";