From 3810a8be84b010f6c26f7541be22ecd6a973af58 Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Wed, 19 Apr 2017 14:17:11 +0500 Subject: Convert speed and distance for known attributes --- web/app/view/edit/Attributes.js | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) (limited to 'web/app/view/edit') diff --git a/web/app/view/edit/Attributes.js b/web/app/view/edit/Attributes.js index 8008319..981d539 100644 --- a/web/app/view/edit/Attributes.js +++ b/web/app/view/edit/Attributes.js @@ -43,15 +43,31 @@ Ext.define('Traccar.view.edit.Attributes', { text: Strings.sharedName, dataIndex: 'name', renderer: function (value, metaData) { - var result; + var attribute; if (this.attributesStore) { - result = Ext.getStore(this.attributesStore).getById(value); + attribute = Ext.getStore(this.attributesStore).getById(value); } - return result && result.get('name') ? result.get('name') : value; + return attribute && attribute.get('name') ? attribute.get('name') : value; } }, { text: Strings.stateValue, - dataIndex: 'value' + dataIndex: 'value', + renderer: function (value, metaData, record) { + var attribute; + if (this.attributesStore) { + attribute = Ext.getStore(this.attributesStore).getById(record.get('name')); + } + if (attribute && attribute.get('convert') === 'speed') { + return Ext.getStore('SpeedUnits').formatValue(value, Traccar.app.getPreference('speedUnit', 'kn')); + } else if (attribute && attribute.get('convert') === 'distance') { + return Ext.getStore('DistanceUnits').formatValue(value, Traccar.app.getPreference('distanceUnit', 'km')); + } else if (attribute && attribute.get('type') === 'color') { + metaData.tdStyle = 'background-color:' + value; + return value; + } else { + return value; + } + } }] } }); -- cgit v1.2.3 From 2c4c52a8d925de24c004db7ec01479c27e507f1d Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Thu, 20 Apr 2017 11:57:55 +0500 Subject: Remove cell colorizing --- web/app/view/edit/Attributes.js | 3 --- 1 file changed, 3 deletions(-) (limited to 'web/app/view/edit') diff --git a/web/app/view/edit/Attributes.js b/web/app/view/edit/Attributes.js index 981d539..7788d8c 100644 --- a/web/app/view/edit/Attributes.js +++ b/web/app/view/edit/Attributes.js @@ -61,9 +61,6 @@ Ext.define('Traccar.view.edit.Attributes', { return Ext.getStore('SpeedUnits').formatValue(value, Traccar.app.getPreference('speedUnit', 'kn')); } else if (attribute && attribute.get('convert') === 'distance') { return Ext.getStore('DistanceUnits').formatValue(value, Traccar.app.getPreference('distanceUnit', 'km')); - } else if (attribute && attribute.get('type') === 'color') { - metaData.tdStyle = 'background-color:' + value; - return value; } else { return value; } -- cgit v1.2.3