diff options
| author | Abyss777 <abyss@fox5.ru> | 2017-07-14 12:39:04 +0500 |
|---|---|---|
| committer | Abyss777 <abyss@fox5.ru> | 2017-07-14 13:33:29 +0500 |
| commit | d40b862b56075e1544d3ed117576e05354b398a1 (patch) | |
| tree | 77631b518eacf8b9a59d9785068624e5ef52003f | |
| parent | 4c5cfa14db69d4f7687c7187c81a36b959a0f415 (diff) | |
| download | trackermap-web-d40b862b56075e1544d3ed117576e05354b398a1.tar.gz trackermap-web-d40b862b56075e1544d3ed117576e05354b398a1.tar.bz2 trackermap-web-d40b862b56075e1544d3ed117576e05354b398a1.zip | |
Implement driverChanged event instead of driverUnauthorized
| -rw-r--r-- | web/app/model/Event.js | 4 | ||||
| -rw-r--r-- | web/app/store/PositionAttributes.js | 4 | ||||
| -rw-r--r-- | 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 da866b4c..9455b0dd 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 44bfa92f..c3d6d180 100644 --- a/web/app/store/PositionAttributes.js +++ b/web/app/store/PositionAttributes.js @@ -121,10 +121,6 @@ Ext.define('Traccar.store.PositionAttributes', { valueType: 'number', dataType: 'consumption' }, { - key: 'rfid', - name: Strings.positionRfid, - valueType: 'string' - }, { key: 'versionFw', name: Strings.positionVersionFw, valueType: 'string' diff --git a/web/l10n/en.json b/web/l10n/en.json index 404b26f7..ba34d066 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", |