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

Fix energy usage graph (#14438)

Browse Source
This commit is contained in:
Bram Kragten 2022-11-24 10:59:55 +01:00 committed by GitHub
parent 8b817b35b0
commit 15a0847db8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -448,20 +448,20 @@ export class HuiEnergyUsageGraphCard
const data: ChartDataset<"bar", ScatterDataPoint[]>[] = [];
const combinedData: {
to_grid?: { [statId: string]: { [start: string]: number } };
to_battery?: { [statId: string]: { [start: string]: number } };
from_grid?: { [statId: string]: { [start: string]: number } };
used_grid?: { [statId: string]: { [start: string]: number } };
used_solar?: { [statId: string]: { [start: string]: number } };
used_battery?: { [statId: string]: { [start: string]: number } };
to_grid?: { [statId: string]: { [start: number]: number } };
to_battery?: { [statId: string]: { [start: number]: number } };
from_grid?: { [statId: string]: { [start: number]: number } };
used_grid?: { [statId: string]: { [start: number]: number } };
used_solar?: { [statId: string]: { [start: number]: number } };
used_battery?: { [statId: string]: { [start: number]: number } };
} = {};
const summedData: {
to_grid?: { [start: string]: number };
from_grid?: { [start: string]: number };
to_battery?: { [start: string]: number };
from_battery?: { [start: string]: number };
solar?: { [start: string]: number };
to_grid?: { [start: number]: number };
from_grid?: { [start: number]: number };
to_battery?: { [start: number]: number };
from_battery?: { [start: number]: number };
solar?: { [start: number]: number };
} = {};
Object.entries(statIdsByCat).forEach(([key, statIds]) => {
@ -473,8 +473,8 @@ export class HuiEnergyUsageGraphCard
"from_battery",
].includes(key);
const add = !["solar", "from_battery"].includes(key);
const totalStats: { [start: string]: number } = {};
const sets: { [statId: string]: { [start: string]: number } } = {};
const totalStats: { [start: number]: number } = {};
const sets: { [statId: string]: { [start: number]: number } } = {};
statIds!.forEach((id) => {
const stats = statistics[id];
if (!stats) {
@ -606,9 +606,8 @@ export class HuiEnergyUsageGraphCard
// Process chart data.
for (const key of uniqueKeys) {
const value = source[key] || 0;
const date = new Date(key);
points.push({
x: date.getTime(),
x: Number(key),
y:
value && ["to_grid", "to_battery"].includes(type)
? -1 * value