- Move addAttributeColumns functional to init

- Remove empty convert functions
- Add check for undefined in some formatters

1 files changed, 11 insertions, 15 deletions

diff --git a/web/app/view/ReportController.js b/web/app/view/ReportController.js
index 8631b7ca..3daa2957 100644
--- a/web/app/view/ReportController.js
+++ b/web/app/view/ReportController.js
@@ -65,7 +65,17 @@ Ext.define('Traccar.view.ReportController', {
     },
 
     init: function () {
-        this.addAttributeColumns();
+        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
+            });
+        }
     },
 
     onConfigureClick: function () {
@@ -387,20 +397,6 @@ 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',