Windy/traccar-web
1
0
Fork 0
mirror of https://github.com/traccar/traccar-web.git synced 2025-01-09 04:37:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add Device Name column to Route report

Browse Source
This commit is contained in:
Abyss777 2016-11-18 18:33:58 +05:00
parent a252dbe435
commit 11826f4b3e
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/app/AttributeFormatter.js
View File

@ -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;
}

16
web/app/view/ReportController.js
View File

@ -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',