CDPP / AMDA_IHM

Commit 1d0858cb9e4e838e4fdb868d874646a71414a216

Authored by Erdogan Furkan
2 parents 7ff3a6d0 4711b5b4
Exists in master and in 38 other branches FER_10400, FER_10435, FER_10828, 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_6860, FER_6951, FER_7618, FER_7862, FER_9629, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_9016_New, MAZ_FIX_9016, SpeasyGet, akkodis/amdadev, amdadev, amdadev_test, density_maps, develop, openam

Merge branch 'FER_9915' into 'develop' 

Fer 9915

See merge request !56
Showing 2 changed files with 4 additions and 0 deletions   Show diff stats
Inline Side-by-side
js/app/views/ExplorerUI.js
  Diff comments   View file @1d0858c
... ... @@ -651,6 +651,9 @@ Ext.define('amdaUI.ExplorerUI', {
651 651 if (view.getRecord(tip.triggerElement)) {
652 652 var info = view.getRecord(tip.triggerElement).get('info');
653 653 var last_update = view.getRecord(tip.triggerElement).get('last_update');
  654 + var start = view.getRecord(tip.triggerElement).get('start');
  655 + if (start)
  656 + info = "<b>Started at: </b>"+ Ext.Date.format(new Date(start), "Y-m-d H:i:s")+'<br/>'+info;
654 657 if (last_update && (last_update > 0)) {
655 658 if (info && (info != '')) {
656 659 info += '<br/>';
... ...
php/classes/AmdaAction.php
  Diff comments   View file @1d0858c
... ... @@ -168,6 +168,7 @@ class AmdaAction
168 168 'pid' => $child->getAttribute('pid'),
169 169 'status' => $child->getAttribute('status'),
170 170 'jobType' => $child->getAttribute('jobType'),
  171 + 'start' => $child->getAttribute('start'),
171 172 'info' => $child->getAttribute('info')
172 173 ];
173 174 break;
... ...