Stefan/evcc-io
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Battery grid charge: show configured limit (#18032)

Browse source
This commit is contained in:
Michael Geers 2025-01-04 19:16:24 +01:00 • committed by GitHub
parent eaff6de83c
commit b728e23caf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
21 changed files with 29 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

30
assets/js/components/Energyflow/Energyflow.vue
View file

@ -103,7 +103,7 @@
data-testid="energyflow-entry-batterydischarge"
@details-clicked="openBatterySettingsModal"
>
<template v-if="batteryGridChargeActive" #subline>
<template v-if="batteryGridChargeLimitSet" #subline>
<div class="d-none d-md-block">&nbsp;</div>
</template>
</EnergyflowEntry>
@ -177,13 +177,25 @@
detailsClickable
@details-clicked="openBatterySettingsModal"
>
<template v-if="batteryGridChargeActive" #subline>
<template v-if="batteryGridChargeLimitSet" #subline>
<button
type="button"
class="btn-reset d-flex justify-content-between"
class="btn-reset d-flex justify-content-between text-start pe-4"
@click.stop="openBatterySettingsModal"
>
{{ batteryGridChargeText }} (≤ {{ batteryGridChargeLimitFmt }})
<span v-if="batteryGridChargeActive">
{{ $t("main.energyflow.batteryGridChargeActive") }}
<span class="text-nowrap"
>(≤ <u>{{ batteryGridChargeLimitFmt }}</u
>)</span
>
</span>
<span v-else>
{{ $t("main.energyflow.batteryGridChargeLimit") }}
<span class="text-nowrap"
>≤ <u>{{ batteryGridChargeLimitFmt }}</u></span
>
</span>
</button>
</template>
</EnergyflowEntry>
@ -341,19 +353,17 @@ export default {
pvPossible() {
return this.pvConfigured || this.gridConfigured;
},
batteryGridChargeText() {
return this.$t(
`main.energyflow.${this.co2Available ? "clean" : "cheap"}BatteryGridCharge`
);
},
batteryGridChargeNow() {
if (this.co2Available) {
return this.fmtCo2Short(this.tariffCo2);
}
return this.fmtPricePerKWh(this.tariffGrid, this.currency, true);
},
batteryGridChargeLimitSet() {
return this.batteryGridChargeLimit !== null;
},
batteryGridChargeLimitFmt() {
if (this.batteryGridChargeLimit === null) {
if (!this.batteryGridChargeLimitSet) {
return;
}
if (this.co2Available) {

2
i18n/bg.toml
View file

@ -418,8 +418,6 @@ batteryCharge = "Зареждане на батерията"
batteryDischarge = "Разреждане на батерията"
batteryHold = "Батерия (заключена)"
batteryTooltip = "{energy} от {total} ({soc})"
cheapBatteryGridCharge = "евтина мрежова енергия"
cleanBatteryGridCharge = "чиста мрежова енергия"
gridImport = "Използвана енергия от мрежата"
homePower = "Потребление"
loadpoints = "Зарядно устройство | Зарядно устройство | {count} зарядни устройства"

2
i18n/da.toml
View file

@ -423,8 +423,6 @@ batteryCharge = "Batteriet oplades"
batteryDischarge = "Batteriet aflades"
batteryHold = "Batteri (låst)"
batteryTooltip = "{energi} af {total} ({soc})"
cheapBatteryGridCharge = "billig strøm på elnettet"
cleanBatteryGridCharge = "Grøn strøm på elnettet"
gridImport = "Forbrug fra elnet"
homePower = "Forbrug"
loadpoints = "Oplader| Oplader | {count} opladere"

4
i18n/de.toml
View file

@ -408,10 +408,10 @@ weekdays = "Tage"
battery = "Batterie"
batteryCharge = "Batterie laden"
batteryDischarge = "Batterie entladen"
batteryGridChargeActive = "Netzladen aktiv"
batteryGridChargeLimit = "Netzladen wenn"
batteryHold = "Batterie (gesperrt)"
batteryTooltip = "{energy} von {total} ({soc})"
cheapBatteryGridCharge = "günstige Netzenergie"
cleanBatteryGridCharge = "saubere Netzenergie"
gridImport = "Netzbezug"
homePower = "Verbrauch"
loadpoints = "Ladepunkt | Ladepunkt | {count} Ladepunkte"

2
i18n/el.toml
View file

@ -410,8 +410,6 @@ batteryCharge = "Φόρτιση μπαταρίας"
batteryDischarge = "Αποφόρτιση μπαταρίας"
batteryHold = "Μπαταρία (κλειδωμένο)"
batteryTooltip = "{energy} από {total} ({soc})"
cheapBatteryGridCharge = "φθηνή ενέργεια δικτύου"
cleanBatteryGridCharge = "πράσινη ενέργεια δικτύου"
gridImport = "Χρήση δικτύου"
homePower = "Κατανάλωση"
loadpoints = "Φορτιστής| Φορτιστής | {count} φορτιστές"

4
i18n/en.toml
View file

@ -407,10 +407,10 @@ weekdays = "Days"
battery = "Battery"
batteryCharge = "Battery charging"
batteryDischarge = "Battery discharging"
batteryGridChargeActive = "grid charging active"
batteryGridChargeLimit = "grid charging when"
batteryHold = "Battery (locked)"
batteryTooltip = "{energy} of {total} ({soc})"
cheapBatteryGridCharge = "cheap grid energy"
cleanBatteryGridCharge = "clean grid energy"
gridImport = "Grid use"
homePower = "Consumption"
loadpoints = "Charger| Charger | {count} chargers"

2
i18n/es.toml
View file

@ -428,8 +428,6 @@ batteryCharge = "Cargar la batería"
batteryDischarge = "Descargar la batería"
batteryHold = "Batería (bloqueada)"
batteryTooltip = "{energy} de {total} ({soc})"
cheapBatteryGridCharge = "Energía de red barata"
cleanBatteryGridCharge = "Energía de red limpia"
gridImport = "Consumo de red"
homePower = "Consumo"
loadpoints = "Punto de carga | Punto de carga | {count} Puntos de carga"

2
i18n/fi.toml
View file

@ -419,8 +419,6 @@ batteryCharge = "Akunlataus"
batteryDischarge = "Akku purkautuu"
batteryHold = "Akku (lukittu)"
batteryTooltip = "{energy} / {total} ({soc})"
cheapBatteryGridCharge = "halpaa energiaa verkosta"
cleanBatteryGridCharge = "puhdasta energiaa verkosta"
gridImport = "Kulutus sähköverkosta"
homePower = "Kodin sähkönkulutus"
loadpoints = "Latauslaite| Latauslaite | {count} latauslaitetta"

2
i18n/fr.toml
View file

@ -428,8 +428,6 @@ batteryCharge = "Batterie en charge"
batteryDischarge = "Décharge de la batterie"
batteryHold = "Batterie (verrouillée)"
batteryTooltip = "{energy} sur {total} ({soc})"
cheapBatteryGridCharge = "énergie réseau bon marché"
cleanBatteryGridCharge = "énergie réseau verte"
gridImport = "Utilisation du réseau"
homePower = "Consommation"
loadpoints = "Recharge| Recharge | {count} chargeurs"

2
i18n/hr.toml
View file

@ -420,8 +420,6 @@ batteryCharge = "Punjenje baterije"
batteryDischarge = "Pražnjenje baterije"
batteryHold = "Baterija (zaključano)"
batteryTooltip = "{energy} od {total} ({soc})"
cheapBatteryGridCharge = "jeftina energije iz mreže"
cleanBatteryGridCharge = "čista energija iz mreže"
gridImport = "Upotreba mreže"
homePower = "Potrošnja"
loadpoints = "Punjač| Punjač | {count} punjača"

2
i18n/hu.toml
View file

@ -410,8 +410,6 @@ batteryCharge = "Energiatároló töltés"
batteryDischarge = "Energiatároló kisütés"
batteryHold = "Energiatároló (lezárva)"
batteryTooltip = "{energy} / {total} ({soc})"
cheapBatteryGridCharge = "olcsó hálózati energia"
cleanBatteryGridCharge = "tiszta hálózati energia"
gridImport = "Hálózatból import"
homePower = "Fogyasztás"
loadpoints = "Töltő| Töltő | {count} töltő"

2
i18n/it.toml
View file

@ -422,8 +422,6 @@ batteryCharge = "Carica della batteria"
batteryDischarge = "Scarico della batteria"
batteryHold = "Batteria (locked)"
batteryTooltip = "{energy} di {total} ({soc})"
cheapBatteryGridCharge = "energia di rete a basso costo"
cleanBatteryGridCharge = "energia di rete pulita"
gridImport = "Uso della rete"
homePower = "Consumo"
loadpoints = "Caricabatterie| Caricabatterie | {count} caricabatterie"

2
i18n/lb.toml
View file

@ -421,8 +421,6 @@ batteryCharge = "Batterie oplueden"
batteryDischarge = "Batterie entlueden"
batteryHold = "Batterie (gespäert)"
batteryTooltip = "{energy} vun {total} ({soc})"
cheapBatteryGridCharge = "Gënschtege Stroum vum Netz"
cleanBatteryGridCharge = "grénge Stroum vum Netz"
gridImport = "Verbrauch vum Stroumnetz"
homePower = "Verbrauch"
loadpoints = "Wallbox | Wallbox | {count} Wallboxen"

2
i18n/lt.toml
View file

@ -428,8 +428,6 @@ batteryCharge = "Kaupiklis įkraunamas"
batteryDischarge = "Kaupiklis iškraunamas"
batteryHold = "Kaupiklis (užblokuotas)"
batteryTooltip = "{energy} iš {total} ({soc})"
cheapBatteryGridCharge = "pigi tinklo energija"
cleanBatteryGridCharge = "švari tinklo energija"
gridImport = "Iš tinklo"
homePower = "Namo suvartojimas"
loadpoints = "Įkroviklis | Įkroviklis | {count} įkrovikliai"

2
i18n/nl.toml
View file

@ -425,8 +425,6 @@ batteryCharge = "Batterij opladen"
batteryDischarge = "Batterij ontladen"
batteryHold = "Batterij (aanhouden)"
batteryTooltip = "{energy} van {total} ({soc})"
cheapBatteryGridCharge = "goedkope net-energie"
cleanBatteryGridCharge = "schone net-energie"
gridImport = "Netafname"
homePower = "Consumptie"
loadpoints = "Lader| Lader | {count} laders"

2
i18n/pt.toml
View file

@ -424,8 +424,6 @@ batteryCharge = "Carrego de bateria"
batteryDischarge = "Descarrego de bateria"
batteryHold = "Bateria (suspensa)"
batteryTooltip = "{energy} de {total} ({soc})"
cheapBatteryGridCharge = "energia de rede barata"
cleanBatteryGridCharge = "energia de rede verde"
gridImport = "Consumo de rede"
homePower = "Consumo"
loadpoints = "Carregador | Carregador | {count} Carregadores"

2
i18n/sl.toml
View file

@ -417,8 +417,6 @@ batteryCharge = "Polnjenje baterije"
batteryDischarge = "Praznjenje baterije"
batteryHold = "Baterija (zaklenjena)"
batteryTooltip = "{energy} od {total} ({soc})"
cheapBatteryGridCharge = "poceni omrežna energija"
cleanBatteryGridCharge = "energija iz čistega omrežja"
gridImport = "Uvoz iz omrežja"
homePower = "Poraba objekta"
loadpoints = "Polnilnica | Polnilnici | {count} polnilnih mest"

2
i18n/sv.toml
View file

@ -423,8 +423,6 @@ batteryCharge = "Batteri laddas"
batteryDischarge = "Batteri laddas ur"
batteryHold = "Batteri (låst)"
batteryTooltip = "{energy} av {total} ({soc})"
cheapBatteryGridCharge = "billig nät-energi"
cleanBatteryGridCharge = "grön nät-energi"
gridImport = "Import från elnät"
homePower = "Konsumtion"
loadpoints = "Laddare | Laddare | {count} laddare"

2
i18n/ta.toml
View file

@ -409,8 +409,6 @@ batteryCharge = "Battery charging"
batteryDischarge = "Battery discharging"
batteryHold = "Battery (locked)"
batteryTooltip = "{energy} of {total} ({soc})"
cheapBatteryGridCharge = "cheap வலைவாய் energy"
cleanBatteryGridCharge = "clean வலைவாய் energy"
gridImport = "Grid use"
homePower = "Consumption"
loadpoints = "Charger| மின்னூட்டி | {count} chargers"

2
i18n/tr.toml
View file

@ -410,8 +410,6 @@ batteryCharge = "Batarya doldurma"
batteryDischarge = "Batarya boşaltma"
batteryHold = "Batarya (kilitli)"
batteryTooltip = "{total} ({soc})'ın {energy}'ı"
cheapBatteryGridCharge = "“ucuz şebeke enerjisi”"
cleanBatteryGridCharge = "“temiz şebeke enerjisi”"
gridImport = "Şebeke kullanımı"
homePower = "Tüketim"
loadpoints = "Doldurma Cihazı| Doldurma Cihazı | {count} doldurma cihazları"

6
tests/battery-settings.spec.js
View file

@ -48,7 +48,11 @@ test.describe("battery settings", async () => {
await page.getByRole("button", { name: "Close" }).click();
await expect(page.getByTestId("battery-settings-modal")).not.toBeVisible();
await page.getByTestId("energyflow").click();
await page.getByRole("button", { name: "cheap grid energy (≤ 50.0 ct)" }).click();
await page.getByRole("button", { name: "grid charging active (≤ 50.0 ct)" }).click();
await expect(page.getByTestId("battery-settings-modal")).toBeVisible();
await page.getByLabel("Price limit").selectOption({ label: "≤ -10.0 ct/kWh" });
await page.getByRole("button", { name: "Close" }).click();
await expect(page.getByTestId("battery-settings-modal")).not.toBeVisible();
await expect(page.getByRole("button", { name: "grid charging when ≤ -10.0 ct" })).toBeVisible();
});
});