Changeset 28727

Timestamp:

Jul 28, 2010, 9:33:54 AM (16 years ago)

Author:

rhenders

Message:

Improvements to above commit

Location:

trunk/ippMonitor/raw

Files:

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

trunk/ippMonitor/raw/czartool_getplot.php

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

trunk/ippMonitor/raw/czartool_labels.php

@@ -77 +77 @@
 echo "</form>\n";
 $lastUpdateTime = getLastUpdateTime($czardb);
-echo "<p  align=\"center\"> Current status of pantasks servers and stdscience labels (any faults are shown in parentheses)<br>";
-echo "NOTE: This data is good as of: $lastUpdateTime </p>";
+echo "<p  align=\"center\"> Current status of IPP (any faults are shown in parentheses). NOTE: This data is good as of: $lastUpdateTime </p>";
 
 echo "<table>\n";
@@ -85 +84 @@
     echo "<td> \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";
 
@@ -101 +99 @@
     echo "</td>\n";
     echo "<td> \n";
-      createServersTable($pass, $proj,$czardb, $servers);
+      createServersTable($pass, $proj,$czardb, $servers, $selectedLabel, $selectedStage);
     echo "</td>\n";
 
@@ -222 +220 @@
         write_table_cell($class, '%s', $link, $label);
     }
+    write_header_cell($class, "");
 
     echo "</tr>\n";
@@ -233 +232 @@
         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);
-    }
+    }
+
+    if ($selectedStage=="all_stages") $link = "";
+    else $link = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj . "&label=" . $selectedLabel . "&stage=all_stages";
+    write_table_cell($class, '%s', $link, "All stages");
 
     echo "</tr>\n";
@@ -307 +309 @@
 
     if ($selectedLabel == "all_labels") $link = "";
-    else  $link = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj . "&label=all_labels";
+    else  $link = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj . "&label=all_labels&stage=".$selectedStage;
 
     echo "<tr><td></td>\n";
@@ -411 +413 @@
 #
 ###########################################################################
-function createServersTable($pass, $proj, $db, $servers) {
+function createServersTable($pass, $proj, $db, $servers, $selectedLabel, $selectedStage) {
 
     // set up table columns
@@ -424 +426 @@
     foreach ($servers as &$server) {
 
-        $link = "czartool_labels.php?pass=" . $pass . "&proj=" . $proj . "&server=" . $server;
+        $link = "czartool_labels.php?pass=".$pass."&proj=".$proj."&server=".$server."&label=".$selectedLabel."&stage=".$selectedStage;
         //      $link = "";