From fc197160566e3f1a0e4ac9a8bd0083ac510ed05b Mon Sep 17 00:00:00 2001
From: Claus Hagen <cshagen@hagens.ch>
Date: Sat, 7 Mar 2026 11:46:32 +0100
Subject: [PATCH 1/3] fix chargepoint switches

---
 .../source/src/assets/js/sendMessages.ts      |   4 +-
 .../src/components/chargePointList/model.ts   |  56 +--------
 .../src/components/powerGraph/PriceLine.vue   | 107 ++++++++++++++++++
 3 files changed, 112 insertions(+), 55 deletions(-)
 create mode 100644 packages/modules/web_themes/colors/source/src/components/powerGraph/PriceLine.vue

diff --git a/packages/modules/web_themes/colors/source/src/assets/js/sendMessages.ts b/packages/modules/web_themes/colors/source/src/assets/js/sendMessages.ts
index 27e227633d..e9f5f29d2b 100644
--- a/packages/modules/web_themes/colors/source/src/assets/js/sendMessages.ts
+++ b/packages/modules/web_themes/colors/source/src/assets/js/sendMessages.ts
@@ -13,7 +13,9 @@ const topics: { [topic: string]: string } = {
 		'openWB/set/vehicle/template/charge_template/%/chargemode/selected',
 	cpPriority: 'openWB/set/vehicle/template/charge_template/%/prio',
 	cpTimedCharging:
-		'openWB/set/vehicle/template/charge_template/%/time_charging/active',
+		//'openWB/set/vehicle/template/charge_template/%/time_charging/active',
+		'openWB/set/chargepoint/%/set/charge_template/time_charging/active',
+
 	pvBatteryPriority:
 		'openWB/set/general/chargemode_config/pv_charging/bat_mode',
 	cpVehicle: 'openWB/set/chargepoint/%/config/ev',
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 b89270f3aa..612c6ea504 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
@@ -133,21 +133,15 @@ export class ChargePoint implements PowerItem {
 			updateChargeTemplate(this.id)
 		}
 	}
-	/* updateChargeMode(cm: ChargeMode) {
-		this._chargeMode = cm
-	} */
 	get hasPriority() {
 		return this.chargeTemplate?.prio ?? false
 	}
 	set hasPriority(prio: boolean) {
 		if (this.chargeTemplate) {
 			this.chargeTemplate.prio = prio
-			updateServer('cpPriority', prio, this.id)
+			updateChargeTemplate(this.id)
 		}
 	}
-	/* updateCpPriority(prio: boolean) {
-		this._hasPriority = prio
-	} */
 	get timedCharging() {
 		if (this.chargeTemplate) {
 			return this.chargeTemplate.time_charging.active
@@ -156,9 +150,8 @@ export class ChargePoint implements PowerItem {
 		}
 	}
 	set timedCharging(setting: boolean) {
-		// chargeTemplates[this.chargeTemplate].time_charging.active = false
 		this.chargeTemplate!.time_charging.active = setting
-		updateServer('cpTimedCharging', setting, this.id)
+		updateChargeTemplate(this.id)
 	}
 	get instantTargetCurrent() {
 		return this.chargeTemplate?.chargemode.instant_charging.current ?? 0
@@ -169,10 +162,6 @@ export class ChargePoint implements PowerItem {
 			updateChargeTemplate(this.id)
 		}
 	}
-	/* updateInstantTargetCurrent(current: number) {
-		this._instantTargetCurrent = current
-	}
-	 */
 	get instantChargeLimitMode() {
 		return (
 			this.chargeTemplate?.chargemode.instant_charging.limit.selected ?? 'none'
@@ -184,9 +173,6 @@ export class ChargePoint implements PowerItem {
 			updateChargeTemplate(this.id)
 		}
 	}
-	/* updateInstantChargeLimitMode(mode: string) {
-		this._instantChargeLimitMode = mode
-	} */
 	get instantTargetSoc() {
 		return this.chargeTemplate?.chargemode.instant_charging.limit.soc ?? 0
 	}
@@ -196,9 +182,6 @@ export class ChargePoint implements PowerItem {
 			updateChargeTemplate(this.id)
 		}
 	}
-	/* updateInstantTargetSoc(soc: number) {
-		this._instantTargetSoc = soc
-	} */
 	get instantMaxEnergy() {
 		return this.chargeTemplate?.chargemode.instant_charging.limit.amount ?? 0
 	}
@@ -208,9 +191,6 @@ export class ChargePoint implements PowerItem {
 			updateChargeTemplate(this.id)
 		}
 	}
