From 1ffa5a058a4cf84f23663bef2f14608059789f40 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Tue, 22 Nov 2016 06:28:52 +1300 Subject: Add unknown status notification --- web/app/controller/Root.js | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'web/app/controller/Root.js') diff --git a/web/app/controller/Root.js b/web/app/controller/Root.js index e30446c..5600d4e 100644 --- a/web/app/controller/Root.js +++ b/web/app/controller/Root.js @@ -119,7 +119,7 @@ Ext.define('Traccar.controller.Root', { }; socket.onmessage = function (event) { - var i, j, store, data, array, entity, device, typeKey, alarmKey, text, geofence; + var i, j, store, data, array, entity, device, alarmKey, text, geofence; data = Ext.decode(event.data); @@ -184,20 +184,16 @@ Ext.define('Traccar.controller.Root', { } } } else { - typeKey = 'event' + array[i].type.charAt(0).toUpperCase() + array[i].type.slice(1); - text = Strings[typeKey]; - if (!text) { - text = typeKey; - } + text = Traccar.app.getEventString(array[i].type); } if (array[i].geofenceId !== 0) { geofence = Ext.getStore('Geofences').getById(array[i].geofenceId); - if (typeof geofence !== 'undefined') { + if (geofence) { text += ' \"' + geofence.get('name') + '"'; } } device = Ext.getStore('Devices').getById(array[i].deviceId); - if (typeof device !== 'undefined') { + if (device) { if (self.mutePressed()) { self.beep(); } -- cgit v1.2.3