+
{{ device.faultText }}
diff --git a/packages/modules/web_themes/colors/source/src/components/consumerList/processMessages.ts b/packages/modules/web_themes/colors/source/src/components/consumerList/processMessages.ts
index b97db227cd..aa4d689888 100644
--- a/packages/modules/web_themes/colors/source/src/components/consumerList/processMessages.ts
+++ b/packages/modules/web_themes/colors/source/src/components/consumerList/processMessages.ts
@@ -31,6 +31,12 @@ function processConsumerDeviceMessages(topic: string, message: string) {
try {
const moduleData = JSON.parse(message)
if (moduleData) {
+ console.log(
+ 'Consumer module data for consumer ' +
+ index +
+ ' received: ' +
+ JSON.stringify(moduleData),
+ )
dev.name = moduleData.name
dev.icon = moduleData.name
}
@@ -43,6 +49,12 @@ function processConsumerDeviceMessages(topic: string, message: string) {
try {
const usage = JSON.parse(message)
if (usage) {
+ console.log(
+ 'Consumer usage data for consumer ' +
+ index +
+ ' received: ' +
+ JSON.stringify(usage),
+ )
dev.usage = usage
}
} catch (e) {
diff --git a/packages/modules/web_themes/colors/source/src/components/powerGraph/PowerGraph.vue b/packages/modules/web_themes/colors/source/src/components/powerGraph/PowerGraph.vue
index 51ef2f8f47..d20fa2a46c 100755
--- a/packages/modules/web_themes/colors/source/src/components/powerGraph/PowerGraph.vue
+++ b/packages/modules/web_themes/colors/source/src/components/powerGraph/PowerGraph.vue
@@ -3,7 +3,7 @@
{{ heading }}
@@ -35,7 +35,10 @@
{{ graphData.errors[0] }}
- ({{ graphData.errors.length - 1 }} weitere Fehlermeldungen)
diff --git a/packages/modules/web_themes/colors/source/src/components/powerGraph/processDayGraphData.ts b/packages/modules/web_themes/colors/source/src/components/powerGraph/processDayGraphData.ts
index 9fe46a10ed..84ee823c71 100755
--- a/packages/modules/web_themes/colors/source/src/components/powerGraph/processDayGraphData.ts
+++ b/packages/modules/web_themes/colors/source/src/components/powerGraph/processDayGraphData.ts
@@ -26,7 +26,8 @@ export function processDayGraphMessages(topic: string, message: string) {
totals: energyValues,
message: errorTextBlock,
} = JSON.parse(message)
- graphData.errors = errorTextBlock.split('\n')
+ const errorTextBlockTemp = ''
+ graphData.errors = errorTextBlockTemp.split('\n')
itemNames.value = new Map(Object.entries(itemNames2))
resetHistoricData()
gridCounters = []
diff --git a/packages/modules/web_themes/colors/source/src/components/priceChart/model.ts b/packages/modules/web_themes/colors/source/src/components/priceChart/model.ts
index f03756a60e..5433ed06b9 100755
--- a/packages/modules/web_themes/colors/source/src/components/priceChart/model.ts
+++ b/packages/modules/web_themes/colors/source/src/components/priceChart/model.ts
@@ -21,6 +21,15 @@ class EtData {
}
}
+ get etCurrentPriceStringDetailed() {
+ if (this.etPriceList.size > 0) {
+ const [p] = this.etPriceList.values()
+ return p + (globalData.country === 'ch' ? ' Rp' : ' ct')
+ } else {
+ return '---'
+ }
+ }
+
maxPriceForDuration(durationMinutes: number, maxTime?: Date): number {
if (this.etPriceList.size > 0) {
const plist = maxTime