aboutsummaryrefslogtreecommitdiff
path: root/web/app/view/edit/Attributes.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/edit/Attributes.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/edit/Attributes.js')
-rw-r--r--web/app/view/edit/Attributes.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/web/app/view/edit/Attributes.js b/web/app/view/edit/Attributes.js
index b080e569..0d16e1e8 100644
--- a/web/app/view/edit/Attributes.js
+++ b/web/app/view/edit/Attributes.js
@@ -58,9 +58,9 @@ Ext.define('Traccar.view.edit.Attributes', {
attribute = Ext.getStore(this.attributesStore).getById(record.get('name'));
}
if (attribute && attribute.get('dataType') === 'speed') {
- return Ext.getStore('SpeedUnits').formatValue(value, Traccar.app.getPreference('speedUnit', 'kn'));
+ return Ext.getStore('SpeedUnits').convertAndFormat(value, Traccar.app.getPreference('speedUnit', 'kn'));
} else if (attribute && attribute.get('dataType') === 'distance') {
- return Ext.getStore('DistanceUnits').formatValue(value, Traccar.app.getPreference('distanceUnit', 'km'));
+ return Ext.getStore('DistanceUnits').convertAndFormat(value, Traccar.app.getPreference('distanceUnit', 'km'));
} else {
return value;
}