1 files changed, 36 insertions, 4 deletions
diff --git a/web/app/controller/Root.js b/web/app/controller/Root.js
index 98ded9c47..53f3b83df 100644
--- a/web/app/controller/Root.js
+++ b/web/app/controller/Root.js
@@ -81,7 +81,7 @@ Ext.define('Traccar.controller.Root', {
                 this.asyncUpdate(true);
             }
         });
-        Ext.get('attribution').remove();
+        if (Ext.get('attribution') !== null) Ext.get('attribution').remove();
         if (this.isPhone) {
             Ext.create('widget.mainMobile');
         } else {
@@ -89,6 +89,17 @@ Ext.define('Traccar.controller.Root', {
         }
     },
 
+    beep: function () {
+        if (!this.beepSound) {
+            this.beepSound = new Audio('beep.wav');
+        }
+        this.beepSound.play();
+    },
+
+    showNotificationsSelected: function () {
+        return Ext.getCmp('showNotificationsButton') && Ext.getCmp('showNotificationsButton').pressed;
+    },
+
     asyncUpdate: function (first) {
         var protocol, socket, self = this;
         protocol = location.protocol === 'https:' ? 'wss:' : 'ws:';
@@ -99,7 +110,7 @@ Ext.define('Traccar.controller.Root', {
         };
 
         socket.onmessage = function (event) {
-            var i, j, store, data, array, entity, device, typeKey, text, geofence;
+            var i, j, store, data, array, entity, device, typeKey, alarmKey, text, geofence;
 
             data = Ext.decode(event.data);
 
@@ -145,10 +156,28 @@ Ext.define('Traccar.controller.Root', {
                             }
                         }
                         text = Strings.eventCommandResult + ': ' + text;
+                    } else if (array[i].type === 'alarm' && data.positions) {
+                        alarmKey = 'alarm';
+                        text = Strings[alarmKey];
+                        if (!text) {
+                            text = alarmKey;
+                        }
+                        for (j = 0; j < data.positions.length; j++) {
+                            if (data.positions[j].id === array[i].positionId && data.positions[j].attributes.alarm !== null) {
+                                if (typeof data.positions[j].attributes.alarm === 'string' && data.positions[j].attributes.alarm.length >= 2) {
+                                    alarmKey = 'alarm' + data.positions[j].attributes.alarm.charAt(0).toUpperCase() + data.positions[j].attributes.alarm.slice(1);
+                                    text = Strings[alarmKey];
+                                    if (!text) {
+                                        text = alarmKey;
+                                    }
+                                }
+                                break;
+                            }
+                        }
                     } else {
                         typeKey = 'event' + array[i].type.charAt(0).toUpperCase() + array[i].type.slice(1);
                         text = Strings[typeKey];
-                        if (typeof text === 'undefined') {
+                        if (!text) {
                             text = typeKey;
                         }
                     }
@@ -160,7 +189,10 @@ Ext.define('Traccar.controller.Root', {
                     }
                     device = Ext.getStore('Devices').getById(array[i].deviceId);
                     if (typeof device !== 'undefined') {
-                        Ext.toast(text, device.getData().name);
+                        if (self.showNotificationsSelected()) {
+                            self.beep();
+                            Ext.toast(text, device.get('name'));
+                        }
                     }
                 }
             }