Changeset 116 for trunk

Timestamp:

05/31/05 09:26:12 (18 years ago)

Author:

bastiaans

Message:

toga/overview.php:

• Fixed time display of queued jobs

File:

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

trunk/web/addons/toga/overview.php

@@ -12 +12 @@
 $httpvars = new HTTPVariables( $HTTP_GET_VARS );
 $clustername = $httpvars->getClusterName();
+printf( "clustername = %s\n", $clustername );
+$queue_select = $httpvars->getHttpVar( "queue" );
+printf( "queue = %s\n", $queue );
 
 $data_gatherer = new DataGatherer();
@@ -18 +21 @@
 $tpl->prepare();
 
-$tpl->assign( "clusterimage", "./image.php?c=".$clustername."&view=big-clusterimage" );
+$tpl->assign( "self", "./index.php" );
+$tpl->assign( "clustername", $clustername );
+
+$tpl->assign( "clusterimage", "./image.php?c=".rawurlencode($clustername)."&view=big-clusterimage" );
 
 $data_gatherer->parseXML();
@@ -37 +43 @@
         if( $days > 0 ) {
                 if( $days > 1 )
-                        $date_str .= $days . 'days - ';
-                else
-                        $date_str .= $days . 'day - ';
+                        $date_str .= $days . ' days - ';
+                else
+                        $date_str .= $days . ' day - ';
         }
 
@@ -215 +221 @@
 
                 $tpl->newBlock("node");
+                $tpl->assign( "clustername", $clustername );
                 $tpl->assign("id", $jobid );
                 $tpl->assign("state", $jobattrs[status] );
@@ -220 +227 @@
                 $tpl->assign("queue", $jobattrs[queue] );
                 $tpl->assign("name", $jobattrs[name] );
+                $tpl->assign("req_cpu", $jobattrs[requested_time] );
+                $tpl->assign("req_memory", $jobattrs[requested_memory] );
                 $nodes = count( $jobattrs[nodes] );
                 $ppn = (int) $jobattrs[ppn] ? $jobattrs[ppn] : 1;
                 $cpus = $nodes * $ppn;
+                $tpl->assign("nodes", $nodes );
                 $tpl->assign("cpus", $cpus );
-                $tpl->assign("req_cpu", $jobattrs[requested_time] );
-                $tpl->assign("req_memory", $jobattrs[requested_memory] );
-                $tpl->assign("nodes", $nodes );
                 $start_time = (int) $jobattrs[start_timestamp];
-                $runningtime = makeTime( $report_time - $start_time );
-                $tpl->assign("started", makeDate( $start_time ) );
-                $tpl->assign("runningtime", $runningtime );
+
+                if( $start_time ) {
+
+                        $runningtime = makeTime( $report_time - $start_time );
+                        $tpl->assign("started", makeDate( $start_time ) );
+                        $tpl->assign("runningtime", $runningtime );
+                }
         }
 }