From d40b862b56075e1544d3ed117576e05354b398a1 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Fri, 14 Jul 2017 12:39:04 +0500 Subject: Implement driverChanged event instead of driverUnauthorized --- web/app/model/Event.js | 4 ++-- web/app/store/PositionAttributes.js | 4 ---- web/l10n/en.json | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/web/app/model/Event.js b/web/app/model/Event.js index da866b4..9455b0d 100644 --- a/web/app/model/Event.js +++ b/web/app/model/Event.js @@ -51,8 +51,8 @@ Ext.define('Traccar.model.Event', { text = Strings[alarmKey] || alarmKey; } else if (rec.get('type') === 'textMessage') { text = Strings.eventTextMessage + ': ' + rec.get('attributes')['message']; - } else if (rec.get('type') === 'driverUnauthorized') { - text = Strings.eventDriverUnauthorized + ': ' + Traccar.AttributeFormatter.driverUniqueIdFormatter( + } else if (rec.get('type') === 'driverChanged') { + text = Strings.eventDriverChanged + ': ' + Traccar.AttributeFormatter.driverUniqueIdFormatter( rec.get('attributes')['driverUniqueId']); } else { text = Traccar.app.getEventString(rec.get('type')); diff --git a/web/app/store/PositionAttributes.js b/web/app/store/PositionAttributes.js index 44bfa92..c3d6d18 100644 --- a/web/app/store/PositionAttributes.js +++ b/web/app/store/PositionAttributes.js @@ -120,10 +120,6 @@ Ext.define('Traccar.store.PositionAttributes', { name: Strings.positionFuelConsumption, valueType: 'number', dataType: 'consumption' - }, { - key: 'rfid', - name: Strings.positionRfid, - valueType: 'string' }, { key: 'versionFw', name: Strings.positionVersionFw, diff --git a/web/l10n/en.json b/web/l10n/en.json index 404b26f..ba34d06 100644 --- a/web/l10n/en.json +++ b/web/l10n/en.json @@ -272,7 +272,7 @@ "eventIgnitionOff": "Ignition is OFF", "eventMaintenance": "Maintenance required", "eventTextMessage": "Text message received", - "eventDriverUnauthorized": "Driver Unauthorized", + "eventDriverChanged": "Driver has changed", "eventsScrollToLast": "Scroll To Last", "alarmSos": "SOS Alarm", "alarmVibration": "Vibration Alarm", -- cgit v1.2.3