-
Notifications
You must be signed in to change notification settings - Fork 115
Feature custom colors #2609
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
benderl
wants to merge
18
commits into
master
Choose a base branch
from
feature-custom-colors
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Feature custom colors #2609
Changes from all commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
2774e40
custom vehicle and charge point colors
benderl 0621575
custom component colors
benderl c2da757
update config step 1
benderl 1ba4e16
fix upgrade config
benderl 702eb43
fix component setup
benderl 54211b9
extend setdata for new vehicle topic
benderl cc320a9
use bootstrap primary color for charge points
benderl f6aea06
update logfiles
LKuemmel 00f1a78
rename color constants
benderl 7f5b5fb
upgrade method
benderl 1c4400f
update dynsec roles
benderl 601194b
update dynsec role acls for vehicle color
benderl 03e1c1a
Apply suggestions from code review
benderl a319535
fix missing color references
benderl 29cd118
Update packages/helpermodules/update_config.py
benderl 7ef8a4f
formatting
benderl 2d896e9
add logging in ComponentSetup
benderl 5d6afe9
increment dynsec version
benderl File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,83 +14,86 @@ | |
| from helpermodules import timecheck | ||
| from helpermodules.utils.json_file_handler import write_and_check | ||
| from helpermodules.utils.topic_parser import decode_payload, get_index | ||
| from modules.common.utils.component_parser import get_component_name_by_id | ||
| from modules.common.utils.component_parser import get_component_name_by_id, get_component_color_by_id | ||
|
|
||
| log = logging.getLogger(__name__) | ||
|
|
||
| # erstellt für jeden Tag eine Datei, die die Daten für den Langzeitgraph enthält. | ||
| # Dazu werden alle 5 Min folgende Daten als json-Liste gespeichert: | ||
| # {"entries": [ | ||
| # { | ||
| # "timestamp": int, | ||
| # "date": str, | ||
| # "prices": { | ||
| # "grid": Preis für Netzbezug, | ||
| # "pv": Preis für PV-Strom, | ||
| # "bat": Preis für Speicherstrom | ||
| # } | ||
| # "cp": { | ||
| # "cp1": { | ||
| # "imported": Zählerstand in Wh, | ||
| # "exported": Zählerstand in Wh | ||
| # } | ||
| # ... (dynamisch, je nach konfigurierter Anzahl) | ||
| # "all": { | ||
| # "imported": Zählerstand in Wh, | ||
| # "exported": Zählerstand in Wh | ||
| # } | ||
| # } | ||
| # "ev": { | ||
| # "ev1": { | ||
| # "soc": int in % | ||
| # { | ||
| # "entries": [ | ||
| # { | ||
| # "timestamp": int, | ||
| # "date": str, | ||
| # "prices": { | ||
| # "grid": Preis für Netzbezug, | ||
| # "pv": Preis für PV-Strom, | ||
| # "bat": Preis für Speicherstrom | ||
| # } | ||
| # ... (dynamisch, je nach konfigurierter Anzahl) | ||
| # } | ||
| # "counter": { | ||
| # "counter0": { | ||
| # "grid": bool, | ||
| # "imported": Wh, | ||
| # "exported": Wh | ||
| # "cp": { | ||
| # "cp1": { | ||
| # "imported": Zählerstand in Wh, | ||
| # "exported": Zählerstand in Wh | ||
| # } | ||
| # ... (dynamisch, je nach konfigurierter Anzahl) | ||
| # "all": { | ||
| # "imported": Zählerstand in Wh, | ||
| # "exported": Zählerstand in Wh | ||
| # } | ||
| # } | ||
| # ... (dynamisch, je nach konfigurierter Anzahl) | ||
| # } | ||
| # "pv": { | ||
| # "all": { | ||
| # "exported": Wh | ||
| # "ev": { | ||
| # "ev1": { | ||
| # "soc": int in % | ||
| # } | ||
| # ... (dynamisch, je nach konfigurierter Anzahl) | ||
| # } | ||
| # "pv0": { | ||
| # "exported": Wh | ||
| # "counter": { | ||
| # "counter0": { | ||
| # "grid": bool, | ||
| # "imported": Wh, | ||
| # "exported": Wh | ||
| # } | ||
| # ... (dynamisch, je nach konfigurierter Anzahl) | ||
| # } | ||
| # ... (dynamisch, je nach konfigurierter Anzahl) | ||
| # } | ||
| # "bat": { | ||
| # "all": { | ||
| # "imported": Wh, | ||
| # "exported": Wh, | ||
| # "soc": int in % | ||
| # "pv": { | ||
| # "all": { | ||
| # "exported": Wh | ||
| # } | ||
| # "pv0": { | ||
| # "exported": Wh | ||
| # } | ||
| # ... (dynamisch, je nach konfigurierter Anzahl) | ||
| # } | ||
| # "bat0": { | ||
| # "imported": Wh, | ||
| # "exported": Wh, | ||
| # "soc": int in % | ||
| # "bat": { | ||
| # "all": { | ||
| # "imported": Wh, | ||
| # "exported": Wh, | ||
| # "soc": int in % | ||
| # } | ||
| # "bat0": { | ||
| # "imported": Wh, | ||
| # "exported": Wh, | ||
| # "soc": int in % | ||
| # } | ||
| # ... (dynamisch, je nach konfigurierter Anzahl) | ||
| # } | ||
| # ... (dynamisch, je nach konfigurierter Anzahl) | ||
| # } | ||
| # "sh": { | ||
| # "sh1": { | ||
| # "exported": Wh, | ||
| # "imported": Wh, | ||
| # wenn konfiguriert: | ||
| # "temp1": int in °C, | ||
| # "temp2": int in °C, | ||
| # "temp3": int in °C | ||
| # "sh": { | ||
| # "sh1": { | ||
| # "exported": Wh, | ||
| # "imported": Wh, | ||
| # wenn konfiguriert: | ||
| # "temp1": int in °C, | ||
| # "temp2": int in °C, | ||
| # "temp3": int in °C | ||
| # }, | ||
| # ... (dynamisch, je nach Anzahl konfigurierter Geräte) | ||
| # }, | ||
| # ... (dynamisch, je nach Anzahl konfigurierter Geräte) | ||
| # }, | ||
| # "hc": {"all": {"imported": Wh # Hausverbrauch}} | ||
| # }], | ||
| # "names": "names": {"sh1": "", "cp1": "", "counter2": "", "pv3": ""} | ||
| # } | ||
| # "hc": {"all": {"imported": Wh # Hausverbrauch}} | ||
| # } | ||
| # ], | ||
| # "names": {"cp1": "", "counter2": "", "pv3": ""}, | ||
| # "colors": {"cp1": "", "counter2": "", "pv3": ""}, | ||
| # } | ||
|
|
||
|
|
||
| class LogType(Enum): | ||
|
|
@@ -165,6 +168,7 @@ def save_log(log_type: LogType): | |
| entries = content["entries"] | ||
| entries.append(new_entry) | ||
| content["names"] = get_names(content["entries"][-1], sh_log_data.sh_names) | ||
| content["colors"] = get_colors(content["entries"][-1]) | ||
| write_and_check(filepath, content) | ||
| return content["entries"] | ||
| except Exception: | ||
|
|
@@ -357,3 +361,30 @@ def get_names(elements: Dict, sh_names: Dict, valid_names: Optional[Dict] = None | |
| except (ValueError, KeyError, AttributeError): | ||
| names.update({entry: entry}) | ||
| return names | ||
|
|
||
|
|
||
| def get_colors(elements: Dict) -> Dict: | ||
| """ Ermittelt die Farben der Fahrzeuge, Ladepunkte und Komponenten, welche | ||
| in elements vorhanden sind und gibt diese als Dictionary zurück. | ||
| Parameter | ||
| --------- | ||
| elements: dict | ||
| Dictionary, das die Messwerte enthält. | ||
| """ | ||
|
Comment on lines
+366
to
+373
|
||
| colors = {} | ||
| for group in elements.items(): | ||
| if group[0] not in ("ev", "cp", "counter", "pv", "bat"): | ||
| continue | ||
| for entry in group[1]: | ||
|
benderl marked this conversation as resolved.
|
||
| if "all" != entry: | ||
| try: | ||
| if "ev" in entry: | ||
| colors.update({entry: data.data.ev_data[entry].data.color}) | ||
| elif "cp" in entry: | ||
| colors.update({entry: data.data.cp_data[entry].data.config.color}) | ||
| else: | ||
| id = entry.strip(string.ascii_letters) | ||
| colors.update({entry: get_component_color_by_id(int(id))}) | ||
| except (ValueError, KeyError, AttributeError): | ||
| colors.update({entry: "#000000"}) | ||
| return colors | ||
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
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.