Commit 99f8357a98b74335f396b99231d01bd9b0a97cd6

Authored by Chantsova Ekaterina
1 parent bf9e8005

Add check for null when formatting value

Showing 1 changed file with 3 additions and 3 deletions
... ... @@ -123,16 +123,16 @@ export function isEmpty(obj: any): boolean {
123 123 }
124 124
125 125 export function formatValue(value: any, dec?: number, units?: string, showZeroDecimals?: boolean): string | undefined {
126   - if (isDefinedAndNotNull(value) && isNumeric(value) && (isDefined(dec) || isDefined(units) || Number(value).toString() === value)) {
  126 + if (isDefinedAndNotNull(value) && isNumeric(value) && (isDefinedAndNotNull(dec) || isDefinedAndNotNull(units) || Number(value).toString() === value)) {
127 127 let formatted: string | number = Number(value);
128   - if (isDefined(dec)) {
  128 + if (isDefinedAndNotNull(dec)) {
129 129 formatted = formatted.toFixed(dec);
130 130 }
131 131 if (!showZeroDecimals) {
132 132 formatted = (Number(formatted));
133 133 }
134 134 formatted = formatted.toString();
135   - if (isDefined(units) && units.length > 0) {
  135 + if (isDefinedAndNotNull(units) && units.length > 0) {
136 136 formatted += ' ' + units;
137 137 }
138 138 return formatted;
... ...