@annalib/anna-core 21.0.2 → 21.0.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2020/lib/anna-core-shared-lib/services/anna-number-format.service.mjs +2 -2
- package/fesm2015/annalib-anna-core.mjs +1 -1
- package/fesm2015/annalib-anna-core.mjs.map +1 -1
- package/fesm2020/annalib-anna-core.mjs +1 -1
- package/fesm2020/annalib-anna-core.mjs.map +1 -1
- package/package.json +1 -1
|
@@ -19,7 +19,7 @@ export class AnnaNumberFormatService {
|
|
|
19
19
|
if (digitsToRoundDecimalPoint == 0 && (unit == "M" || unit == "B" || unit == "K")) {
|
|
20
20
|
digitsToRoundDecimalPoint = 2;
|
|
21
21
|
}
|
|
22
|
-
return value.toFixed(digitsToRoundDecimalPoint) + unit;
|
|
22
|
+
return Number.isInteger(value) ? value.toString() + unit : value.toFixed(digitsToRoundDecimalPoint) + unit;
|
|
23
23
|
// return (Math.round(value, digitsToRoundDecimalPoint, MidpointRounding.AwayFromZero) + unit);
|
|
24
24
|
}
|
|
25
25
|
static GetValueInUnits(inputValue) {
|
|
@@ -50,4 +50,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.9", ngImpor
|
|
|
50
50
|
providedIn: "root",
|
|
51
51
|
}]
|
|
52
52
|
}] });
|
|
53
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
53
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYW5uYS1udW1iZXItZm9ybWF0LnNlcnZpY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9wcm9qZWN0cy9hbm5hLWNvcmUvc3JjL2xpYi9hbm5hLWNvcmUtc2hhcmVkLWxpYi9zZXJ2aWNlcy9hbm5hLW51bWJlci1mb3JtYXQuc2VydmljZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDOztBQUszQyxNQUFNLE9BQU8sdUJBQXVCO0lBRTdCLE1BQU0sQ0FBQyx3QkFBd0IsQ0FBQyxVQUFrQixFQUFFLHlCQUF5QixHQUFHLENBQUM7UUFFbEYsSUFBSSxDQUFDLEtBQUssRUFBQyxJQUFJLENBQUMsR0FBRyx1QkFBdUIsQ0FBQyxlQUFlLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDO1FBQ2pGLEtBQUssR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLE9BQU8sQ0FBQyx5QkFBeUIsQ0FBQyxDQUFDLENBQUM7UUFDdkQsSUFBRyxVQUFVLEdBQUcsQ0FBQyxFQUFDO1lBQ2QsS0FBSyxHQUFHLEtBQUssR0FBRyxDQUFDLENBQUMsQ0FBQztTQUN0QjtRQUNELE9BQU8sS0FBSyxDQUFDLFFBQVEsRUFBRSxHQUFHLElBQUksQ0FBQztRQUNqQyxpR0FBaUc7SUFDbkcsQ0FBQztJQUVNLE1BQU0sQ0FBQyw4QkFBOEIsQ0FBQyxVQUFrQixFQUFFLDRCQUFvQyxDQUFDO1FBRWhHLElBQUksQ0FBQyxLQUFLLEVBQUMsSUFBSSxDQUFDLEdBQUcsSUFBSSxDQUFDLGVBQWUsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUM7UUFDOUQsS0FBSyxHQUFHLENBQUMsS0FBSyxDQUFDO1FBQ2YsSUFBRyxVQUFVLEdBQUcsQ0FBQyxFQUFDO1lBQ2QsS0FBSyxHQUFHLEtBQUssR0FBRyxDQUFDLENBQUMsQ0FBQztTQUN0QjtRQUNELElBQUcseUJBQXlCLElBQUksQ0FBQyxJQUFJLENBQUMsSUFBSSxJQUFJLEdBQUcsSUFBSSxJQUFJLElBQUksR0FBRyxJQUFJLElBQUksSUFBSSxHQUFHLENBQUMsRUFDaEY7WUFDSSx5QkFBeUIsR0FBRyxDQUFDLENBQUM7U0FDakM7UUFDRCxPQUFPLE1BQU0sQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxRQUFRLEVBQUUsR0FBRyxJQUFJLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMseUJBQXlCLENBQUMsR0FBRyxJQUFJLENBQUM7UUFDM0csK0ZBQStGO0lBQ25HLENBQUM7SUFFSSxNQUFNLENBQUMsZUFBZSxDQUFDLFVBQWtCO1FBQzVDLElBQUksSUFBSSxHQUFHLEVBQUUsQ0FBQztRQUNkLElBQUksUUFBUSxHQUFHLElBQUksQ0FBQztRQUNwQixJQUFJLE9BQU8sR0FBRyxPQUFPLENBQUM7UUFDdEIsSUFBSSxPQUFPLEdBQUcsVUFBVSxDQUFDO1FBRXpCLElBQUksVUFBVSxJQUFJLFFBQVEsSUFBSSxVQUFVLEdBQUcsT0FBTyxFQUNsRDtZQUNJLFVBQVUsR0FBRyxVQUFVLEdBQUcsUUFBUSxDQUFDO1lBQ25DLElBQUksR0FBRyxHQUFHLENBQUM7U0FDZDthQUNJLElBQUksVUFBVSxJQUFJLE9BQU8sSUFBSSxVQUFVLEdBQUcsT0FBTyxFQUN0RDtZQUNJLFVBQVUsR0FBRyxVQUFVLEdBQUcsT0FBTyxDQUFDO1lBQ2xDLElBQUksR0FBRyxHQUFHLENBQUM7U0FDZDthQUNJLElBQUksVUFBVSxJQUFJLE9BQU8sRUFDOUI7WUFDSSxVQUFVLEdBQUcsVUFBVSxHQUFHLE9BQU8sQ0FBQztZQUNsQyxJQUFJLEdBQUcsR0FBRyxDQUFDO1NBQ2Q7UUFFRCxPQUFPLENBQUMsVUFBVSxFQUFDLElBQUksQ0FBQyxDQUFDO0lBQzdCLENBQUM7O29IQW5EVSx1QkFBdUI7d0hBQXZCLHVCQUF1QixjQUZwQixNQUFNOzJGQUVULHVCQUF1QjtrQkFIbkMsVUFBVTttQkFBQztvQkFDUixVQUFVLEVBQUUsTUFBTTtpQkFDckIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBJbmplY3RhYmxlIH0gZnJvbSBcIkBhbmd1bGFyL2NvcmVcIjtcclxuXHJcbkBJbmplY3RhYmxlKHtcclxuICAgIHByb3ZpZGVkSW46IFwicm9vdFwiLFxyXG59KVxyXG5leHBvcnQgY2xhc3MgQW5uYU51bWJlckZvcm1hdFNlcnZpY2Uge1xyXG5cclxucHVibGljIHN0YXRpYyBHZXRSb3VuZGVkVmFsdWVXaXRoVW5pdHMoaW5wdXRWYWx1ZTogbnVtYmVyLCBkaWdpdHNUb1JvdW5kRGVjaW1hbFBvaW50ID0gMilcclxuICB7XHJcbiAgICAgIGxldCBbdmFsdWUsdW5pdF0gPSBBbm5hTnVtYmVyRm9ybWF0U2VydmljZS5HZXRWYWx1ZUluVW5pdHMoTWF0aC5hYnMoaW5wdXRWYWx1ZSkpO1xyXG4gICAgICB2YWx1ZSA9ICsoKCt2YWx1ZSkudG9GaXhlZChkaWdpdHNUb1JvdW5kRGVjaW1hbFBvaW50KSk7XHJcbiAgICAgIGlmKGlucHV0VmFsdWUgPCAwKXtcclxuICAgICAgICAgIHZhbHVlID0gdmFsdWUgKiAtMTtcclxuICAgICAgfVxyXG4gICAgICByZXR1cm4gdmFsdWUudG9TdHJpbmcoKSArIHVuaXQ7XHJcbiAgICAvLyAgIHJldHVybiAoTWF0aC5Sb3VuZCh2YWx1ZSwgZGlnaXRzVG9Sb3VuZERlY2ltYWxQb2ludCwgTWlkcG9pbnRSb3VuZGluZy5Bd2F5RnJvbVplcm8pICsgdW5pdCk7XHJcbiAgfVxyXG5cclxuICBwdWJsaWMgc3RhdGljIEdldFJvdW5kZWRJbXByZXNzaW9uc1dpdGhVbml0cyhpbnB1dFZhbHVlOiBudW1iZXIsIGRpZ2l0c1RvUm91bmREZWNpbWFsUG9pbnQ6IG51bWJlciA9IDApXHJcbiAgICB7XHJcbiAgICAgICAgbGV0IFt2YWx1ZSx1bml0XSA9IHRoaXMuR2V0VmFsdWVJblVuaXRzKE1hdGguYWJzKGlucHV0VmFsdWUpKTtcclxuICAgICAgICB2YWx1ZSA9ICt2YWx1ZTtcclxuICAgICAgICBpZihpbnB1dFZhbHVlIDwgMCl7XHJcbiAgICAgICAgICAgIHZhbHVlID0gdmFsdWUgKiAtMTtcclxuICAgICAgICB9XHJcbiAgICAgICAgaWYoZGlnaXRzVG9Sb3VuZERlY2ltYWxQb2ludCA9PSAwICYmICh1bml0ID09IFwiTVwiIHx8IHVuaXQgPT0gXCJCXCIgfHwgdW5pdCA9PSBcIktcIikpXHJcbiAgICAgICAge1xyXG4gICAgICAgICAgICBkaWdpdHNUb1JvdW5kRGVjaW1hbFBvaW50ID0gMjtcclxuICAgICAgICB9XHJcbiAgICAgICAgcmV0dXJuIE51bWJlci5pc0ludGVnZXIodmFsdWUpID8gdmFsdWUudG9TdHJpbmcoKSArIHVuaXQgOiB2YWx1ZS50b0ZpeGVkKGRpZ2l0c1RvUm91bmREZWNpbWFsUG9pbnQpICsgdW5pdDtcclxuICAgICAgICAvLyByZXR1cm4gKE1hdGgucm91bmQodmFsdWUsIGRpZ2l0c1RvUm91bmREZWNpbWFsUG9pbnQsIE1pZHBvaW50Um91bmRpbmcuQXdheUZyb21aZXJvKSArIHVuaXQpO1xyXG4gICAgfVxyXG5cclxuICBwdWJsaWMgc3RhdGljIEdldFZhbHVlSW5Vbml0cyhpbnB1dFZhbHVlOiBudW1iZXIpe1xyXG4gICAgICBsZXQgdW5pdCA9IFwiXCI7XHJcbiAgICAgIGxldCB0aG91c2FuZCA9IDEwMDA7XHJcbiAgICAgIGxldCBtaWxsaW9uID0gMTAwMDAwMDtcclxuICAgICAgbGV0IGJpbGxpb24gPSAxMDAwMDAwMDAwO1xyXG5cclxuICAgICAgaWYgKGlucHV0VmFsdWUgPj0gdGhvdXNhbmQgJiYgaW5wdXRWYWx1ZSA8IG1pbGxpb24pXHJcbiAgICAgIHtcclxuICAgICAgICAgIGlucHV0VmFsdWUgPSBpbnB1dFZhbHVlIC8gdGhvdXNhbmQ7XHJcbiAgICAgICAgICB1bml0ID0gXCJLXCI7XHJcbiAgICAgIH1cclxuICAgICAgZWxzZSBpZiAoaW5wdXRWYWx1ZSA+PSBtaWxsaW9uICYmIGlucHV0VmFsdWUgPCBiaWxsaW9uKVxyXG4gICAgICB7XHJcbiAgICAgICAgICBpbnB1dFZhbHVlID0gaW5wdXRWYWx1ZSAvIG1pbGxpb247XHJcbiAgICAgICAgICB1bml0ID0gXCJNXCI7XHJcbiAgICAgIH1cclxuICAgICAgZWxzZSBpZiAoaW5wdXRWYWx1ZSA+PSBiaWxsaW9uKVxyXG4gICAgICB7XHJcbiAgICAgICAgICBpbnB1dFZhbHVlID0gaW5wdXRWYWx1ZSAvIGJpbGxpb247XHJcbiAgICAgICAgICB1bml0ID0gXCJCXCI7XHJcbiAgICAgIH1cclxuXHJcbiAgICAgIHJldHVybiBbaW5wdXRWYWx1ZSx1bml0XTtcclxuICB9XHJcbn0iXX0=
|
|
@@ -5660,7 +5660,7 @@ class AnnaNumberFormatService {
|
|
|
5660
5660
|
if (digitsToRoundDecimalPoint == 0 && (unit == "M" || unit == "B" || unit == "K")) {
|
|
5661
5661
|
digitsToRoundDecimalPoint = 2;
|
|
5662
5662
|
}
|
|
5663
|
-
return value.toFixed(digitsToRoundDecimalPoint) + unit;
|
|
5663
|
+
return Number.isInteger(value) ? value.toString() + unit : value.toFixed(digitsToRoundDecimalPoint) + unit;
|
|
5664
5664
|
// return (Math.round(value, digitsToRoundDecimalPoint, MidpointRounding.AwayFromZero) + unit);
|
|
5665
5665
|
}
|
|
5666
5666
|
static GetValueInUnits(inputValue) {
|