From 1d7007584c05c7cb9438fd2dff41b4ba3ae6f5ea Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Wed, 28 Jul 2021 17:38:04 +0200 Subject: [PATCH] Use currency from core config (#9628) --- src/data/energy.ts | 1 - .../components/ha-energy-grid-settings.ts | 4 -- .../dialog-energy-grid-flow-settings.ts | 2 +- .../energy/dialogs/show-dialogs-energy.ts | 3 -- src/panels/config/energy/ha-config-energy.ts | 41 +------------------ .../energy/cards/energy-setup-wizard-card.ts | 1 - .../energy/hui-energy-costs-table-card.ts | 16 ++++++-- .../cards/energy/hui-energy-summary-card.ts | 2 +- 8 files changed, 17 insertions(+), 53 deletions(-) diff --git a/src/data/energy.ts b/src/data/energy.ts index 4b8536424c..216bf566ff 100644 --- a/src/data/energy.ts +++ b/src/data/energy.ts @@ -85,7 +85,6 @@ type EnergySource = | GridSourceTypeEnergyPreference; export interface EnergyPreferences { - currency: string; energy_sources: EnergySource[]; device_consumption: DeviceConsumptionEnergyPreference[]; } diff --git a/src/panels/config/energy/components/ha-energy-grid-settings.ts b/src/panels/config/energy/components/ha-energy-grid-settings.ts index b919a6d60d..15574cb38a 100644 --- a/src/panels/config/energy/components/ha-energy-grid-settings.ts +++ b/src/panels/config/energy/components/ha-energy-grid-settings.ts @@ -201,7 +201,6 @@ export class EnergyGridSettings extends LitElement { private _addFromSource() { showEnergySettingsGridFlowFromDialog(this, { - currency: this.preferences.currency, saveCallback: async (flow) => { let preferences: EnergyPreferences; const gridSource = this.preferences.energy_sources.find( @@ -236,7 +235,6 @@ export class EnergyGridSettings extends LitElement { private _addToSource() { showEnergySettingsGridFlowToDialog(this, { - currency: this.preferences.currency, saveCallback: async (flow) => { let preferences: EnergyPreferences; const gridSource = this.preferences.energy_sources.find( @@ -273,7 +271,6 @@ export class EnergyGridSettings extends LitElement { const origSource: FlowFromGridSourceEnergyPreference = ev.currentTarget.closest(".row").source; showEnergySettingsGridFlowFromDialog(this, { - currency: this.preferences.currency, source: { ...origSource }, saveCallback: async (source) => { const flowFrom = energySourcesByType(this.preferences).grid![0] @@ -301,7 +298,6 @@ export class EnergyGridSettings extends LitElement { const origSource: FlowToGridSourceEnergyPreference = ev.currentTarget.closest(".row").source; showEnergySettingsGridFlowToDialog(this, { - currency: this.preferences.currency, source: { ...origSource }, saveCallback: async (source) => { const flowTo = energySourcesByType(this.preferences).grid![0].flow_to; diff --git a/src/panels/config/energy/dialogs/dialog-energy-grid-flow-settings.ts b/src/panels/config/energy/dialogs/dialog-energy-grid-flow-settings.ts index 607e3384fb..c7fb18e36b 100644 --- a/src/panels/config/energy/dialogs/dialog-energy-grid-flow-settings.ts +++ b/src/panels/config/energy/dialogs/dialog-energy-grid-flow-settings.ts @@ -203,7 +203,7 @@ export class DialogEnergyGridFlowSettings ${this.hass.localize( `ui.panel.config.energy.grid.flow_dialog.${this._params.direction}.cost_number_suffix`, - { currency: this._params.currency } + { currency: this.hass.config.currency } )} ` diff --git a/src/panels/config/energy/dialogs/show-dialogs-energy.ts b/src/panels/config/energy/dialogs/show-dialogs-energy.ts index 62f9d4a48d..f471cce7a7 100644 --- a/src/panels/config/energy/dialogs/show-dialogs-energy.ts +++ b/src/panels/config/energy/dialogs/show-dialogs-energy.ts @@ -10,7 +10,6 @@ export interface EnergySettingsGridFlowDialogParams { source?: | FlowFromGridSourceEnergyPreference | FlowToGridSourceEnergyPreference; - currency: string; direction: "from" | "to"; saveCallback: ( source: @@ -21,13 +20,11 @@ export interface EnergySettingsGridFlowDialogParams { export interface EnergySettingsGridFlowFromDialogParams { source?: FlowFromGridSourceEnergyPreference; - currency: string; saveCallback: (source: FlowFromGridSourceEnergyPreference) => Promise; } export interface EnergySettingsGridFlowToDialogParams { source?: FlowToGridSourceEnergyPreference; - currency: string; saveCallback: (source: FlowToGridSourceEnergyPreference) => Promise; } diff --git a/src/panels/config/energy/ha-config-energy.ts b/src/panels/config/energy/ha-config-energy.ts index 3b81c275ca..d55210dcd3 100644 --- a/src/panels/config/energy/ha-config-energy.ts +++ b/src/panels/config/energy/ha-config-energy.ts @@ -1,22 +1,15 @@ import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit"; import { customElement, property, state } from "lit/decorators"; - import "../../../components/ha-svg-icon"; -import { - EnergyPreferences, - getEnergyPreferences, - saveEnergyPreferences, -} from "../../../data/energy"; - +import { EnergyPreferences, getEnergyPreferences } from "../../../data/energy"; import "../../../layouts/hass-loading-screen"; import "../../../layouts/hass-tabs-subpage"; import { haStyle } from "../../../resources/styles"; import type { HomeAssistant, Route } from "../../../types"; import { configSections } from "../ha-panel-config"; +import "./components/ha-energy-device-settings"; import "./components/ha-energy-grid-settings"; import "./components/ha-energy-solar-settings"; -import "./components/ha-energy-device-settings"; -import { showAlertDialog } from "../../../dialogs/generic/show-dialog-box"; const INITIAL_CONFIG = { currency: "€", @@ -72,18 +65,6 @@ class HaConfigEnergy extends LitElement { .route=${this.route} .tabs=${configSections.experiences} > - -
- - - - Save -
-
- ${this._config!.prefs.currency} ${cost.toFixed(2)} + ${formatNumber(cost, this.hass.locale, { + style: "currency", + currency: this.hass.config.currency!, + })} `; })} @@ -162,7 +166,10 @@ export class HuiEnergyCostsTableCard - ${this._config!.prefs.currency} ${cost.toFixed(2)} + ${formatNumber(cost, this.hass.locale, { + style: "currency", + currency: this.hass.config.currency!, + })} `; })} @@ -172,7 +179,10 @@ export class HuiEnergyCostsTableCard ${round(totalEnergy)} kWh - ${this._config!.prefs.currency} ${totalCost.toFixed(2)} + ${formatNumber(totalCost, this.hass.locale, { + style: "currency", + currency: this.hass.config.currency!, + })} diff --git a/src/panels/lovelace/cards/energy/hui-energy-summary-card.ts b/src/panels/lovelace/cards/energy/hui-energy-summary-card.ts index 9fd7dd20e2..60179e94f0 100644 --- a/src/panels/lovelace/cards/energy/hui-energy-summary-card.ts +++ b/src/panels/lovelace/cards/energy/hui-energy-summary-card.ts @@ -171,7 +171,7 @@ class HuiEnergySummaryCard extends LitElement implements LovelaceCard { types .grid![0].flow_from.map((flow) => flow.stat_cost) .filter(Boolean) as string[], - prefs.currency + this.hass.config.currency! )}