CDPP / AMDA_IHM

Commit 795ce2705388705113c63fbd4e344e18857cb68a

Authored by Benjamin Renard
2 parents 74c27538 1cfbb4ac
Exists in master and in 33 other branches FER_10435, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_6265, FER_6951, FER_7618, FER_7862, FER_9629, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_11362, MAZ_11427, MAZ_9016_New, MAZ_FIX_9016, SpeasyGet, akkodis/amdadev, amdadev, amdadev_test, develop, openam

Merge branch 'develop' into amdadev

Showing 4 changed files with 7 additions and 7 deletions   Show diff stats
Inline Side-by-side
js/app/controllers/JobsMgr.js
  Diff comments   View file @795ce27
... ... @@ -100,7 +100,7 @@ Ext.define('amdaDesktop.JobsMgr', {
100 100 default:
101 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 104 message = strDate + type + ' ' + job.name + ' completed'
105 105 myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.explorer.id, true,
106 106 function (mod) {
... ...
js/app/models/BkgJobNode.js
  Diff comments   View file @795ce27
... ... @@ -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 290 // if ownerTree panel is not active
291 291 if (this.myGetOwnerTree().ownerCt.getActiveTab() !== this.myGetOwnerTree()) {
... ... @@ -329,7 +329,7 @@ Ext.define('amdaModel.BkgJobNode', {
329 329 default: var type = 'unknown';
330 330 }
331 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 333 myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.explorer.id, true, function (module) {
334 334 module.addLogMessage(message);
335 335 });
... ...
js/app/models/ExecutableNode.js
  Diff comments   View file @795ce27
... ... @@ -137,14 +137,14 @@ Ext.define('amdaModel.ExecutableNode', {
137 137 switch (res.status)
138 138 {
139 139 case amdaModel.BkgJobNode.STATUS_LIST.DONE :
140   - newNode.createJobNode(true);
  140 + newNode.createJobNode(true,res.start);
141 141 newNode.editNode(true, false);
142 142 break;
143 143 case amdaModel.BkgJobNode.STATUS_LIST.IN_PROGRESS :
144   - newNode.createJobNode(false);
  144 + newNode.createJobNode(false,res.start);
145 145 break;
146 146 default:
147   - newNode.createJobNode(true);
  147 + newNode.createJobNode(true,res.start);
148 148 }
149 149 }
150 150 }, this );
... ...
php/classes/AmdaAction.php
  Diff comments   View file @795ce27
... ... @@ -210,7 +210,7 @@ class AmdaAction
210 210 $info .= 'Units: '.$child->getAttribute('units').'<br/>';
211 211 $samplingMode = $child->getAttribute('sampling_mode');
212 212 if($samplingMode == 'timestep'){
213   - $info .= 'Sampling Time: '.$child->getAttribute('timestep');
  213 + $info .= 'Sampling: '.$child->getAttribute('timestep').' sec';
214 214 }else if($samplingMode == 'refparam'){
215 215 $info .= 'Reference Parameter: '.$child->getAttribute('reference_param');
216 216 }
... ...