You need to sign in before continuing.

Merged
Merge Request #49 · created by Erdogan Furkan


Fer 5165


From FER_5165 into develop

Merged by Benjamin Renard

2 participants

10 Nov, 2022

1 commit


js/app/views/IntervalUI.js
  Diff comments   Edit  View file @abdf73a
... ... @@ -231,7 +231,6 @@ Ext.define('amdaUI.IntervalUI', {
231 231 // margin : '10 0 5 5', // (top, right, bottom, left).
232 232 name: fieldName,
233 233 width : 230,
234   - id : fieldName+'id',
235 234 emptyText: 'YYYY/MM/DD hh:mm:ss.uuu',
236 235 tip: 'Date formatted as YYYY/MM/DD hh:mm:ss.uuu',
237 236 format: 'Y/m/d H:i:s.u',
... ...
js/app/views/PlotComponents/PlotPanelForm.js
  Diff comments   Edit  View file @abdf73a
... ... @@ -50,8 +50,8 @@ Ext.define('amdaPlotComp.PlotPanelForm', {
50 50 //Instant time visibility
51 51 var instantTimeField = this.getForm().findField('panel-instant-time');
52 52 instantTimeField.setVisible(plotType == 'instantPlot');
53   - var startDate = Ext.getCmp('startDateid').getValue();
54   - var stopDate = Ext.getCmp('stopDateid').getValue();
  53 + var startDate = this.up().up().up().timeSelector.intervalSel.items.items[0].getValue();
  54 + var stopDate = this.up().up().up().timeSelector.intervalSel.items.items[1].getValue();
55 55 if(startDate <= stopDate ){
56 56 var interval = (stopDate-startDate)/2
57 57 instantTimeField.setValue(new Date(stopDate-interval));
... ...