CDPP / AMDA_IHM

Commit 79a609559b8c3b86f9959f16ef6d2e3a96f7329d

Authored by Hacene SI HADJ MOHAND
1 parent 9193d9a6
Exists in master and in 64 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, amdadev, amdadev_test, cu2022, density_maps, develop, epn-tap, mlplasmas, openam, test-merge

ms ok affichage ko

Showing 7 changed files with 19 additions and 19 deletions   Show diff stats
Inline Side-by-side
js/app/models/Download.js
  Diff comments   View file @79a6095
... ... @@ -163,8 +163,8 @@ Ext.define('amdaModel.Download', {
163 163 }
164 164 });
165 165 } else {
166   - myValues.startDate = this.get('startDate');
167   - myValues.stopDate = this.get('stopDate');
  166 + myValues.startDate = Ext.Date.format(this.get('startDate'), 'Y-m-d\\TH:i:s.u');
  167 + myValues.stopDate = Ext.Date.format(this.get('stopDate'), 'Y-m-d\\TH:i:s.u');
168 168 myValues.durationDay = this.get('durationDay');
169 169 myValues.durationHour = this.get('durationHour');
170 170 myValues.durationMin = this.get('durationMin');
... ...
js/app/models/DownloadNode.js
  Diff comments   View file @79a6095
... ... @@ -73,8 +73,8 @@ Ext.define('amdaModel.DownloadNode', {
73 73 });
74 74 }
75 75 else {
76   - myValues.startDate = obj.get('startDate');
77   - myValues.stopDate = obj.get('stopDate');
  76 + myValues.startDate = Ext.Date.format(obj.get('startDate'), 'Y-m-d\\TH:i:s.u');
  77 + myValues.stopDate = Ext.Date.format(obj.get('startDate'), 'Y-m-d\\TH:i:s.u');
78 78 myValues.durationDay = obj.get('durationDay');
79 79 myValues.durationHour = obj.get('durationHour');
80 80 myValues.durationMin = obj.get('durationMin');
... ...
js/app/models/PlotObjects/MultiplotRequestObject.js
  Diff comments   View file @79a6095
... ... @@ -126,8 +126,8 @@ Ext.define('amdaPlotObj.MultiplotRequestObject', {
126 126 }
127 127 });
128 128 } else {
129   - requestValues['startDate'] = this.get('startDate');
130   - requestValues['stopDate'] = this.get('stopDate');
  129 + requestValues['startDate'] = Ext.Date.format(this.get('startDate'), 'Y-m-d\\TH:i:s.u');
  130 + requestValues['stopDate'] = Ext.Date.format(this.get('stopDate'), 'Y-m-d\\TH:i:s.u');
131 131 requestValues['durationDay'] = this.get('durationDay');
132 132 requestValues['durationHour'] = this.get('durationHour');
133 133 requestValues['durationMin'] = this.get('durationMin');
... ...
js/app/models/Search.js
  Diff comments   View file @79a6095
... ... @@ -65,8 +65,8 @@ Ext.define('amdaModel.Search', {
65 65 }
66 66 });
67 67 } else {
68   - myValues.startDate = this.get('startDate');
69   - myValues.stopDate = this.get('stopDate');
  68 + myValues.startDate = Ext.Date.format(this.get('startDate'), 'Y-m-d\\TH:i:s.u');
  69 + myValues.stopDate = Ext.Date.format(this.get('stopDate'), 'Y-m-d\\TH:i:s.u');
70 70 myValues.durationDay = this.get('durationDay');
71 71 myValues.durationHour = this.get('durationHour');
72 72 myValues.durationMin = this.get('durationMin');
... ...
js/app/models/Statistic.js
  Diff comments   View file @79a6095
... ... @@ -104,8 +104,8 @@ Ext.define('amdaModel.Statistic', {
104 104 });
105 105 } else
106 106 {
107   - values.startDate = this.get('startDate');
108   - values.stopDate = this.get('stopDate');
  107 + values.startDate = Ext.Date.format(this.get('startDate'), 'Y-m-d\\TH:i:s.u');
  108 + values.stopDate = Ext.Date.format(this.get('stopDate'), 'Y-m-d\\TH:i:s.u');
109 109 values.durationDay = this.get('durationDay');
110 110 values.durationHour = this.get('durationHour');
111 111 values.durationMin = this.get('durationMin');
... ...
js/app/views/IntervalUI.js
  Diff comments   View file @79a6095
... ... @@ -230,9 +230,9 @@ Ext.define('amdaUI.IntervalUI', {
230 230 xtype: 'datefield',
231 231 // margin : '10 0 5 5', // (top, right, bottom, left).
232 232 name: fieldName,
233   - // width : 220,
234   - emptyText: 'YYYY/MM/DD hh:mm:ss',
235   - tip: 'Date formatted as YYYY/MM/DD hh:mm:ss',
  233 + width : 230,
  234 + emptyText: 'YYYY/MM/DD hh:mm:ss.uuu',
  235 + tip: 'Date formatted as YYYY/MM/DD hh:mm:ss.uuu',
236 236 format: 'Y/m/d H:i:s.u',
237 237 enforceMaxLength: true,
238 238 maxLength: 25,
... ...
js/app/views/StatisticsUI.js
  Diff comments   View file @79a6095
... ... @@ -177,17 +177,17 @@ Ext.define('amdaUI.StatisticsUI',
177 177  
178 178 /**
179 179 * Set Start-Stop from parameter info (Local & MyData)
180   - */
  180 +
181 181 setTimeFromData: function (obj) {
182 182 if (!obj.start || !obj.stop)
183 183 return;
184 184  
185   - var dateStart = new Date(obj.start.replace(/[T|Z]/g, ' ').replace(/\-/g, '\/'));
186   - var dateStop = new Date(obj.stop.replace(/[T|Z]/g, ' ').replace(/\-/g, '\/'));
  185 + //var dateStart = new Date(obj.start.replace(/[T|Z]/g, ' ').replace(/\-/g, '\/'));
  186 + //var dateStop = new Date(obj.stop.replace(/[T|Z]/g, ' ').replace(/\-/g, '\/'));
187 187  
188   - this.formPanel.items.items[1].getForm().setValues({startDate: dateStart, stopDate: dateStop});
189   - this.timeSelector.intervalSel.updateDuration();
190   - },
  188 + //this.formPanel.items.items[1].getForm().setValues({startDate: dateStart, stopDate: dateStop});
  189 + // this.timeSelector.intervalSel.updateDuration();
  190 + }, */
191 191  
192 192 generateCatalog: function ()
193 193 {
... ...