diff options
Diffstat (limited to 'web/app/view')
-rw-r--r-- | web/app/view/ReportController.js | 3 | ||||
-rw-r--r-- | web/app/view/dialog/ReportConfig.js | 16 | ||||
-rw-r--r-- | web/app/view/dialog/ReportConfigController.js | 49 |
3 files changed, 68 insertions, 0 deletions
diff --git a/web/app/view/ReportController.js b/web/app/view/ReportController.js index 6d984de..80e56ba 100644 --- a/web/app/view/ReportController.js +++ b/web/app/view/ReportController.js @@ -128,6 +128,9 @@ Ext.define('Traccar.view.ReportController', { if (this.toTime !== undefined) { dialog.lookupReference('toTimeField').setValue(this.toTime); } + if (this.period !== undefined) { + dialog.lookupReference('periodField').setValue(this.period); + } dialog.show(); }, diff --git a/web/app/view/dialog/ReportConfig.js b/web/app/view/dialog/ReportConfig.js index 836b605..35cc95b 100644 --- a/web/app/view/dialog/ReportConfig.js +++ b/web/app/view/dialog/ReportConfig.js @@ -73,8 +73,22 @@ Ext.define('Traccar.view.dialog.ReportConfig', { uncheckedValue: false, value: false }, { + fieldLabel: Strings.reportPeriod, + reference: 'periodField', + xtype: 'combobox', + store: 'ReportPeriods', + editable: false, + valueField: 'key', + displayField: 'name', + queryMode: 'local', + listeners: { + change: 'onPeriodChange' + } + }, { xtype: 'fieldcontainer', layout: 'vbox', + reference: 'fromContainer', + hidden: true, fieldLabel: Strings.reportFrom, items: [{ xtype: 'datefield', @@ -90,6 +104,8 @@ Ext.define('Traccar.view.dialog.ReportConfig', { }, { xtype: 'fieldcontainer', layout: 'vbox', + reference: 'toContainer', + hidden: true, fieldLabel: Strings.reportTo, items: [{ xtype: 'datefield', diff --git a/web/app/view/dialog/ReportConfigController.js b/web/app/view/dialog/ReportConfigController.js index ce66371..6d02942 100644 --- a/web/app/view/dialog/ReportConfigController.js +++ b/web/app/view/dialog/ReportConfigController.js @@ -44,7 +44,56 @@ Ext.define('Traccar.view.dialog.ReportConfigController', { callingPanel.fromTime = this.lookupReference('fromTimeField').getValue(); callingPanel.toDate = this.lookupReference('toDateField').getValue(); callingPanel.toTime = this.lookupReference('toTimeField').getValue(); + callingPanel.period = this.lookupReference('periodField').getValue(); callingPanel.updateButtons(); button.up('window').close(); + }, + + onPeriodChange: function (combobox, newValue) { + var day, first, from, to, custom = newValue === 'custom'; + this.lookupReference('fromContainer').setHidden(!custom); + this.lookupReference('toContainer').setHidden(!custom); + if (!custom) { + from = new Date(); + to = new Date(); + switch (newValue) { + case 'today': + to.setDate(to.getDate() + 1); + break; + case 'yesterday': + from.setDate(to.getDate() - 1); + break; + case 'thisWeek': + day = from.getDay(); + first = from.getDate() - day + (day === 0 ? -6 : 1); + from.setDate(first); + to.setDate(first + 7); + break; + case 'previousWeek': + day = from.getDay(); + first = from.getDate() - day + (day === 0 ? -6 : 1); + from.setDate(first - 7); + to.setDate(first); + break; + case 'thisMonth': + from.setDate(1); + to.setDate(1); + to.setMonth(from.getMonth() + 1); + break; + case 'previousMonth': + from.setDate(1); + from.setMonth(from.getMonth() - 1); + to.setDate(1); + break; + default: + break; + } + from.setHours(0, 0, 0, 0); + to.setHours(0, 0, 0, 0); + this.lookupReference('fromDateField').setValue(from); + this.lookupReference('fromTimeField').setValue(from); + this.lookupReference('toDateField').setValue(to); + this.lookupReference('toTimeField').setValue(to); + } } }); |