Merge pull request #4 from ckrey/OdometerInReports316

Odometer in reports316

6 files changed, 44 insertions, 0 deletions

diff --git a/web/app/model/ReportStop.js b/web/app/model/ReportStop.js
index 1867f73..9aaa58b 100644
--- a/web/app/model/ReportStop.js
+++ b/web/app/model/ReportStop.js
@@ -34,6 +34,10 @@ Ext.define('Traccar.model.ReportStop', {
         type: 'date',
         dateFormat: 'c'
     }, {
+        name: 'startOdometer',
+        type: 'float',
+        convert: Traccar.AttributeFormatter.getConverter('distance')
+    }, {
         name: 'address',
         type: 'string'
     }, {
diff --git a/web/app/model/ReportSummary.js b/web/app/model/ReportSummary.js
index 4bc7873..dcc0365 100644
--- a/web/app/model/ReportSummary.js
+++ b/web/app/model/ReportSummary.js
@@ -39,6 +39,14 @@ Ext.define('Traccar.model.ReportSummary', {
         type: 'float',
         convert: Traccar.AttributeFormatter.getConverter('distance')
     }, {
+        name: 'startOdometer',
+        type: 'float',
+        convert: Traccar.AttributeFormatter.getConverter('distance')
+    }, {
+        name: 'endOdometer',
+        type: 'float',
+        convert: Traccar.AttributeFormatter.getConverter('distance')
+    }, {
         name: 'engineHours',
         type: 'int'
     }, {
diff --git a/web/app/model/ReportTrip.js b/web/app/model/ReportTrip.js
index 9004b86..9d45fc8 100644
--- a/web/app/model/ReportTrip.js
+++ b/web/app/model/ReportTrip.js
@@ -39,6 +39,14 @@ Ext.define('Traccar.model.ReportTrip', {
         type: 'float',
         convert: Traccar.AttributeFormatter.getConverter('distance')
     }, {
+        name: 'startOdometer',
+        type: 'float',
+        convert: Traccar.AttributeFormatter.getConverter('distance')
+    }, {
+        name: 'endOdometer',
+        type: 'float',
+        convert: Traccar.AttributeFormatter.getConverter('distance')
+    }, {
         name: 'duration',
         type: 'int'
     }, {
diff --git a/web/app/view/ReportController.js b/web/app/view/ReportController.js
index 72e7e37..6079da7 100644
--- a/web/app/view/ReportController.js
+++ b/web/app/view/ReportController.js
@@ -539,6 +539,14 @@ Ext.define('Traccar.view.ReportController', {
         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',
         renderer: Traccar.AttributeFormatter.getFormatter('speed')
@@ -566,6 +574,10 @@ Ext.define('Traccar.view.ReportController', {
         xtype: 'datecolumn',
         renderer: Traccar.AttributeFormatter.getFormatter('startTime')
     }, {
+        text: Strings.reportStartOdometer,
+        dataIndex: 'startOdometer',
+        renderer: Traccar.AttributeFormatter.getFormatter('distance'),
+    }, {
         text: Strings.reportStartAddress,
         dataIndex: 'startAddress',
         renderer: Traccar.AttributeFormatter.getFormatter('address')
@@ -575,6 +587,10 @@ Ext.define('Traccar.view.ReportController', {
         xtype: 'datecolumn',
         renderer: Traccar.AttributeFormatter.getFormatter('endTime')
     }, {
+        text: Strings.reportEndOdometer,
+        dataIndex: 'endOdometer',
+        renderer: Traccar.AttributeFormatter.getFormatter('distance'),
+    }, {
         text: Strings.reportEndAddress,
         dataIndex: 'endAddress',
         renderer: Traccar.AttributeFormatter.getFormatter('address')
@@ -614,6 +630,10 @@ Ext.define('Traccar.view.ReportController', {
         xtype: 'datecolumn',
         renderer: Traccar.AttributeFormatter.getFormatter('startTime')
     }, {
+        text: Strings.reportStartOdometer,
+        dataIndex: 'startOdometer',
+        renderer: Traccar.AttributeFormatter.getFormatter('distance'),
+    }, {
         text: Strings.positionAddress,
         dataIndex: 'address',
         renderer: Traccar.AttributeFormatter.getFormatter('address')
diff --git a/web/l10n/de.json b/web/l10n/de.json
index 8cae0ac..ca7cf3f 100644
--- a/web/l10n/de.json
+++ b/web/l10n/de.json
@@ -389,6 +389,8 @@
     "reportEndTime": "Zielzeit",
     "reportEndAddress": "Zielort",
     "reportSpentFuel": "Kraftstoffverbrauch",
+    "reportStartOdometer": "Kilometerzähler Start",
+    "reportEndOdometer": "Kilometerzähler Ende",
     "statisticsTitle": "Statistiken",
     "statisticsCaptureTime": "Zeitpunkt",
     "statisticsActiveUsers": "Aktive Benutzer",
diff --git a/web/l10n/en.json b/web/l10n/en.json
index c7fb1e7..2d91ae2 100644
--- a/web/l10n/en.json
+++ b/web/l10n/en.json
@@ -389,6 +389,8 @@
     "reportEndTime": "End Time",
     "reportEndAddress": "End Address",
     "reportSpentFuel": "Spent Fuel",
+    "reportStartOdometer": "Odometer Start",
+    "reportEndOdometer": "Odometer End",
     "statisticsTitle": "Statistics",
     "statisticsCaptureTime": "Capture Time",
     "statisticsActiveUsers": "Active Users",