aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Tananaev <anton.tananaev@gmail.com>2018-10-15 21:59:56 +1300
committerGitHub <noreply@github.com>2018-10-15 21:59:56 +1300
commite43322abed86fc73da470eafe553f87d5e5aa093 (patch)
tree31f452920bbea96c388b5f8b3feea49eb10c3c9d
parent2273341a2d22ac86dbc2c23481c06fe7d2c91a0f (diff)
parentca151426b29a262f7917682a7b6c54967546dabd (diff)
downloadtrackermap-web-e43322abed86fc73da470eafe553f87d5e5aa093.tar.gz
trackermap-web-e43322abed86fc73da470eafe553f87d5e5aa093.tar.bz2
trackermap-web-e43322abed86fc73da470eafe553f87d5e5aa093.zip
Merge pull request #706 from ckrey/OdometerInReports40a
Odometer in reports40a
-rw-r--r--web/app/model/ReportStop.js4
-rw-r--r--web/app/model/ReportSummary.js8
-rw-r--r--web/app/model/ReportTrip.js8
-rw-r--r--web/app/view/ReportController.js20
-rw-r--r--web/l10n/de.json2
-rw-r--r--web/l10n/en.json2
6 files changed, 44 insertions, 0 deletions
diff --git a/web/app/model/ReportStop.js b/web/app/model/ReportStop.js
index 1867f73b..9aaa58b0 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 4bc78731..dcc0365c 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 9004b86d..9d45fc87 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 2cbfcbc6..5d43007a 100644
--- a/web/app/view/ReportController.js
+++ b/web/app/view/ReportController.js
@@ -541,6 +541,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')
@@ -568,6 +576,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')
@@ -577,6 +589,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')
@@ -616,6 +632,10 @@ Ext.define('Traccar.view.ReportController', {
xtype: 'datecolumn',
renderer: Traccar.AttributeFormatter.getFormatter('startTime')
}, {
+ text: Strings.positionOdometer,
+ 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 8cae0ac0..ca7cf3f1 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 12305b67..541871a7 100644
--- a/web/l10n/en.json
+++ b/web/l10n/en.json
@@ -391,6 +391,8 @@
"reportEndTime": "End Time",
"reportEndAddress": "End Address",
"reportSpentFuel": "Spent Fuel",
+ "reportStartOdometer": "Odometer Start",
+ "reportEndOdometer": "Odometer End",
"statisticsTitle": "Statistics",
"statisticsCaptureTime": "Capture Time",
"statisticsActiveUsers": "Active Users",