diff --git a/js/app/models/Download.js b/js/app/models/Download.js index 99eafd1..ce634aa 100644 --- a/js/app/models/Download.js +++ b/js/app/models/Download.js @@ -163,8 +163,8 @@ Ext.define('amdaModel.Download', { } }); } else { - myValues.startDate = this.get('startDate'); - myValues.stopDate = this.get('stopDate'); + myValues.startDate = Ext.Date.format(this.get('startDate'), 'Y-m-d\\TH:i:s.u'); + myValues.stopDate = Ext.Date.format(this.get('stopDate'), 'Y-m-d\\TH:i:s.u'); myValues.durationDay = this.get('durationDay'); myValues.durationHour = this.get('durationHour'); myValues.durationMin = this.get('durationMin'); diff --git a/js/app/models/DownloadNode.js b/js/app/models/DownloadNode.js index f082206..d5940af 100644 --- a/js/app/models/DownloadNode.js +++ b/js/app/models/DownloadNode.js @@ -73,8 +73,8 @@ Ext.define('amdaModel.DownloadNode', { }); } else { - myValues.startDate = obj.get('startDate'); - myValues.stopDate = obj.get('stopDate'); + myValues.startDate = Ext.Date.format(obj.get('startDate'), 'Y-m-d\\TH:i:s.u'); + myValues.stopDate = Ext.Date.format(obj.get('startDate'), 'Y-m-d\\TH:i:s.u'); myValues.durationDay = obj.get('durationDay'); myValues.durationHour = obj.get('durationHour'); myValues.durationMin = obj.get('durationMin'); diff --git a/js/app/models/PlotObjects/MultiplotRequestObject.js b/js/app/models/PlotObjects/MultiplotRequestObject.js index d600bb2..41d28c8 100644 --- a/js/app/models/PlotObjects/MultiplotRequestObject.js +++ b/js/app/models/PlotObjects/MultiplotRequestObject.js @@ -126,8 +126,8 @@ Ext.define('amdaPlotObj.MultiplotRequestObject', { } }); } else { - requestValues['startDate'] = this.get('startDate'); - requestValues['stopDate'] = this.get('stopDate'); + requestValues['startDate'] = Ext.Date.format(this.get('startDate'), 'Y-m-d\\TH:i:s.u'); + requestValues['stopDate'] = Ext.Date.format(this.get('stopDate'), 'Y-m-d\\TH:i:s.u'); requestValues['durationDay'] = this.get('durationDay'); requestValues['durationHour'] = this.get('durationHour'); requestValues['durationMin'] = this.get('durationMin'); diff --git a/js/app/models/Search.js b/js/app/models/Search.js index eee316b..5d25a61 100644 --- a/js/app/models/Search.js +++ b/js/app/models/Search.js @@ -65,8 +65,8 @@ Ext.define('amdaModel.Search', { } }); } else { - myValues.startDate = this.get('startDate'); - myValues.stopDate = this.get('stopDate'); + myValues.startDate = Ext.Date.format(this.get('startDate'), 'Y-m-d\\TH:i:s.u'); + myValues.stopDate = Ext.Date.format(this.get('stopDate'), 'Y-m-d\\TH:i:s.u'); myValues.durationDay = this.get('durationDay'); myValues.durationHour = this.get('durationHour'); myValues.durationMin = this.get('durationMin'); diff --git a/js/app/models/Statistic.js b/js/app/models/Statistic.js index 16b7528..8e0c0de 100644 --- a/js/app/models/Statistic.js +++ b/js/app/models/Statistic.js @@ -104,8 +104,8 @@ Ext.define('amdaModel.Statistic', { }); } else { - values.startDate = this.get('startDate'); - values.stopDate = this.get('stopDate'); + values.startDate = Ext.Date.format(this.get('startDate'), 'Y-m-d\\TH:i:s.u'); + values.stopDate = Ext.Date.format(this.get('stopDate'), 'Y-m-d\\TH:i:s.u'); values.durationDay = this.get('durationDay'); values.durationHour = this.get('durationHour'); values.durationMin = this.get('durationMin'); diff --git a/js/app/views/IntervalUI.js b/js/app/views/IntervalUI.js index b89c9a4..14a039c 100644 --- a/js/app/views/IntervalUI.js +++ b/js/app/views/IntervalUI.js @@ -230,9 +230,9 @@ Ext.define('amdaUI.IntervalUI', { xtype: 'datefield', // margin : '10 0 5 5', // (top, right, bottom, left). name: fieldName, - // width : 220, - emptyText: 'YYYY/MM/DD hh:mm:ss', - tip: 'Date formatted as YYYY/MM/DD hh:mm:ss', + width : 230, + emptyText: 'YYYY/MM/DD hh:mm:ss.uuu', + tip: 'Date formatted as YYYY/MM/DD hh:mm:ss.uuu', format: 'Y/m/d H:i:s.u', enforceMaxLength: true, maxLength: 25, diff --git a/js/app/views/StatisticsUI.js b/js/app/views/StatisticsUI.js index 00d76d1..efc5ccc 100644 --- a/js/app/views/StatisticsUI.js +++ b/js/app/views/StatisticsUI.js @@ -177,17 +177,17 @@ Ext.define('amdaUI.StatisticsUI', /** * Set Start-Stop from parameter info (Local & MyData) - */ + setTimeFromData: function (obj) { if (!obj.start || !obj.stop) return; - var dateStart = new Date(obj.start.replace(/[T|Z]/g, ' ').replace(/\-/g, '\/')); - var dateStop = new Date(obj.stop.replace(/[T|Z]/g, ' ').replace(/\-/g, '\/')); + //var dateStart = new Date(obj.start.replace(/[T|Z]/g, ' ').replace(/\-/g, '\/')); + //var dateStop = new Date(obj.stop.replace(/[T|Z]/g, ' ').replace(/\-/g, '\/')); - this.formPanel.items.items[1].getForm().setValues({startDate: dateStart, stopDate: dateStop}); - this.timeSelector.intervalSel.updateDuration(); - }, + //this.formPanel.items.items[1].getForm().setValues({startDate: dateStart, stopDate: dateStop}); + // this.timeSelector.intervalSel.updateDuration(); + }, */ generateCatalog: function () { -- libgit2 0.21.2