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

Fix energy units (#24672)

Browse Source
This commit is contained in:
Simon Lamon 2025-03-17 22:07:27 +01:00 committed by GitHub
parent 64b9104199
commit 5803ab68c2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/data/energy.ts
View File

@ -765,16 +765,13 @@ export const getEnergyGasUnit = (
hass: HomeAssistant, hass: HomeAssistant,
prefs: EnergyPreferences, prefs: EnergyPreferences,
statisticsMetaData: Record<string, StatisticsMetaData> = {} statisticsMetaData: Record<string, StatisticsMetaData> = {}
): string | undefined => { ): string => {
const unitClass = getEnergyGasUnitClass(prefs, undefined, statisticsMetaData); const unitClass = getEnergyGasUnitClass(prefs, undefined, statisticsMetaData);
if (unitClass === undefined) { if (unitClass === "energy") {
return undefined; return "kWh";
} }
return unitClass === "energy"
? "kWh" return hass.config.unit_system.length === "km" ? "m³" : "ft³";
: hass.config.unit_system.length === "km"
? "m³"
: "ft³";
}; };
export const getEnergyWaterUnit = (hass: HomeAssistant): string => export const getEnergyWaterUnit = (hass: HomeAssistant): string =>

11
src/panels/energy/ha-panel-energy.ts
View File

@ -150,12 +150,11 @@ class PanelEnergy extends LitElement {
return; return;
} }
const gasUnit = const gasUnit = getEnergyGasUnit(
getEnergyGasUnit( this.hass,
this.hass, energyData.prefs,
energyData.prefs, energyData.state.statsMetadata
energyData.state.statsMetadata );
) || "";
const waterUnit = getEnergyWaterUnit(this.hass); const waterUnit = getEnergyWaterUnit(this.hass);
const electricUnit = "kWh"; const electricUnit = "kWh";

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

@ -353,7 +353,7 @@ class HuiEnergyDistrubutionCard
this.hass, this.hass,
prefs, prefs,
this._data.statsMetadata this._data.statsMetadata
) || "m³"} )}
</div> </div>
<svg width="80" height="30"> <svg width="80" height="30">
<path d="M40 0 v30" id="gas" /> <path d="M40 0 v30" id="gas" />
@ -386,7 +386,7 @@ class HuiEnergyDistrubutionCard
${formatNumber(waterUsage || 0, this.hass.locale, { ${formatNumber(waterUsage || 0, this.hass.locale, {
maximumFractionDigits: 1, maximumFractionDigits: 1,
})} })}
${getEnergyWaterUnit(this.hass) || "m³"} ${getEnergyWaterUnit(this.hass)}
</div> </div>
<svg width="80" height="30"> <svg width="80" height="30">
<path d="M40 0 v30" id="water" /> <path d="M40 0 v30" id="water" />
@ -606,7 +606,7 @@ class HuiEnergyDistrubutionCard
${formatNumber(waterUsage || 0, this.hass.locale, { ${formatNumber(waterUsage || 0, this.hass.locale, {
maximumFractionDigits: 1, maximumFractionDigits: 1,
})} })}
${getEnergyWaterUnit(this.hass) || "m³"} ${getEnergyWaterUnit(this.hass)}
</div> </div>
<span class="label" <span class="label"
>${this.hass.localize( >${this.hass.localize(

8
src/panels/lovelace/cards/energy/hui-energy-gas-graph-card.ts
View File

@ -163,9 +163,11 @@ export class HuiEnergyGasGraphCard
(source) => source.type === "gas" (source) => source.type === "gas"
) as GasSourceTypeEnergyPreference[]; ) as GasSourceTypeEnergyPreference[];
this._unit = this._unit = getEnergyGasUnit(
getEnergyGasUnit(this.hass, energyData.prefs, energyData.statsMetadata) || this.hass,
"m³"; energyData.prefs,
energyData.statsMetadata
);
const datasets: BarSeriesOption[] = []; const datasets: BarSeriesOption[] = [];

10
src/panels/lovelace/cards/energy/hui-energy-sources-table-card.ts
View File

@ -134,11 +134,13 @@ export class HuiEnergySourcesTableCard
flow.stat_cost || flow.entity_energy_price || flow.number_energy_price flow.stat_cost || flow.entity_energy_price || flow.number_energy_price
); );
const gasUnit = const gasUnit = getEnergyGasUnit(
getEnergyGasUnit(this.hass, this._data.prefs, this._data.statsMetadata) || this.hass,
""; this._data.prefs,
this._data.statsMetadata
);
const waterUnit = getEnergyWaterUnit(this.hass) || "m³"; const waterUnit = getEnergyWaterUnit(this.hass);
const compare = this._data.statsCompare !== undefined; const compare = this._data.statsCompare !== undefined;