Merge pull request #2269 from Abyss777/reports_web_configure

Implemented configure dialog for reports

1 files changed, 5 insertions, 41 deletions

diff --git a/web/app/view/Report.js b/web/app/view/Report.js
index 2ce9137ee..7e77ef4f4 100644
--- a/web/app/view/Report.js
+++ b/web/app/view/Report.js
@@ -19,8 +19,7 @@ Ext.define('Traccar.view.Report', {
     xtype: 'reportView',
 
     requires: [
-        'Traccar.view.ReportController',
-        'Traccar.view.CustomTimeField'
+        'Traccar.view.ReportController'
     ],
 
     controller: 'report',
@@ -41,52 +40,17 @@ Ext.define('Traccar.view.Report', {
             change: 'onTypeChange'
         }
     }, '-', {
-        xtype: 'tbtext',
-        html: Strings.reportDevice
-    }, {
-        xtype: 'tagfield',
-        maxWidth: Traccar.Style.maxTagfieldWidth,
-        growMax: Traccar.Style.maxTagfieldGrow,
-        reference: 'deviceField',
-        store: 'Devices',
-        valueField: 'id',
-        displayField: 'name',
-        queryMode: 'local'
-    }, '-', {
-        xtype: 'tbtext',
-        html: Strings.reportFrom
-    }, {
-        xtype: 'datefield',
-        reference: 'fromDateField',
-        startDay: Traccar.Style.weekStartDay,
-        format: Traccar.Style.dateFormat,
-        value: new Date(new Date().getTime() - 30 * 60 * 1000)
-    }, {
-        xtype: 'customTimeField',
-        reference: 'fromTimeField',
-        maxWidth: Traccar.Style.reportTime,
-        value: new Date(new Date().getTime() - 30 * 60 * 1000)
-    }, '-', {
-        xtype: 'tbtext',
-        html: Strings.reportTo
-    }, {
-        xtype: 'datefield',
-        reference: 'toDateField',
-        startDay: Traccar.Style.weekStartDay,
-        format: Traccar.Style.dateFormat,
-        value: new Date()
-    }, {
-        xtype: 'customTimeField',
-        reference: 'toTimeField',
-        maxWidth: Traccar.Style.reportTime,
-        value: new Date()
+        text: Strings.reportConfigure,
+        handler: 'onConfigureClick'
     }, '-', {
         text: Strings.reportShow,
         reference: 'showButton',
+        disabled: true,
         handler: 'onReportClick'
     }, {
         text: Strings.reportCsv,
         reference: 'csvButton',
+        disabled: true,
         handler: 'onReportClick'
     }, {
         text: Strings.reportClear,