aboutsummaryrefslogtreecommitdiff
path: root/web/app
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2017-07-18 00:27:42 +1200
committerGitHub <noreply@github.com>2017-07-18 00:27:42 +1200
commitaf256a07e31d65013c294962ad42443d6e50c5f5 (patch)
treef09b8736c685632387767aff8d8d6e2ca04d97a1 /web/app
parent1386a568850016ad3a68d9c40d682efa9c407bf4 (diff)
parent1ff8bbde713392126181dabfeb076a84353cfd83 (diff)
downloadetbsa-traccar-web-af256a07e31d65013c294962ad42443d6e50c5f5.tar.gz
etbsa-traccar-web-af256a07e31d65013c294962ad42443d6e50c5f5.tar.bz2
etbsa-traccar-web-af256a07e31d65013c294962ad42443d6e50c5f5.zip
Merge pull request #529 from Abyss777/filter_geofences
Implement Geofences column for Devices with filtering
Diffstat (limited to 'web/app')
-rw-r--r--web/app/AttributeFormatter.js14
-rw-r--r--web/app/controller/Root.js3
-rw-r--r--web/app/view/ArrayListFilter.js45
-rw-r--r--web/app/view/ReportController.js6
-rw-r--r--web/app/view/edit/Devices.js23
5 files changed, 83 insertions, 8 deletions
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 27f4f62..d85102a 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..cea748a
--- /dev/null
+++ b/web/app/view/ArrayListFilter.js
@@ -0,0 +1,45 @@
+/*
+ * 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.view.ArrayListFilter', {
+ extend: 'Ext.grid.filters.filter.List',
+ alias: 'grid.filter.arraylist',
+
+ type: 'arraylist',
+
+ constructor: function (config) {
+ this.callParent([config]);
+ this.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 d74fdfb..5850086 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',
@@ -149,6 +150,24 @@ Ext.define('Traccar.view.edit.Devices', {
},
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',
filter: {
@@ -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);