Change alarm highlight logic

Abyss777 · Jul 29, 2016 · cd0c04a · cd0c04a
1 parent 88c9571
commit cd0c04a
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 35 deletions.
diff --git a/web/app.css b/web/app.css
@@ -1,10 +1,10 @@
-.status-color-online {
+.view-color-green {
     background-color: rgba(77, 250, 144, 0.3);
 }
-.status-color-unknown {
+.view-color-yellow {
     background-color: rgba(250, 190, 77, 0.3);
 }
-.status-color-offline {
+.view-color-red {
     background-color: rgba(255, 84, 104, 0.3);
 }
 

diff --git a/web/app/AttributeFormatter.js b/web/app/AttributeFormatter.js
@@ -34,24 +34,6 @@ Ext.define('Traccar.AttributeFormatter', {
         return Ext.getStore('DistanceUnits').formatValue(value, Traccar.app.getPreference('distanceUnit'));
     },
 
-    alarmFormatter: function (attributes) {
-        var value = '';
-        if (attributes instanceof Object) {//for Traccar.view.Attributes
-            if (attributes.hasOwnProperty('alarm')) {
-                value = attributes.alarm;
-                if (typeof value === 'boolean') {
-                    value = (value ? Ext.Msg.buttonText.yes : Ext.Msg.buttonText.no);
-                }
-            }
-        } else {//for Traccar.view.Report
-            value = attributes;
-            if (typeof value === 'boolean') {
-                value = (value ? Ext.Msg.buttonText.yes : Ext.Msg.buttonText.no);
-            }
-        }
-        return '<span style="color:red;">' + value + '</span>';
-    },
-
     defaultFormatter: function (value) {
         if (typeof value === 'number') {
             return Number(value.toFixed(Traccar.Style.numberPrecision));
@@ -76,8 +58,6 @@ Ext.define('Traccar.AttributeFormatter', {
             return this.courseFormatter;
         } else if (key === 'distance' || key === 'odometer') {
             return this.distanceFormatter;
-        } else if (key === 'alarm') {
-            return this.alarmFormatter;
         } else {
             return this.defaultFormatter;
         }

diff --git a/web/app/view/Devices.js b/web/app/view/Devices.js
@@ -57,10 +57,10 @@ Ext.define('Traccar.view.Devices', {
             tooltipType: 'title'
         }, {
             xtype: 'tbfill'
-        },{
+        }, {
             id: 'muteButton',
             glyph: 'xf1f7@FontAwesome',
-            tooltip: Strings.muteButton,
+            tooltip: Strings.sharedMute,
             tooltipType: 'title',
             pressed : true,
             enableToggle: true,
@@ -156,13 +156,13 @@ Ext.define('Traccar.view.Devices', {
         renderer: function (value, metaData, record) {
             switch (record.get('status')) {
                 case 'online':
-                    metaData.tdCls = 'status-color-online';
+                    metaData.tdCls = 'view-color-green';
                     break;
                 case 'offline':
-                    metaData.tdCls = 'status-color-offline';
+                    metaData.tdCls = 'view-color-red';
                     break;
                 default:
-                    metaData.tdCls = 'status-color-unknown';
+                    metaData.tdCls = 'view-color-yellow';
                     break;
             }
             if (Traccar.app.getPreference('twelveHourFormat', false)) {

diff --git a/web/app/view/Report.js b/web/app/view/Report.js
@@ -115,10 +115,5 @@ 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')
     }]
 });
diff --git a/web/app/view/State.js b/web/app/view/State.js
@@ -34,6 +34,12 @@ Ext.define('Traccar.view.State', {
     }, {
         text: Strings.stateValue,
         dataIndex: 'value',
-        flex: 1
+        flex: 1,
+        renderer: function (value, metaData, record) {
+            if (record.get('name') === 'Alarm') {
+                metaData.tdCls = 'view-color-red';
+            }
+            return value;
+        }
     }]
 });
diff --git a/web/l10n/en.json b/web/l10n/en.json
@@ -19,11 +19,11 @@
     "sharedSearch": "Search",
     "sharedGeofence": "Geofence",
     "sharedGeofences": "Geofences",
-    "muteButton": "Mute",
     "sharedNotifications": "Notifications",
     "sharedAttributes": "Attributes",
     "sharedAttribute": "Attribute",
     "sharedArea": "Area",
+    "sharedMute": "Mute",
     "errorTitle": "Error",
     "errorUnknown": "Unknown error",
     "errorConnection": "Connection error",