diff options
author | Abyss777 <abyss@fox5.ru> | 2017-07-13 10:02:44 +0500 |
---|---|---|
committer | Abyss777 <abyss@fox5.ru> | 2017-07-13 12:55:55 +0500 |
commit | 4c5cfa14db69d4f7687c7187c81a36b959a0f415 (patch) | |
tree | 2fcddf4d1fc2a734534ca9e21e751a9ecd2eb7b5 /web/app | |
parent | 805d50ac020dec042bfc94a1f17869372f7eff0e (diff) | |
download | trackermap-web-4c5cfa14db69d4f7687c7187c81a36b959a0f415.tar.gz trackermap-web-4c5cfa14db69d4f7687c7187c81a36b959a0f415.tar.bz2 trackermap-web-4c5cfa14db69d4f7687c7187c81a36b959a0f415.zip |
Use driverUniqueId for trips
Diffstat (limited to 'web/app')
-rw-r--r-- | web/app/AttributeFormatter.js | 2 | ||||
-rw-r--r-- | web/app/model/ReportTrip.js | 3 | ||||
-rw-r--r-- | web/app/view/ReportController.js | 6 |
3 files changed, 8 insertions, 3 deletions
diff --git a/web/app/AttributeFormatter.js b/web/app/AttributeFormatter.js index 464314ad..3e6758ac 100644 --- a/web/app/AttributeFormatter.js +++ b/web/app/AttributeFormatter.js @@ -143,6 +143,8 @@ Ext.define('Traccar.AttributeFormatter', { return this.lastUpdateFormatter; } else if (key === 'spentFuel') { return this.numberFormatterFactory(Traccar.Style.numberPrecision, Strings.sharedLiterAbbreviation); + } else if (key === 'driverUniqueId') { + return this.driverUniqueIdFormatter; } else { return this.defaultFormatter; } diff --git a/web/app/model/ReportTrip.js b/web/app/model/ReportTrip.js index 107008eb..edff02b5 100644 --- a/web/app/model/ReportTrip.js +++ b/web/app/model/ReportTrip.js @@ -56,6 +56,9 @@ Ext.define('Traccar.model.ReportTrip', { name: 'endAddress', type: 'string' }, { + name: 'driverUniqueId', + type: 'string' + }, { name: 'driverName', type: 'string' }] diff --git a/web/app/view/ReportController.js b/web/app/view/ReportController.js index b478ae98..7dfeaf3f 100644 --- a/web/app/view/ReportController.js +++ b/web/app/view/ReportController.js @@ -532,9 +532,9 @@ Ext.define('Traccar.view.ReportController', { dataIndex: 'spentFuel', renderer: Traccar.AttributeFormatter.getFormatter('spentFuel') }, { - text: Strings.reportDriverName, - dataIndex: 'driverName', - renderer: Traccar.AttributeFormatter.getFormatter('driverName') + text: Strings.sharedDriver, + dataIndex: 'driverUniqueId', + renderer: Traccar.AttributeFormatter.getFormatter('driverUniqueId') }], stopsColumns: [{ |