Merge branch 'FER_11586' into amdadev

Benjamin Renard
2 parents 72326213 53871bb5
Showing 3 changed files with 19 additions and 17 deletions Show diff stats
js/app/controllers/ExplorerModule.js
js/app/models/BkgJobNode.js
js/app/models/InteractiveNode.js
@@ -204,11 +204,9 @@ Ext.define(&#39;amdaDesktop.ExplorerModule&#39;,
  
     addLogMessage: function (message) {
       var height, msg, panel, win
-      height = 40
       msg = Ext.create('Ext.Component', {
-        height: height,
-        html: message,
-        style: {color: '#555555'}
+        html: '<div class="logMessage">'+message+'</div>',
+        style: {color: '#555555', marginLeft:'5px', marginBottom:'2px'}
       })
       win = myDesktopApp.getDesktop().getWindow(this.id)
       panel = win.items.get('LogPanel')
@@ -174,19 +174,6 @@ Ext.define(&#39;amdaModel.BkgJobNode&#39;, {
  
 				amdaDesktop.JobsMgr.updateStatus = null;
  
-				switch (this.get('jobType')) 
-				{
-					case 'condition' : var type = 'Data Mining '; break;
-					case 'request' : var type = 'Plot '; break;   
-					case 'download' : var type = 'Download '; break;
-					case 'statistic' : var type = 'Statistics '; break;
-					default: var type = 'unknown';    
-				}
-				
-				var message = Ext.Date.format(new Date(), 'd-m-Y H:i:s: ') + ': '+ type + ' '+this.get('text') + ' killed';
-				myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.explorer.id, true, function (module) {
-					module.addLogMessage(message); 
-				});
 			}
 			//delete fieldset from Result Module if it is open       
 			else {
@@ -616,6 +616,23 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 									});
 								}
 							}
+							else{
+								if(this.get('nodeType') == "bkgWorks"){
+									switch (this.get('jobType')) 
+									{
+										case 'condition' : var type = 'Data Mining '; break;
+										case 'request' : var type = 'Plot '; break;   
+										case 'download' : var type = 'Download '; break;
+										case 'statistic' : var type = 'Statistics '; break;
+										default: var type = 'unknown';    
+									}
+				
+									var message = Ext.Date.format(new Date(res.time*1000), 'Y-m-d H:i:s: ') + type + ' '+this.get('text') + ' killed';
+									myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.explorer.id, true, function (module) {
+										module.addLogMessage(message); 
+									});
+								}
+							}
 						}
 						//update mask info in myData
 						if (res.maskDesc && !res.maskDeleted) {