diff options
| -rw-r--r-- | web/app/model/Position.js | 29 | ||||
| -rw-r--r-- | web/app/store/ReportChartTypes.js | 6 | ||||
| -rw-r--r-- | web/l10n/en.json | 2 |
3 files changed, 29 insertions, 8 deletions
diff --git a/web/app/model/Position.js b/web/app/model/Position.js index 3b85a1b..4b1a429 100644 --- a/web/app/model/Position.js +++ b/web/app/model/Position.js @@ -59,12 +59,6 @@ Ext.define('Traccar.model.Position', { name: 'speed', type: 'float' }, { - name: 'speedConverted', - type: 'float', - calculate: function (data) { - return Ext.getStore('SpeedUnits').convertValue(data.speed, Traccar.app.getPreference('speedUnit')); - } - }, { name: 'course', type: 'float' }, { @@ -73,11 +67,30 @@ Ext.define('Traccar.model.Position', { }, { name: 'attributes' }, { + name: 'speedConverted', + type: 'float', + calculate: function (data) { + return Ext.getStore('SpeedUnits').convertValue( + data.speed, Traccar.app.getPreference('speedUnit')); + } + }, { name: 'distanceConverted', type: 'float', calculate: function (data) { - return Ext.getStore('DistanceUnits').convertValue(data.attributes.distance, - Traccar.app.getPreference('distanceUnit')); + return Ext.getStore('DistanceUnits').convertValue( + data.attributes.distance, Traccar.app.getPreference('distanceUnit')); + } + }, { + name: 'rpm', + type: 'float', + calculate: function (data) { + return data.attributes.rpm; + } + }, { + name: 'fuel', + type: 'float', + calculate: function (data) { + return data.attributes.fuel; } }] }); diff --git a/web/app/store/ReportChartTypes.js b/web/app/store/ReportChartTypes.js index 7a63fd0..889db50 100644 --- a/web/app/store/ReportChartTypes.js +++ b/web/app/store/ReportChartTypes.js @@ -26,5 +26,11 @@ Ext.define('Traccar.store.ReportChartTypes', { }, { key: 'distanceConverted', name: Strings.positionDistance + }, { + key: 'rpm', + name: Strings.positionRpm + }, { + key: 'fuel', + name: Strings.positionFuel }] }); diff --git a/web/l10n/en.json b/web/l10n/en.json index a810943..4caac48 100644 --- a/web/l10n/en.json +++ b/web/l10n/en.json @@ -119,6 +119,8 @@ "positionAddress": "Address", "positionProtocol": "Protocol", "positionDistance": "Distance", + "positionRpm": "RPM", + "positionFuel": "Fuel", "serverTitle": "Server Settings", "serverZoom": "Zoom", "serverRegistration": "Registration", |