diff --git a/js/app/controllers/ExplorerModule.js b/js/app/controllers/ExplorerModule.js index fbbb365..4af1d9e 100644 --- a/js/app/controllers/ExplorerModule.js +++ b/js/app/controllers/ExplorerModule.js @@ -204,11 +204,9 @@ Ext.define('amdaDesktop.ExplorerModule', addLogMessage: function (message) { var height, msg, panel, win - height = 40 msg = Ext.create('Ext.Component', { - height: height, - html: message, - style: {color: '#555555'} + html: '
'+message+'
', + style: {color: '#555555', marginLeft:'5px', marginBottom:'2px'} }) win = myDesktopApp.getDesktop().getWindow(this.id) panel = win.items.get('LogPanel') diff --git a/js/app/models/BkgJobNode.js b/js/app/models/BkgJobNode.js index eaccece..2463b27 100644 --- a/js/app/models/BkgJobNode.js +++ b/js/app/models/BkgJobNode.js @@ -174,19 +174,6 @@ Ext.define('amdaModel.BkgJobNode', { 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 { diff --git a/js/app/models/InteractiveNode.js b/js/app/models/InteractiveNode.js index d4ec76c..7682cdf 100644 --- a/js/app/models/InteractiveNode.js +++ b/js/app/models/InteractiveNode.js @@ -616,6 +616,23 @@ Ext.define('amdaModel.InteractiveNode', { }); } } + 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) { -- libgit2 0.21.2