Changeset 739 for branches/0.4/web/addons/job_monarch/overview.php

Timestamp:

03/24/13 20:18:46 (11 years ago)

Author:

ramonb

Message:

• make sure range is correctly set and passed on

File:

• branches/0.4/web/addons/job_monarch/overview.php (modified) (2 diffs)

branches/0.4/web/addons/job_monarch/overview.php

@@ -1121 +1121 @@
                     //printf("last job %s job start %s runningtime %s period start %s", $last_displayed_job, $jobstart, $job_runningtime, $period_start);
                     $graphargs     = ($reports[$metricname]) ? "g=$metricname&" : "m=$metricname&";
-                    $graphargs     .= "z=overview-medium&c=$cluster_url&h=$host_url&l=$load_color&v=".$val['VAL']."&job_start=$job_start&period_start=$period_start&period_stop=$period_end";
-                    $host_link   = "\"?j_view=overview-host&c=$cluster_url&r=$range&h=$host_url&job_start=$jobstart&period_start=$period_start&period_stop=$period_end\"";
+                    $graphargs    .= "z=overview-medium&c=$cluster_url&r=$range&h=$host_url&l=$load_color&v=".$val['VAL']."&job_start=$job_start";
+                    $host_link     = "?j_view=overview-host&c=$cluster_url&r=$range&h=$host_url&job_start=$jobstart";
+
+                    if( $range == 'job' )
+                    {
+                        $graphargs     .= "&period_start=$period_start&period_stop=$period_end";
+                        $host_link     .= "&period_start=$period_start&period_stop=$period_end";
+                    }
+                    else
+                    {
+                        $graphargs     .= "&st=$period_end";
+                        $host_link     .= "&st=$period_end";
+                    }
                     if( $max > 0 ) 
                     {
@@ -1132 +1143 @@
                     $cell    = "<td class=$class>".  "<b><a href=$host_link>$host</a></b><br>".  "<i>$metricname:</i> <b>$textval</b></td>";
                 } else {
-                    $cell    = "<td><a href=$host_link>" . "<img src=\"./graph.php?$graphargs\" " . "alt=\"$host\" border=0></a></td>";
+                    $cell    = "<td><a href=\"$host_link\">" . "<img src=\"./graph.php?$graphargs\" " . "alt=\"$host\" border=0></a></td>";
                 }