aboutsummaryrefslogtreecommitdiff
path: root/web
diff options
context:
space:
mode:
authorninioe <ninioe@gmail.com>2016-07-19 10:20:51 +0300
committerninioe <ninioe@gmail.com>2016-07-19 10:20:51 +0300
commitbfa3fa62305858166d8acdcf6da4a6d33249877d (patch)
tree8cac0dc85f2da735055333a9d90b86c71579d1e5 /web
parentef40f3317392068692606b484c6782b95b554cbf (diff)
downloadtraccar-server-bfa3fa62305858166d8acdcf6da4a6d33249877d.tar.gz
traccar-server-bfa3fa62305858166d8acdcf6da4a6d33249877d.tar.bz2
traccar-server-bfa3fa62305858166d8acdcf6da4a6d33249877d.zip
changed to generic alarm type event
Diffstat (limited to 'web')
-rw-r--r--web/app/controller/Root.js15
-rw-r--r--web/l10n/en.json13
2 files changed, 24 insertions, 4 deletions
diff --git a/web/app/controller/Root.js b/web/app/controller/Root.js
index dec3c9158..b508cc5ef 100644
--- a/web/app/controller/Root.js
+++ b/web/app/controller/Root.js
@@ -156,6 +156,21 @@ Ext.define('Traccar.controller.Root', {
}
}
text = Strings.eventCommandResult + ': ' + text;
+ } else if (array[i].type === 'alarm' && data.positions) {
+ text = 'Alarm';
+ 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){
+ var 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;
+ }
+ text = 'Alarm: ' + text;
+ }
+ break;
+ }
+ }
} else {
typeKey = 'event' + array[i].type.charAt(0).toUpperCase() + array[i].type.slice(1);
text = Strings[typeKey];
diff --git a/web/l10n/en.json b/web/l10n/en.json
index 2f930a27c..ff432d444 100644
--- a/web/l10n/en.json
+++ b/web/l10n/en.json
@@ -118,10 +118,15 @@
"eventCommandResult": "Command result",
"eventGeofenceEnter": "Device has entered geofence",
"eventGeofenceExit": "Device has exited geofence",
- "eventSosAlarm": "SOS alarm",
- "eventVibrationAlarm": "Vibration alarm",
- "eventMovementAlarm": "Movement alarm",
- "eventOverspeedAlarm": "Overspeed alarm",
+ "eventAlarm": "Alarms",
+ "alarmSos": "sos",
+ "alarmVibration": "vibration",
+ "alarmMovement": "movement",
+ "alarmOverspeed": "overspeed",
+ "alarmFallDown": "fallDown",
+ "alarmLowBattery": "lowBattery",
+ "alarmMotion": "motion",
+ "alarmFault": "fault",
"notificationType": "Type of Notification",
"notificationWeb": "Send via Web",
"notificationMail": "Send via Mail"