-	/* updateInstantMaxEnergy(max: number) {
-		this._instantMaxEnergy = max
-	} */
 	get instantTargetPhases() {
 		return this.chargeTemplate?.chargemode.instant_charging.phases_to_use ?? 0
 	}
@@ -220,7 +200,6 @@ export class ChargePoint implements PowerItem {
 			updateChargeTemplate(this.id)
 		}
 	}
-
 	get pvFeedInLimit() {
 		return this.chargeTemplate?.chargemode.pv_charging.feed_in_limit ?? false
 	}
@@ -230,9 +209,6 @@ export class ChargePoint implements PowerItem {
 			updateChargeTemplate(this.id)
 		}
 	}
-	/* updatePvFeedInLimit(setting: boolean) {
-		this._pvFeedInLimit = setting
-	} */
 	get pvMinCurrent() {
 		return this.chargeTemplate?.chargemode.pv_charging.min_current ?? 0
 	}
@@ -242,9 +218,6 @@ export class ChargePoint implements PowerItem {
 			updateChargeTemplate(this.id)
 		}
 	}
-	/* updatePvMinCurrent(min: number) {
-		this._pvMinCurrent = min
-	} */
 	get pvMaxSoc() {
 		return this._pvMaxSoc
 	}
@@ -264,9 +237,6 @@ export class ChargePoint implements PowerItem {
 			updateChargeTemplate(this.id)
 		}
 	}
-	/* updatePvMinSoc(min: number) {
-		this._pvMinSoc = min
-	} */
 	get pvMinSocCurrent() {
 		return this.chargeTemplate?.chargemode.pv_charging.min_soc_current ?? 0
 	}
@@ -400,28 +370,6 @@ export class ChargePoint implements PowerItem {
 				return 0
 		}
 	}
