- Added columns filters to most windows

- Added more columns to UserDevices and UserGroups
- Change openlayers version to 4.2.0

10 files changed, 136 insertions, 11 deletions

diff --git a/web/app/view/permissions/DeviceAttributes.js b/web/app/view/permissions/DeviceAttributes.js
index 2ce07633..c7755f09 100644
--- a/web/app/view/permissions/DeviceAttributes.js
+++ b/web/app/view/permissions/DeviceAttributes.js
@@ -20,17 +20,29 @@ Ext.define('Traccar.view.permissions.DeviceAttributes', {
     extend: 'Traccar.view.permissions.Base',
     xtype: 'deviceAttributesView',
 
+    requires: [
+        'Ext.grid.filters.Filters'
+    ],
+
+    plugins: 'gridfilters',
+
     columns: {
         items: [{
             text: Strings.sharedDescription,
             dataIndex: 'description',
             flex: 1,
-            minWidth: Traccar.Style.columnWidthNormal
+            minWidth: Traccar.Style.columnWidthNormal,
+            filter: 'string'
         }, {
             text: Strings.sharedAttribute,
             dataIndex: 'attribute',
             flex: 1,
             minWidth: Traccar.Style.columnWidthNormal,
+            filter: {
+                type: 'list',
+                labelField: 'name',
+                store: 'PositionAttributes'
+            },
             renderer: function (value) {
                 return Ext.getStore('PositionAttributes').getAttributeName(value);
             }
diff --git a/web/app/view/permissions/DeviceGeofences.js b/web/app/view/permissions/DeviceGeofences.js
index 7905b49e..c16bceda 100644
--- a/web/app/view/permissions/DeviceGeofences.js
+++ b/web/app/view/permissions/DeviceGeofences.js
@@ -19,12 +19,19 @@ Ext.define('Traccar.view.permissions.DeviceGeofences', {
     extend: 'Traccar.view.permissions.Base',
     xtype: 'deviceGeofencesView',
 
+    requires: [
+        'Ext.grid.filters.Filters'
+    ],
+
+    plugins: 'gridfilters',
+
     columns: {
         items: [{
             text: Strings.sharedName,
             dataIndex: 'name',
             flex: 1,
-            minWidth: Traccar.Style.columnWidthNormal
+            minWidth: Traccar.Style.columnWidthNormal,
+            filter: 'string'
         }]
     }
 });
diff --git a/web/app/view/permissions/GroupAttributes.js b/web/app/view/permissions/GroupAttributes.js
index 44089daf..4db8b244 100644
--- a/web/app/view/permissions/GroupAttributes.js
+++ b/web/app/view/permissions/GroupAttributes.js
@@ -20,17 +20,27 @@ Ext.define('Traccar.view.permissions.GroupAttributes', {
     extend: 'Traccar.view.permissions.Base',
     xtype: 'groupAttributesView',
 
+    requires: [
+        'Ext.grid.filters.Filters'
+    ],
+
     columns: {
         items: [{
             text: Strings.sharedDescription,
             dataIndex: 'description',
             flex: 1,
-            minWidth: Traccar.Style.columnWidthNormal
+            minWidth: Traccar.Style.columnWidthNormal,
+            filter: 'string'
         }, {
             text: Strings.sharedAttribute,
             dataIndex: 'attribute',
             flex: 1,
             minWidth: Traccar.Style.columnWidthNormal,
+            filter: {
+                type: 'list',
+                labelField: 'name',
+                store: 'PositionAttributes'
+            },
             renderer: function (value) {
                 return Ext.getStore('PositionAttributes').getAttributeName(value);
             }
diff --git a/web/app/view/permissions/GroupGeofences.js b/web/app/view/permissions/GroupGeofences.js
index 84cec3ca..f365e356 100644
--- a/web/app/view/permissions/GroupGeofences.js
+++ b/web/app/view/permissions/GroupGeofences.js
@@ -19,12 +19,19 @@ Ext.define('Traccar.view.permissions.GroupGeofences', {
     extend: 'Traccar.view.permissions.Base',
     xtype: 'groupGeofencesView',
 
+    requires: [
+        'Ext.grid.filters.Filters'
+    ],
+
+    plugins: 'gridfilters',
+
     columns: {
         items: [{
             text: Strings.sharedName,
             dataIndex: 'name',
             flex: 1,
-            minWidth: Traccar.Style.columnWidthNormal
+            minWidth: Traccar.Style.columnWidthNormal,
+            filter: 'string'
         }]
     }
 });
diff --git a/web/app/view/permissions/UserAttributes.js b/web/app/view/permissions/UserAttributes.js
index 7bca6223..a0a385ee 100644
--- a/web/app/view/permissions/UserAttributes.js
+++ b/web/app/view/permissions/UserAttributes.js
@@ -20,17 +20,29 @@ Ext.define('Traccar.view.permissions.UserAttributes', {
     extend: 'Traccar.view.permissions.Base',
     xtype: 'userAttributesView',
 
+    requires: [
+        'Ext.grid.filters.Filters'
+    ],
+
+    plugins: 'gridfilters',
+
     columns: {
         items: [{
             text: Strings.sharedDescription,
             dataIndex: 'description',
             flex: 1,
-            minWidth: Traccar.Style.columnWidthNormal
+            minWidth: Traccar.Style.columnWidthNormal,
+            filter: 'string'
         }, {
             text: Strings.sharedAttribute,
             dataIndex: 'attribute',
             flex: 1,
             minWidth: Traccar.Style.columnWidthNormal,
+            filter: {
+                type: 'list',
+                labelField: 'name',
+                store: 'PositionAttributes'
+            },
             renderer: function (value) {
                 return Ext.getStore('PositionAttributes').getAttributeName(value);
             }
diff --git a/web/app/view/permissions/UserCalendars.js b/web/app/view/permissions/UserCalendars.js
index f45f7772..54ecfc22 100644
--- a/web/app/view/permissions/UserCalendars.js
+++ b/web/app/view/permissions/UserCalendars.js
@@ -20,12 +20,19 @@ Ext.define('Traccar.view.permissions.UserCalendars', {
     extend: 'Traccar.view.permissions.Base',
     xtype: 'userCalendarsView',
 
+    requires: [
+        'Ext.grid.filters.Filters'
+    ],
+
+    plugins: 'gridfilters',
+
     columns: {
         items: [{
             text: Strings.sharedName,
             dataIndex: 'name',
             flex: 1,
-            minWidth: Traccar.Style.columnWidthNormal
+            minWidth: Traccar.Style.columnWidthNormal,
+            filter: 'string'
         }]
     }
 });
diff --git a/web/app/view/permissions/UserDevices.js b/web/app/view/permissions/UserDevices.js
index dd6f43d2..a9bb65b7 100644
--- a/web/app/view/permissions/UserDevices.js
+++ b/web/app/view/permissions/UserDevices.js
@@ -19,17 +19,59 @@ Ext.define('Traccar.view.permissions.UserDevices', {
     extend: 'Traccar.view.permissions.Base',
     xtype: 'userDevicesView',
 
+    requires: [
+        'Ext.grid.filters.Filters',
+        'Traccar.AttributeFormatter'
+    ],
+
+    plugins: 'gridfilters',
+
     columns: {
         items: [{
             text: Strings.sharedName,
             dataIndex: 'name',
             flex: 1,
-            minWidth: Traccar.Style.columnWidthNormal
+            minWidth: Traccar.Style.columnWidthNormal,
+            filter: 'string'
         }, {
             text: Strings.deviceIdentifier,
             dataIndex: 'uniqueId',
             flex: 1,
-            minWidth: Traccar.Style.columnWidthNormal
+            minWidth: Traccar.Style.columnWidthNormal,
+            filter: 'string'
+        }, {
+            text: Strings.sharedPhone,
+            dataIndex: 'phone',
+            flex: 1,
+            minWidth: Traccar.Style.columnWidthNormal,
+            hidden: true,
+            filter: 'string'
+        }, {
+            text: Strings.deviceModel,
+            dataIndex: 'model',
+            flex: 1,
+            minWidth: Traccar.Style.columnWidthNormal,
+            hidden: true,
+            filter: 'string'
+        }, {
+            text: Strings.deviceContact,
+            dataIndex: 'contact',
+            flex: 1,
+            minWidth: Traccar.Style.columnWidthNormal,
+            hidden: true,
+            filter: 'string'
+        }, {
+            text: Strings.groupDialog,
+            dataIndex: 'groupId',
+            flex: 1,
+            minWidth: Traccar.Style.columnWidthNormal,
+            hidden: true,
+            filter: {
+                type: 'list',
+                labelField: 'name',
+                store: 'AllGroups'
+            },
+            renderer: Traccar.AttributeFormatter.getFormatter('groupId')
         }]
     }
 });
diff --git a/web/app/view/permissions/UserGeofences.js b/web/app/view/permissions/UserGeofences.js
index 49b94ff9..436a2a6a 100644
--- a/web/app/view/permissions/UserGeofences.js
+++ b/web/app/view/permissions/UserGeofences.js
@@ -19,12 +19,19 @@ Ext.define('Traccar.view.permissions.UserGeofences', {
     extend: 'Traccar.view.permissions.Base',
     xtype: 'userGeofencesView',
 
+    requires: [
+        'Ext.grid.filters.Filters'
+    ],
+
+    plugins: 'gridfilters',
+
     columns: {
         items: [{
             text: Strings.sharedName,
             dataIndex: 'name',
             flex: 1,
-            minWidth: Traccar.Style.columnWidthNormal
+            minWidth: Traccar.Style.columnWidthNormal,
+            filter: 'string'
         }]
     }
 });
diff --git a/web/app/view/permissions/UserGroups.js b/web/app/view/permissions/UserGroups.js
index 0c23713b..bc24201c 100644
--- a/web/app/view/permissions/UserGroups.js
+++ b/web/app/view/permissions/UserGroups.js
@@ -19,12 +19,32 @@ Ext.define('Traccar.view.permissions.UserGroups', {
     extend: 'Traccar.view.permissions.Base',
     xtype: 'userGroupsView',
 
+    requires: [
+        'Ext.grid.filters.Filters',
+        'Traccar.AttributeFormatter'
+    ],
+
+    plugins: 'gridfilters',
+
     columns: {
         items: [{
             text: Strings.sharedName,
             dataIndex: 'name',
             flex: 1,
-            minWidth: Traccar.Style.columnWidthNormal
+            minWidth: Traccar.Style.columnWidthNormal,
+            filter: 'string'
+        }, {
+            text: Strings.groupDialog,
+            dataIndex: 'groupId',
+            flex: 1,
+            minWidth: Traccar.Style.columnWidthNormal,
+            hidden: true,
+            filter: {
+                type: 'list',
+                labelField: 'name',
+                store: 'AllGroups'
+            },
+            renderer: Traccar.AttributeFormatter.getFormatter('groupId')
         }]
     }
 });
diff --git a/web/app/view/permissions/UserUsers.js b/web/app/view/permissions/UserUsers.js
index abef700a..c5980c2f 100644
--- a/web/app/view/permissions/UserUsers.js
+++ b/web/app/view/permissions/UserUsers.js
@@ -25,7 +25,8 @@ Ext.define('Traccar.view.permissions.UserUsers', {
             text: Strings.sharedName,
             dataIndex: 'name',
             flex: 1,
-            minWidth: Traccar.Style.columnWidthNormal
+            minWidth: Traccar.Style.columnWidthNormal,
+            filter: 'string'
         }]
     }
 });