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

Improve handling of batteries in sankey chart (#25175)

Browse Source
This commit is contained in:
Petar Petrov 2025-04-25 15:18:40 +03:00 committed by GitHub
parent 834ece8547
commit 3b0cd9e3ae
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/panels/lovelace/cards/energy/hui-energy-sankey-card.ts
View File

@ -123,30 +123,6 @@ class HuiEnergySankeyCard
});
}
// Add battery source if available
if (types.battery) {
const totalBatteryOut =
calculateStatisticsSumGrowth(
this._data.stats,
types.battery.map((source) => source.stat_energy_from)
) || 0;
nodes.push({
id: "battery",
label: this.hass.localize(
"ui.panel.lovelace.cards.energy.energy_distribution.battery"
),
value: totalBatteryOut,
tooltip: `${formatNumber(totalBatteryOut, this.hass.locale)} kWh`,
color: computedStyle.getPropertyValue("--energy-battery-out-color"),
index: 0,
});
links.push({
source: "battery",
target: "home",
});
}
// Add solar if available
if (types.solar) {
const totalSolarProduction =
@ -172,26 +148,51 @@ class HuiEnergySankeyCard
});
}
// Calculate total home consumption from all source nodes
// Calculate total home consumption from all producers
homeNode.value = nodes
.filter((node) => node.index === 0)
.reduce((sum, node) => sum + (node.value || 0), 0);
// Add battery sink if available
if (types.battery) {
// Add battery source
const totalBatteryOut =
calculateStatisticsSumGrowth(
this._data.stats,
types.battery.map((source) => source.stat_energy_from)
) || 0;
const totalBatteryIn =
calculateStatisticsSumGrowth(
this._data.stats,
types.battery.map((source) => source.stat_energy_to)
) || 0;
const netBattery = totalBatteryOut - totalBatteryIn;
const netBatteryOut = Math.max(netBattery, 0);
const netBatteryIn = Math.max(-netBattery, 0);
homeNode.value += netBattery;
nodes.push({
id: "battery",
label: this.hass.localize(
"ui.panel.lovelace.cards.energy.energy_distribution.battery"
),
value: netBatteryOut,
tooltip: `${formatNumber(netBatteryOut, this.hass.locale)} kWh`,
color: computedStyle.getPropertyValue("--energy-battery-out-color"),
index: 0,
});
links.push({
source: "battery",
target: "home",
});
// Add battery sink
nodes.push({
id: "battery_in",
label: this.hass.localize(
"ui.panel.lovelace.cards.energy.energy_distribution.battery"
),
value: totalBatteryIn,
tooltip: `${formatNumber(totalBatteryIn, this.hass.locale)} kWh`,
value: netBatteryIn,
tooltip: `${formatNumber(netBatteryIn, this.hass.locale)} kWh`,
color: computedStyle.getPropertyValue("--energy-battery-in-color"),
index: 1,
});
@ -204,8 +205,6 @@ class HuiEnergySankeyCard
});
}
});
homeNode.value -= totalBatteryIn;
}
// Add grid return if available