diff options
author | Abyss777 <abyss@fox5.ru> | 2016-06-18 07:59:43 +0500 |
---|---|---|
committer | Abyss777 <abyss@fox5.ru> | 2016-06-18 07:59:43 +0500 |
commit | 4109447d0adc778b246543b77672c280d58da8bf (patch) | |
tree | 08ee98636cec128587bbf5f25654c5e3534dfcd9 /web/app/controller | |
parent | b3b0cd9d6f2d26cef2e64ef38e23203f1f3fa51a (diff) | |
download | traccar-server-4109447d0adc778b246543b77672c280d58da8bf.tar.gz traccar-server-4109447d0adc778b246543b77672c280d58da8bf.tar.bz2 traccar-server-4109447d0adc778b246543b77672c280d58da8bf.zip |
- Update Geofences API and Manager a bit
- Show geofence name in event toasts
- Link/Unlink geofences to users, devices and groups
Diffstat (limited to 'web/app/controller')
-rw-r--r-- | web/app/controller/Root.js | 7 |
1 files changed, 7 insertions, 0 deletions
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); |