From 714da0355baee78fb28e97aed95db68a63c43424 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Mon, 17 Jul 2017 09:21:43 +0500 Subject: Implement Geofences column for Devices with filtering --- web/app/AttributeFormatter.js | 14 ++++++++++++ web/app/controller/Root.js | 3 ++- web/app/view/ArrayListFilter.js | 46 ++++++++++++++++++++++++++++++++++++++++ web/app/view/ReportController.js | 6 +----- web/app/view/edit/Devices.js | 23 ++++++++++++++++++-- 5 files changed, 84 insertions(+), 8 deletions(-) create mode 100644 web/app/view/ArrayListFilter.js (limited to 'web/app') diff --git a/web/app/AttributeFormatter.js b/web/app/AttributeFormatter.js index 3e6758a..47a924a 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') { diff --git a/web/app/controller/Root.js b/web/app/controller/Root.js index 337ec4c..07fb3be 100644 --- a/web/app/controller/Root.js +++ b/web/app/controller/Root.js @@ -215,7 +215,8 @@ Ext.define('Traccar.controller.Root', { if (entity) { entity.set({ status: array[i].status, - lastUpdate: array[i].lastUpdate + lastUpdate: array[i].lastUpdate, + geofenceIds: array[i].geofenceIds }, { dirty: false }); diff --git a/web/app/view/ArrayListFilter.js b/web/app/view/ArrayListFilter.js new file mode 100644 index 0000000..b4442cc --- /dev/null +++ b/web/app/view/ArrayListFilter.js @@ -0,0 +1,46 @@ +/* + * 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 . + */ + +Ext.define('Traccar.view.ArrayListFilter', { + extend: 'Ext.grid.filters.filter.List', + alias: 'grid.filter.arraylist', + + type: 'arraylist', + + constructor: function (config) { + var me = this; + me.callParent([config]); + me.filter.setFilterFn(function (item) { + var i, property, value; + property = item.get(this.getProperty()); + value = this.getValue(); + if (Ext.isArray(property)) { + for (i = 0; i < property.length; i++) { + if (value.indexOf(property[i]) !== -1) { + return true; + } + } + } else { + if (value.indexOf(property) !== -1) { + return true; + } + } + return false; + }); + } +}); diff --git a/web/app/view/ReportController.js b/web/app/view/ReportController.js index 7dfeaf3..ff39a56 100644 --- a/web/app/view/ReportController.js +++ b/web/app/view/ReportController.js @@ -456,11 +456,7 @@ Ext.define('Traccar.view.ReportController', { }, { text: Strings.sharedGeofence, dataIndex: 'geofenceId', - renderer: function (value) { - if (value !== 0) { - return Ext.getStore('Geofences').getById(value).get('name'); - } - } + renderer: Traccar.AttributeFormatter.getFormatter('geofenceId') }], summaryColumns: [{ diff --git a/web/app/view/edit/Devices.js b/web/app/view/edit/Devices.js index 97cbba2..d601800 100644 --- a/web/app/view/edit/Devices.js +++ b/web/app/view/edit/Devices.js @@ -22,7 +22,8 @@ Ext.define('Traccar.view.edit.Devices', { requires: [ 'Ext.grid.filters.Filters', 'Traccar.AttributeFormatter', - 'Traccar.view.edit.DevicesController' + 'Traccar.view.edit.DevicesController', + 'Traccar.view.ArrayListFilter' ], controller: 'devices', @@ -148,6 +149,24 @@ Ext.define('Traccar.view.edit.Devices', { store: 'Groups' }, renderer: Traccar.AttributeFormatter.getFormatter('groupId') + }, { + text: Strings.sharedGeofences, + dataIndex: 'geofenceIds', + hidden: true, + filter: { + type: 'arraylist', + idField: 'id', + labelField: 'name', + store: 'Geofences' + }, + renderer: function (value) { + var i, result = ''; + for (i = 0; i < value.length; i++) { + result += Traccar.AttributeFormatter.geofenceIdFormatter(value[i]); + result += (i < value.length - 1) ? ', ' : ''; + } + return result; + } }, { text: Strings.deviceStatus, dataIndex: 'status', @@ -156,7 +175,7 @@ Ext.define('Traccar.view.edit.Devices', { labelField: 'name', store: 'DeviceStatuses' }, - renderer: function (value, metaData) { + renderer: function (value) { var status; if (value) { status = Ext.getStore('DeviceStatuses').getById(value); -- cgit v1.2.3 From 1ff8bbde713392126181dabfeb076a84353cfd83 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Mon, 17 Jul 2017 12:06:16 +0500 Subject: Remove intermediate variable --- web/app/view/ArrayListFilter.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'web/app') diff --git a/web/app/view/ArrayListFilter.js b/web/app/view/ArrayListFilter.js index b4442cc..cea748a 100644 --- a/web/app/view/ArrayListFilter.js +++ b/web/app/view/ArrayListFilter.js @@ -23,9 +23,8 @@ Ext.define('Traccar.view.ArrayListFilter', { type: 'arraylist', constructor: function (config) { - var me = this; - me.callParent([config]); - me.filter.setFilterFn(function (item) { + this.callParent([config]); + this.filter.setFilterFn(function (item) { var i, property, value; property = item.get(this.getProperty()); value = this.getValue(); -- cgit v1.2.3