Changeset 568 for trunk

Timestamp:

01/26/09 11:57:38 (15 years ago)

Author:

ramonb

Message:

job_monarch/css/styles.css:

• added nodes filter class

job_monarch/js/jobgrid.js:

• added cell rendering/selection for nodes column

Location:

trunk/web2/addons/job_monarch

Files:

• css/styles.css (modified) (2 diffs)
• js/jobgrid.js (modified) (6 diffs)

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

@@ -2 +2 @@
 {
    color: blue;
+   cursor: pointer;
+}
+
+.filterenabled
+{
+   background: blue;
+   color: white;
    cursor: pointer;
 }
@@ -16 +23 @@
 }
 
-.filterenabled
+.nodesfilter
 {
-   background: rgb(100,100,255);
+   color: rgb(130,150,255);
+   cursor: pointer;
+}
+
+.nodesfilterenabled
+{
+   background: rgb(130,150,255);
    color: white;
    cursor: pointer;

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

@@ -250 +250 @@
   ClusterImageWindow.getBottomToolbar().showBusy();
 
-  filter_str = 'Nodes Overview' + makeFilterString();
+  filter_str = 'Nodes' + makeFilterString();
   ClusterImageWindow.setTitle( filter_str );
 
@@ -300 +300 @@
     var view = grid.getView();
     var cell = view.getCell( rowIndex, columnIndex );
-
-    if( fieldName == 'owner' || fieldName == 'jid' || fieldName == 'status' || fieldName == 'queue' )
+    var filter_title = false;
+    var fil_dis = 'filter';
+    var fil_ena = 'filterenabled';
+    var filterName = fieldName;
+
+    if( fieldName == 'owner' || fieldName == 'jid' || fieldName == 'status' || fieldName == 'queue' || fieldName == 'nodes')
     {
-      if( inMyArrayKeys( myfilters, fieldName ) )
+      if( fieldName == 'nodes' )
       {
-        Ext.fly(cell).removeClass( 'filterenabled' );
-        Ext.fly(cell).addClass( 'filter' );
+        filterName = 'host';
+        fil_dis = 'nodesfilter';
+        fil_ena = 'nodesfilterenabled';
+      }
+      if( inMyArrayKeys( myfilters, filterName ) )
+      {
+        Ext.fly(cell).removeClass( fil_ena );
+        Ext.fly(cell).addClass( fil_dis );
 
         // Remove this filter
         //
-        delete myfilters[fieldName];
-        delete myparams[fieldName];
+        delete myfilters[filterName];
+        delete myparams[filterName];
 
         reloadJobStore();
@@ -318 +328 @@
       else
       {
-        Ext.fly(cell).removeClass( 'filter' );
-        Ext.fly(cell).addClass( 'filterenabled' );
+        Ext.fly(cell).removeClass( fil_dis );
+        Ext.fly(cell).addClass( fil_ena );
+
+        if( fieldName == 'nodes' )
+        { // Get the first node (master mom) as node filter
+          new_data = data.split( ',' )[0];
+          data = new_data;
+        }
 
         // Set filter for selected column to selected cell value
         //
-        myfilters[fieldName] = data;
+        myfilters[filterName] = data;
 
         reloadJobStore();
         reloadClusterImage();
       }
+      JobListingWindow.setTitle( filter_str );
+      filter_title = true;
       filter_str = myparams.c + ' Jobs Overview' + makeFilterString();
-      JobListingWindow.setTitle( filter_str );
     }
   }
@@ -336 +353 @@
   {
     var fieldName = JobsColumnModel.getColumnById( colindex ).dataIndex;
-
-    if( fieldName == 'owner' || fieldName == 'jid' || fieldName == 'status' || fieldName == 'queue' )
+    var fil_dis = 'filter';
+    var fil_ena = 'filterenabled';
+    var filterName = fieldName;
+
+    if( fieldName == 'owner' || fieldName == 'jid' || fieldName == 'status' || fieldName == 'queue' || fieldName == 'nodes' )
     {
-      if( myfilters[fieldName] != null )
+      if( fieldName == 'nodes' )
       {
-        metadata.css = 'filterenabled';
+        fil_dis = 'nodesfilter';
+        fil_ena = 'nodesfilterenabled';
+        filterName = 'host';
+      }
+      if( myfilters[filterName] != null )
+      {
+        metadata.css = fil_ena;
       }
       else
       {
-        metadata.css = 'filter';
+        metadata.css = fil_dis;
       }
     }
@@ -506 +532 @@
         dataIndex: 'nodes',
         width: 100,
-        hidden: true
+        hidden: true,
+        renderer: jobCellRender
       },{
         header: 'Queued',
@@ -611 +638 @@
                         height      : 300,
                         closeAction :'hide',
+                        //tbar: next Ext.
                         items:  [ images ]
                     });