diff options
author | Christoph Krey <c@ckrey.de> | 2018-08-06 18:06:16 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-06 18:06:16 +0200 |
commit | 4b9726dd8dd083060810d9472fa8d2187e6c9a0f (patch) | |
tree | 2cd712b68fdb2d409ab64ca5df580fd5a2cf078d /web/app | |
parent | 5a41451ab3558f0ffd43f44a65d34b9590331c5d (diff) | |
parent | 5defdfeb901434458dbcbc4ca7eb0c164a6f71c0 (diff) | |
download | etbsa-traccar-web-4b9726dd8dd083060810d9472fa8d2187e6c9a0f.tar.gz etbsa-traccar-web-4b9726dd8dd083060810d9472fa8d2187e6c9a0f.tar.bz2 etbsa-traccar-web-4b9726dd8dd083060810d9472fa8d2187e6c9a0f.zip |
Merge pull request #4 from ckrey/OdometerInReports316
Odometer in reports316
Diffstat (limited to 'web/app')
-rw-r--r-- | web/app/model/ReportStop.js | 4 | ||||
-rw-r--r-- | web/app/model/ReportSummary.js | 8 | ||||
-rw-r--r-- | web/app/model/ReportTrip.js | 8 | ||||
-rw-r--r-- | web/app/view/ReportController.js | 20 |
4 files changed, 40 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') |