espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix number

Browse Source
This commit is contained in:
yuri
2019-02-20 15:33:42 +02:00
parent 0bb3464e81
commit 141a6f218b
1 changed files with 36 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/number.js
+36 -38
View File
@@ -51,49 +51,47 @@ define('number', [], function () {
_.extend(NumberUtil.prototype, {
formatInt: function (value) {
if (value !== null) {
var stringValue = value.toString();
stringValue = stringValue.replace(/\B(?=(\d{3})+(?!\d))/g, this.getThousandSeparator());
return stringValue;
}
return '';
if (value !== null || typeof value === 'undefined') return '';
var stringValue = value.toString();
stringValue = stringValue.replace(/\B(?=(\d{3})+(?!\d))/g, this.getThousandSeparator());
return stringValue;
},
formatFloat: function (value, decimalPlaces) {
if (value !== null) {
if (value !== null || typeof value === 'undefined') return '';
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());
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));
}
return '';
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());
},
getThousandSeparator: function () {