- Reworked fields and attributes formatting

- Convert position and reports fields in the model
- Add hidden columns to Route report
- Add Number attributes to possible chart types

3 files changed, 16 insertions, 34 deletions

diff --git a/web/app/model/Position.js b/web/app/model/Position.js
index 4b1a429f..6db54653 100644
--- a/web/app/model/Position.js
+++ b/web/app/model/Position.js
@@ -45,7 +45,8 @@ Ext.define('Traccar.model.Position', {
         type: 'boolean'
     }, {
         name: 'accuracy',
-        type: 'float'
+        type: 'float',
+        convert: Traccar.AttributeFormatter.getConverter('accuracy')
     }, {
         name: 'latitude',
         type: 'float'
@@ -57,7 +58,8 @@ Ext.define('Traccar.model.Position', {
         type: 'float'
     }, {
         name: 'speed',
-        type: 'float'
+        type: 'float',
+        convert: Traccar.AttributeFormatter.getConverter('speed')
     }, {
         name: 'course',
         type: 'float'
@@ -66,31 +68,5 @@ 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'));
-        }
-    }, {
-        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/model/ReportSummary.js b/web/app/model/ReportSummary.js
index d236ecd0..5cfbdcd7 100644
--- a/web/app/model/ReportSummary.js
+++ b/web/app/model/ReportSummary.js
@@ -28,13 +28,16 @@ Ext.define('Traccar.model.ReportSummary', {
         type: 'string'
     }, {
         name: 'maxSpeed',
-        type: 'float'
+        type: 'float',
+        convert: Traccar.AttributeFormatter.getConverter('speed')
     }, {
         name: 'averageSpeed',
-        type: 'float'
+        type: 'float',
+        convert: Traccar.AttributeFormatter.getConverter('speed')
     }, {
         name: 'distance',
-        type: 'float'
+        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 51f98078..d243a8ae 100644
--- a/web/app/model/ReportTrip.js
+++ b/web/app/model/ReportTrip.js
@@ -28,13 +28,16 @@ Ext.define('Traccar.model.ReportTrip', {
         type: 'string'
     }, {
         name: 'maxSpeed',
-        type: 'float'
+        type: 'float',
+        convert: Traccar.AttributeFormatter.getConverter('speed')
     }, {
         name: 'averageSpeed',
-        type: 'float'
+        type: 'float',
+        convert: Traccar.AttributeFormatter.getConverter('speed')
     }, {
         name: 'distance',
-        type: 'float'
+        type: 'float',
+        convert: Traccar.AttributeFormatter.getConverter('distance')
     }, {
         name: 'duration',
         type: 'int'