Changeset 543 for trunk

Timestamp:

07/11/08 16:25:59 (16 years ago)

Author:

ramonb

Message:

job_monarch/jobstore.php:

• filter jobs

js/jobgrid.js:

• add and remove proper CSS class to cells for filters

job_monarch/css/styles.css:

• cleanup, pretty colors

Location:

trunk/web2/addons/job_monarch

Files:

• css/styles.css (modified) (2 diffs)
• jobstore.php (modified) (4 diffs)
• js/jobgrid.js (modified) (4 diffs)

trunk/web2/addons/job_monarch/css/styles.css

@@ -1 @@
-.oddfilter
-{
-   //background: rgb(240,240,240);
-   color: red;
-   cursor: pointer;
-}
-
-.evenfilter
-{
-   //background: rgb(255,255,255);
-   color: red;
-   cursor: pointer;
-}
-
 .filter
 {
@@ -21 +7 @@
 .filterenabled
 {
-   color: red;
+   background: rgb(0,0,255);
+   color: white;
    cursor: pointer;
-}
-
-.oddfilterenabled
-{
-   //background: rgb(240,240,240);
-   color: red;
-   cursor: pointer;
-   text-decoration: bold;
-}
-
-.evenfilterenabled
-{
-   //background: rgb(255,255,255);
-   color: red;
-   cursor: pointer;
-   text-decoration: bold;
 }
 

trunk/web2/addons/job_monarch/jobstore.php

@@ -13 +13 @@
 //
 $query                  = isset($_POST['query']) ? $_POST['query'] : null;
+
+// Filter values
+//
+$jid                    = isset($_POST['jid']) ? $_POST['jid'] : null;
+$owner                  = isset($_POST['owner']) ? $_POST['owner'] : null;
+$status                 = isset($_POST['status']) ? $_POST['status'] : null;
+$queue                  = isset($_POST['queue']) ? $_POST['queue'] : null;
 
 global $c, $clustername, $cluster;
@@ -209 +216 @@
 }
 
-
+function filterJobs( $jobs )
+{
+        global $jid, $owner, $queue,  $status;
+
+        $filtered_jobs  = array();
+
+        if( isset( $jobs ) && count( $jobs ) > 0 )
+        {
+                foreach( $jobs as $jobid => $jobattrs )
+                {
+                                $state          = $jobattrs[status];
+                                $user           = $jobattrs[owner];
+                                $jqueue          = $jobattrs[queue];
+                                $name           = $jobattrs[name];
+                                $req_cpu        = $jobattrs[requested_time];
+                                $req_memory     = $jobattrs[requested_memory];
+
+                                if( $state == 'R' )
+                                {
+                                        $nodes = count( $jobattrs[nodes] );
+                                }
+                                else
+                                {
+                                        $nodes = $jobattrs[nodes];
+                                }
+
+                                $ppn            = (int) $jobattrs[ppn] ? $jobattrs[ppn] : 1;
+                                $cpus           = $nodes * $ppn;
+                                $queued_time    = (int) $jobattrs[queued_timestamp];
+                                $start_time     = (int) $jobattrs[start_timestamp];
+                                $runningtime    = $report_time - $start_time;
+        
+                                $keepjob        = true;
+
+                                if( $jid )
+                                {
+                                        if( $jobid != $jid )
+                                        {
+                                                $keepjob        = false;
+                                        }
+                                }
+                                if( $owner )
+                                {
+                                        if( $user != $owner )
+                                        {
+                                                $keepjob        = false;
+                                        }
+                                }
+                                if( $queue )
+                                {
+                                        if( $jqueue != $queue )
+                                        {
+                                                $keepjob        = false;
+                                        }
+                                }
+                                if( $status )
+                                {
+                                        if( $state != $status )
+                                        {
+                                                $keepjob        = false;
+                                        }
+                                }
+                                if( $keepjob )
+                                {
+                                        $filtered_jobs[$jobid]  = $jobattrs;
+                                }
+                }
+        }
+
+        return $filtered_jobs;
+}
 
 function getList() 
@@ -215 +292 @@
         global $jobs, $hearbeat, $pstart, $pend;
         global $sortfield, $sortorder, $query;
+        global $jid, $owner, $queue,  $status;
 
         $job_count              = count( $jobs );
@@ -230 +308 @@
         $sorted_jobs            = sortJobs( $jobs, $sortfield, $sortorder );
 
-        if( $query != null )
+        if( $query )
         {
                 $jobs                   = quickSearchJobs( $jobs, $query );
+        }
+        if( $jid || $owner || $queue || $status )
+        {
+                $jobs                   = filterJobs( $jobs );
         }
         $result_count           = count( $jobs );

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

@@ -4 +4 @@
 var JobListingWindow;
 var JobProxy;
-
-//Ext.onReady( initJobGrid() );
+var myfilters = { start: 0, limit: 30};
 
 function initJobGrid() {
@@ -13 +12 @@
   function jobCellClick(grid, rowIndex, columnIndex, e)
   {
+    var record = grid.getStore().getAt(rowIndex);  // Get the Record
     var fieldName = grid.getColumnModel().getDataIndex(columnIndex);
-
+    var data = record.get(fieldName);
     var view = grid.getView();
     var cell = view.getCell( rowIndex, columnIndex );
@@ -20 +20 @@
     if( fieldName == 'owner' || fieldName == 'jid' || fieldName == 'status' || fieldName == 'queue' )
     {
-      Ext.fly(cell).removeClass( 'filter' );
-      Ext.fly(cell).addClass( 'filterenabled' );
+      if( myfilters[fieldName] != null )
+      {
+        Ext.fly(cell).removeClass( 'filterenabled' );
+        Ext.fly(cell).addClass( 'filter' );
+
+        delete myfilters[fieldName];
+
+        grid.getStore().reload( {params: myfilters} );
+      }
+      else
+      {
+        Ext.fly(cell).removeClass( 'filter' );
+        Ext.fly(cell).addClass( 'filterenabled' );
+
+        myfilters[fieldName] = data;
+
+        grid.getStore().reload( {params: myfilters} );
+      }
     }
   }
@@ -31 +47 @@
     if( fieldName == 'owner' || fieldName == 'jid' || fieldName == 'status' || fieldName == 'queue' )
     {
-      metadata.css = 'filter';
+      if( myfilters[fieldName] != null )
+      {
+        metadata.css = 'filterenabled';
+      }
+      else
+      {
+        metadata.css = 'filter';
+      }
     }
     return value;