Index: /trunk/web/addons/job_monarch/search.php =================================================================== --- /trunk/web/addons/job_monarch/search.php (revision 246) +++ /trunk/web/addons/job_monarch/search.php (revision 247) @@ -324,5 +324,5 @@ global $clustername, $tpl, $id, $user, $name, $start_from_time, $start_to_time, $queue; global $end_from_time, $end_to_time, $filter, $default_showhosts, $m, $hosts_up; - global $period_start, $period_stop, $sortby, $sortorder; + global $period_start, $period_stop, $sortby, $sortorder, $COLUMN_REQUESTED_MEMORY; $metricname = $m; @@ -366,4 +366,8 @@ } + if( $COLUMN_REQUESTED_MEMORY ) { + $tpl->newBlock( "column_header_req_mem" ); + } + //print_r( $nodes ); $sorted_search = sortJobs( $jobs, $nodes, $sortby, $sortorder ); @@ -387,5 +391,10 @@ $tpl->assign( "name", $job[name] ); $tpl->assign( "req_cpu", makeTime( TimeToEpoch( $job[requested_time] ) ) ); - $tpl->assign( "req_memory", $job[requested_memory] ); + + if( $COLUMN_REQUESTED_MEMORY ) { + $tpl->newBlock( "column_req_mem" ); + $tpl->assign( "req_memory", $jobs[$jobid][requested_memory] ); + $tpl->gotoBlock( "node" ); + } $nodes_nr = count( $nodes[$foundid] ); Index: /trunk/web/addons/job_monarch/templates/overview.tpl =================================================================== --- /trunk/web/addons/job_monarch/templates/overview.tpl (revision 246) +++ /trunk/web/addons/job_monarch/templates/overview.tpl (revision 247) @@ -162,5 +162,5 @@
Id | -State | +Id | +S | User | Queue | -Name | -Req. CPU time | -Req. Memory | -Nodes/Cpus | +Name | +Req. CPU time | + +Req. Memory | + +N/P | Started | Finished | @@ -223,7 +225,17 @@{user} | {queue} | -{name} | ++ + + + {name} + + + + | {req_cpu} | +{req_memory} | +{nodes}/{cpus} | {started} |
---|