Merge pull request #529 from Abyss777/filter_geofences

Implement Geofences column for Devices with filtering

1 files changed, 14 insertions, 0 deletions

diff --git a/web/app/AttributeFormatter.js b/web/app/AttributeFormatter.js
index 3e6758ac..47a924a7 100644
--- a/web/app/AttributeFormatter.js
+++ b/web/app/AttributeFormatter.js
@@ -74,6 +74,18 @@ Ext.define('Traccar.AttributeFormatter', {
         }
     },
 
+    geofenceIdFormatter: function (value) {
+        var geofence, store;
+        if (value !== 0) {
+            store = Ext.getStore('AllGeofences');
+            if (store.getTotalCount() === 0) {
+                store = Ext.getStore('Geofences');
+            }
+            geofence = store.getById(value);
+            return geofence ? geofence.get('name') : value;
+        }
+    },
+
     driverUniqueIdFormatter: function (value) {
         var driver, store;
         if (value !== 0) {
@@ -139,6 +151,8 @@ Ext.define('Traccar.AttributeFormatter', {
             return this.deviceIdFormatter;
         } else if (key === 'groupId') {
             return this.groupIdFormatter;
+        } else if (key === 'geofenceId') {
+            return this.geofenceIdFormatter;
         } else if (key === 'lastUpdate') {
             return this.lastUpdateFormatter;
         } else if (key === 'spentFuel') {