From 1b7a355a4f056e64e0117f650cc2a8b5656ada62 Mon Sep 17 00:00:00 2001
From: electron <cshagen@hagens.ch>
Date: Wed, 21 Oct 2026 06:35:54 +0100
Subject: [PATCH 1/3] fix powergraph warning and consumer error message display

---
 .../colors/source/src/components/chargePointList/model.ts  | 1 -
 .../source/src/components/consumerList/ConsumerDevice.vue  | 5 ++++-
 .../colors/source/src/components/powerGraph/PowerGraph.vue | 7 +++++--
 .../src/components/powerGraph/processDayGraphData.ts       | 3 ++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/packages/modules/web_themes/colors/source/src/components/chargePointList/model.ts b/packages/modules/web_themes/colors/source/src/components/chargePointList/model.ts
index b528d26f2b..f041eaeeac 100755
--- a/packages/modules/web_themes/colors/source/src/components/chargePointList/model.ts
+++ b/packages/modules/web_themes/colors/source/src/components/chargePointList/model.ts
@@ -599,7 +599,6 @@ export const topVehicles = computed(() => {
 	} */ /*else if (result.length == 1) {
 		result.push(-1)
 	}*/
-	console.log(result)
 	return result
 })
 export const chargeLimitModes = [
diff --git a/packages/modules/web_themes/colors/source/src/components/consumerList/ConsumerDevice.vue b/packages/modules/web_themes/colors/source/src/components/consumerList/ConsumerDevice.vue
index 9d0fb0b68b..4374d17ab6 100644
--- a/packages/modules/web_themes/colors/source/src/components/consumerList/ConsumerDevice.vue
+++ b/packages/modules/web_themes/colors/source/src/components/consumerList/ConsumerDevice.vue
@@ -35,7 +35,10 @@
 				</div>
 			</transition>
 			<transition name="status-fade">
-				<div v-if="showFault" class="faulttext status-entry p-2">
+				<div
+					v-if="showFault && device && device.faultText"
+					class="faulttext status-entry p-2"
+				>
 					{{ device.faultText }}
 				</div>
 			</transition>
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 @@
 		<template #title>
 			{{ heading }}
 			<span
-				v-if="graphData.errors.length > 0"
+				v-if="graphData.errors.length > 0 && graphData.errors[0] != ''"
 				@click="showErrors = !showErrors"
 				class="fa-solid fa-triangle-exclamation ms-2"
 			/>
@@ -35,7 +35,10 @@
 		</template>
 		<div v-if="showErrors" class="errormessage d-flex flex-column mt-2 mb-2">
 			{{ graphData.errors[0] }}
-			<span class="morebutton" @click="showErrorModal"
+			<span
+				v-if="graphData.errors.length > 1"
+				class="morebutton"
+				@click="showErrorModal"
 				>({{ graphData.errors.length - 1 }} weitere Fehlermeldungen)
 			</span>
 		</div>
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 = []

From d579019e64bfffa7f1e03a001a3dfd5272aeb5e8 Mon Sep 17 00:00:00 2001
From: electron <cshagen@hagens.ch>
Date: Wed, 21 Oct 2026 06:41:26 +0100
Subject: [PATCH 2/3] add control output for consumer debugging

---
 .../source/src/components/consumerList/processMessages.ts       | 2 ++
 1 file changed, 2 insertions(+)

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..59a837c729 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,7 @@ 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 +44,7 @@ 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) {

From 6187d1d9fc1f9a91627e28abca9ef17219b42f2f Mon Sep 17 00:00:00 2001
From: electron <cshagen@hagens.ch>
Date: Wed, 21 Oct 2026 16:28:36 +0100
Subject: [PATCH 3/3] allow toggling between rounded and detailed price

---
 .../chargePointList/VehicleData.vue           | 24 +++++++++++++------
 .../consumerList/processMessages.ts           | 14 +++++++++--
 .../source/src/components/priceChart/model.ts |  9 +++++++
 3 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/packages/modules/web_themes/colors/source/src/components/chargePointList/VehicleData.vue b/packages/modules/web_themes/colors/source/src/components/chargePointList/VehicleData.vue
index 41a06989f8..4ed5f360b8 100644
--- a/packages/modules/web_themes/colors/source/src/components/chargePointList/VehicleData.vue
+++ b/packages/modules/web_themes/colors/source/src/components/chargePointList/VehicleData.vue
@@ -127,17 +127,15 @@
 			v-if="etData.active"
 			heading="Strompreis:"
 			class="grid-col-4 grid-left"
+			@click="showRawPrice = !showRawPrice"
 		>
-			<span :style="currentPriceStyle">{{ etData.etCurrentPriceString }} </span>
+			<span :style="currentPriceStyle">
+				{{ currentPriceToShow }}
+			</span>
 		</InfoItem>
 		<InfoItem v-if="cp.etActive" heading="max. Preis:" class="grid-col-4">
 			<span type="button" @click="editPrice = !editPrice"
-				>{{
-					props.chargepoint.etActive
-						? (Math.round(props.chargepoint.etMaxPrice * 10) / 10).toFixed(1) +
-							priceUnit
-						: '-'
-				}}
+				>{{ maxPriceToShow }}
 				<i
 					v-if="props.chargepoint.etActive"
 					class="fa-solid fa-sm fas fa-edit ms-2"
@@ -193,6 +191,7 @@ const cp = props.chargepoint
 const editSoc = ref(false)
 const editPrice = ref(false)
 const changeCar = ref(false)
+const showRawPrice = ref(false)
 
 // computed
 const chargeMode = computed({
@@ -257,6 +256,17 @@ const modePillStyle = computed(() => {
 const priceUnit = computed(() => {
 	return globalData.country === 'ch' ? ' Rp' : ' ct'
 })
+const currentPriceToShow = computed(() => {
+	return showRawPrice.value
+		? etData.etCurrentPriceStringDetailed
+		: etData.etCurrentPriceString
+})
+const maxPriceToShow = computed(() => {
+	return showRawPrice.value
+		? props.chargepoint.etMaxPrice + priceUnit.value
+		: (Math.round(props.chargepoint.etMaxPrice * 10) / 10).toFixed(1) +
+				priceUnit.value
+})
 //methods
 function loadSoc() {
 	updateServer('socUpdate', 1, props.chargepoint.connectedVehicle)
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 59a837c729..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,7 +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))
+				console.log(
+					'Consumer module data for consumer ' +
+						index +
+						' received: ' +
+						JSON.stringify(moduleData),
+				)
 				dev.name = moduleData.name
 				dev.icon = moduleData.name
 			}
@@ -44,7 +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))
+				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/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