Changeset 33949 for branches/eam_branches/ipp-20120405/ippMonitor/raw/czartool_labels.php

Timestamp:

May 29, 2012, 5:08:07 PM (14 years ago)

Author:

eugene

Message:

merging changes from trunk

Location:

branches/eam_branches/ipp-20120405/ippMonitor

Files:

• . (modified) (1 prop)
• raw/czartool_labels.php (modified) (8 diffs)

branches/eam_branches/ipp-20120405/ippMonitor/raw/czartool_labels.php

@@ -23 +23 @@
 
 if ($ID['menu']) {$myMenu = $ID['menu'];}
-else {$myMenu = "ipp.imfiles.dat";}
+else {$myMenu = "ipp.czar.dat";}
 
 menu($myMenu, 'Czartool on '.$lastUpdateTime, 'ipp.css', $ID['link'], $ID['proj']);
 
 $stages=array(
-        "burntool", 
         "chip",
         "cam",
@@ -34 +33 @@
         "warp",
         "stack",
+        "staticsky",
         "diff",
-        "magic",
-        "magicDS",
         "dist", 
-        "pub");
+        "pub",
+        "chipbackground");
 
 $servers=array(
@@ -92 +91 @@
 
 $debug = 0;
-$table = "<table bgcolor=\"#FFFFFF\" width=\"700\" align=\"middle\" border=\"1\" cellspacing=\"0\" cellpadding=\"4\" style=\"font-size:80%\">\n";
+$table = "<table bgcolor=\"#FFFFFF\" width=\"900\" align=\"middle\" border=\"1\" cellspacing=\"0\" cellpadding=\"4\" style=\"font-size:80%\">\n";
 
 $labels = getLabels($czardb, $selectedMode);
@@ -441 +440 @@
         $anyFaults = false; 
 
-        $link = $defaultlink;
-        getStateAndFaults($db, $thisLabel, $selectedState, "burntool", $str, $anyFaults);
-        createFormattedTableCell($anyFaults, $link, $str, $anyFaults, 0);
-
         $link = "failedChipProcessedImfile.php?pass=" . $pass . "&proj=" . $proj . "&chipRun.label=" . $thisLabel . "&chipRun.state=".$searchState;
         getStateAndFaults($db, $thisLabel, $selectedState, "chip", $str, $anyFaults);
@@ -465 +460 @@
         createFormattedTableCell($anyFaults, $link, $str, $anyFaults, 0);
 
+        $link = $defaultlink;
+        getStateAndFaults($db, $thisLabel, $selectedState, "staticsky", $str, $anyFaults);
+        createFormattedTableCell($anyFaults, $link, $str, $anyFaults, 0);
+
         $link = "failedDiffSkyfile.php?pass=" . $pass . "&proj=" . $proj . "&diffRun.label=" . $thisLabel . "&diffRun.state=".$searchState;
         getStateAndFaults($db, $thisLabel, $selectedState, "diff", $str, $anyFaults);
@@ -470 +469 @@
 
         $link = $defaultlink;
-        getStateAndFaults($db, $thisLabel, $selectedState, "magic", $str, $anyFaults);
-        createFormattedTableCell($anyFaults, $link, $str, $anyFaults, (!$isUpdate && !$distributing) ? "gray" : null);
-
-        $link = $defaultlink;
-        getStateAndFaults($db, $thisLabel, $selectedState, "magicDS", $str, $anyFaults);
-        createFormattedTableCell($anyFaults, $link, $str, $anyFaults, (!$isUpdate && !$distributing) ? "gray" : null);
-
-        $link = $defaultlink;
         getStateAndFaults($db, $thisLabel, $selectedState, "dist", $str, $anyFaults);
         createFormattedTableCell($anyFaults, $link, $str, $anyFaults, (!$isUpdate && !$distributing) ? "gray" : null);
@@ -485 +476 @@
         createFormattedTableCell($anyFaults, $link, $str, $anyFaults, (!$isUpdate && !$publishing) ? "gray" : null);
 
+        $link = $defaultlink;
+        getStateAndFaults($db, $thisLabel, $selectedState, "chipbackground", $str, $anyFaults);
+        createFormattedTableCell($anyFaults, $link, $str, $anyFaults, 0);
+
         echo "</tr>\n";
     }
@@ -492 +487 @@
     createFormattedTableCell(($selectedLabel != "all"), $link, "All labels", 0, null);
 
-    createFormattedTableCell(0, null, "Reverting?", 0, "$columnHeaderColor");
-
     foreach ($stages as &$stage) {
 
-        if ($stage == "burntool") continue;
         $reverting = getRevertStatus($db, $stage);
-        #$link = 
-        #    "czartool_labels.php?pass=".$pass
-        #    ."&proj=".$proj
-        #    ."&mode=" .$selectedMode
-        #    ."&label=".$selectedLabel
-        #    ."&stage=".$selectedStage
-        #    ."&plottype=".$plotType
-        #    ."&revertstage=".$stage
-        #    ."&revertmode=";
-#
-        #if(!$reverting) {$label =  "Start";$link = $link . "on";}
-        #if($reverting) {$label = "Stop";$link = $link . "off";}
-        if(!$reverting) {$label =  "no";}
-        if($reverting) {$label = "yes";}
+        if(!$reverting) {$label =  "";}
+        if($reverting) {$label = "reverting";}
         unset($reverting);
-        #createFormattedTableCell(1, $link, $label, 0, "$columnHeaderColor");
         createFormattedTableCell(0, null, $label, 0, "$columnHeaderColor");
-        #echo "<td><a href=\"$link\"><font color=\"blue\">$label</font></td>";
-
     }