From f538963be5fcee2280b22050c8a51475c3a984f8 Mon Sep 17 00:00:00 2001
From: Abyss777 <abyss@fox5.ru>
Date: Tue, 6 Jun 2017 11:43:09 +0500
Subject: - 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

---
 web/app/store/DistanceUnits.js      |  9 +++++++++
 web/app/store/PositionAttributes.js |  2 +-
 web/app/store/ReportChartTypes.js   | 12 +++---------
 web/app/store/SpeedUnits.js         |  9 +++++++++
 4 files changed, 22 insertions(+), 10 deletions(-)

(limited to 'web/app/store')

diff --git a/web/app/store/DistanceUnits.js b/web/app/store/DistanceUnits.js
index 514a051e..189f79bd 100644
--- a/web/app/store/DistanceUnits.js
+++ b/web/app/store/DistanceUnits.js
@@ -43,6 +43,15 @@ Ext.define('Traccar.store.DistanceUnits', {
     },
 
     formatValue: function (value, unit) {
+        var model;
+        if (!unit) {
+            unit = 'km';
+        }
+        model = this.findRecord('key', unit);
+        return value.toFixed(2) + ' ' + model.get('name');
+    },
+
+    convertAndFormat: function (value, unit) {
         var model;
         if (!unit) {
             unit = 'km';
diff --git a/web/app/store/PositionAttributes.js b/web/app/store/PositionAttributes.js
index 985c558e..72154297 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 889db50d..8ca074f3 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 ce976952..fc2e573e 100644
--- a/web/app/store/SpeedUnits.js
+++ b/web/app/store/SpeedUnits.js
@@ -43,6 +43,15 @@ Ext.define('Traccar.store.SpeedUnits', {
     },
 
     formatValue: function (value, unit) {
+        var model;
+        if (!unit) {
+            unit = 'kn';
+        }
+        model = this.findRecord('key', unit);
+        return value.toFixed(1) + ' ' + model.get('name');
+    },
+
+    convertAndFormat: function (value, unit) {
         var model;
         if (!unit) {
             unit = 'kn';
-- 
cgit v1.2.3