jeans/frontend
jeans/frontend
1
0
Fork 0
mirror of https://github.com/home-assistant/frontend.git synced 2025-04-26 22:37:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revise grid neutrality energy dashboard card, modify energy dashboard presentation to match (#10054)

Browse Source 
Co-authored-by: Bram Kragten <mail@bramkragten.nl>
This commit is contained in:
Will Adler 2021-10-19 07:48:59 -04:00 committed by GitHub
parent 8e22e41605
commit 04f586721f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/panels/lovelace/cards/energy/hui-energy-grid-neutrality-gauge-card.ts
View File

@ -18,12 +18,10 @@ import { SubscribeMixin } from "../../../../mixins/subscribe-mixin";
import type { HomeAssistant } from "../../../../types"; import type { HomeAssistant } from "../../../../types";
import type { LovelaceCard } from "../../types"; import type { LovelaceCard } from "../../types";
import type { EnergyGridGaugeCardConfig } from "../types"; import type { EnergyGridGaugeCardConfig } from "../types";
import { severityMap } from "../hui-gauge-card";
const LEVELS: LevelDefinition[] = [ const LEVELS: LevelDefinition[] = [
{ level: -1, stroke: severityMap.red }, { level: -1, stroke: "var(--energy-grid-consumption-color)" },
{ level: -0.2, stroke: severityMap.yellow }, { level: 0, stroke: "var(--energy-grid-return-color)" },
{ level: 0, stroke: severityMap.green },
]; ];
@customElement("hui-energy-grid-neutrality-gauge-card") @customElement("hui-energy-grid-neutrality-gauge-card")

7
src/panels/lovelace/cards/energy/hui-energy-usage-graph-card.ts
View File

@ -17,7 +17,6 @@ import {
rgb2hex, rgb2hex,
rgb2lab, rgb2lab,
} from "../../../../common/color/convert-color"; } from "../../../../common/color/convert-color";
import { hexBlend } from "../../../../common/color/hex";
import { labDarken } from "../../../../common/color/lab"; import { labDarken } from "../../../../common/color/lab";
import { formatTime } from "../../../../common/datetime/format_time"; import { formatTime } from "../../../../common/datetime/format_time";
import { computeStateName } from "../../../../common/entity/compute_state_name"; import { computeStateName } from "../../../../common/entity/compute_state_name";
@ -357,10 +356,6 @@ export class HuiEnergyUsageGraphCard
), ),
}; };
const backgroundColor = computedStyles
.getPropertyValue("--card-background-color")
.trim();
Object.entries(statistics).forEach(([key, statIds]) => { Object.entries(statistics).forEach(([key, statIds]) => {
const sum = [ const sum = [
"solar", "solar",
@ -515,7 +510,7 @@ export class HuiEnergyUsageGraphCard
? Object.keys(combinedData).length ? Object.keys(combinedData).length
: idx + 1, : idx + 1,
borderColor, borderColor,
backgroundColor: hexBlend(borderColor, backgroundColor, 50), backgroundColor: borderColor + "7F",
stack: "stack", stack: "stack",
data: [], data: [],
}); });

4
src/resources/ha-style.ts
View File

@ -84,8 +84,8 @@ documentContainer.innerHTML = `<custom-style>
--state-climate-idle-color: #8a8a8a; --state-climate-idle-color: #8a8a8a;
/* energy */ /* energy */
--energy-grid-consumption-color: #126a9a; --energy-grid-consumption-color: #488fc2;
--energy-grid-return-color: #673ab7; --energy-grid-return-color: #8353d1;
--energy-solar-color: #ff9800; --energy-solar-color: #ff9800;
--energy-non-fossil-color: #0f9d58; --energy-non-fossil-color: #0f9d58;
--energy-battery-out-color: #4db6ac; --energy-battery-out-color: #4db6ac;

2
src/resources/styles.ts
View File

@ -45,7 +45,7 @@ export const darkStyles = {
"codemirror-property": "#C792EA", "codemirror-property": "#C792EA",
"codemirror-qualifier": "#DECB6B", "codemirror-qualifier": "#DECB6B",
"codemirror-type": "#DECB6B", "codemirror-type": "#DECB6B",
"energy-grid-return-color": "#b39bdb", "energy-grid-return-color": "#a280db",
}; };
export const derivedStyles = { export const derivedStyles = {