Changeset 564

Timestamp:

01/22/09 16:58:52 (15 years ago)

Author:

ramonb

Message:

web2/addons/job_monarch/jobstore.php:

• fixed/added sorting by node/hostname

web2/addons/job_monarch/js/jobgrid.js:

• changed button text

Location:

trunk/web2/addons/job_monarch

Files:

• jobstore.php (modified) (3 diffs)
• js/jobgrid.js (modified) (1 diff)

trunk/web2/addons/job_monarch/jobstore.php

@@ -156 +156 @@
                                 $req_memory     = $jobattrs[requested_memory];
 
-                                if( $state == 'R' )
-                                {
-                                        $nodes = count( $jobattrs[nodes] );
-                                }
-                                else
-                                {
-                                        $nodes = $jobattrs[nodes];
-                                }
+                                $nodes          = $jobattrs[nodes];
 
                                 $ppn            = (int) $jobattrs[ppn] ? $jobattrs[ppn] : 1;
-                                $cpus           = $nodes * $ppn;
+
+                                if( $state == 'R' )
+                                {
+                                        $cpus           = count( $nodes ) * $ppn;
+                                }
+                                else
+                                {
+                                        $cpus           = ((int) $nodes ) * $ppn;
+                                }
                                 $queued_time    = (int) $jobattrs[queued_timestamp];
                                 $start_time     = (int) $jobattrs[start_timestamp];
@@ -205 +206 @@
                                                 break;
                                         case "nodesct":
-                                                $sorted[$jobid] = $nodes;
+                                                if( $state == 'Q' )
+                                                {
+                                                        $sorted[$jobid] = $nodes;
+                                                }
+                                                else
+                                                {
+                                                        $sorted[$jobid] = count( $nodes );
+                                                }
                                                 break;
                                         case "cpus":
@@ -222 +230 @@
                                                 $sorted[$jobid] = $runningtime;
                                                 break;
+                                        case "nodes":
+                                                if( $state == 'R' )
+                                                {
+                                                        $sorted[$jobid] = $nodes[0];
+                                                }
+                                                else
+                                                {
+                                                        $sorted[$jobid] = $nodes;
+                                                }
 
                                         default:

trunk/web2/addons/job_monarch/js/jobgrid.js

@@ -517 +517 @@
       tbar: [ SearchField,
                 new Ext.Button({
-                                text: 'Show nodes',
-                                tooltip: 'Show nodes for selected jobs',
+                                text: 'Show graphs',
+                                tooltip: 'Show node graphs for selected jobs',
                                 iconCls: 'option',
                                 listeners: {