-	/* toPowerItem(): PowerItem {
-		return {
-			name: this.name,
-			type: PowerItemType.chargepoint,
-			power: this.power,
-			now : {
-				energy: this.dailyYield,
-				energyPv: this.energyPv,
-				energyBat: this.energyBat,
-				pvPercentage: this.pvPercentage,
-			},			
-			past: {
-				energy: this.dailyYield,
-				energyPv: this.energyPv,
-				energyBat: this.energyBat,
-				pvPercentage: this.pvPercentage,
-			},
-			color: this.color,
-			icon: this.icon,
-			showInGraph: true,
-		}
-	} */
 }
 export class Vehicle {
 	id: number
diff --git a/packages/modules/web_themes/colors/source/src/components/powerGraph/PriceLine.vue b/packages/modules/web_themes/colors/source/src/components/powerGraph/PriceLine.vue
new file mode 100644
index 0000000000..7f2ac990f3
--- /dev/null
+++ b/packages/modules/web_themes/colors/source/src/components/powerGraph/PriceLine.vue
@@ -0,0 +1,107 @@
+<template>
+	<svg x="0" :width="props.width" class="Prices">
+		<g>
+			<path
+				id="price"
+				.origin="autozoom"
+				class="price-baseline"
+				:d="myline"
+				stroke="var(--color-bg)"
+				stroke-width="1"
+				fill="none"
+			/>
+			<path
+				id="pricedashes"
+				class="price-dashes"
+				:d="myline"
+				stroke="crimson"
+				stroke-width="1"
+				:style="{ strokeDasharray: '3,1' }"
+				fill="none"
+			/>
+			<text
+				class="pricename"
+				:x="props.width / 2"
+				:y="nameY"
+				:style="{ fill: 'crimson', fontSize: 10 }"
+				text-anchor="middle"
+			>
+				Strompreis
+			</text>
+		</g>
+	</svg>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+import {
+	extent,
+	scaleLinear,
+	scaleTime,
+	line,
+	type Selection,
+	select,
+} from 'd3'
+import { graphData, type GraphDataItem, zoomedRange } from './model'
+
+const props = defineProps<{
+	width: number
+	height: number
+	margin: { left: number; top: number; right: number; bottom: number }
+}>()
+const xScale = computed(() => {
+	let e = extent(graphData.data, (d) => d.date)
+	if (e[0] && e[1]) {
+		return scaleTime<number>().domain(e).range([0, props.width])
+	} else {
+		return scaleTime().range([0, 0])
+	}
+})
+const yScale = computed(() => {
+	let e = extent(graphData.data, (d) => d.price)
+	if (e[0] && e[1]) {
+		e[0] = 0
+		return scaleLinear()
+			.range([props.height - 10, 5])
+			.domain(e)
+	} else {
+		return scaleLinear()
+			.range([props.height - 10, 0])
+			.domain([0, 0])
+	}
+})
+const myline = computed(() => {
+	const path = line<GraphDataItem>()
+		.x((d) => xScale.value(d.date))
+		.y((d) => yScale.value(d.price) ?? yScale.value(0))
+	let p = path(graphData.data)
+	return p ? p : ''
+})
+
+const nameY = computed(() => {
+	if (graphData.data.length > 0) {
+		let index: number
+		index = Math.round(graphData.data.length / 2)
+		return yScale.value(graphData.data[index].price) + 2
+	} else {
+		return 0
+	}
+})
+
+const autozoom = computed(() => {
+	if (graphData.graphMode != 'month' && graphData.graphMode != 'year') {
+		const path1: Selection<SVGPathElement, unknown, HTMLElement, unknown> =
+			select('path#price')
+		const path2: Selection<SVGPathElement, unknown, HTMLElement, unknown> =
+			select('path#pricedashes')
+		xScale.value.range(zoomedRange.value)
+		const path = line<GraphDataItem>()
+			.x((d) => xScale.value(d.date))
+			.y((d) => yScale.value(d.price) ?? yScale.value(0))
+		path1.attr('d', path(graphData.data))
+		path2.attr('d', path(graphData.data))
+	}
+	return 'zoomed'
+})
+</script>
+<style scoped></style>

From 8557c0a39261795ec8b343ec098643116ed8a58b Mon Sep 17 00:00:00 2001
From: Claus Hagen <cshagen@hagens.ch>
Date: Sat, 7 Mar 2026 11:50:28 +0100
Subject: [PATCH 2/3] cleanup

---
 .../src/components/powerGraph/PriceLine.vue   | 107 ------------------
 1 file changed, 107 deletions(-)
 delete mode 100644 packages/modules/web_themes/colors/source/src/components/powerGraph/PriceLine.vue

diff --git a/packages/modules/web_themes/colors/source/src/components/powerGraph/PriceLine.vue b/packages/modules/web_themes/colors/source/src/components/powerGraph/PriceLine.vue
deleted file mode 100644
index 7f2ac990f3..0000000000
--- a/packages/modules/web_themes/colors/source/src/components/powerGraph/PriceLine.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-<template>
-	<svg x="0" :width="props.width" class="Prices">
-		<g>
-			<path
-				id="price"
-				.origin="autozoom"
-				class="price-baseline"
-				:d="myline"
-				stroke="var(--color-bg)"
-				stroke-width="1"
-				fill="none"
-			/>
-			<path
-				id="pricedashes"
-				class="price-dashes"
-				:d="myline"
-				stroke="crimson"
-				stroke-width="1"
-				:style="{ strokeDasharray: '3,1' }"
-				fill="none"
-			/>
-			<text
-				class="pricename"
-				:x="props.width / 2"
-				:y="nameY"
-				:style="{ fill: 'crimson', fontSize: 10 }"
-				text-anchor="middle"
-			>
-				Strompreis
-			</text>
-		</g>
-	</svg>
-</template>
-
-<script setup lang="ts">
-import { computed } from 'vue'
-import {
-	extent,
-	scaleLinear,
-	scaleTime,
-	line,
-	type Selection,
-	select,
-} from 'd3'
-import { graphData, type GraphDataItem, zoomedRange } from './model'
-
-const props = defineProps<{
-	width: number
-	height: number
-	margin: { left: number; top: number; right: number; bottom: number }
-}>()
-const xScale = computed(() => {
-	let e = extent(graphData.data, (d) => d.date)
-	if (e[0] && e[1]) {
-		return scaleTime<number>().domain(e).range([0, props.width])
-	} else {
-		return scaleTime().range([0, 0])
-	}
-})
-const yScale = computed(() => {
-	let e = extent(graphData.data, (d) => d.price)
-	if (e[0] && e[1]) {
-		e[0] = 0
-		return scaleLinear()
-			.range([props.height - 10, 5])
-			.domain(e)
-	} else {
-		return scaleLinear()
-			.range([props.height - 10, 0])
-			.domain([0, 0])
-	}
-})
-const myline = computed(() => {
-	const path = line<GraphDataItem>()
-		.x((d) => xScale.value(d.date))
-		.y((d) => yScale.value(d.price) ?? yScale.value(0))
-	let p = path(graphData.data)
-	return p ? p : ''
-})
-
-const nameY = computed(() => {
-	if (graphData.data.length > 0) {
-		let index: number
-		index = Math.round(graphData.data.length / 2)
-		return yScale.value(graphData.data[index].price) + 2
-	} else {
-		return 0
-	}
-})
-
-const autozoom = computed(() => {
-	if (graphData.graphMode != 'month' && graphData.graphMode != 'year') {
-		const path1: Selection<SVGPathElement, unknown, HTMLElement, unknown> =
-			select('path#price')
-		const path2: Selection<SVGPathElement, unknown, HTMLElement, unknown> =
-			select('path#pricedashes')
-		xScale.value.range(zoomedRange.value)
-		const path = line<GraphDataItem>()
-			.x((d) => xScale.value(d.date))
-			.y((d) => yScale.value(d.price) ?? yScale.value(0))
-		path1.attr('d', path(graphData.data))
-		path2.attr('d', path(graphData.data))
-	}
-	return 'zoomed'
-})
-</script>
-<style scoped></style>

From ae21a3255194930ab39e57a426c53c6e9b8e2c00 Mon Sep 17 00:00:00 2001
From: Claus Hagen <cshagen@hagens.ch>
Date: Sat, 7 Mar 2026 11:58:09 +0100
Subject: [PATCH 3/3] clean up

---
 .../web_themes/colors/source/src/assets/js/sendMessages.ts    | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/modules/web_themes/colors/source/src/assets/js/sendMessages.ts b/packages/modules/web_themes/colors/source/src/assets/js/sendMessages.ts
index e9f5f29d2b..687e9c4a9b 100644
--- a/packages/modules/web_themes/colors/source/src/assets/js/sendMessages.ts
+++ b/packages/modules/web_themes/colors/source/src/assets/js/sendMessages.ts
@@ -12,10 +12,6 @@ const topics: { [topic: string]: string } = {
 	chargeMode:
 		'openWB/set/vehicle/template/charge_template/%/chargemode/selected',
 	cpPriority: 'openWB/set/vehicle/template/charge_template/%/prio',
-	cpTimedCharging:
-		//'openWB/set/vehicle/template/charge_template/%/time_charging/active',
-		'openWB/set/chargepoint/%/set/charge_template/time_charging/active',
-
 	pvBatteryPriority:
 		'openWB/set/general/chargemode_config/pv_charging/bat_mode',
 	cpVehicle: 'openWB/set/chargepoint/%/config/ev',