Skip to content

Intergrate consumers in koala theme charts - #3672

Merged
benderl merged 15 commits into
openWB:feature_consumerfrom
Brett-S-OWB:consumer-chart-addition
Jul 20, 2026
Merged

benderl merged 15 commits into
openWB:feature_consumerfrom
Brett-S-OWB:consumer-chart-addition

Conversation

@Brett-S-OWB

Copy link
Copy Markdown
Contributor

Ergänzt die konfigurierten Verbraucher in den drei Diagrammen des Koala-Themes:

Energiefluss-Diagramm: Verbraucher als eigenes Element (Summenleistung aus openWB/consumer/get/power).
Tagesübersicht: Verbraucher-Zeile mit aufklappbaren Unterzeilen je Verbraucher (analog zu Speicher/Ladepunkten).
Verlaufs-Diagramm: bei einem Verbraucher dessen Linie; bei mehreren eine sichtbare Summenlinie („Verbraucher ges.") plus die einzelnen Verbraucher, standardmäßig ausgeblendet und über die Legende zuschaltbar. Auf kleinen Bildschirmen erhalten Verbraucher ein eigenes Legenden-Dropdown.
Verbraucher verwenden ihre benutzerdefinierte Farbe (Topic openWB/consumer/{id}/module, Schlüssel color) mit Fallback auf var(--q-consumer).

Bildschirmfoto vom 2026-07-15 18-14-20 Bildschirmfoto vom 2026-07-15 18-13-20 Bildschirmfoto vom 2026-07-15 18-14-46

@Brett-S-OWB
Brett-S-OWB requested a review from benderl July 15, 2026 16:23
const $q = useQuasar();
const wrapToGrid = computed(
() =>
props.categorizedLegendItems.consumer.length > 0 && $q.screen.width < 700,

@benderl benderl Jul 16, 2026 •

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In anderen Abschnitten wird auf Screen.lt.sm geprüft. Passt das hier auch?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bei Screen.sm kommt es dann vor, dass ein Menü-Dropdown allein in der zweiten Reihe steht.

Bildschirmfoto vom 2026-07-16 09-54-18

@Brett-S-OWB
Brett-S-OWB force-pushed the consumer-chart-addition branch from 0abfa10 to add5cbe Compare July 17, 2026 12:05
@Brett-S-OWB
Brett-S-OWB force-pushed the consumer-chart-addition branch from d7de401 to a1dcaa8 Compare July 20, 2026 07:29
@benderl
benderl merged commit 09dcfb9 into openWB:feature_consumer Jul 20, 2026
1 check failed
LKuemmel pushed a commit that referenced this pull request Jul 23, 2026
* Add consumer to energy flow chart

* Add consumer row to daily totals chart

* Add consumer total to history chart

* add consumer color to store

* Align legend category dropdowns
LKuemmel pushed a commit that referenced this pull request Aug 6, 2026
* Add consumer to energy flow chart

* Add consumer row to daily totals chart

* Add consumer total to history chart

* add consumer color to store

* Align legend category dropdowns
LKuemmel pushed a commit that referenced this pull request Aug 18, 2026
* Add consumer to energy flow chart

* Add consumer row to daily totals chart

* Add consumer total to history chart

* add consumer color to store

* Align legend category dropdowns
LKuemmel pushed a commit that referenced this pull request Aug 18, 2026
* Add consumer to energy flow chart

* Add consumer row to daily totals chart

* Add consumer total to history chart

* add consumer color to store

* Align legend category dropdowns
LKuemmel pushed a commit that referenced this pull request Aug 19, 2026
* Add consumer to energy flow chart

* Add consumer row to daily totals chart

* Add consumer total to history chart

* add consumer color to store

* Align legend category dropdowns
LKuemmel pushed a commit that referenced this pull request Aug 19, 2026
* Add consumer to energy flow chart

* Add consumer row to daily totals chart

* Add consumer total to history chart

* add consumer color to store

* Align legend category dropdowns
LKuemmel pushed a commit that referenced this pull request Aug 20, 2026
* Add consumer to energy flow chart

* Add consumer row to daily totals chart

* Add consumer total to history chart

* add consumer color to store

* Align legend category dropdowns
LKuemmel pushed a commit that referenced this pull request Aug 20, 2026
* Add consumer to energy flow chart

* Add consumer row to daily totals chart

* Add consumer total to history chart

* add consumer color to store

* Align legend category dropdowns
LKuemmel pushed a commit that referenced this pull request Aug 20, 2026
* Add consumer to energy flow chart

* Add consumer row to daily totals chart

* Add consumer total to history chart

* add consumer color to store

* Align legend category dropdowns
LKuemmel pushed a commit that referenced this pull request Aug 21, 2026
* Add consumer to energy flow chart

* Add consumer row to daily totals chart

* Add consumer total to history chart

* add consumer color to store

* Align legend category dropdowns
LKuemmel pushed a commit that referenced this pull request Aug 24, 2026
* Add consumer to energy flow chart

* Add consumer row to daily totals chart

* Add consumer total to history chart

* add consumer color to store

* Align legend category dropdowns
LKuemmel pushed a commit that referenced this pull request Aug 26, 2026
* Add consumer to energy flow chart

* Add consumer row to daily totals chart

* Add consumer total to history chart

* add consumer color to store

* Align legend category dropdowns
LKuemmel pushed a commit that referenced this pull request Aug 28, 2026
* Add consumer to energy flow chart

* Add consumer row to daily totals chart

* Add consumer total to history chart

* add consumer color to store

* Align legend category dropdowns
LKuemmel pushed a commit that referenced this pull request Sep 7, 2026
* Add consumer to energy flow chart

* Add consumer row to daily totals chart

* Add consumer total to history chart

* add consumer color to store

* Align legend category dropdowns
LKuemmel pushed a commit to benderl/core that referenced this pull request Sep 8, 2026
* Add consumer to energy flow chart

* Add consumer row to daily totals chart

* Add consumer total to history chart

* add consumer color to store

* Align legend category dropdowns
LKuemmel pushed a commit that referenced this pull request Sep 9, 2026
* Add consumer to energy flow chart

* Add consumer row to daily totals chart

* Add consumer total to history chart

* add consumer color to store

* Align legend category dropdowns
LKuemmel pushed a commit that referenced this pull request Sep 9, 2026
* Add consumer to energy flow chart

* Add consumer row to daily totals chart

* Add consumer total to history chart

* add consumer color to store

* Align legend category dropdowns
LKuemmel added a commit that referenced this pull request Sep 9, 2026
* draft

* draft

* fixes

* fixes

* Anlauferkennung, Betriebsmodus zurücksetzen, Befehle für Pläne (#3588)

* draft

* Anlauferkennung

* Betriebsmodus zurücksetzen

* ammend

* Anlauferkennung

* draft

* draft scheduled charging

* add scheduled und time plan commands for adding and removing

* flake8

* update config

* Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <[email protected]>

* review

* fix pytest

---------

Co-authored-by: Copilot Autofix powered by AI <[email protected]>

* on time, fixes (#3612)

* on_time

* eco default price, typo

* on_time accessible via 1883 (#3626)

* on_time accessible via 1883

* fix

* Add Consumer tab and cards to koala web theme (#3630)

* add consumer tab/cards

* apply new design to consumer cards

* add consumer time on to consumer card

* fix consumer card CSS

* remove redundant placeholders

* imported and exported for consumers; daily, monthly log; daily yields; graph data (#3644)

* update module config

* imported and exported for consumers

* daily, monthly log

* daily yields

* graph data

* Consumer cards in carousel - small screen mobile view (#3637)

* Intergrate consumers in koala theme charts (#3672)

* Add consumer to energy flow chart

* Add consumer row to daily totals chart

* Add consumer total to history chart

* add consumer color to store

* Align legend category dropdowns

* Add consumer component to display flow chart (#3673)

* Add consumer component to display flow chart

* Add user management role

* energy percentage, set usage per json, several fixes (#3705)

* energy percentage, set usage per json

* consider min interval

* fixes

* pv

* fix

* pycheck, fix extra meter

* ammend

* fixes

* ammend

* fix

* switch interval elapsed

* flake8

* improve wait for start

* shelly, pytest (#3730)

* add shelly, flake8, pytest consumer chargemodes

* fix shelly

* existing pytests running

* review

* fix colors, lookup dict names and colors for consumers (#3736)

* fix colors, lookup dict names and colors for consumers

* review

* hide mode controls for consumer measurement only (#3715)

* update consumer-configuration-access (user management) (#3743)

* diagram colors, pytests, remove extra meters from log data (#3742)

* fix colors, lookup dict names and colors for consumers

* review

* extend tests

* add colors for yearly graph data

* remove extra meters from log data

* remove comment

* flake8

* ammend

* fix_merge

* switch mode on card

* update consumer button groups

* update message - data order in consumer card

* linting

* reapply lost changes from #3715

* usage type self controlled (#3775)

* usage type self controlled

* fix

* review

* review (#3776)

* calc on time (#3777)

* calc on time

* review

* pytest (#3786)

* fix pytest

* fixes, pytest

* review

* fix

* fixes (#3794)

* typo

* fix

* pytest

* Reworked IDM and Lambda consumer and add Ovum (#3737)

* IDM: send PV/Hausverbrauch/Batterie via GLT statt Leistungsvorgabe

* Lambda: PV-Überschuss statt power_limit an E-Manager senden

* Add OVUM CubeSpeicher/MPlus consumer module

* IDM: revert scaling factor, fix flake8 formatting

* flake8

* Rename send_grid_values to send_values in config.py

* Adjust surplus calculation to account for charging power

Include charging power in surplus calculation to avoid misreporting surplus to the heat pump.

* Update send_values function to send grid power

* Add Self_Controlled for IDM and Lambda

* flake8: fix syntax error and whitespace in consumer modules

Stray pasted line broke lambda_ consumer.py syntax; idm/lambda_/ovum
files had trailing whitespace on blank lines and missing EOF newlines.

* split PR: remove moduls except mqtt

* fix loadmanagement, clean up (#3819)

* clean up

* fix loadmanagement

* review

* review

* flake8

* fix versions

* fix merge error

* consider non charging for consumers and update consumer state messages (#3840)

* no charge for loads

* consider non charging for consumers and update consumer state messages

* flake8

* review

* fix rebase

* pass data object as parameter in set_power_limit methode (#3854)

* fix some type hints (#3866)

* fix reset of consumer state string (#3887)

* pass data object as parameter in set_power_limit methode, review (#3856)

* improve

* review: update comments

* flake8

* fix rebase

* Verbraucher: Fixes für  Löschen & Hinzufügen (#3909)

* fixes delete consumer, add consumer

* review

* Verbraucher: Fixes für Topics und Anlauferkennung (#3911)

* fixes

* type hint

* fix thread handling (#3912)

---------

Co-authored-by: Copilot Autofix powered by AI <[email protected]>
Co-authored-by: BrettS <[email protected]>
Co-authored-by: Brett-S-OWB <[email protected]>
Co-authored-by: Lutz Bender <[email protected]>
Co-authored-by: SeaSpotter <[email protected]>
Co-authored-by: benderl <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants