dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3309 from ChantsovaEkaterina/improvement/format-value

Browse Source 
Add check for null when formatting value
This commit is contained in:
Igor Kulikov 2020-08-14 17:07:41 +03:00 committed by GitHub
commit a95af6a303
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui-ngx/src/app/core/utils.ts
View File

@ -123,16 +123,16 @@ export function isEmpty(obj: any): boolean {
} }
export function formatValue(value: any, dec?: number, units?: string, showZeroDecimals?: boolean): string | undefined { export function formatValue(value: any, dec?: number, units?: string, showZeroDecimals?: boolean): string | undefined {
if (isDefinedAndNotNull(value) && isNumeric(value) && (isDefined(dec) || isDefined(units) || Number(value).toString() === value)) { if (isDefinedAndNotNull(value) && isNumeric(value) && (isDefinedAndNotNull(dec) || isDefinedAndNotNull(units) || Number(value).toString() === value)) {
let formatted: string | number = Number(value); let formatted: string | number = Number(value);
if (isDefined(dec)) { if (isDefinedAndNotNull(dec)) {
formatted = formatted.toFixed(dec); formatted = formatted.toFixed(dec);
} }
if (!showZeroDecimals) { if (!showZeroDecimals) {
formatted = (Number(formatted)); formatted = (Number(formatted));
} }
formatted = formatted.toString(); formatted = formatted.toString();
if (isDefined(units) && units.length > 0) { if (isDefinedAndNotNull(units) && units.length > 0) {
formatted += ' ' + units; formatted += ' ' + units;
} }
return formatted; return formatted;