Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: 🐛 decimals limited by locale format string number #303

Merged
merged 1 commit into from
Jun 26, 2023
Merged

fix: 🐛 decimals limited by locale format string number #303

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions src/power-flow-card-plus.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,10 +208,10 @@ export class PowerFlowCardPlus extends LitElement {
if (Number.isNaN(+value)) return value.toString();
const valueInNumber = Number(value);
const isKW = unit === undefined && valueInNumber >= this._config!.watt_threshold;
const v = formatNumber(
isKW ? round(valueInNumber / 1000, this._config!.kw_decimals) : round(valueInNumber, decimals ?? this._config!.w_decimals),
this.hass.locale
);
const decimalsToUse = decimals ?? (isKW ? this._config!.kw_decimals : this._config!.w_decimals);
const v = formatNumber(round(valueInNumber / (isKW ? 1000 : 1), decimalsToUse), this.hass.locale, {
maximumFractionDigits: isKW ? this._config!.kw_decimals : decimals ?? this._config!.w_decimals, // fixes decimals being overriden by locale
});
return `${v}${unitWhiteSpace === false ? "" : " "}${unit || (isKW ? "kW" : "W")}`;
};

Expand Down Expand Up @@ -1676,12 +1676,14 @@ export class PowerFlowCardPlus extends LitElement {
id="solar-battery-flow"
class="flat-line"
>
<path id="battery-solar" class="battery-solar ${this.styleLine(
solar.state.toBattery || 0
)}" d="M50,0 V100" vector-effect="non-scaling-stroke"></path>
${
solar.state.toBattery
? svg`<circle
<path
id="battery-solar"
class="battery-solar ${this.styleLine(solar.state.toBattery || 0)}"
d="M50,0 V100"
vector-effect="non-scaling-stroke"
></path>
${solar.state.toBattery
? svg`<circle
r="1"
class="battery-solar"
vector-effect="non-scaling-stroke"
Expand All @@ -1694,8 +1696,7 @@ export class PowerFlowCardPlus extends LitElement {
<mpath xlink:href="#battery-solar" />
</animateMotion>
</circle>`
: ""
}
: ""}
</svg>
</div>`
: ""}
Expand Down