From 4c13d0f9ee6b431c215783070f8a1f410697dc7b Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Tue, 15 Sep 2015 22:40:32 +1200 Subject: Move value formatting code --- web/app/view/report/Report.js | 54 ++++++++++++++++++++++++++++--------------- 1 file changed, 35 insertions(+), 19 deletions(-) (limited to 'web/app/view/report') diff --git a/web/app/view/report/Report.js b/web/app/view/report/Report.js index 8a1dae9c4..67547e536 100644 --- a/web/app/view/report/Report.js +++ b/web/app/view/report/Report.js @@ -78,23 +78,39 @@ Ext.define('Traccar.view.report.Report', { selectionchange: 'onSelectionChange' }, - columns: [ - { text: strings.positionValid, dataIndex: 'valid', flex: 1 }, - { text: strings.positionTime, dataIndex: 'fixTime', flex: 1, xtype: 'datecolumn', format: styles.dateTimeFormat }, - { text: strings.positionLatitude, dataIndex: 'latitude', flex: 1 }, - { text: strings.positionLongitude, dataIndex: 'longitude', flex: 1 }, - { text: strings.positionAltitude, dataIndex: 'altitude', flex: 1 }, - { - text: strings.positionSpeed, - dataIndex: 'speed', - flex: 1, - renderer: function(value) { - var speedUnits = Ext.getStore('SpeedUnits'); - var unit = Traccar.getApplication().getUser().get('speedUnit') || Traccar.getApplication().getServer().get('speedUnit') || ''; - return speedUnits.formatValue(value, unit); - } - }, - { text: strings.positionAddress, dataIndex: 'address', flex: 1 } - ] - + columns: [{ + text: strings.positionValid, + dataIndex: 'valid', + flex: 1 + }, { + text: strings.positionTime, + dataIndex: 'fixTime', + flex: 1, + xtype: 'datecolumn', + //renderer: Traccar.app.getRenderer() + }, { + text: strings.positionLatitude, + dataIndex: 'latitude', + flex: 1, + //renderer: Traccar.app.getRenderer('latitude') + }, { + text: strings.positionLongitude, + dataIndex: 'longitude', + flex: 1, + //renderer: Traccar.app.getRenderer('latitude') + }, { + text: strings.positionAltitude, + dataIndex: 'altitude', + flex: 1, + //renderer: Traccar.app.getRenderer('altitude') + }, { + text: strings.positionSpeed, + dataIndex: 'speed', + flex: 1, + //renderer: Traccar.app.getRenderer('speed') + }, { + text: strings.positionAddress, + dataIndex: 'address', + flex: 1 + }] }); -- cgit v1.2.3