diff options
Diffstat (limited to 'web')
| -rw-r--r-- | web/app/AttributeFormatter.js | 20 | ||||
| -rw-r--r-- | web/app/controller/Root.js | 36 | ||||
| -rw-r--r-- | web/app/view/Devices.js | 18 | ||||
| -rw-r--r-- | web/app/view/Report.js | 5 | ||||
| -rw-r--r-- | web/beep.wav | bin | 0 -> 3047 bytes | |||
| -rw-r--r-- | web/l10n/en.json | 10 |
6 files changed, 87 insertions, 2 deletions
diff --git a/web/app/AttributeFormatter.js b/web/app/AttributeFormatter.js index 3432ca1e0..e14a9539b 100644 --- a/web/app/AttributeFormatter.js +++ b/web/app/AttributeFormatter.js @@ -34,6 +34,24 @@ 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)); @@ -58,6 +76,8 @@ 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/controller/Root.js b/web/app/controller/Root.js index 98ded9c47..3a7f24bca 100644 --- a/web/app/controller/Root.js +++ b/web/app/controller/Root.js @@ -89,6 +89,17 @@ Ext.define('Traccar.controller.Root', { } }, + beep: function() { + if(this.snd == null){ + this.snd = new Audio("beep.wav"); + } + this.snd.play(); + }, + + showAlarmSelected: function () { + return Ext.getCmp('showAlarmButton') && Ext.getCmp('showAlarmButton').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,6 +156,24 @@ Ext.define('Traccar.controller.Root', { } } text = Strings.eventCommandResult + ': ' + text; + } else if (array[i].type === 'alarm' && data.positions) { + alarmKey = 'alarm'; + text = Strings[alarmKey]; + if (typeof text === 'undefined') { + 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 (typeof text === 'undefined') { + text = alarmKey; + } + } + break; + } + } } else { typeKey = 'event' + array[i].type.charAt(0).toUpperCase() + array[i].type.slice(1); text = Strings[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.showAlarmSelected()){ + self.beep(); + Ext.toast(text, device.getData().name); + } } } } 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') }] }); diff --git a/web/beep.wav b/web/beep.wav Binary files differnew file mode 100644 index 000000000..c2364f114 --- /dev/null +++ b/web/beep.wav diff --git a/web/l10n/en.json b/web/l10n/en.json index e97bb45b1..c5d67e8c1 100644 --- a/web/l10n/en.json +++ b/web/l10n/en.json @@ -118,6 +118,16 @@ "eventCommandResult": "Command result", "eventGeofenceEnter": "Device has entered geofence", "eventGeofenceExit": "Device has exited geofence", + "eventAlarm": "Alarms", + "alarm": "Alarm", + "alarmSos": "SOS Alarm", + "alarmVibration": "Vibration Alarm", + "alarmMovement": "Movement Alarm", + "alarmOverspeed": "Overspeed Alarm", + "alarmFallDown": "FallDown Alarm", + "alarmLowBattery": "LowBattery Alarm", + "alarmMotion": "Motion Alarm", + "alarmFault": "Fault Alarm", "notificationType": "Type of Notification", "notificationWeb": "Send via Web", "notificationMail": "Send via Mail" |