From 6422cbef5728dd18dfe22f1cc02e72e7ae0a8f60 Mon Sep 17 00:00:00 2001
From: Christoph Krey <krey.christoph@gmail.com>
Date: Sat, 14 Apr 2018 18:48:41 +0200
Subject: [NEW] Feature Request: Add Odometer to Summary, Trips, and Stops
 Reports #652

---
 web/app/view/ReportController.js | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'web/app/view')

diff --git a/web/app/view/ReportController.js b/web/app/view/ReportController.js
index 42e099d..9ec75ce 100644
--- a/web/app/view/ReportController.js
+++ b/web/app/view/ReportController.js
@@ -520,6 +520,14 @@ Ext.define('Traccar.view.ReportController', {
         text: Strings.sharedDistance,
         dataIndex: 'distance',
         renderer: Traccar.AttributeFormatter.getFormatter('distance')
+    }, {
+        text: Strings.reportStartOdometer,
+        dataIndex: 'startOdometer',
+        renderer: Traccar.AttributeFormatter.getFormatter('distance'),
+    }, {
+        text: Strings.reportEndOdometer,
+        dataIndex: 'endOdometer',
+        renderer: Traccar.AttributeFormatter.getFormatter('distance'),
     }, {
         text: Strings.reportAverageSpeed,
         dataIndex: 'averageSpeed',
@@ -547,6 +555,10 @@ Ext.define('Traccar.view.ReportController', {
         dataIndex: 'startTime',
         xtype: 'datecolumn',
         renderer: Traccar.AttributeFormatter.getFormatter('startTime')
+    }, {
+        text: Strings.reportStartOdometer,
+        dataIndex: 'startOdometer',
+        renderer: Traccar.AttributeFormatter.getFormatter('distance'),
     }, {
         text: Strings.reportStartAddress,
         dataIndex: 'startAddress',
@@ -556,6 +568,10 @@ Ext.define('Traccar.view.ReportController', {
         dataIndex: 'endTime',
         xtype: 'datecolumn',
         renderer: Traccar.AttributeFormatter.getFormatter('endTime')
+    }, {
+        text: Strings.reportEndOdometer,
+        dataIndex: 'endOdometer',
+        renderer: Traccar.AttributeFormatter.getFormatter('distance'),
     }, {
         text: Strings.reportEndAddress,
         dataIndex: 'endAddress',
@@ -595,6 +611,10 @@ Ext.define('Traccar.view.ReportController', {
         dataIndex: 'startTime',
         xtype: 'datecolumn',
         renderer: Traccar.AttributeFormatter.getFormatter('startTime')
+    }, {
+        text: Strings.reportStartOdometer,
+        dataIndex: 'startOdometer',
+        renderer: Traccar.AttributeFormatter.getFormatter('distance'),
     }, {
         text: Strings.positionAddress,
         dataIndex: 'address',
-- 
cgit v1.2.3


From 99a0b3892410809452250fb1535316afd14bbbcb Mon Sep 17 00:00:00 2001
From: Christoph Krey <c@ckrey.de>
Date: Mon, 6 Aug 2018 18:21:44 +0200
Subject: [FIX] re-use Odometer string from positions in reports

---
 web/app/view/ReportController.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'web/app/view')

diff --git a/web/app/view/ReportController.js b/web/app/view/ReportController.js
index 6079da7..6a160b2 100644
--- a/web/app/view/ReportController.js
+++ b/web/app/view/ReportController.js
@@ -630,7 +630,7 @@ Ext.define('Traccar.view.ReportController', {
         xtype: 'datecolumn',
         renderer: Traccar.AttributeFormatter.getFormatter('startTime')
     }, {
-        text: Strings.reportStartOdometer,
+        text: Strings.positionOdometer,
         dataIndex: 'startOdometer',
         renderer: Traccar.AttributeFormatter.getFormatter('distance'),
     }, {
-- 
cgit v1.2.3


From ca151426b29a262f7917682a7b6c54967546dabd Mon Sep 17 00:00:00 2001
From: Christoph Krey <c@ckrey.de>
Date: Mon, 15 Oct 2018 08:49:27 +0200
Subject: [FIX] dangling commas

---
 web/app/view/ReportController.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'web/app/view')

diff --git a/web/app/view/ReportController.js b/web/app/view/ReportController.js
index 6a160b2..7ecb15e 100644
--- a/web/app/view/ReportController.js
+++ b/web/app/view/ReportController.js
@@ -541,11 +541,11 @@ Ext.define('Traccar.view.ReportController', {
     }, {
         text: Strings.reportStartOdometer,
         dataIndex: 'startOdometer',
-        renderer: Traccar.AttributeFormatter.getFormatter('distance'),
+        renderer: Traccar.AttributeFormatter.getFormatter('distance')
     }, {
         text: Strings.reportEndOdometer,
         dataIndex: 'endOdometer',
-        renderer: Traccar.AttributeFormatter.getFormatter('distance'),
+        renderer: Traccar.AttributeFormatter.getFormatter('distance')
     }, {
         text: Strings.reportAverageSpeed,
         dataIndex: 'averageSpeed',
@@ -576,7 +576,7 @@ Ext.define('Traccar.view.ReportController', {
     }, {
         text: Strings.reportStartOdometer,
         dataIndex: 'startOdometer',
-        renderer: Traccar.AttributeFormatter.getFormatter('distance'),
+        renderer: Traccar.AttributeFormatter.getFormatter('distance')
     }, {
         text: Strings.reportStartAddress,
         dataIndex: 'startAddress',
@@ -589,7 +589,7 @@ Ext.define('Traccar.view.ReportController', {
     }, {
         text: Strings.reportEndOdometer,
         dataIndex: 'endOdometer',
-        renderer: Traccar.AttributeFormatter.getFormatter('distance'),
+        renderer: Traccar.AttributeFormatter.getFormatter('distance')
     }, {
         text: Strings.reportEndAddress,
         dataIndex: 'endAddress',
@@ -632,7 +632,7 @@ Ext.define('Traccar.view.ReportController', {
     }, {
         text: Strings.positionOdometer,
         dataIndex: 'startOdometer',
-        renderer: Traccar.AttributeFormatter.getFormatter('distance'),
+        renderer: Traccar.AttributeFormatter.getFormatter('distance')
     }, {
         text: Strings.positionAddress,
         dataIndex: 'address',
-- 
cgit v1.2.3