- 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

4 files changed, 22 insertions, 10 deletions

diff --git a/web/app/store/DistanceUnits.js b/web/app/store/DistanceUnits.js
index 514a051..189f79b 100644
--- a/web/app/store/DistanceUnits.js
+++ b/web/app/store/DistanceUnits.js
@@ -48,6 +48,15 @@ Ext.define('Traccar.store.DistanceUnits', {
             unit = 'km';
         }
         model = this.findRecord('key', unit);
+        return value.toFixed(2) + ' ' + model.get('name');
+    },
+
+    convertAndFormat: function (value, unit) {
+        var model;
+        if (!unit) {
+            unit = 'km';
+        }
+        model = this.findRecord('key', unit);
         return this.convertValue(value, unit).toFixed(2) + ' ' + model.get('name');
     }
 });
diff --git a/web/app/store/PositionAttributes.js b/web/app/store/PositionAttributes.js
index 985c558..7215429 100644
--- a/web/app/store/PositionAttributes.js
+++ b/web/app/store/PositionAttributes.js
@@ -62,7 +62,7 @@ Ext.define('Traccar.store.PositionAttributes', {
         valueType: 'string'
     }, {
         key: 'alarm',
-        name: Strings.alarm,
+        name: Strings.positionAlarm,
         valueType: 'string'
     }, {
         key: 'status',
diff --git a/web/app/store/ReportChartTypes.js b/web/app/store/ReportChartTypes.js
index 889db50..8ca074f 100644
--- a/web/app/store/ReportChartTypes.js
+++ b/web/app/store/ReportChartTypes.js
@@ -21,16 +21,10 @@ Ext.define('Traccar.store.ReportChartTypes', {
     fields: ['key', 'name'],
 
     data: [{
-        key: 'speedConverted',
+        key: 'speed',
         name: Strings.positionSpeed
     }, {
-        key: 'distanceConverted',
-        name: Strings.positionDistance
-    }, {
-        key: 'rpm',
-        name: Strings.positionRpm
-    }, {
-        key: 'fuel',
-        name: Strings.positionFuel
+        key: 'accuracy',
+        name: Strings.positionAccuracy
     }]
 });
diff --git a/web/app/store/SpeedUnits.js b/web/app/store/SpeedUnits.js
index ce97695..fc2e573 100644
--- a/web/app/store/SpeedUnits.js
+++ b/web/app/store/SpeedUnits.js
@@ -48,6 +48,15 @@ Ext.define('Traccar.store.SpeedUnits', {
             unit = 'kn';
         }
         model = this.findRecord('key', unit);
+        return value.toFixed(1) + ' ' + model.get('name');
+    },
+
+    convertAndFormat: function (value, unit) {
+        var model;
+        if (!unit) {
+            unit = 'kn';
+        }
+        model = this.findRecord('key', unit);
         return this.convertValue(value, unit).toFixed(1) + ' ' + model.get('name');
     }
 });