From 4109447d0adc778b246543b77672c280d58da8bf Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Sat, 18 Jun 2016 07:59:43 +0500 Subject: - Update Geofences API and Manager a bit - Show geofence name in event toasts - Link/Unlink geofences to users, devices and groups --- web/app/controller/Root.js | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'web/app/controller') diff --git a/web/app/controller/Root.js b/web/app/controller/Root.js index 991a2572c..bbbe616a0 100644 --- a/web/app/controller/Root.js +++ b/web/app/controller/Root.js @@ -75,6 +75,7 @@ Ext.define('Traccar.controller.Root', { loadApp: function () { Ext.getStore('Groups').load(); Ext.getStore('Devices').load(); + Ext.getStore('Geofences').load(); Ext.get('attribution').remove(); if (this.isPhone) { Ext.create('widget.mainMobile'); @@ -147,6 +148,12 @@ Ext.define('Traccar.controller.Root', { text = typeKey; } } + if (array[i].geofenceId !== 0) { + geofence = Ext.getStore('Geofences').getById(array[i].geofenceId); + if (typeof geofence != "undefined") { + text += ' \"' + geofence.getData().name + '"'; + } + } device = Ext.getStore('Devices').getById(array[i].deviceId); if (typeof device != "undefined") { Ext.toast(text, device.getData().name); -- cgit v1.2.3