CDPP / AMDA_IHM

Commit 9193d9a617b82d2e66e74ec7c19785ba10c53499

Authored by Hacene SI HADJ MOHAND
1 parent b852834a
Exists in master and in 65 other branches 10098, 10178, 5390, 7616, 9014, 9016Bis, 9084, 9326, 9505, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, 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_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, akkodis/amdadev, amdadev, amdadev_test, cu2022, density_maps, develop, epn-tap, mlplasmas, openam, test-merge

request ok

Showing 2 changed files with 9 additions and 4 deletions   Show diff stats
Inline Side-by-side
js/app/models/AmdaTimeObject.js
  Diff comments   View file @9193d9a
... ... @@ -37,7 +37,10 @@ Ext.define('amdaModel.AmdaTimeObject', {
37 37 { name: 'folderId', type: 'string'},
38 38 { name: 'processId', type: 'string'},
39 39 { name: 'timesrc', type: 'string'/*, defaultValue: amdaModel.AmdaTimeObject.inputTimeSrc[1] /*'Interval'*/ },
40   - { name: 'startDate', type: 'date', defaultValue:Ext.Date.add(Ext.Date.clearTime(new Date()),Ext.Date.DAY,-1),
  40 + {
  41 + name: 'startDate',
  42 + type: 'date',
  43 + defaultValue:Ext.Date.add(Ext.Date.clearTime(new Date()),Ext.Date.DAY,-1),
41 44 convert: function(value,rec) {
42 45 if (!Ext.isDate(value)) {
43 46 return new Date(value);
... ... @@ -46,7 +49,9 @@ Ext.define('amdaModel.AmdaTimeObject', {
46 49 }
47 50 },
48 51 {
49   - name: 'stopDate', type: 'date', defaultValue: Ext.Date.clearTime (new Date()), persist: false,
  52 + name: 'stopDate',
  53 + type: 'date',
  54 + defaultValue: Ext.Date.clearTime (new Date()), persist: false,
50 55 convert: function(value,rec) {
51 56 if (!Ext.isDate(value)){
52 57 return new Date(value);
... ...
js/app/models/PlotObjects/PlotRequestObject.js
  Diff comments   View file @9193d9a
... ... @@ -288,8 +288,8 @@ Ext.define('amdaPlotObj.PlotRequestObject', {
288 288 }
289 289 });
290 290 } else {
291   - requestValues['startDate'] = this.get('startDate');
292   - requestValues['stopDate'] = this.get('stopDate');
  291 + requestValues['startDate'] = Ext.Date.format(this.get('startDate'), 'Y-m-d\\TH:i:s.u');
  292 + requestValues['stopDate'] = Ext.Date.format(this.get('stopDate'), 'Y-m-d\\TH:i:s.u');
293 293 requestValues['durationDay'] = this.get('durationDay');
294 294 requestValues['durationHour'] = this.get('durationHour');
295 295 requestValues['durationMin'] = this.get('durationMin');
... ...