Changeset 189 for trunk/web/addons/toga/index.php

Timestamp:

08/05/05 12:55:27 (18 years ago)

Author:

bastiaans

Message:

web/addons/toga/templates/search.tpl:

• Removed graph timeperiod selection -> to be placed in header

web/addons/toga/templates/header.tpl:

• Added graph timeperiod selection when browsing jobarchive
• Now a user can change graphing timeperiods for the node detail graphs from the archive!

web/addons/toga/host_view.php:

• Added correct parsing of timeperiod

web/addons/toga/index.php:

• Added placement of graph timeperiod selection and variables

web/addons/toga/search.php:

• Small cleanup

File:

• trunk/web/addons/toga/index.php (modified) (5 diffs)

trunk/web/addons/toga/index.php

@@ -59 +59 @@
 //if( isset($id) && ($id!='')) $filter[id]=$id;
 
+function epochToDatetime( $epoch ) {
+
+        return strftime( "%d-%m-%Y %H:%M:%S", $epoch );
+}
+
 function makeHeader() {
 
@@ -69 +74 @@
         global $default_refresh, $filterorder, $view;
         global $TARCHD, $period_start, $period_stop, $h, $id;
+        global $job_start, $job_stop;
         
         if( isset($default_metric) and !isset($m) )
@@ -223 +229 @@
         }
 
-        if( $view == "search" ) {
+        $m = $metricname;
+
+
+        $tpl->gotoBlock( "_ROOT" );
+        $tpl->assignGlobal("view", $view);
+
+        if( array_key_exists( "id", $filter ) or isset($hostname) ) {
+
+                //print_r( $context_metrics );
+
+                if( !isset( $hostname ) ) {
+
+                        if (is_array($context_metrics) ) {
+                                $metric_menu = "<B>Metric</B>&nbsp;&nbsp;"
+                                        ."<SELECT NAME=\"m\" OnChange=\"".$form_name.".submit();\">\n";
+
+                                sort($context_metrics);
+                                foreach( $context_metrics as $k ) {
+                                        $url = rawurlencode($k);
+                                        $metric_menu .= "<OPTION VALUE=\"$url\" ";
+                                        if ($k == $metricname )
+                                                $metric_menu .= "SELECTED";
+                                        $metric_menu .= ">$k\n";
+                                }
+                                $metric_menu .= "</SELECT>\n";
+
+                        }
+                }
+
+                $tpl->assign("metric_menu", $metric_menu );
+
+                if( $view == "search" or $view == "host" ) {
+                        $tpl->newBlock("timeperiod");
+                        if( is_numeric( $period_start ) ) {
+                                $period_start = epochToDatetime( $period_start );
+                        }
+                        if( is_numeric( $period_stop ) ) {
+                                $period_stop = epochToDatetime( $period_stop );
+                        }
+                        $tpl->assign("period_start", $period_start );
+                        $tpl->assign("period_stop", $period_stop );
+                        $tpl->assign("hostname", $hostname );
+
+                        if( $view == "host" ) {
+                                $tpl->newBlock("hostview");
+                                $tpl->assign("job_start", $job_start );
+                                $tpl->assign("job_stop", $job_stop );
+                        }
+                } 
+
+        }
+
+        if( $view == "search" or $view == "host" ) {
 
                 $node_menu .= "<B>&gt;</B>\n";
                 $node_menu .= "<B>Jobarchive</B> ";
-                $tpl->assign("view", "search" );
                 $form_name = "archive_search_form";
                 $tpl->assignGlobal("form_name", $form_name );
@@ -234 +291 @@
                 $form_name = "toga_form";
                 $tpl->assignGlobal("form_name", $form_name );
-                $tpl->assign("view", "overview" );
-        }
-
-        $tpl->assign("node_menu", $node_menu);
-
-        if( array_key_exists( "id", $filter ) ) {
-
-                //print_r( $context_metrics );
-
-                if (is_array($context_metrics) ) {
-                        $metric_menu = "<B>Metric</B>&nbsp;&nbsp;"
-                                ."<SELECT NAME=\"m\" OnChange=\"".$form_name.".submit();\">\n";
-
-                        sort($context_metrics);
-                        foreach( $context_metrics as $k ) {
-                                $url = rawurlencode($k);
-                                $metric_menu .= "<OPTION VALUE=\"$url\" ";
-                                if ($k == $metricname )
-                                        $metric_menu .= "SELECTED";
-                                $metric_menu .= ">$k\n";
-                        }
-                        $metric_menu .= "</SELECT>\n";
-
-                }
-
-                $tpl->assign("metric_menu", $metric_menu );
-        }
-        $m = $metricname;
+        }
 
         if( $TARCHD ) {
@@ -267 +297 @@
                 $tpl->assignGlobal( "cluster_url", rawurlencode($clustername) );
                 $tpl->assignGlobal( "cluster", $clustername );
-                $tpl->gotoBlock( "_ROOT" );
-        }
+        }
+        $tpl->gotoBlock( "_ROOT" );
+        $tpl->assignGlobal( "cluster", $clustername );
+        $tpl->assign("node_menu", $node_menu);
 
         # Make sure that no data is cached..