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

Merge pull request #9715 from home-assistant/dev

Browse Source 
20210804.0
This commit is contained in:
Bram Kragten 2021-08-04 23:53:37 +02:00 committed by GitHub
commit d45f47d908
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 39 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup.py
View File

@ -2,7 +2,7 @@ from setuptools import setup, find_packages
setup(
name="home-assistant-frontend",
version="20210803.2",
version="20210804.0",
description="The Home Assistant frontend",
url="https://github.com/home-assistant/frontend",
author="The Home Assistant Authors",

4
src/data/energy.ts
View File

@ -12,7 +12,7 @@ import { ConfigEntry, getConfigEntries } from "./config_entries";
import { subscribeEntityRegistry } from "./entity_registry";
import { fetchStatistics, Statistics } from "./history";
const energyCollectionKeys: string[] = [];
const energyCollectionKeys: (string | undefined)[] = [];
export const emptyFlowFromGridSourceEnergyPreference =
(): FlowFromGridSourceEnergyPreference => ({
@ -278,7 +278,7 @@ export const getEnergyDataCollection = (
return (hass.connection as any)[key];
}
energyCollectionKeys.push(options.key || "energy");
energyCollectionKeys.push(options.key);
const collection = getCollection<EnergyData>(
hass.connection,

12
src/panels/lovelace/cards/energy/hui-energy-carbon-consumed-gauge-card.ts
View File

@ -126,8 +126,10 @@ class HuiEnergyCarbonGaugeCard
<ha-card>
<ha-svg-icon id="info" .path=${mdiInformation}></ha-svg-icon>
<paper-tooltip animation-delay="0" for="info" position="left">
This card represents how much of the energy consumed by your home was
generated using non-fossil fuels like solar, wind and nuclear.
<span>
This card represents how much of the energy consumed by your home
was generated using non-fossil fuels like solar, wind and nuclear.
</span>
</paper-tooltip>
${value !== undefined
@ -194,10 +196,14 @@ class HuiEnergyCarbonGaugeCard
top: 4px;
color: var(--secondary-text-color);
}
paper-tooltip > span {
font-size: 12px;
line-height: 12px;
}
paper-tooltip {
width: 80%;
max-width: 250px;
margin-top: 10%;
top: 8px !important;
}
`;
}

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

@ -98,11 +98,13 @@ class HuiEnergyGridGaugeCard
<ha-card>
<ha-svg-icon id="info" .path=${mdiInformation}></ha-svg-icon>
<paper-tooltip animation-delay="0" for="info" position="left">
<span>
This card represents your energy dependency.
<br /><br />
If it's green, it means you produced more energy than that you
consumed from the grid. If it's in the red, it means that you relied
on the grid for part of your home's energy consumption.
</span>
</paper-tooltip>
${value !== undefined
? html`<ha-gauge
@ -162,10 +164,14 @@ class HuiEnergyGridGaugeCard
top: 4px;
color: var(--secondary-text-color);
}
paper-tooltip > span {
font-size: 12px;
line-height: 12px;
}
paper-tooltip {
width: 80%;
max-width: 250px;
margin-top: 10%;
top: 8px !important;
}
`;
}

13
src/panels/lovelace/cards/energy/hui-energy-solar-consumed-gauge-card.ts
View File

@ -88,11 +88,14 @@ class HuiEnergySolarGaugeCard
<ha-card>
<ha-svg-icon id="info" .path=${mdiInformation}></ha-svg-icon>
<paper-tooltip animation-delay="0" for="info" position="left">
<span>
This card represents how much of the solar energy was used by your
home and was not returned to the grid.
<br /><br />
If you frequently produce more than you consume, try to conserve this
energy by installing a battery or buying an electric car to charge.
If you frequently produce more than you consume, try to conserve
this energy by installing a battery or buying an electric car to
charge.
</span>
</paper-tooltip>
${value !== undefined
? html`<ha-gauge
@ -157,10 +160,14 @@ class HuiEnergySolarGaugeCard
top: 4px;
color: var(--secondary-text-color);
}
paper-tooltip > span {
font-size: 12px;
line-height: 12px;
}
paper-tooltip {
width: 80%;
max-width: 250px;
margin-top: 10%;
top: 8px !important;
}
`;
}

2
src/panels/lovelace/cards/energy/hui-energy-solar-graph-card.ts
View File

@ -101,7 +101,7 @@ export class HuiEnergySolarGraphCard
? html`<div class="no-data">
${isToday(this._start)
? "There is no data to show. It can take up to 2 hours for new data to arrive after you configure your energy dashboard."
: "There is not data for this period."}
: "There is no data for this period."}
</div>`
: ""}
</div>

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

@ -88,7 +88,7 @@ export class HuiEnergyUsageGraphCard
? html`<div class="no-data">
${isToday(this._start)
? "There is no data to show. It can take up to 2 hours for new data to arrive after you configure your energy dashboard."
: "There is not data for this period."}
: "There is no data for this period."}
</div>`
: ""}
</div>