Skip to content

Colors theme fixes #2937

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.

Sign up for GitHub

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

Closed
cshagen wants to merge 15 commits into from
Closed

Colors theme fixes #2937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1107509
fix counter display
cshagen Nov 13, 2025
c5dee26
add counter component (#2939)
ndrsnhs Nov 14, 2025
47b97d5
AlphaESS bat control (#2932)
ndrsnhs Nov 14, 2025
381d427
BatterX: add bat control (#2933)
ndrsnhs Nov 14, 2025
57a5607
Update charge_template.py - optional expects remaining time untill pl…
tpd-opitz Nov 14, 2025
99be200
build UI (#2940)
LKuemmel Nov 14, 2025
ee676f1
electricity tariff quarter hourly prices: remove global variables (#2…
LKuemmel Nov 14, 2025
263eef8
Dynamische Netzentgelte (#2941)
LKuemmel Nov 14, 2025
72dd4c0
Build Themes
actions-user Nov 14, 2025
f88d5f4
HTTP simpleAPI erweitert (#2938)
kevinwieland Nov 14, 2025
3cc278a
build UI (#2942)
LKuemmel Nov 14, 2025
c5fa7f0
fix error handling (#2943)
LKuemmel Nov 14, 2025
8e40115
Fix double functions, fix mosquitto_sub -v read charge template
kevinwieland Nov 16, 2025
1fc3725
fix price display
cshagen Nov 16, 2025
cc2c4a8
Merge branch 'master' into web-2511
cshagen Nov 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/modules/web_themes/colors/source/src/assets/js/processMessages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const topicsToSubscribe = [
'openWB/chargepoint/#',
'openWB/vehicle/#',
'openWB/general/chargemode_config/pv_charging/#',
'openWB/optional/et/#',
'openWB/optional/ep/#',
'openWB/system/#',
'openWB/LegacySmartHome/#',
'openWB/command/' + mqttClientId() + '/#',
Expand Down Expand Up @@ -85,7 +85,7 @@ function processMqttMessage(topic: string, payload: Buffer) {
processMonthGraphMessages(topic, message)
} else if (topic.match(/^openwb\/log\/yearly\//i)) {
processYearGraphMessages(topic, message)
} else if (topic.match(/^openwb\/optional\/et\//i)) {
} else if (topic.match(/^openwb\/optional\/ep\//i)) {
processEtProviderMessages(topic, message)
} else if (topic.match(/^openwb\/system\//i)) {
processSystemMessages(topic, message)
Expand Down
5 changes: 4 additions & 1 deletion packages/modules/web_themes/colors/source/src/components/powerGraph/PgToolTipItem.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,10 @@ function devs() {
}
function counters() {
return Object.entries(props.entry)
.filter(([k, v]) => k.startsWith('counter') && k != 'counters' && k.length > 2 && v > 0)
.filter(
([k, v]) =>
k.startsWith('counter') && k != 'counters' && k.length > 2 && v > 0,
)
.map(([k, v]) => {
return {
power: v,
Expand Down
10 changes: 4 additions & 6 deletions packages/modules/web_themes/colors/source/src/components/powerGraph/processDayGraphData.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ function transformRow(currentRow: RawDayGraphDataItem): GraphDataItem {
currentItem.evuOut = 0
currentItem.evuIn = 0
currentItem.counters = 0

Object.entries(currentRow.counter).forEach(([id, values]) => {
if (values.grid) {
currentItem.evuOut += values.power_exported
Expand All @@ -82,14 +82,12 @@ function transformRow(currentRow: RawDayGraphDataItem): GraphDataItem {
registry.duplicateItem(id, counters.get(+id.slice(7))!)
//registry.items.get(id)!.showInGraph = true
}
const item : Counter = registry.items.get(id) as Counter
const item: Counter = registry.items.get(id) as Counter
if (item._showInGraph) {
currentItem.counters += values.power_imported ?? 0
currentItem[id] = values.power_imported ?? 0

}
}

})
if (currentItem.evuOut == 0 && currentItem.evuIn == 0) {
// legacy mode
Expand Down Expand Up @@ -171,8 +169,8 @@ function transformRow(currentRow: RawDayGraphDataItem): GraphDataItem {
currentItem[id] = values.power_imported ?? 0
if (!registry.keys().includes(id)) {
registry.duplicateItem(id, counters.get(+id.slice(7))!)
*/ //registry.items.get(id)!.showInGraph = true
/* }
*/ //registry.items.get(id)!.showInGraph = true
/* }
const item : Counter = registry.items.get(id) as Counter
if (item._showInGraph) {
currentItem.counters += values.power_imported ?? 0
Expand Down
8 changes: 3 additions & 5 deletions packages/modules/web_themes/colors/source/src/components/priceChart/processMessages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,10 @@ import { etData } from './model'

export function processEtProviderMessages(topic: string, message: string) {
if (topic == 'openWB/optional/ep/configured') {
etData.active = message == 'true'
} else if (topic == 'openWB/optional/ep/flexible_tariff/provider') {
const data = JSON.parse(message)
if (data.type == null) {
etData.active = false
} else {
etData.active = true
}
etData.etProvider = data.name
if (data.configuration && data.configuration.country != null) {
globalData.country = data.configuration.country
}
Expand Down