Merge pull request #556 from Abyss777/disable_vehicle_features

Disable some UI features

18 files changed, 166 insertions, 98 deletions

diff --git a/web/app/Application.js b/web/app/Application.js
index c14dd4d..e0f0aa4 100644
--- a/web/app/Application.js
+++ b/web/app/Application.js
@@ -83,10 +83,12 @@ Ext.define('Traccar.Application', {
         'AllTimezones',
         'VisibleDevices',
         'DeviceStatuses',
+        'CommonDeviceAttributes',
         'DeviceAttributes',
         'GeofenceAttributes',
         'GroupAttributes',
         'ServerAttributes',
+        'CommonUserAttributes',
         'UserAttributes',
         'ComputedAttributes',
         'AllComputedAttributes',
@@ -104,6 +106,10 @@ Ext.define('Traccar.Application', {
         return window.matchMedia && window.matchMedia('(max-width: 768px)').matches;
     },
 
+    getVehicleFeaturesDisabled: function () {
+        return this.getBooleanAttributePreference('ui.disableVehicleFetures');
+    },
+
     getEventString: function (eventType) {
         var key = 'event' + eventType.charAt(0).toUpperCase() + eventType.slice(1);
         return Strings[key] || key;
@@ -161,6 +167,10 @@ Ext.define('Traccar.Application', {
         }
     },
 
+    getBooleanAttributePreference: function (key) {
+        return this.getAttributePreference(key, false).toString() === 'true';
+    },
+
     getReportColor: function (deviceId) {
         var index, reportColor, device = Ext.getStore('Devices').getById(deviceId);
         if (device) {
diff --git a/web/app/controller/Root.js b/web/app/controller/Root.js
index 9262011..1c70dd0 100644
--- a/web/app/controller/Root.js
+++ b/web/app/controller/Root.js
@@ -113,6 +113,13 @@ Ext.define('Traccar.controller.Root', {
         Ext.getStore('AttributeAliases').load();
         Ext.getStore('ComputedAttributes').load();
         this.initReportEventTypesStore();
+
+        Ext.getStore('ServerAttributes').loadData(Ext.getStore('CommonDeviceAttributes').getData().items, true);
+        Ext.getStore('ServerAttributes').loadData(Ext.getStore('CommonUserAttributes').getData().items, true);
+        Ext.getStore('UserAttributes').loadData(Ext.getStore('CommonUserAttributes').getData().items, true);
+        Ext.getStore('DeviceAttributes').loadData(Ext.getStore('CommonDeviceAttributes').getData().items, true);
+        Ext.getStore('GroupAttributes').loadData(Ext.getStore('CommonDeviceAttributes').getData().items, true);
+
         Ext.getStore('Devices').load({
             scope: this,
             callback: function () {
diff --git a/web/app/store/CommonDeviceAttributes.js b/web/app/store/CommonDeviceAttributes.js
new file mode 100644
index 0000000..83dd411
--- /dev/null
+++ b/web/app/store/CommonDeviceAttributes.js
@@ -0,0 +1,42 @@
+/*
+ * 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.store.CommonDeviceAttributes', {
+    extend: 'Ext.data.Store',
+    model: 'Traccar.model.KnownAttribute',
+
+    data: [{
+        key: 'speedLimit',
+        name: Strings.attributeSpeedLimit,
+        valueType: 'number',
+        dataType: 'speed'
+    }, {
+        key: 'report.ignoreOdometer',
+        name: Strings.attributeReportIgnoreOdometer,
+        valueType: 'boolean'
+    }, {
+        key: 'maintenance.start',
+        name: Strings.attributeMaintenanceStart,
+        valueType: 'number',
+        dataType: 'distance'
+    }, {
+        key: 'maintenance.interval',
+        name: Strings.attributeMaintenanceInterval,
+        valueType: 'number',
+        dataType: 'distance'
+    }]
+});
diff --git a/web/app/store/CommonUserAttributes.js b/web/app/store/CommonUserAttributes.js
new file mode 100644
index 0000000..85d652d
--- /dev/null
+++ b/web/app/store/CommonUserAttributes.js
@@ -0,0 +1,55 @@
+/*
+ * 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.store.CommonUserAttributes', {
+    extend: 'Ext.data.Store',
+    model: 'Traccar.model.KnownAttribute',
+
+    data: [{
+        key: 'web.liveRouteLength',
+        name: Strings.attributeWebLiveRouteLength,
+        valueType: 'number',
+        allowDecimals: false
+    }, {
+        key: 'web.selectZoom',
+        name: Strings.attributeWebSelectZoom,
+        valueType: 'number',
+        allowDecimals: false,
+        minValue: Traccar.Style.mapDefaultZoom,
+        maxValue: Traccar.Style.mapMaxZoom
+    }, {
+        key: 'ui.disableReport',
+        name: Strings.attributeUiDisableReport,
+        valueType: 'boolean'
+    }, {
+        key: 'ui.disableVehicleFetures',
+        name: Strings.attributeUiDisableVehicleFetures,
+        valueType: 'boolean'
+    }, {
+        key: 'ui.disableDrivers',
+        name: Strings.attributeUiDisableDrivers,
+        valueType: 'boolean'
+    }, {
+        key: 'ui.disableComputedAttributes',
+        name: Strings.attributeUiDisableComputedAttributes,
+        valueType: 'boolean'
+    }, {
+        key: 'ui.disableCalendars',
+        name: Strings.attributeUiDisableCalendars,
+        valueType: 'boolean'
+    }]
+});
diff --git a/web/app/store/DeviceAttributes.js b/web/app/store/DeviceAttributes.js
index 220f9a5..4b1d920 100644
--- a/web/app/store/DeviceAttributes.js
+++ b/web/app/store/DeviceAttributes.js
@@ -18,28 +18,8 @@
 Ext.define('Traccar.store.DeviceAttributes', {
     extend: 'Ext.data.Store',
     model: 'Traccar.model.KnownAttribute',
-    proxy: 'memory',
 
     data: [{
-        key: 'speedLimit',
-        name: Strings.attributeSpeedLimit,
-        valueType: 'number',
-        dataType: 'speed'
-    }, {
-        key: 'report.ignoreOdometer',
-        name: Strings.attributeReportIgnoreOdometer,
-        valueType: 'boolean'
-    }, {
-        key: 'maintenance.start',
-        name: Strings.attributeMaintenanceStart,
-        valueType: 'number',
-        dataType: 'distance'
-    }, {
-        key: 'maintenance.interval',
-        name: Strings.attributeMaintenanceInterval,
-        valueType: 'number',
-        dataType: 'distance'
-    }, {
         key: 'web.reportColor',
         name: Strings.attributeWebReportColor,
         valueType: 'color'
diff --git a/web/app/store/GroupAttributes.js b/web/app/store/GroupAttributes.js
index 2a2765f..9389db1 100644
--- a/web/app/store/GroupAttributes.js
+++ b/web/app/store/GroupAttributes.js
@@ -18,28 +18,8 @@
 Ext.define('Traccar.store.GroupAttributes', {
     extend: 'Ext.data.Store',
     model: 'Traccar.model.KnownAttribute',
-    proxy: 'memory',
 
     data: [{
-        key: 'speedLimit',
-        name: Strings.attributeSpeedLimit,
-        valueType: 'number',
-        dataType: 'speed'
-    }, {
-        key: 'report.ignoreOdometer',
-        name: Strings.attributeReportIgnoreOdometer,
-        valueType: 'boolean'
-    }, {
-        key: 'maintenance.start',
-        name: Strings.attributeMaintenanceStart,
-        valueType: 'number',
-        dataType: 'distance'
-    }, {
-        key: 'maintenance.interval',
-        name: Strings.attributeMaintenanceInterval,
-        valueType: 'number',
-        dataType: 'distance'
-    }, {
         key: 'processing.copyAttributes',
         name: Strings.attributeProcessingCopyAttributes,
         valueType: 'string'
diff --git a/web/app/store/ServerAttributes.js b/web/app/store/ServerAttributes.js
index 89a0137..204f885 100644
--- a/web/app/store/ServerAttributes.js
+++ b/web/app/store/ServerAttributes.js
@@ -18,38 +18,6 @@
 Ext.define('Traccar.store.ServerAttributes', {
     extend: 'Ext.data.Store',
     model: 'Traccar.model.KnownAttribute',
-    proxy: 'memory',
 
-    data: [{
-        key: 'speedLimit',
-        name: Strings.attributeSpeedLimit,
-        valueType: 'number',
-        dataType: 'speed'
-    }, {
-        key: 'maintenance.start',
-        name: Strings.attributeMaintenanceStart,
-        valueType: 'number',
-        dataType: 'distance'
-    }, {
-        key: 'maintenance.interval',
-        name: Strings.attributeMaintenanceInterval,
-        valueType: 'number',
-        dataType: 'distance'
-    }, {
-        key: 'web.liveRouteLength',
-        name: Strings.attributeWebLiveRouteLength,
-        valueType: 'number',
-        allowDecimals: false
-    }, {
-        key: 'web.selectZoom',
-        name: Strings.attributeWebSelectZoom,
-        valueType: 'number',
-        allowDecimals: false,
-        minValue: Traccar.Style.mapDefaultZoom,
-        maxValue: Traccar.Style.mapMaxZoom
-    }, {
-        key: 'ui.disableReport',
-        name: Strings.attributeUiDisableReport,
-        valueType: 'boolean'
-    }]
+    data: []
 });
diff --git a/web/app/store/UserAttributes.js b/web/app/store/UserAttributes.js
index 6cf06fb..dfe6942 100644
--- a/web/app/store/UserAttributes.js
+++ b/web/app/store/UserAttributes.js
@@ -18,7 +18,6 @@
 Ext.define('Traccar.store.UserAttributes', {
     extend: 'Ext.data.Store',
     model: 'Traccar.model.KnownAttribute',
-    proxy: 'memory',
 
     data: [{
         key: 'mail.smtp.host',
@@ -67,21 +66,5 @@ Ext.define('Traccar.store.UserAttributes', {
         key: 'mail.smtp.password',
         name: Strings.attributeMailSmtpPassword,
         valueType: 'string'
-    }, {
-        key: 'web.liveRouteLength',
-        name: Strings.attributeWebLiveRouteLength,
-        valueType: 'number',
-        allowDecimals: false
-    }, {
-        key: 'web.selectZoom',
-        name: Strings.attributeWebSelectZoom,
-        valueType: 'number',
-        allowDecimals: false,
-        minValue: Traccar.Style.mapDefaultZoom,
-        maxValue: Traccar.Style.mapMaxZoom
-    }, {
-        key: 'ui.disableReport',
-        name: Strings.attributeUiDisableReport,
-        valueType: 'boolean'
     }]
 });
diff --git a/web/app/view/MainController.js b/web/app/view/MainController.js
index 1a2fe91..126d9af 100644
--- a/web/app/view/MainController.js
+++ b/web/app/view/MainController.js
@@ -20,7 +20,6 @@ Ext.define('Traccar.view.MainController', {
     alias: 'controller.mainController',
 
     init: function () {
-        this.lookupReference('reportView').setHidden(
-            Traccar.app.getAttributePreference('ui.disableReport', false).toString() === 'true');
+        this.lookupReference('reportView').setHidden(Traccar.app.getBooleanAttributePreference('ui.disableReport'));
     }
 });
diff --git a/web/app/view/ReportController.js b/web/app/view/ReportController.js
index 4d2c9b3..f9dbc03 100644
--- a/web/app/view/ReportController.js
+++ b/web/app/view/ReportController.js
@@ -79,6 +79,23 @@ Ext.define('Traccar.view.ReportController', {
                 hidden: true
             });
         }
+        if (Traccar.app.getVehicleFeaturesDisabled()) {
+            for (i = 0; i < this.summaryColumns.length; i++) {
+                if (this.summaryColumns[i].dataIndex.match('engineHours|spentFuel')) {
+                    this.summaryColumns[i].hidden = true;
+                }
+            }
+            for (i = 0; i < this.tripsColumns.length; i++) {
+                if (this.tripsColumns[i].dataIndex.match('spentFuel|driverUniqueId')) {
+                    this.tripsColumns[i].hidden = true;
+                }
+            }
+            for (i = 0; i < this.stopsColumns.length; i++) {
+                if (this.stopsColumns[i].dataIndex.match('engineHours|spentFuel')) {
+                    this.stopsColumns[i].hidden = true;
+                }
+            }
+        }
     },
 
     onConfigureClick: function () {
diff --git a/web/app/view/SettingsMenuController.js b/web/app/view/SettingsMenuController.js
index d435e35..7175260 100644
--- a/web/app/view/SettingsMenuController.js
+++ b/web/app/view/SettingsMenuController.js
@@ -45,7 +45,7 @@ Ext.define('Traccar.view.SettingsMenuController', {
         if (admin) {
             this.lookupReference('settingsServerButton').setHidden(false);
             this.lookupReference('settingsStatisticsButton').setHidden(false);
-            this.lookupReference('settingsDeviceDistanceButton').setHidden(false);
+            this.lookupReference('settingsDeviceDistanceButton').setHidden(Traccar.app.getVehicleFeaturesDisabled());
         }
         if (admin || manager) {
             this.lookupReference('settingsUsersButton').setHidden(false);
@@ -55,12 +55,15 @@ Ext.define('Traccar.view.SettingsMenuController', {
             this.lookupReference('settingsGroupsButton').setHidden(false);
             this.lookupReference('settingsGeofencesButton').setHidden(false);
             this.lookupReference('settingsNotificationsButton').setHidden(false);
-            this.lookupReference('settingsCalendarsButton').setHidden(false);
-            this.lookupReference('settingsDriversButton').setHidden(false);
+            this.lookupReference('settingsCalendarsButton').setHidden(
+                Traccar.app.getBooleanAttributePreference('ui.disableCalendars'));
+            this.lookupReference('settingsDriversButton').setHidden(
+                Traccar.app.getVehicleFeaturesDisabled() || Traccar.app.getBooleanAttributePreference('ui.disableDrivers'));
         }
         if (admin || !deviceReadonly && !readonly) {
             this.lookupReference('settingsAttributeAliasesButton').setHidden(false);
-            this.lookupReference('settingsComputedAttributesButton').setHidden(false);
+            this.lookupReference('settingsComputedAttributesButton').setHidden(
+                Traccar.app.getBooleanAttributePreference('ui.disableComputedAttributes'));
         }
     },
 
diff --git a/web/app/view/dialog/Geofence.js b/web/app/view/dialog/Geofence.js
index 93f17de..bed20d3 100644
--- a/web/app/view/dialog/Geofence.js
+++ b/web/app/view/dialog/Geofence.js
@@ -46,6 +46,7 @@ Ext.define('Traccar.view.dialog.Geofence', {
                 fieldLabel: Strings.sharedDescription
             }, {
                 xtype: 'combobox',
+                reference: 'calendarCombo',
                 name: 'calendarId',
                 store: 'Calendars',
                 queryMode: 'local',
diff --git a/web/app/view/dialog/GeofenceController.js b/web/app/view/dialog/GeofenceController.js
index 9fdad61..e4ac5a2 100644
--- a/web/app/view/dialog/GeofenceController.js
+++ b/web/app/view/dialog/GeofenceController.js
@@ -34,6 +34,11 @@ Ext.define('Traccar.view.dialog.GeofenceController', {
         }
     },
 
+    init: function () {
+        this.lookupReference('calendarCombo').setHidden(
+            Traccar.app.getBooleanAttributePreference('ui.disableCalendars'));
+    },
+
     saveArea: function (value) {
         this.lookupReference('areaField').setValue(value);
     },
diff --git a/web/app/view/edit/AttributesController.js b/web/app/view/edit/AttributesController.js
index 235f2c5..c12c196 100644
--- a/web/app/view/edit/AttributesController.js
+++ b/web/app/view/edit/AttributesController.js
@@ -90,6 +90,7 @@ Ext.define('Traccar.view.edit.AttributesController', {
         displayField: 'name',
         valueField: 'key',
         allowBlank: false,
+        queryMode: 'local',
         listeners: {
             change: 'onNameChange'
         }
diff --git a/web/app/view/edit/DevicesController.js b/web/app/view/edit/DevicesController.js
index 6de2498..df75b1d 100644
--- a/web/app/view/edit/DevicesController.js
+++ b/web/app/view/edit/DevicesController.js
@@ -61,6 +61,10 @@ Ext.define('Traccar.view.edit.DevicesController', {
         deviceReadonly = Traccar.app.getPreference('deviceReadonly', false) && !Traccar.app.getUser().get('admin');
         readonly = Traccar.app.getPreference('readonly', false) && !Traccar.app.getUser().get('admin');
         this.lookupReference('toolbarAddButton').setDisabled(readonly || deviceReadonly);
+        this.lookupReference('toolbarDriversButton').setHidden(
+            Traccar.app.getVehicleFeaturesDisabled() || Traccar.app.getBooleanAttributePreference('ui.disableDrivers'));
+        this.lookupReference('toolbarAttributesButton').setHidden(
+            Traccar.app.getBooleanAttributePreference('ui.disableComputedAttributes'));
 
         setInterval(function () {
             self.getView().getView().refresh();
diff --git a/web/app/view/edit/GroupsController.js b/web/app/view/edit/GroupsController.js
index 21f17ff..be26cc9 100644
--- a/web/app/view/edit/GroupsController.js
+++ b/web/app/view/edit/GroupsController.js
@@ -32,6 +32,13 @@ Ext.define('Traccar.view.edit.GroupsController', {
     objectDialog: 'Traccar.view.dialog.Group',
     removeTitle: Strings.groupDialog,
 
+    init: function () {
+        this.lookupReference('toolbarDriversButton').setHidden(
+            Traccar.app.getVehicleFeaturesDisabled() || Traccar.app.getBooleanAttributePreference('ui.disableDrivers'));
+        this.lookupReference('toolbarAttributesButton').setHidden(
+            Traccar.app.getBooleanAttributePreference('ui.disableComputedAttributes'));
+    },
+
     onGeofencesClick: function () {
         var admin, group;
         admin = Traccar.app.getUser().get('admin');
diff --git a/web/app/view/edit/UsersController.js b/web/app/view/edit/UsersController.js
index fb7a36e..d67f5a7 100644
--- a/web/app/view/edit/UsersController.js
+++ b/web/app/view/edit/UsersController.js
@@ -41,6 +41,12 @@ Ext.define('Traccar.view.edit.UsersController', {
     init: function () {
         Ext.getStore('Users').load();
         this.lookupReference('userUsersButton').setHidden(!Traccar.app.getUser().get('admin'));
+        this.lookupReference('userDriversButton').setHidden(
+            Traccar.app.isVehicleFeaturesDisabled() || Traccar.app.getBooleanAttributePreference('ui.disableDrivers'));
+        this.lookupReference('userAttributesButton').setHidden(
+            Traccar.app.getBooleanAttributePreference('ui.disableComputedAttributes'));
+        this.lookupReference('userCalendarsButton').setHidden(
+            Traccar.app.getBooleanAttributePreference('ui.disableCalendars'));
     },
 
     onEditClick: function () {
diff --git a/web/app/view/map/MapController.js b/web/app/view/map/MapController.js
index d8d2f04..75796f9 100644
--- a/web/app/view/map/MapController.js
+++ b/web/app/view/map/MapController.js
@@ -44,8 +44,8 @@ Ext.define('Traccar.view.map.MapController', {
 
     init: function () {
         this.callParent();
-        this.lookupReference('showReportsButton').setVisible(Traccar.app.isMobile() &&
-                !Traccar.app.getAttributePreference('ui.disableReport', false));
+        this.lookupReference('showReportsButton').setVisible(
+            Traccar.app.isMobile() && !Traccar.app.getBooleanAttributePreference('ui.disableReport'));
         this.lookupReference('showEventsButton').setVisible(Traccar.app.isMobile());
     },