- 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

1 files changed, 24 insertions, 0 deletions

diff --git a/web/app/controller/Root.js b/web/app/controller/Root.js
index 8d604b62..5d22a74a 100644
--- a/web/app/controller/Root.js
+++ b/web/app/controller/Root.js
@@ -26,7 +26,31 @@ Ext.define('Traccar.controller.Root', {
     ],
 
     init: function () {
+        var i, data, attribute, chartTypesStore = Ext.getStore('ReportChartTypes');
         Ext.state.Manager.setProvider(new Ext.state.CookieProvider());
+        data = Ext.getStore('PositionAttributes').getData().items;
+        for (i = 0; i < data.length; i++) {
+            attribute = data[i];
+            Traccar.model.Position.addFields([{
+                name: 'attribute.' + attribute.get('key'),
+                attributeKey: attribute.get('key'),
+                calculate: this.calculateAttribute,
+                persist: false
+            }]);
+            if (attribute.get('valueType') === 'number') {
+                chartTypesStore.add({
+                    key: 'attribute.' + attribute.get('key'),
+                    name: attribute.get('name')
+                });
+            }
+        }
+    },
+
+    calculateAttribute: function (data) {
+        var value = data.attributes[this.attributeKey];
+        if (value !== undefined) {
+            return Traccar.AttributeFormatter.getAttributeConverter(this.attributeKey)(value);
+        }
     },
 
     onLaunch: function () {