Repository navigation
EEG-Aufteilung auf der Energie-Seite - #45
Merged
Merged
Conversation
With an EEG counter set, the grid card of the energy page splits the export: the EEG part is stacked as its own lighter bar next to the standard feed-in, the legend lists both, and the revenue tiles show the standard feed-in and the EEG revenue separately, each priced slot by slot by /api/feedinsplit, also without a grid price. Without a counter the page is unchanged and makes no extra request. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> (cherry picked from commit eb49197)
The energy page's grid card already shows the EEG part, so its counter is left out of the additional meters card. The collector is titled with its name for that; the CSV download still contains it. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> (cherry picked from commit c6bd35e)
README section 15 and the touch point table describe the display on the energy page; forkUiHooks checks the mounts in Energy.vue, GroupChart.vue and GridStats.vue. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
/api/feedinsplit parsed from and to itself because historyRange only existed in evcc PR 33989; evcc has it now, same checks and errors. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
evcc PR 33989 brought aggregateStarts, the same local-time alignment as our bucketStart; using it keeps /api/feedinsplit on the energy history's buckets if evcc changes them. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
With several grid series in a bucket (grid meter swapped) the EEG part came off each of them; now it is taken out once across them. A failed split request no longer leaves the previous period's split on the page. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
evcc's aggregateStarts keeps the location of time.Unix, which the test's time.Local = UTC swap makes a different pointer than time.UTC. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
SolarPower2024
changed the base branch from
evcc-update/2026-10-05
to
load-peak-features
October 5, 2026 15:50
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
EEG-Aufteilung auf der Energie-Seite, jetzt auf dem echten evcc-Energie-UI (evcc PR 33989 ist im Master). Ersetzt PR 1, der auf dem Vorschau-Branch
preview/energy-pagestand.Basis ist
evcc-update/2026-10-05(evcc-Master-Merge); nach dessen Merge geht dieser PR aufload-peak-features.Was drin ist
forkUiHooksprüft die Stellen inEnergy.vue,GroupChart.vue,GridStats.vue./api/feedinsplitnimmt für from/to evcc'shistoryRangeund für die Buckets evcc'saggregateStartsstatt eigener Kopien (gleiches Verhalten).feedInEeg.test.ts); schlägt die Split-Abfrage fehl, bleibt nicht die Aufteilung des vorigen Zeitraums stehen.Konflikte beim Umsetzen
Nur
Energy.vue: evcc hat den Schalter für Preise im Diagramm entfernt, Preise kommen jetzt immer überchartPrices/gridPrices. Unsere Anpassung nutzt jetzt diese stattsettings.energyGridPrices.Tests
Lokal: Go
./core/ ./core/metrics/ ./server/grün inkl.TestForkHooksInPlace; Frontend vue-tsc, Lint, i18n, vitest 232/232; Headless-UI im EEG-Szenario (Tag, Monat, Handy): EEG als eigener hellerer Balken, Legende getrennt, Kacheln Netzkosten / Einspeisevergütung / EEG-Vergütung passen zum Diagramm, EEG-Zähler nicht unter den Zählern,/api/feedinsplit200 mit Daten und 400 bei ungültigem from.Code-Review (medium) auf den Branch: 3 Funde, alle behoben (siehe 4 und 5).
Für das Add-on
CHANGELOG: „Energie-Seite: Einspeisung nach EEG und normalem Tarif aufgeteilt (Balken, Legende, getrennte Erlös-Kacheln), sobald ein EEG-Zähler eingerichtet ist.“
DOCS: „Energie-Seite (Einstellungen → Experimentell): mit EEG-Tarif und EEG-Zähler zeigt die Netz-Karte EEG-Einspeisung und -Erlös getrennt.“
🤖 Generated with Claude Code