From 557ffa7f106e44a09a99746dcd8e4f369ea4730d Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Mon, 26 Dec 2016 18:06:48 +0500 Subject: Charts implementation --- web/app/store/DistanceUnits.js | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'web/app/store/DistanceUnits.js') diff --git a/web/app/store/DistanceUnits.js b/web/app/store/DistanceUnits.js index cc9f1e92..57d15fc8 100644 --- a/web/app/store/DistanceUnits.js +++ b/web/app/store/DistanceUnits.js @@ -33,6 +33,15 @@ Ext.define('Traccar.store.DistanceUnits', { factor: 0.000539957 }], + convertValue: function (value, unit) { + var model; + if (!unit) { + unit = 'km'; + } + model = this.findRecord('key', unit); + return value * model.get('factor'); + }, + formatValue: function (value, unit) { var model; if (!unit) { -- cgit v1.2.3 From 3e19bbcd0d871db4c38d9f44c3ae29bafdff5a9d Mon Sep 17 00:00:00 2001 From: Abyss777 Date: Tue, 27 Dec 2016 10:08:43 +0500 Subject: Reuse convertValue functions --- web/app/store/DistanceUnits.js | 4 ++-- web/app/store/SpeedUnits.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'web/app/store/DistanceUnits.js') diff --git a/web/app/store/DistanceUnits.js b/web/app/store/DistanceUnits.js index 57d15fc8..0dcddbea 100644 --- a/web/app/store/DistanceUnits.js +++ b/web/app/store/DistanceUnits.js @@ -1,5 +1,5 @@ /* - * Copyright 2015 Anton Tananaev (anton@traccar.org) + * Copyright 2015 - 2016 Anton Tananaev (anton@traccar.org) * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -48,6 +48,6 @@ Ext.define('Traccar.store.DistanceUnits', { unit = 'km'; } model = this.findRecord('key', unit); - return (value * model.get('factor')).toFixed(2) + ' ' + model.get('name'); + return this.convertValue(value, unit).toFixed(2) + ' ' + model.get('name'); } }); diff --git a/web/app/store/SpeedUnits.js b/web/app/store/SpeedUnits.js index 0480ad42..a14ab22d 100644 --- a/web/app/store/SpeedUnits.js +++ b/web/app/store/SpeedUnits.js @@ -48,6 +48,6 @@ Ext.define('Traccar.store.SpeedUnits', { unit = 'kn'; } model = this.findRecord('key', unit); - return (value * model.get('factor')).toFixed(1) + ' ' + model.get('name'); + return this.convertValue(value, unit).toFixed(1) + ' ' + model.get('name'); } }); -- cgit v1.2.3