diff options
Diffstat (limited to 'web')
-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 | ||||
-rw-r--r-- | web/l10n/de.json | 4 | ||||
-rw-r--r-- | web/l10n/en.json | 4 |
6 files changed, 46 insertions, 2 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 42e099d..9ec75ce 100644 --- a/web/app/view/ReportController.js +++ b/web/app/view/ReportController.js @@ -521,6 +521,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') @@ -548,6 +556,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') @@ -557,6 +569,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') @@ -596,6 +612,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 6f51ec3..9764737 100644 --- a/web/l10n/de.json +++ b/web/l10n/de.json @@ -383,6 +383,8 @@ "reportEndTime": "Zielzeit", "reportEndAddress": "Zielort", "reportSpentFuel": "Kraftstoffverbrauch", + "reportStartOdometer": "Kilometerzähler Start", + "reportEndOdometer": "Kilometerzähler End", "statisticsTitle": "Statistiken", "statisticsCaptureTime": "Zeitpunkt", "statisticsActiveUsers": "Aktive Benutzer", @@ -410,4 +412,4 @@ "categoryTractor": "Traktor", "categoryTruck": "LKW", "categoryVan": "Van" -}
\ No newline at end of file +} diff --git a/web/l10n/en.json b/web/l10n/en.json index 1ebccbd..c13a501 100644 --- a/web/l10n/en.json +++ b/web/l10n/en.json @@ -383,6 +383,8 @@ "reportEndTime": "End Time", "reportEndAddress": "End Address", "reportSpentFuel": "Spent Fuel", + "reportStartOdometer": "Odometer Start", + "reportEndOdometer": "Odometer End", "statisticsTitle": "Statistics", "statisticsCaptureTime": "Capture Time", "statisticsActiveUsers": "Active Users", @@ -410,4 +412,4 @@ "categoryTractor": "Tractor", "categoryTruck": "Truck", "categoryVan": "Van" -}
\ No newline at end of file +} |