diff options
author | Abyss777 <abyss@fox5.ru> | 2016-11-18 18:33:58 +0500 |
---|---|---|
committer | Abyss777 <abyss@fox5.ru> | 2016-11-18 18:33:58 +0500 |
commit | 11826f4b3eac08ad4f52d8c3e6af2b8a0156daee (patch) | |
tree | ad2e4689aa9d9e652addda75e8f658873b1a3c19 /web | |
parent | a252dbe43512c75afd4a17075b834f767576fd28 (diff) | |
download | trackermap-web-11826f4b3eac08ad4f52d8c3e6af2b8a0156daee.tar.gz trackermap-web-11826f4b3eac08ad4f52d8c3e6af2b8a0156daee.tar.bz2 trackermap-web-11826f4b3eac08ad4f52d8c3e6af2b8a0156daee.zip |
Add Device Name column to Route report
Diffstat (limited to 'web')
-rw-r--r-- | web/app/AttributeFormatter.js | 6 | ||||
-rw-r--r-- | web/app/view/ReportController.js | 16 |
2 files changed, 13 insertions, 9 deletions
diff --git a/web/app/AttributeFormatter.js b/web/app/AttributeFormatter.js index 049532f2..a6f6dd91 100644 --- a/web/app/AttributeFormatter.js +++ b/web/app/AttributeFormatter.js @@ -47,6 +47,10 @@ Ext.define('Traccar.AttributeFormatter', { return (hours + ' ' + Strings.sharedHourAbbreviation + ' ' + minutes + ' ' + Strings.sharedMinuteAbbreviation); }, + deviceNameFormatter: function (value) { + return Ext.getStore('Devices').findRecord('id', value).get('name'); + }, + defaultFormatter: function (value) { if (typeof value === 'number') { return Number(value.toFixed(Traccar.Style.numberPrecision)); @@ -78,6 +82,8 @@ Ext.define('Traccar.AttributeFormatter', { return this.hoursFormatter; } else if (key === 'duration') { return this.durationFormatter; + } else if (key === 'deviceName') { + return this.deviceNameFormatter; } else { return this.defaultFormatter; } diff --git a/web/app/view/ReportController.js b/web/app/view/ReportController.js index a8c5f4eb..85cdb686 100644 --- a/web/app/view/ReportController.js +++ b/web/app/view/ReportController.js @@ -225,6 +225,10 @@ Ext.define('Traccar.view.ReportController', { }, routeColumns: [{ + text: Strings.reportDeviceName, + dataIndex: 'deviceId', + renderer: Traccar.AttributeFormatter.getFormatter('deviceName') + }, { text: Strings.positionValid, dataIndex: 'valid', renderer: Traccar.AttributeFormatter.getFormatter('valid') @@ -263,9 +267,7 @@ Ext.define('Traccar.view.ReportController', { }, { text: Strings.reportDeviceName, dataIndex: 'deviceId', - renderer: function (value) { - return Ext.getStore('Devices').findRecord('id', value).get('name'); - } + renderer: Traccar.AttributeFormatter.getFormatter('deviceName') }, { text: Strings.sharedType, dataIndex: 'type', @@ -286,9 +288,7 @@ Ext.define('Traccar.view.ReportController', { summaryColumns: [{ text: Strings.reportDeviceName, dataIndex: 'deviceId', - renderer: function (value) { - return Ext.getStore('Devices').findRecord('id', value).get('name'); - } + renderer: Traccar.AttributeFormatter.getFormatter('deviceName') }, { text: Strings.sharedDistance, dataIndex: 'distance', @@ -310,9 +310,7 @@ Ext.define('Traccar.view.ReportController', { tripsColumns: [{ text: Strings.reportDeviceName, dataIndex: 'deviceId', - renderer: function (value) { - return Ext.getStore('Devices').findRecord('id', value).get('name'); - } + renderer: Traccar.AttributeFormatter.getFormatter('deviceName') }, { text: Strings.reportStartTime, dataIndex: 'startTime', |