Implement attribute to disable vehicle related UI features

6 files changed, 26 insertions, 5 deletions

diff --git a/web/app/view/MainController.js b/web/app/view/MainController.js
index 76645e43..126d9af5 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 58500860..85af559a 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.isVehicleFeaturesDisabled()) {
+            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 102120d8..11bfb538 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.isVehicleFeaturesDisabled());
         }
         if (admin || manager) {
             this.lookupReference('settingsUsersButton').setHidden(false);
@@ -56,7 +56,7 @@ Ext.define('Traccar.view.SettingsMenuController', {
             this.lookupReference('settingsGeofencesButton').setHidden(false);
             this.lookupReference('settingsNotificationsButton').setHidden(false);
             this.lookupReference('settingsCalendarsButton').setHidden(false);
-            this.lookupReference('settingsDriversButton').setHidden(false);
+            this.lookupReference('settingsDriversButton').setHidden(Traccar.app.isVehicleFeaturesDisabled());
         }
         if (admin || (!deviceReadonly && !readonly)) {
             this.lookupReference('settingsAttributeAliasesButton').setHidden(false);
diff --git a/web/app/view/edit/DevicesController.js b/web/app/view/edit/DevicesController.js
index ae65fbb1..b98a8d4f 100644
--- a/web/app/view/edit/DevicesController.js
+++ b/web/app/view/edit/DevicesController.js
@@ -61,6 +61,7 @@ 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.isVehicleFeaturesDisabled());
 
         setInterval(function () {
             self.getView().getView().refresh();
diff --git a/web/app/view/edit/GroupsController.js b/web/app/view/edit/GroupsController.js
index 21f17ffa..941f5f18 100644
--- a/web/app/view/edit/GroupsController.js
+++ b/web/app/view/edit/GroupsController.js
@@ -32,6 +32,10 @@ Ext.define('Traccar.view.edit.GroupsController', {
     objectDialog: 'Traccar.view.dialog.Group',
     removeTitle: Strings.groupDialog,
 
+    init: function () {
+        this.lookupReference('toolbarDriversButton').setHidden(Traccar.app.isVehicleFeaturesDisabled());
+    },
+
     onGeofencesClick: function () {
         var admin, group;
         admin = Traccar.app.getUser().get('admin');
diff --git a/web/app/view/map/MapController.js b/web/app/view/map/MapController.js
index f2a561a3..651bd9f0 100644
--- a/web/app/view/map/MapController.js
+++ b/web/app/view/map/MapController.js
@@ -45,7 +45,7 @@ Ext.define('Traccar.view.map.MapController', {
     init: function () {
         this.callParent();
         this.lookupReference('showReportsButton').setVisible(Traccar.app.isMobile() &&
-                !Traccar.app.getAttributePreference('ui.disableReport', false));
+                !Traccar.app.getBooleanAttributePreference('ui.disableReport'));
         this.lookupReference('showEventsButton').setVisible(Traccar.app.isMobile());
     },