Changeset 553 for trunk

Timestamp:

07/15/08 09:55:27 (15 years ago)

Author:

ramonb

Message:

job_monarch/templates/header.tpl:

• load Window's after showing, so that loadMask is displayed

job_monarch/jobstore.php:

• new summary task for summarywindow

job_monarch/js/jobgrid.js:

• some code cleanup

Location:

trunk/web2/addons/job_monarch

Files:

• jobstore.php (modified) (1 diff)
• js/jobgrid.js (modified) (6 diffs)
• templates/header.tpl (modified) (3 diffs)

trunk/web2/addons/job_monarch/jobstore.php

@@ -78 +78 @@
     case "LISTING":
         getList();
+        break;          
+    case "SUMMARY":
+        getSummary();
         break;          
     default:

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

@@ -119 +119 @@
 {
   bubbling = bubbling || false;
-  if(window.addEventListener)   { // Standard
+  if(window.addEventListener)
+  { // Standard
     element.addEventListener(type, expression, bubbling);
     return true;
-  } else if(window.attachEvent) { // IE
+  } 
+  else if(window.attachEvent) 
+  { // IE
     element.attachEvent('on' + type, expression);
     return true;
-  } else return false;
+  } 
+  else 
+    return false;
 }
 
@@ -135 +140 @@
 };
 
-ImageLoader.prototype = {
-  load:function(){
+ImageLoader.prototype = 
+{
+  load:function()
+  {
     var url = this.url;
     var image = this.image;
     var loadEvent = this.loadEvent;
-    addListener(this.image, 'load', function(e){
-      if(loadEvent != null){
-        loadEvent(url, image);
+    addListener( this.image, 'load', function(e)
+    {
+      if( loadEvent != null )
+      {
+        loadEvent( url, image );
       }
     }, false);
     this.image.src = this.url;
   },
-  getImage:function(){
+  getImage: function()
+  {
     return this.image;
   }
@@ -161 +171 @@
 
   var newClusterImage = new ImageLoader( 'clusterimage', img_url );
-  newClusterImage.loadEvent = function( url, image ) {ClusterImageWindow.getBottomToolbar().clearStatus({useDefaults:true});}
+  newClusterImage.loadEvent = function( url, image ) 
+    {
+      ClusterImageWindow.getBottomToolbar().clearStatus( { useDefaults:true } );
+    }
 
   ClusterImageWindow.getBottomToolbar().showBusy();
@@ -235 +248 @@
       id: 'JobsDataStore',
       proxy: JobProxy,
-      baseParams:{task: "LISTING"}, // this parameter is passed for any HTTP request
+      baseParams: { task: "LISTING" },
       reader: new Ext.data.JsonReader({
         root: 'results',
@@ -247 +260 @@
         {name: 'name', type: 'string', mapping: 'name'},
         {name: 'requested_time', type: 'string', mapping: 'requested_time'},
-        //{name: 'requested_memory', type: 'string', mapping: 'requested_memory'},
+        {name: 'requested_memory', type: 'string', mapping: 'requested_memory'},
         {name: 'ppn', type: 'int', mapping: 'ppn'},
         {name: 'nodect', type: 'int', mapping: 'nodect'},
@@ -255 +268 @@
         {name: 'runningtime', type: 'string', mapping: 'runningtime'}
       ]),
-      sortInfo: {field: 'jid', direction: "ASC"},
+      sortInfo: { field: 'jid', direction: "DESC" },
       remoteSort: true
     });

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

@@ -17 +17 @@
 Ext.onReady( function(){
   initJobGrid();
-  JobProxy.on('beforeload', function(p, params) {
+  JobProxy.on('beforeload', function(p, params) 
+    {
         params.c = "{cluster}";
         newparams = joinMyArray( params, myfilters );
@@ -23 +24 @@
         params = newparams;
     });
+
   ClusterImageArgs['{session_name}'] = '{session_id}';
   ClusterImageArgs['c'] = '{cluster}';
+
   ClusterImageWindow.html = '<IMG ID="clusterimage" SRC="{clusterimage}" USEMAP="#MONARCH_CLUSTER_BIG" BORDER="0">';
   ClusterImageWindow.height = '{clusterimage_height}';
@@ -30 +33 @@
   ClusterImageWindow.x = (window.innerWidth - ClusterImageWindow.width - 25);
   ClusterImageWindow.show();
-  JobsDataStore.load( {params: {start: 0, limit: 30}} );
+  reloadClusterImage();
+
   JobListingWindow.setTitle( "{cluster} Jobs Overview" );
   JobListingWindow.y = ({clusterimage_height} + 150);
   JobListingWindow.show();
+  reloadJobStore();
   });
 </script>