2 files changed, 23 insertions, 0 deletions
diff --git a/web/app/view/Devices.js b/web/app/view/Devices.js
index 1a70dfef8..77d796b1e 100644
--- a/web/app/view/Devices.js
+++ b/web/app/view/Devices.js
@@ -57,6 +57,24 @@ Ext.define('Traccar.view.Devices', {
             tooltipType: 'title'
         }, {
             xtype: 'tbfill'
+        },{
+            id: 'showAlarmButton',
+            glyph: 'xf0a2@FontAwesome',
+            tooltip: 'Show Alarms',
+            tooltipType: 'title',
+            pressed : true,
+            enableToggle: true,
+            listeners:{
+                toggle: function(button, pressed){
+                    if(pressed){
+                        button.setGlyph('xf0a2@FontAwesome');
+                    }
+                    else {
+                        button.setGlyph('xf1f7@FontAwesome');
+                    }
+                },
+                scope:this
+            }
         }, {
             id: 'deviceFollowButton',
             glyph: 'xf05b@FontAwesome',
diff --git a/web/app/view/Report.js b/web/app/view/Report.js
index 4261b9040..78ff5d52f 100644
--- a/web/app/view/Report.js
+++ b/web/app/view/Report.js
@@ -115,5 +115,10 @@ Ext.define('Traccar.view.Report', {
         dataIndex: 'address',
         flex: 1,
         renderer: Traccar.AttributeFormatter.getFormatter('address')
+    }, {
+        text: 'Alarm',
+        dataIndex: 'attributes',
+        flex: 1,
+        renderer: Traccar.AttributeFormatter.getFormatter('alarm')
     }]
 });