From 4c13d0f9ee6b431c215783070f8a1f410697dc7b Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Tue, 15 Sep 2015 22:40:32 +1200
Subject: Move value formatting code

---
 web/app/view/state/StateController.js | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

(limited to 'web/app/view/state')

diff --git a/web/app/view/state/StateController.js b/web/app/view/state/StateController.js
index 23ac72db3..91fa7714f 100644
--- a/web/app/view/state/StateController.js
+++ b/web/app/view/state/StateController.js
@@ -91,19 +91,10 @@ Ext.define('Traccar.view.state.StateController', {
 
         for (var key in position.data) {
             if (position.data.hasOwnProperty(key) && this.keys[key] !== undefined) {
-                value = position.get(key);
-                if (key === 'speed') {
-                    var speedUnits = Ext.getStore('SpeedUnits');
-                    unit = Traccar.getApplication().getUser().get('speedUnit') || Traccar.getApplication().getServer().get('speedUnit') || '';
-                    value = speedUnits.formatValue(value, unit);
-                } else if (value instanceof Date) {
-                    value = Ext.Date.format(value, styles.dateTimeFormat);
-                }
-                
                 store.add(Ext.create('Traccar.model.Attribute', {
                     priority: this.keys[key].priority,
                     name: this.keys[key].name,
-                    value: this.formatValue(value)
+                    value: Traccar.getApplication().getRenderer(key)(position.get(key))
                 }));
             }
         }
@@ -116,20 +107,12 @@ Ext.define('Traccar.view.state.StateController', {
         }
         for (var key in attributes) {
             if (attributes.hasOwnProperty(key)) {
-
-                value = attributes[key];
-                if (key === 'distance' || key === 'odometer') {
-                    var distanceUnits = Ext.getStore('DistanceUnits');
-                    unit = Traccar.getApplication().getUser().get('distanceUnit') || Traccar.getApplication().getServer().get('distanceUnit') || '';
-                    value = distanceUnits.formatValue(value, unit);
-                }
-
                 store.add(Ext.create('Traccar.model.Attribute', {
-                    priority: 999,
+                    priority: 1024,
                     name: key.replace(/^./, function (match) {
                         return match.toUpperCase();
                     }),
-                    value: this.formatValue(value)
+                    value: Traccar.getApplication().getRenderer(key)(attributes[key])
                 }));
             }
         }
-- 
cgit v1.2.3