Changeset 546 for trunk/web2

Timestamp:

07/12/08 22:54:34 (16 years ago)

Author:

ramonb

Message:

job_monarch/templates/header.tpl:

• set clustername in grid window title
• respect filters for each load: filters now stick beyond multiple pages

job_monarch/js/jobgrid.js:

• added some useful functions
• respect parameters set while applying filters: filters now stick beyond multiple pages

Location:

trunk/web2/addons/job_monarch

Files:

• js/jobgrid.js (modified) (3 diffs)
• templates/header.tpl (modified) (2 diffs)

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

@@ -4 +4 @@
 var JobListingWindow;
 var JobProxy;
-var myfilters = { start: 0, limit: 30};
+var myfilters = { };
+var myparams = { };
+
+var filterfields = [ "jid", "queue", "name", "owner" ];
+
+function isset( somevar )
+{
+  try
+  {
+    if( eval( somevar ) ) { }
+  }
+  catch( err )
+  {
+    return false;
+  }
+  return true;
+}
+
+function inMyArray( arr, someval )
+{
+  for( arval in arr )
+  {
+    if( arval == someval )
+    {
+      return true;
+    }
+  }
+  return false;
+}
+
+function inMyArrayValues( arr, someval )
+{
+  for( arkey in arr )
+  {
+    if( arr[arkey] == someval )
+    {
+      return true;
+    }
+  }
+  return false;
+}
+
+function inMyArrayKeys( arr, someval )
+{
+  for( arkey in arr )
+  {
+    if( arkey == someval )
+    {
+      return true;
+    }
+  }
+  return false;
+}
+
+function joinMyArray( arr1, arr2 )
+{
+  for( arkey in arr2 )
+  {
+    arr1[arkey] = arr2[arkey];
+  }
+
+  return arr1;
+}
 
 function initJobGrid() {
@@ -20 +82 @@
     if( fieldName == 'owner' || fieldName == 'jid' || fieldName == 'status' || fieldName == 'queue' )
     {
-      if( myfilters[fieldName] != null )
+      if( !isset( myfilters[fieldName] ) )
       {
         Ext.fly(cell).removeClass( 'filterenabled' );
         Ext.fly(cell).addClass( 'filter' );
 
+        // Remove this filter
+        //
         delete myfilters[fieldName];
-
-        grid.getStore().reload( {params: myfilters} );
+        delete myparams[fieldName];
+
+        // Respect any other parameters that may have been set outside filters
+        //
+        myparams = joinMyArray( myparams, myfilters );
+
+        // Can't be sure if there are enough pages for new filter: reset to page 1
+        //
+        myparams = joinMyArray( myparams, { start: 0, limit: 30 } );
+
+        grid.getStore().reload( { params: myparams } );
       }
       else
@@ -34 +107 @@
         Ext.fly(cell).addClass( 'filterenabled' );
 
+        // Set filter for selected column to selected cell value
+        //
         myfilters[fieldName] = data;
 
-        grid.getStore().reload( {params: myfilters} );
+        myparams = joinMyArray( myparams, myfilters );
+        myparams = joinMyArray( myparams, { start: 0, limit: 30 } );
+
+        grid.getStore().reload( { params: myparams } );
       }
     }

trunk/web2/addons/job_monarch/templates/header.tpl

@@ -9 +9 @@
 <link rel="stylesheet" type="text/css" href="./css/styles.css" />
 <script type="text/javascript" src="./lib/extjs/adapter/ext/ext-base.js"></script>
-<script type="text/javascript" src="./lib/extjs/adapter/ext/ext-base-debug.js"></script>
+<!-- <script type="text/javascript" src="./lib/extjs/adapter/ext/ext-base-debug.js"></script> -->
 <script type="text/javascript" src="./lib/extjs/ext-all.js"></script>
-<script type="text/javascript" src="./lib/extjs/ext-all-debug.js"></script>
+<!-- <script type="text/javascript" src="./lib/extjs/ext-all-debug.js"></script> -->
 <script type="text/javascript" src="./lib/extjs/searchfield.js"></script>
 <script type="text/javascript" src="./js/jobgrid.js"></script>
@@ -19 +19 @@
   JobProxy.on('beforeload', function(p, params) {
         params.c = "{cluster}";
+        newparams = joinMyArray( params, myfilters );
+        myparams = newparams;
+        params = newparams;
     });
   JobsDataStore.load( {params: {start: 0, limit: 30}} );
+  JobListingWindow.setTitle( "{cluster} Jobs Overview" );
   JobListingWindow.show();
   });