From b728e23caf6b75caa909ca75a1adffd1cad3f673 Mon Sep 17 00:00:00 2001
From: Michael Geers <michael@geers.tv>
Date: Sat, 4 Jan 2025 19:16:24 +0100
Subject: [PATCH] Battery grid charge: show configured limit (#18032)

---
 .../js/components/Energyflow/Energyflow.vue   | 30 ++++++++++++-------
 i18n/bg.toml                                  |  2 --
 i18n/da.toml                                  |  2 --
 i18n/de.toml                                  |  4 +--
 i18n/el.toml                                  |  2 --
 i18n/en.toml                                  |  4 +--
 i18n/es.toml                                  |  2 --
 i18n/fi.toml                                  |  2 --
 i18n/fr.toml                                  |  2 --
 i18n/hr.toml                                  |  2 --
 i18n/hu.toml                                  |  2 --
 i18n/it.toml                                  |  2 --
 i18n/lb.toml                                  |  2 --
 i18n/lt.toml                                  |  2 --
 i18n/nl.toml                                  |  2 --
 i18n/pt.toml                                  |  2 --
 i18n/sl.toml                                  |  2 --
 i18n/sv.toml                                  |  2 --
 i18n/ta.toml                                  |  2 --
 i18n/tr.toml                                  |  2 --
 tests/battery-settings.spec.js                |  6 +++-
 21 files changed, 29 insertions(+), 49 deletions(-)

diff --git a/assets/js/components/Energyflow/Energyflow.vue b/assets/js/components/Energyflow/Energyflow.vue
index 30f86aa68..760132657 100644
--- a/assets/js/components/Energyflow/Energyflow.vue
+++ b/assets/js/components/Energyflow/Energyflow.vue
@@ -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) {
diff --git a/i18n/bg.toml b/i18n/bg.toml
index add79734b..cd673510e 100644
--- a/i18n/bg.toml
+++ b/i18n/bg.toml
@@ -418,8 +418,6 @@ batteryCharge = "Зареждане на батерията"
 batteryDischarge = "Разреждане на батерията"
 batteryHold = "Батерия (заключена)"
 batteryTooltip = "{energy} от {total} ({soc})"
-cheapBatteryGridCharge = "евтина мрежова енергия"
-cleanBatteryGridCharge = "чиста мрежова енергия"
 gridImport = "Използвана енергия от мрежата"
 homePower = "Потребление"
 loadpoints = "Зарядно устройство | Зарядно устройство | {count} зарядни устройства"
diff --git a/i18n/da.toml b/i18n/da.toml
index 94ca96735..e057d38d9 100644
--- a/i18n/da.toml
+++ b/i18n/da.toml
@@ -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"
diff --git a/i18n/de.toml b/i18n/de.toml
index 4e45a8653..ab44b7bf9 100644
--- a/i18n/de.toml
+++ b/i18n/de.toml
@@ -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"
diff --git a/i18n/el.toml b/i18n/el.toml
index f34396901..ab4a6400d 100644
--- a/i18n/el.toml
+++ b/i18n/el.toml
@@ -410,8 +410,6 @@ batteryCharge = "Φόρτιση μπαταρίας"
 batteryDischarge = "Αποφόρτιση μπαταρίας"
 batteryHold = "Μπαταρία (κλειδωμένο)"
 batteryTooltip = "{energy} από {total} ({soc})"
-cheapBatteryGridCharge = "φθηνή ενέργεια δικτύου"
-cleanBatteryGridCharge = "πράσινη ενέργεια δικτύου"
 gridImport = "Χρήση δικτύου"
 homePower = "Κατανάλωση"
 loadpoints = "Φορτιστής| Φορτιστής | {count} φορτιστές"
diff --git a/i18n/en.toml b/i18n/en.toml
index 2c81f7e88..6e289b9bf 100644
--- a/i18n/en.toml
+++ b/i18n/en.toml
@@ -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"
diff --git a/i18n/es.toml b/i18n/es.toml
index 09c7185ce..d058bd5ba 100644
--- a/i18n/es.toml
+++ b/i18n/es.toml
@@ -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"
diff --git a/i18n/fi.toml b/i18n/fi.toml
index 2ac7b5ac3..e6056a3f7 100644
--- a/i18n/fi.toml
+++ b/i18n/fi.toml
@@ -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"
diff --git a/i18n/fr.toml b/i18n/fr.toml
index 04ddea383..62412a76b 100644
--- a/i18n/fr.toml
+++ b/i18n/fr.toml
@@ -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"
diff --git a/i18n/hr.toml b/i18n/hr.toml
index 7c34332b6..9c9c7afac 100644
--- a/i18n/hr.toml
+++ b/i18n/hr.toml
@@ -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"
diff --git a/i18n/hu.toml b/i18n/hu.toml
index c11785a00..3cb546770 100644
--- a/i18n/hu.toml
+++ b/i18n/hu.toml
@@ -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ő"
diff --git a/i18n/it.toml b/i18n/it.toml
index 4b91132bd..92d924f89 100644
--- a/i18n/it.toml
+++ b/i18n/it.toml
@@ -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"
diff --git a/i18n/lb.toml b/i18n/lb.toml
index ab740e990..3c4a87f71 100644
--- a/i18n/lb.toml
+++ b/i18n/lb.toml
@@ -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"
diff --git a/i18n/lt.toml b/i18n/lt.toml
index 9b54f2125..4dc18dc07 100644
--- a/i18n/lt.toml
+++ b/i18n/lt.toml
@@ -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"
diff --git a/i18n/nl.toml b/i18n/nl.toml
index 1d3934712..f33b818e2 100644
--- a/i18n/nl.toml
+++ b/i18n/nl.toml
@@ -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"
diff --git a/i18n/pt.toml b/i18n/pt.toml
index d8401e66f..a512b1a76 100644
--- a/i18n/pt.toml
+++ b/i18n/pt.toml
@@ -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"
diff --git a/i18n/sl.toml b/i18n/sl.toml
index d44c53494..5e8bcb37d 100644
--- a/i18n/sl.toml
+++ b/i18n/sl.toml
@@ -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"
diff --git a/i18n/sv.toml b/i18n/sv.toml
index e5c35ea18..d16e01429 100644
--- a/i18n/sv.toml
+++ b/i18n/sv.toml
@@ -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"
diff --git a/i18n/ta.toml b/i18n/ta.toml
index f02a059c1..b2f97f2a4 100644
--- a/i18n/ta.toml
+++ b/i18n/ta.toml
@@ -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"
diff --git a/i18n/tr.toml b/i18n/tr.toml
index a02c510a4..24e48355f 100644
--- a/i18n/tr.toml
+++ b/i18n/tr.toml
@@ -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ı"
diff --git a/tests/battery-settings.spec.js b/tests/battery-settings.spec.js
index 4dba33b1a..6fd3ead50 100644
--- a/tests/battery-settings.spec.js
+++ b/tests/battery-settings.spec.js
@@ -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();
   });
 });