diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2017-08-09 21:54:23 +1200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-09 21:54:23 +1200 |
commit | c7888fcf5e92280ed4573ee0973872a59451ac52 (patch) | |
tree | afbc234fe4e6eb666178723414c380125d8b589a /web/app | |
parent | ac0d6b1bf5833536b28aabad25b628ea0322fb76 (diff) | |
parent | df4d20d9e31193d73d001795ee4de5d6270b4abb (diff) | |
download | etbsa-traccar-web-c7888fcf5e92280ed4573ee0973872a59451ac52.tar.gz etbsa-traccar-web-c7888fcf5e92280ed4573ee0973872a59451ac52.tar.bz2 etbsa-traccar-web-c7888fcf5e92280ed4573ee0973872a59451ac52.zip |
Merge pull request #539 from Abyss777/disable_report
Implement attribute to disable reports
Diffstat (limited to 'web/app')
-rw-r--r-- | web/app/store/ServerAttributes.js | 4 | ||||
-rw-r--r-- | web/app/store/UserAttributes.js | 4 | ||||
-rw-r--r-- | web/app/view/Main.js | 4 | ||||
-rw-r--r-- | web/app/view/MainController.js | 26 | ||||
-rw-r--r-- | web/app/view/map/MapController.js | 3 |
5 files changed, 40 insertions, 1 deletions
diff --git a/web/app/store/ServerAttributes.js b/web/app/store/ServerAttributes.js index 05002f1..89a0137 100644 --- a/web/app/store/ServerAttributes.js +++ b/web/app/store/ServerAttributes.js @@ -47,5 +47,9 @@ Ext.define('Traccar.store.ServerAttributes', { allowDecimals: false, minValue: Traccar.Style.mapDefaultZoom, maxValue: Traccar.Style.mapMaxZoom + }, { + key: 'ui.disableReport', + name: Strings.attributeUiDisableReport, + valueType: 'boolean' }] }); diff --git a/web/app/store/UserAttributes.js b/web/app/store/UserAttributes.js index 91a54d0..6cf06fb 100644 --- a/web/app/store/UserAttributes.js +++ b/web/app/store/UserAttributes.js @@ -79,5 +79,9 @@ Ext.define('Traccar.store.UserAttributes', { allowDecimals: false, minValue: Traccar.Style.mapDefaultZoom, maxValue: Traccar.Style.mapMaxZoom + }, { + key: 'ui.disableReport', + name: Strings.attributeUiDisableReport, + valueType: 'boolean' }] }); diff --git a/web/app/view/Main.js b/web/app/view/Main.js index 3f7cf7c..2d251a5 100644 --- a/web/app/view/Main.js +++ b/web/app/view/Main.js @@ -20,6 +20,7 @@ Ext.define('Traccar.view.Main', { alias: 'widget.main', requires: [ + 'Traccar.view.MainController', 'Traccar.view.edit.Devices', 'Traccar.view.State', 'Traccar.view.Report', @@ -27,6 +28,8 @@ Ext.define('Traccar.view.Main', { 'Traccar.view.map.Map' ], + controller: 'mainController', + layout: 'border', defaults: { @@ -60,6 +63,7 @@ Ext.define('Traccar.view.Main', { }, { region: 'south', xtype: 'reportView', + reference: 'reportView', height: Traccar.Style.reportHeight, collapsed: true, titleCollapse: true, diff --git a/web/app/view/MainController.js b/web/app/view/MainController.js new file mode 100644 index 0000000..76645e4 --- /dev/null +++ b/web/app/view/MainController.js @@ -0,0 +1,26 @@ +/* + * Copyright 2017 Anton Tananaev (anton@traccar.org) + * Copyright 2017 Andrey Kunitsyn (andrey@traccar.org) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +Ext.define('Traccar.view.MainController', { + extend: 'Ext.app.ViewController', + alias: 'controller.mainController', + + init: function () { + this.lookupReference('reportView').setHidden( + Traccar.app.getAttributePreference('ui.disableReport', false).toString() === 'true'); + } +}); diff --git a/web/app/view/map/MapController.js b/web/app/view/map/MapController.js index 02d4e38..f2a561a 100644 --- a/web/app/view/map/MapController.js +++ b/web/app/view/map/MapController.js @@ -44,7 +44,8 @@ Ext.define('Traccar.view.map.MapController', { init: function () { this.callParent(); - this.lookupReference('showReportsButton').setVisible(Traccar.app.isMobile()); + this.lookupReference('showReportsButton').setVisible(Traccar.app.isMobile() && + !Traccar.app.getAttributePreference('ui.disableReport', false)); this.lookupReference('showEventsButton').setVisible(Traccar.app.isMobile()); }, |