From acb361639878852f4a73a280d3bd015d98c1893f Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Mon, 17 Apr 2017 17:00:13 +1200
Subject: Add more chart options

---
 web/app/model/Position.js         | 29 +++++++++++++++++++++--------
 web/app/store/ReportChartTypes.js |  6 ++++++
 web/l10n/en.json                  |  2 ++
 3 files changed, 29 insertions(+), 8 deletions(-)

(limited to 'web')

diff --git a/web/app/model/Position.js b/web/app/model/Position.js
index 3b85a1b7..4b1a429f 100644
--- a/web/app/model/Position.js
+++ b/web/app/model/Position.js
@@ -58,12 +58,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'
@@ -72,12 +66,31 @@ Ext.define('Traccar.model.Position', {
         type: 'string'
     }, {
         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 7a63fd08..889db50d 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 a810943b..4caac488 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",
-- 
cgit v1.2.3