mirror of
https://github.com/home-assistant/frontend.git
synced 2025-08-01 13:37:47 +00:00
Merge branch 'energy_no_ids' into ii2
This commit is contained in:
commit
c636eacc51
@ -428,6 +428,7 @@ const getEnergyData = async (
|
|||||||
)
|
)
|
||||||
: Promise.resolve({});
|
: Promise.resolve({});
|
||||||
|
|
||||||
|
let statsCompare;
|
||||||
let startCompare;
|
let startCompare;
|
||||||
let endCompare;
|
let endCompare;
|
||||||
let _energyStatsCompare = Promise.resolve({});
|
let _energyStatsCompare = Promise.resolve({});
|
||||||
@ -516,7 +517,9 @@ const getEnergyData = async (
|
|||||||
_fossilEnergyConsumptionCompare,
|
_fossilEnergyConsumptionCompare,
|
||||||
]);
|
]);
|
||||||
const stats = { ...energyStats, ...waterStats };
|
const stats = { ...energyStats, ...waterStats };
|
||||||
const statsCompare = { ...energyStatsCompare, ...waterStatsCompare };
|
if (compare) {
|
||||||
|
statsCompare = { ...energyStatsCompare, ...waterStatsCompare };
|
||||||
|
}
|
||||||
if (allStatIDs.length) {
|
if (allStatIDs.length) {
|
||||||
statsMetadataArray.forEach((x) => {
|
statsMetadataArray.forEach((x) => {
|
||||||
statsMetadata[x.statistic_id] = x;
|
statsMetadata[x.statistic_id] = x;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user