Commit 0b736ee76c4c191b9ef2d8acd26df31f49ab6329
1 parent
b5664815
Exists in
master
and in
38 other branches
#9915 - Bug fixed
Showing
3 changed files
with
6 additions
and
6 deletions
Show diff stats
js/app/controllers/JobsMgr.js
@@ -100,7 +100,7 @@ Ext.define('amdaDesktop.JobsMgr', { | @@ -100,7 +100,7 @@ Ext.define('amdaDesktop.JobsMgr', { | ||
100 | default: | 100 | default: |
101 | type = 'unknown' | 101 | type = 'unknown' |
102 | } | 102 | } |
103 | - strDate = Ext.Date.format(new Date(), 'd-m-Y H:i:s: ') | 103 | + strDate = Ext.Date.format(new Date(job.stop), 'Y-m-d H:i:s: ') |
104 | message = strDate + type + ' ' + job.name + ' completed' | 104 | message = strDate + type + ' ' + job.name + ' completed' |
105 | myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.explorer.id, true, | 105 | myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.explorer.id, true, |
106 | function (mod) { | 106 | function (mod) { |
js/app/models/BkgJobNode.js
@@ -285,7 +285,7 @@ Ext.define('amdaModel.BkgJobNode', { | @@ -285,7 +285,7 @@ Ext.define('amdaModel.BkgJobNode', { | ||
285 | } | 285 | } |
286 | }, | 286 | }, |
287 | 287 | ||
288 | - createJobNode: function(isResult) | 288 | + createJobNode: function(isResult, start) |
289 | { | 289 | { |
290 | // if ownerTree panel is not active | 290 | // if ownerTree panel is not active |
291 | if (this.myGetOwnerTree().ownerCt.getActiveTab() !== this.myGetOwnerTree()) { | 291 | if (this.myGetOwnerTree().ownerCt.getActiveTab() !== this.myGetOwnerTree()) { |
@@ -329,7 +329,7 @@ Ext.define('amdaModel.BkgJobNode', { | @@ -329,7 +329,7 @@ Ext.define('amdaModel.BkgJobNode', { | ||
329 | default: var type = 'unknown'; | 329 | default: var type = 'unknown'; |
330 | } | 330 | } |
331 | myDesktopApp.infoMsg('Your request is still running and has been assigned the name '+this.get('text')+' -- Check Jobs in Progress'); | 331 | myDesktopApp.infoMsg('Your request is still running and has been assigned the name '+this.get('text')+' -- Check Jobs in Progress'); |
332 | - var message = Ext.Date.format(new Date(), 'd-m-Y H:i:s: ')+ type + ' '+this.get('text')+ ' created'; | 332 | + var message = Ext.Date.format(new Date(start), 'Y-m-d H:i:s: ')+ type + ' '+this.get('text')+ ' created'; |
333 | myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.explorer.id, true, function (module) { | 333 | myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.explorer.id, true, function (module) { |
334 | module.addLogMessage(message); | 334 | module.addLogMessage(message); |
335 | }); | 335 | }); |
js/app/models/ExecutableNode.js
@@ -137,14 +137,14 @@ Ext.define('amdaModel.ExecutableNode', { | @@ -137,14 +137,14 @@ Ext.define('amdaModel.ExecutableNode', { | ||
137 | switch (res.status) | 137 | switch (res.status) |
138 | { | 138 | { |
139 | case amdaModel.BkgJobNode.STATUS_LIST.DONE : | 139 | case amdaModel.BkgJobNode.STATUS_LIST.DONE : |
140 | - newNode.createJobNode(true); | 140 | + newNode.createJobNode(true,res.start); |
141 | newNode.editNode(true, false); | 141 | newNode.editNode(true, false); |
142 | break; | 142 | break; |
143 | case amdaModel.BkgJobNode.STATUS_LIST.IN_PROGRESS : | 143 | case amdaModel.BkgJobNode.STATUS_LIST.IN_PROGRESS : |
144 | - newNode.createJobNode(false); | 144 | + newNode.createJobNode(false,res.start); |
145 | break; | 145 | break; |
146 | default: | 146 | default: |
147 | - newNode.createJobNode(true); | 147 | + newNode.createJobNode(true,res.start); |
148 | } | 148 | } |
149 | } | 149 | } |
150 | }, this ); | 150 | }, this ); |