jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-07-14 12:56:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Coerce all energy distribution values to the same unit (#26117)

Browse Source
This commit is contained in:
karwosts 2025-07-09 04:06:47 -07:00 committed by GitHub
parent 15dabe372c
commit 5cf8b39703
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 79 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/data/energy.ts
View File

@ -1109,21 +1109,31 @@ export const computeConsumptionSingle = (data: {
export const formatConsumptionShort = (
hass: HomeAssistant,
consumption: number | null,
unit: string
unit: string,
targetUnit?: string
): string => {
if (!consumption) {
return `0 ${unit}`;
}
const units = ["Wh", "kWh", "MWh", "GWh", "TWh"];
let pickedUnit = unit;
let val = consumption;
let val = consumption || 0;
let targetUnitIndex = -1;
if (targetUnit) {
targetUnitIndex = units.findIndex((u) => u === targetUnit);
}
let unitIndex = units.findIndex((u) => u === unit);
if (unitIndex >= 0) {
while (Math.abs(val) < 1 && unitIndex > 0) {
while (
targetUnitIndex > -1
? targetUnitIndex < unitIndex
: Math.abs(val) < 1 && unitIndex > 0
) {
val *= 1000;
unitIndex--;
}
while (Math.abs(val) >= 1000 && unitIndex < units.length - 1) {
while (
targetUnitIndex > -1
? targetUnitIndex > unitIndex
: Math.abs(val) >= 1000 && unitIndex < units.length - 1
) {
val /= 1000;
unitIndex++;
}

35
src/panels/lovelace/cards/energy/hui-energy-distribution-card.ts
View File

@ -255,6 +255,20 @@ class HuiEnergyDistrubutionCard
(batteryFromGrid || 0) +
(batteryToGrid || 0);
// Coerce all energy numbers to the same unit (the biggest)
const maxEnergy = Math.max(
lowCarbonEnergy || 0,
totalSolarProduction || 0,
returnedToGrid || 0,
totalFromGrid || 0,
totalHomeConsumption,
totalBatteryIn || 0,
totalBatteryOut || 0
);
const targetEnergyUnit = formatConsumptionShort(this.hass, maxEnergy, "kWh")
.split(" ")
.pop();
return html`
<ha-card .header=${this._config.title}>
<div class="card-content">
@ -281,7 +295,8 @@ class HuiEnergyDistrubutionCard
${formatConsumptionShort(
this.hass,
lowCarbonEnergy,
"kWh"
"kWh",
targetEnergyUnit
)}
</a>
<svg width="80" height="30">
@ -300,7 +315,8 @@ class HuiEnergyDistrubutionCard
${formatConsumptionShort(
this.hass,
totalSolarProduction,
"kWh"
"kWh",
targetEnergyUnit
)}
</div>
</div>`
@ -396,7 +412,8 @@ class HuiEnergyDistrubutionCard
>${formatConsumptionShort(
this.hass,
returnedToGrid,
"kWh"
"kWh",
targetEnergyUnit
)}
</span>`
: ""}
@ -409,7 +426,8 @@ class HuiEnergyDistrubutionCard
: ""}${formatConsumptionShort(
this.hass,
totalFromGrid,
"kWh"
"kWh",
targetEnergyUnit
)}
</span>
</div>
@ -432,7 +450,8 @@ class HuiEnergyDistrubutionCard
${formatConsumptionShort(
this.hass,
totalHomeConsumption,
"kWh"
"kWh",
targetEnergyUnit
)}
${homeSolarCircumference !== undefined ||
homeLowCarbonCircumference !== undefined
@ -535,7 +554,8 @@ class HuiEnergyDistrubutionCard
>${formatConsumptionShort(
this.hass,
totalBatteryIn,
"kWh"
"kWh",
targetEnergyUnit
)}
</span>
<span class="battery-out">
@ -546,7 +566,8 @@ class HuiEnergyDistrubutionCard
>${formatConsumptionShort(
this.hass,
totalBatteryOut,
"kWh"
"kWh",
targetEnergyUnit
)}
</span>
</div>

36
test/data/energy.test.ts
View File

@ -70,8 +70,10 @@ describe("Energy Short Format Test", () => {
const hass = { locale: defaultLocale } as HomeAssistant;
it("No Unit conversion", () => {
assert.strictEqual(formatConsumptionShort(hass, 0, "Wh"), "0 Wh");
assert.strictEqual(formatConsumptionShort(hass, 0, "kWh"), "0 kWh");
assert.strictEqual(formatConsumptionShort(hass, 0, "GWh"), "0 GWh");
assert.strictEqual(formatConsumptionShort(hass, 0, "kWh"), "0 Wh");
assert.strictEqual(formatConsumptionShort(hass, 0, "kWh", "kWh"), "0 kWh");
assert.strictEqual(formatConsumptionShort(hass, 0, "GWh"), "0 Wh");
assert.strictEqual(formatConsumptionShort(hass, 0, "GWh", "GWh"), "0 GWh");
assert.strictEqual(formatConsumptionShort(hass, 0, "gal"), "0 gal");
assert.strictEqual(
@ -139,6 +141,36 @@ describe("Energy Short Format Test", () => {
"-1.23 Wh"
);
});
it("Conversion with target unit", () => {
assert.strictEqual(
formatConsumptionShort(hass, 0.00012, "kWh", "Wh"),
"0.12 Wh"
);
assert.strictEqual(
formatConsumptionShort(hass, 0.00012, "kWh", "kWh"),
"0 kWh"
);
assert.strictEqual(
formatConsumptionShort(hass, 0.01012, "kWh", "kWh"),
"0.01 kWh"
);
assert.strictEqual(
formatConsumptionShort(hass, 0.00012, "kWh", "MWh"),
"0 MWh"
);
assert.strictEqual(
formatConsumptionShort(hass, 10.12345, "kWh", "kWh"),
"10.1 kWh"
);
assert.strictEqual(
formatConsumptionShort(hass, 10.12345, "kWh", "ZZZZZWh"),
"10.1 kWh"
);
assert.strictEqual(
formatConsumptionShort(hass, 151234.5678, "kWh", "MWh"),
"151 MWh"
);
});
});
describe("Energy Usage Calculation Tests", () => {