diff --git a/src/panels/energy/strategies/energy-strategy.ts b/src/panels/energy/strategies/energy-strategy.ts index ffd6f166d4..787d1de38b 100644 --- a/src/panels/energy/strategies/energy-strategy.ts +++ b/src/panels/energy/strategies/energy-strategy.ts @@ -110,12 +110,6 @@ export class EnergyStrategy { }); } - view.cards!.push({ - type: "energy-summary", - prefs: energyPrefs, - view_layout: { position: "sidebar" }, - }); - return view; } } diff --git a/src/panels/lovelace/cards/energy/hui-energy-summary-card.ts b/src/panels/lovelace/cards/energy/hui-energy-summary-card.ts deleted file mode 100644 index 60179e94f0..0000000000 --- a/src/panels/lovelace/cards/energy/hui-energy-summary-card.ts +++ /dev/null @@ -1,302 +0,0 @@ -import { mdiCashMultiple, mdiSolarPower } from "@mdi/js"; -import { css, html, LitElement } from "lit"; -import { customElement, property, state } from "lit/decorators"; -import "../../../../components/ha-svg-icon"; -import { - energySourcesByType, - GridSourceTypeEnergyPreference, - SolarSourceTypeEnergyPreference, -} from "../../../../data/energy"; -import { - calculateStatisticSumGrowth, - fetchStatistics, - Statistics, -} from "../../../../data/history"; -import { HomeAssistant } from "../../../../types"; -import { LovelaceCard } from "../../types"; -import { EnergySummaryCardConfig } from "../types"; -import "../../../../components/ha-card"; - -const renderSumStatHelper = ( - data: Statistics, - stats: string[], - unit: string -) => { - let totalGrowth = 0; - - for (const stat of stats) { - if (!(stat in data)) { - return "stat missing"; - } - const statGrowth = calculateStatisticSumGrowth(data[stat]); - - if (statGrowth === null) { - return "incomplete data"; - } - - totalGrowth += statGrowth; - } - - return `${totalGrowth.toFixed(2)} ${unit}`; -}; - -@customElement("hui-energy-summary-card") -class HuiEnergySummaryCard extends LitElement implements LovelaceCard { - @property({ attribute: false }) public hass?: HomeAssistant; - - @state() private _config?: EnergySummaryCardConfig; - - @state() private _data?: Statistics; - - private _fetching = false; - - public setConfig(config: EnergySummaryCardConfig): void { - this._config = config; - } - - public getCardSize(): Promise | number { - return 3; - } - - public willUpdate(changedProps) { - super.willUpdate(changedProps); - - if (!this._fetching && !this._data) { - this._getStatistics(); - } - } - - protected render() { - if (!this._config || !this.hass) { - return html``; - } - - const prefs = this._config!.prefs; - const types = energySourcesByType(prefs); - - const hasConsumption = types.grid !== undefined; - const hasProduction = types.solar !== undefined; - const hasReturnToGrid = hasConsumption && types.grid![0].flow_to.length > 0; - const hasCost = - hasConsumption && - types.grid![0].flow_from.some((flow) => flow.stat_cost !== null); - - // total consumption = consumption_from_grid + solar_production - return_to_grid - - return html` - -
- ${!hasConsumption - ? "" - : html` -
- -
Total Consumption
-
- ${!this._data - ? "" - : renderSumStatHelper( - this._data, - types.grid![0].flow_from.map( - (flow) => flow.stat_energy_from - ), - "kWh" - )} -
-
- `} - ${!hasProduction - ? "" - : html` -
- -
Total Production
-
- ${!this._data - ? "" - : renderSumStatHelper( - this._data, - types.solar!.map((source) => source.stat_energy_from), - "kWh" - )} -
-
- `} - ${!hasReturnToGrid - ? "" - : html` -
- -
Production returned to grid
-
- ${!this._data - ? "" - : renderSumStatHelper( - this._data, - types.grid![0].flow_to.map( - (flow) => flow.stat_energy_to - ), - "kWh" - )} -
-
- `} - ${!hasReturnToGrid || !hasProduction - ? "" - : html` -
- -
Amount of produced power self used
-
- ${!this._data - ? "" - : this._renderSolarPowerConsumptionRatio( - types.solar![0], - types.grid![0] - )} -
-
- `} - ${!hasCost - ? "" - : html` -
- -
Total costs of today
-
- ${!this._data - ? "" - : renderSumStatHelper( - this._data, - types - .grid![0].flow_from.map((flow) => flow.stat_cost) - .filter(Boolean) as string[], - this.hass.config.currency! - )} -
-
- `} -
- - `; - } - - // This is superduper temp. - private async _getStatistics(): Promise { - if (this._fetching) { - return; - } - const startDate = new Date(); - startDate.setHours(0, 0, 0, 0); - startDate.setTime(startDate.getTime() - 1000 * 60 * 60); // subtract 1 hour to get a startpoint - - this._fetching = true; - const statistics: string[] = []; - const prefs = this._config!.prefs; - for (const source of prefs.energy_sources) { - if (source.type === "solar") { - statistics.push(source.stat_energy_from); - // Use ws command to get solar forecast - - // if (source.stat_predicted_energy_from) { - // statistics.push(source.stat_predicted_energy_from); - // } - continue; - } - - // grid source - for (const flowFrom of source.flow_from) { - statistics.push(flowFrom.stat_energy_from); - if (flowFrom.stat_cost) { - statistics.push(flowFrom.stat_cost); - } - } - for (const flowTo of source.flow_to) { - statistics.push(flowTo.stat_energy_to); - } - } - - try { - this._data = await fetchStatistics( - this.hass!, - startDate, - undefined, - statistics - ); - } finally { - this._fetching = false; - } - } - - private _renderSolarPowerConsumptionRatio( - solarSource: SolarSourceTypeEnergyPreference, - gridSource: GridSourceTypeEnergyPreference - ) { - let returnToGrid = 0; - - for (const flowTo of gridSource.flow_to) { - if (!flowTo.stat_energy_to || !(flowTo.stat_energy_to in this._data!)) { - continue; - } - const flowReturned = calculateStatisticSumGrowth( - this._data![flowTo.stat_energy_to] - ); - if (flowReturned === null) { - return "incomplete return data"; - } - returnToGrid += flowReturned; - } - - if (!(solarSource.stat_energy_from in this._data!)) { - return "sun stat missing"; - } - - const production = calculateStatisticSumGrowth( - this._data![solarSource.stat_energy_from] - ); - - if (production === null) { - return "incomplete solar data"; - } - - if (production === 0) { - return "-"; - } - - const consumed = Math.max( - Math.min(((production - returnToGrid) / production) * 100, 100), - 0 - ); - - return `${consumed.toFixed(1)}%`; - } - - static styles = css` - .row { - display: flex; - align-items: center; - color: var(--primary-text-color); - } - ha-svg-icon { - padding: 8px; - color: var(--paper-item-icon-color); - } - div { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - } - .label { - flex: 1; - margin-left: 16px; - } - .data { - } - `; -} - -declare global { - interface HTMLElementTagNameMap { - "hui-energy-summary-card": HuiEnergySummaryCard; - } -} diff --git a/src/panels/lovelace/create-element/create-card-element.ts b/src/panels/lovelace/create-element/create-card-element.ts index 0524406b79..71cee8f6fd 100644 --- a/src/panels/lovelace/create-element/create-card-element.ts +++ b/src/panels/lovelace/create-element/create-card-element.ts @@ -35,7 +35,6 @@ const LAZY_LOAD_TYPES = { "alarm-panel": () => import("../cards/hui-alarm-panel-card"), error: () => import("../cards/hui-error-card"), "empty-state": () => import("../cards/hui-empty-state-card"), - "energy-summary": () => import("../cards/energy/hui-energy-summary-card"), "energy-summary-graph": () => import("../cards/energy/hui-energy-summary-graph-card"), "energy-solar-graph": () =>