From f7ffcafb27846932435c13fda4aa3f00bb7bd6ff Mon Sep 17 00:00:00 2001
From: yuri <yurikuzn@users.noreply.github.com>
Date: Wed, 20 Feb 2019 12:12:26 +0200
Subject: [PATCH] number format float

---
 client/src/number.js | 94 +++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 85 insertions(+), 9 deletions(-)

diff --git a/client/src/number.js b/client/src/number.js
index 0aebb8bb69..751f2d5519 100644
--- a/client/src/number.js
+++ b/client/src/number.js
@@ -31,27 +31,103 @@ define('number', [], function () {
     var NumberUtil = function (config, preferences) {
         this.config = config;
         this.preferences = preferences;
+
+        this.thousandSeparator = null;
+        this.decimalMark = null;
+
+        this.config.on('change', function () {
+            this.thousandSeparator = null;
+            this.decimalMark = null;
+        }, this);
+
+        this.preferences.on('change', function () {
+            this.thousandSeparator = null;
+            this.decimalMark = null;
+        }, this);
+
+        this.maxDecimalPlaces = 10;
     };
 
     _.extend(NumberUtil.prototype, {
 
         formatInt: function (value) {
-            var thousandSeparator = '';
-            if (this.preferences.has('thousandSeparator')) {
-                thousandSeparator = this.preferences.get('thousandSeparator');
-            } else {
-                if (this.getConfig().has('thousandSeparator')) {
-                    thousandSeparator = this.config.get('thousandSeparator');
-                }
-            }
             if (value !== null) {
                 var stringValue = value.toString();
-                stringValue = stringValue.replace(/\B(?=(\d{3})+(?!\d))/g, thousandSeparator);
+                stringValue = stringValue.replace(/\B(?=(\d{3})+(?!\d))/g, this.getThousandSeparator());
                 return stringValue;
             }
             return '';
         },
 
+        formatFloat: function (value, decimalPlaces) {
+            if (value !== null) {
+
+                if (decimalPlaces === 0) {
+                    value = Math.round(value);
+                } else if (decimalPlaces) {
+                    value = Math.round(value * Math.pow(10, decimalPlaces)) / (Math.pow(10, decimalPlaces));
+                } else {
+                    value = Math.round(value * Math.pow(10, this.maxDecimalPlaces)) / (Math.pow(10, this.maxDecimalPlaces));
+                }
+
+                var parts = value.toString().split(".");
+                parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, this.getThousandSeparator());
+
+                if (decimalPlaces === 0) {
+                    return parts[0];
+                } else if (decimalPlaces) {
+                    var decimalPartLength = 0;
+                    if (parts.length > 1) {
+                        decimalPartLength = parts[1].length;
+                    } else {
+                        parts[1] = '';
+                    }
+
+                    if (decimalPlaces && decimalPartLength < decimalPlaces) {
+                        var limit = decimalPlaces - decimalPartLength;
+                        for (var i = 0; i < limit; i++) {
+                            parts[1] += '0';
+                        }
+                    }
+                }
+
+                return parts.join(this.getDecimalMark());
+            }
+            return '';
+        },
+
+        getThousandSeparator: function () {
+            if (this.thousandSeparator !== null) return this.thousandSeparator;
+
+            var thousandSeparator = '.';
+            if (this.preferences.has('thousandSeparator')) {
+                thousandSeparator = this.preferences.get('thousandSeparator');
+            } else {
+                if (this.config.has('thousandSeparator')) {
+                    thousandSeparator = this.config.get('thousandSeparator');
+                }
+            }
+            this.thousandSeparator = thousandSeparator;
+
+            return thousandSeparator;
+        },
+
+        getDecimalMark: function () {
+            if (this.decimalMark !== null) return this.decimalMark;
+
+            var decimalMark = '.';
+            if (this.preferences.has('decimalMark')) {
+                decimalMark = this.preferences.get('decimalMark');
+            } else {
+                if (this.config.has('decimalMark')) {
+                    decimalMark = this.config.get('decimalMark');
+                }
+            }
+            this.decimalMark = decimalMark;
+
+            return decimalMark;
+        },
+
     });
 
     return NumberUtil;