From c5f53243c67faa2d1663ea357e24e37d2c4735d0 Mon Sep 17 00:00:00 2001 From: Anton Tananaev Date: Fri, 6 Nov 2015 13:56:59 +1300 Subject: Remove demical zeroes from values --- web/app/AttributeFormatter.js | 2 +- web/app/store/DistanceUnits.js | 2 +- web/app/store/SpeedUnits.js | 2 +- web/app/view/StateController.js | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'web') diff --git a/web/app/AttributeFormatter.js b/web/app/AttributeFormatter.js index b7b2d01a6..44cc7d5a8 100644 --- a/web/app/AttributeFormatter.js +++ b/web/app/AttributeFormatter.js @@ -36,7 +36,7 @@ Ext.define('Traccar.AttributeFormatter', { defaultFormatter: function (value) { if (typeof value === 'number') { - return value.toFixed(2); + return Number(value.toFixed(2)); } else if (typeof value === 'boolean') { return value ? Ext.Msg.buttonText.yes : Ext.Msg.buttonText.no; } else if (value instanceof Date) { diff --git a/web/app/store/DistanceUnits.js b/web/app/store/DistanceUnits.js index 20d057c1f..7f808c684 100644 --- a/web/app/store/DistanceUnits.js +++ b/web/app/store/DistanceUnits.js @@ -32,7 +32,7 @@ Ext.define('Traccar.store.DistanceUnits', { var model; if (unit) { model = this.findRecord('key', unit); - return (value * model.get('factor')).toFixed(2) + ' ' + model.get('name'); + return (value * Number(model.get('factor')).toFixed(2)) + ' ' + model.get('name'); } else { return value; } diff --git a/web/app/store/SpeedUnits.js b/web/app/store/SpeedUnits.js index d02892a01..cbcf94e3b 100644 --- a/web/app/store/SpeedUnits.js +++ b/web/app/store/SpeedUnits.js @@ -32,7 +32,7 @@ Ext.define('Traccar.store.SpeedUnits', { var model; if (unit) { model = this.findRecord('key', unit); - return (value * model.get('factor')).toFixed(1) + ' ' + model.get('name'); + return (value * Number(model.get('factor')).toFixed(1)) + ' ' + model.get('name'); } else { return value; } diff --git a/web/app/view/StateController.js b/web/app/view/StateController.js index 819c203c4..4b8236aa7 100644 --- a/web/app/view/StateController.js +++ b/web/app/view/StateController.js @@ -76,7 +76,7 @@ Ext.define('Traccar.view.StateController', { formatValue: function (value) { if (typeof (id) === 'number') { - return value.toFixed(2); + return Number(value.toFixed(2)); } else { return value; } -- cgit v1.2.3