Browse Source

fixed bug with displaying decimals in liquid level widget

pull/14012/head
Maksym Tsymbarov 1 year ago
parent
commit
36f8c9ed55
  1. 12
      ui-ngx/src/app/modules/home/components/widget/lib/indicator/liquid-level-widget.component.ts

12
ui-ngx/src/app/modules/home/components/widget/lib/indicator/liquid-level-widget.component.ts

@ -510,11 +510,10 @@ export class LiquidLevelWidgetComponent implements OnInit {
let content: string;
let container: JQuery<HTMLElement>;
const jQueryContainerElement = $(this.liquidLevelContent.nativeElement);
let value = 'N/A';
let value: number | string = 'N/A';
if (isNumeric(data)) {
value = this.widgetUnitsConvertor(convertLiters(this.convertOutputData(percentage), this.widgetUnits as CapacityUnits, ConversionType.from))
.toFixed(this.settings.decimals || 0);
value = +this.widgetUnitsConvertor(convertLiters(this.convertOutputData(percentage), this.widgetUnits as CapacityUnits, ConversionType.from)).toFixed(this.ctx.widgetConfig.decimals || 0)
}
this.valueColor.update(value);
const valueTextStyle = cssTextFromInlineStyle({...inlineTextStyle(this.settings.valueFont),
@ -528,10 +527,9 @@ export class LiquidLevelWidgetComponent implements OnInit {
let volume: number | string;
if (this.widgetUnits !== CapacityUnits.percent) {
const volumeInLiters: number = convertLiters(this.volume, this.volumeUnits as CapacityUnits, ConversionType.to);
volume = this.widgetUnitsConvertor(convertLiters(volumeInLiters, this.widgetUnits as CapacityUnits, ConversionType.from))
.toFixed(this.settings.decimals || 0);
volume = +this.widgetUnitsConvertor(convertLiters(volumeInLiters, this.widgetUnits as CapacityUnits, ConversionType.from)).toFixed(this.ctx.widgetConfig.decimals || 0)
} else {
volume = this.widgetUnitsConvertor(this.volume).toFixed(this.settings.decimals || 0);
volume = +this.widgetUnitsConvertor(this.volume).toFixed(this.ctx.widgetConfig.decimals || 0)
}
const volumeTextStyle = cssTextFromInlineStyle({...inlineTextStyle(this.settings.volumeFont),

Loading…
Cancel
Save