diff --git a/assets/js/components/Battery/BatteryGridChargeOnce.vue b/assets/js/components/Battery/BatteryGridChargeOnce.vue index 6c53462e3f..e549e40299 100644 --- a/assets/js/components/Battery/BatteryGridChargeOnce.vue +++ b/assets/js/components/Battery/BatteryGridChargeOnce.vue @@ -1,90 +1,90 @@ - - diff --git a/assets/js/utils/circuitFromPeak.test.ts b/assets/js/utils/circuitFromPeak.test.ts index 24767e9b9c..00d1df1da7 100644 --- a/assets/js/utils/circuitFromPeak.test.ts +++ b/assets/js/utils/circuitFromPeak.test.ts @@ -1,5 +1,5 @@ import { describe, expect, test } from "vite-plus/test"; -import { circuitPeakHintLimit, peakShavingCircuitTitle } from "./circuitFromPeak"; +import { circuitPeakHintLimit } from "./circuitFromPeak"; describe("circuitPeakHintLimit", () => { const on = { @@ -25,26 +25,3 @@ describe("circuitPeakHintLimit", () => { expect(circuitPeakHintLimit({}, "main")).toBeUndefined(); }); }); - -describe("peakShavingCircuitTitle", () => { - const on = { - lmOff: { circuit: "main", fromPeak: true }, - peakShaving: true, - circuits: { main: { title: "Hausanschluss" } }, - }; - - test("names the circuit whose limit is the peak limit right now", () => { - expect(peakShavingCircuitTitle(on)).toBe("Hausanschluss"); - expect(peakShavingCircuitTitle({ ...on, circuits: {} })).toBe("main"); - }); - - test("empty otherwise", () => { - expect(peakShavingCircuitTitle({ ...on, lmOff: { circuit: "main", fromPeak: false } })).toBe( - "" - ); - expect(peakShavingCircuitTitle({ ...on, lmOff: { fromPeak: true } })).toBe(""); - expect(peakShavingCircuitTitle({ ...on, peakShaving: false })).toBe(""); - expect(peakShavingCircuitTitle(undefined)).toBe(""); - expect(peakShavingCircuitTitle({})).toBe(""); - }); -}); diff --git a/assets/js/utils/circuitFromPeak.ts b/assets/js/utils/circuitFromPeak.ts index aaf04a8b56..1ecd3aaa3c 100644 --- a/assets/js/utils/circuitFromPeak.ts +++ b/assets/js/utils/circuitFromPeak.ts @@ -18,11 +18,3 @@ export function circuitPeakHintLimit( if (!state.lmAdvanced?.circuitFromPeak) return undefined; return state.peakShavingLimit || 0; } - -// The circuit the peak shaving card names: the one whose limit is the peak limit -// right now, empty otherwise. -export function peakShavingCircuitTitle(state: CircuitFromPeakState | undefined): string { - const name = state?.lmOff?.circuit; - if (!name || !state?.lmOff?.fromPeak || !state.peakShaving) return ""; - return state.circuits?.[name]?.title || name; -} diff --git a/core/lm/README.md b/core/lm/README.md index d625ce9c20..a9863a8b0c 100644 --- a/core/lm/README.md +++ b/core/lm/README.md @@ -1026,7 +1026,7 @@ Every change in an evcc file. Check these when merging a new evcc version. | snow on pv | `core/site_snow.go`, `core/site_snow_auto.go`, `core/testdata/open-meteo-snow-tirol.json` (recorded answer, added with `git add -f` as `*.json` is ignored), `assets/js/components/Forecast/SnowCoverSwitch.vue` | | optimizer | `core/site_optimizer_lm.go`, `core/site_optimizer_reserve_pass.go`, `core/site_optimizer_soc_pass.go`, `core/site_lm_export_forecast.go`, `tariff/homeassistant_forecast.go`, `templates/definition/tariff/homeassistant-forecast.yaml` | | api, keys | `core/site/api_custom.go`, `server/http_custom.go`, `core/keys/site_custom.go` | -| ui | `assets/js/types/evcc-lm.ts`, `assets/js/utils/lmPriorityOrder.ts`, `assets/js/utils/socSteps.ts`, `assets/js/components/LoadManagement/`, `assets/js/components/PeakShaving/`, the battery cards in `assets/js/components/Battery/` (`BatterySocGridChargeCard`, `BatteryGridChargeOnce`, `PowerIcon`, `BatteryPeakShavingCard`, `BatteryProfileCard`, `ProfileIcon`), the config components in `assets/js/components/Config/` (`PeakShavingConfig`, `LmConfigModals` and its dialogs, `FeedInEegSummary`, `PhaseSwitchFields`, `CircuitPeakHint`), `assets/js/utils/circuitFromPeak.ts` | +| ui | `assets/js/types/evcc-lm.ts`, `assets/js/utils/lmPriorityOrder.ts`, `assets/js/utils/socSteps.ts`, `assets/js/components/LoadManagement/`, `assets/js/components/PeakShaving/`, the battery cards in `assets/js/components/Battery/` (`BatterySocGridChargeCard`, `BatteryGridChargeOnce`, `BatteryPeakShavingCard`, `BatteryProfileCard`, `ProfileIcon`), the config components in `assets/js/components/Config/` (`PeakShavingConfig`, `LmConfigModals` and its dialogs, `FeedInEegSummary`, `PhaseSwitchFields`, `CircuitPeakHint`), `assets/js/utils/circuitFromPeak.ts` | | build | `.github/workflows/custom-image.yml` | | start page | `.github/README.md` (GitHub shows it instead of the evcc `README.md`; its feature list follows part 1) | diff --git a/i18n/de.json b/i18n/de.json index ebbb5db8d6..da94cd38cc 100644 --- a/i18n/de.json +++ b/i18n/de.json @@ -82,7 +82,6 @@ "suggestion": "Vorschlag" }, "peakShaving": { - "alsoCircuit": "Gilt auch für Stromkreis {name}", "description": "Unter {reserve} deckt die Batterie nur, was das 15-Minuten-Mittel über {limit} heben würde. Darüber normaler Eigenverbrauch.", "enable": "Untere Batteriereserve für Lastspitzen zurückhalten.", "noEntity": "Keine Zielentität hinterlegt (Konfiguration → Lastmanagement-Details → Peak Shaving).", diff --git a/i18n/en.json b/i18n/en.json index 15635f78f0..dda652c5dc 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -82,7 +82,6 @@ "suggestion": "Suggestion" }, "peakShaving": { - "alsoCircuit": "Also applies to circuit {name}", "description": "Below {reserve}, the battery only covers what would lift the 15 minute average above {limit}. Above it, normal self-consumption.", "enable": "Hold the lower battery range back for demand peaks.", "noEntity": "No target entity set (Configuration → Load management details → Peak Shaving).",