aboutsummaryrefslogtreecommitdiff
path: root/web/app/view/StateController.js
diff options
context:
space:
mode:
authorAbyss777 <abyss@fox5.ru>2017-06-06 11:43:09 +0500
committerAbyss777 <abyss@fox5.ru>2017-06-06 11:43:09 +0500
commitf538963be5fcee2280b22050c8a51475c3a984f8 (patch)
tree6a08cb27c330480b60bb8fd160570e308802de0c /web/app/view/StateController.js
parentb6f2faab0d35d54189fefd7567b6310023c3ad7b (diff)
downloadtrackermap-web-f538963be5fcee2280b22050c8a51475c3a984f8.tar.gz
trackermap-web-f538963be5fcee2280b22050c8a51475c3a984f8.tar.bz2
trackermap-web-f538963be5fcee2280b22050c8a51475c3a984f8.zip
- 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
Diffstat (limited to 'web/app/view/StateController.js')
-rw-r--r--web/app/view/StateController.js9
1 files changed, 7 insertions, 2 deletions
diff --git a/web/app/view/StateController.js b/web/app/view/StateController.js
index 0723dc13..4c99a8be 100644
--- a/web/app/view/StateController.js
+++ b/web/app/view/StateController.js
@@ -101,7 +101,7 @@ Ext.define('Traccar.view.StateController', {
},
updatePosition: function () {
- var attributes, store, key, aliasIndex, name;
+ var attributes, store, key, aliasIndex, name, value;
store = Ext.getStore('Attributes');
store.removeAll();
@@ -126,11 +126,16 @@ Ext.define('Traccar.view.StateController', {
} else {
name = Ext.getStore('PositionAttributes').getAttributeName(key, true);
}
+ if (this.position.get('attribute.' + key) !== undefined) {
+ value = Traccar.AttributeFormatter.getAttributeFormatter(key)(this.position.get('attribute.' + key));
+ } else {
+ value = Traccar.AttributeFormatter.defaultFormatter(attributes[key]);
+ }
store.add(Ext.create('Traccar.model.Attribute', {
priority: 1024,
name: name,
attribute: key,
- value: Traccar.AttributeFormatter.getAttributeFormatter(key)(attributes[key])
+ value: value
}));
}
}