- 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, 18 insertions, 0 deletions

diff --git a/web/app/view/ReportController.js b/web/app/view/ReportController.js
index d83d9986..8631b7ca 100644
--- a/web/app/view/ReportController.js
+++ b/web/app/view/ReportController.js
@@ -64,6 +64,10 @@ Ext.define('Traccar.view.ReportController', {
         return this.getView().getComponent('chart');
     },
 
+    init: function () {
+        this.addAttributeColumns();
+    },
+
     onConfigureClick: function () {
         var dialog = Ext.create('Traccar.view.dialog.ReportConfig');
         dialog.lookupReference('eventTypeField').setHidden(this.lookupReference('reportTypeField').getValue() !== 'events');
@@ -383,6 +387,20 @@ Ext.define('Traccar.view.ReportController', {
         this.updateButtons();
     },
 
+    addAttributeColumns: function () {
+        var i, data, attribute;
+        data = Ext.getStore('PositionAttributes').getData().items;
+        for (i = 0; i < data.length; i++) {
+            attribute = data[i];
+            this.routeColumns.push({
+                text: attribute.get('name'),
+                dataIndex: 'attribute.' + attribute.get('key'),
+                renderer: Traccar.AttributeFormatter.getAttributeFormatter(attribute.get('key')),
+                hidden: true
+            });
+        }
+    },
+
     routeColumns: [{
         text: Strings.reportDeviceName,
         dataIndex: 'deviceId',