Colors theme (display): Fix display prices

packages/modules/display_themes/colors/source/package.json

@@ -13,36 +13,36 @@
     "format": "prettier --write src/"
   },
   "dependencies": {
-    "bootstrap": "^5.3.3",
+    "bootstrap": "^5.3.8",
     "d3": "^7.9.0",
-    "mqtt": "^5.10.3",
+    "mqtt": "^5.15.0",
     "rollup-plugin-polyfill-node": "^0.13.0",
     "vue": "^3.5.10"
   },
   "devDependencies": {
-    "@babel/types": "^7.26.8",
+    "@babel/types": "^7.29.0",
     "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
     "@esbuild-plugins/node-modules-polyfill": "^0.2.2",
-    "@eslint/compat": "^1.2.6",
-    "@eslint/eslintrc": "^3.2.0",
+    "@eslint/compat": "^1.4.1",
+    "@eslint/eslintrc": "^3.3.4",
     "@eslint/js": "^9.18.0",
-    "@rushstack/eslint-patch": "^1.10.5",
-    "@tsconfig/node22": "^22.0.0",
+    "@rushstack/eslint-patch": "^1.16.1",
+    "@tsconfig/node22": "^22.0.5",
     "@types/bootstrap": "^5.2.10",
     "@types/d3": "^7.4.3",
-    "@types/node": "^22.13.1",
-    "@vitejs/plugin-vue": "^5.2.1",
+    "@types/node": "^22.19.13",
+    "@vitejs/plugin-vue": "^5.2.4",
     "@vue/eslint-config-prettier": "^10.2.0",
-    "@vue/eslint-config-typescript": "^14.3.0",
+    "@vue/eslint-config-typescript": "^14.7.0",
     "@vue/tsconfig": "^0.7.0",
-    "esbuild": "^0.24.2",
-    "eslint": "^9.20.0",
-    "eslint-plugin-vue": "^9.32.0",
+    "esbuild": "^0.27.3",
+    "eslint": "^9.39.3",
+    "eslint-plugin-vue": "^9.33.0",
     "npm-run-all2": "^7.0.2",
-    "prettier": "^3.4.2",
-    "rollup": "^4.34.6",
-    "typescript": "^5.7.3",
-    "vite": "^6.1.0",
-    "vue-tsc": "^2.2.0"
+    "prettier": "^3.8.1",
+    "rollup": "^4.59.0",
+    "typescript": "^5.9.3",
+    "vite": "^6.4.1",
+    "vue-tsc": "^2.2.12"
   }
 }

packages/modules/display_themes/colors/source/src/assets/js/processMessages.ts

@@ -30,7 +30,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() + '/#',
@@ -76,7 +76,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 ( mqttTopic.match( /^openwb\/global\//i) ) { processGlobalMessages(mqttTopic, message); }
 	else if (topic.match(/^openwb\/system\//i)) {

packages/modules/display_themes/colors/source/src/assets/js/types.ts

@@ -38,6 +38,7 @@ export class GlobalData {
 	cpDailyExported = 0
 	evuId = 0
 	etProvider = ''
+	country = 'de'
 	ipAddress = ''
 	systemTime = 0.0
 	version = ''

packages/modules/display_themes/colors/source/src/components/chargePointList/configPanels/ConfigEco.vue

@@ -30,7 +30,11 @@
 		</ConfigItem>
 
 		<!-- Phases -->
-		<ConfigItem title="Anzahl Phasen bei Überschuss" icon="fa-plug" :fullwidth="true">
+		<ConfigItem
+			title="Anzahl Phasen bei Überschuss"
+			icon="fa-plug"
+			:fullwidth="true"
+		>
 			<RadioInput
 				id="targetPhases"
 				v-model="cp.ecoTargetPhases"

packages/modules/display_themes/colors/source/src/components/priceChart/PriceChart.vue

@@ -160,7 +160,7 @@ const plotdata = computed(() => {
 })
 const barwidth = computed(() => {
 	if (plotdata.value.length > 1) {
-		return (width - margin.left - margin.right) / plotdata.value.length - 1
+		return (width - margin.left - margin.right) / plotdata.value.length
 	} else {
 		return 0
 	}
@@ -204,13 +204,16 @@ const linePath = computed(() => {
 	]
 	return generator(points as [number, number][])
 })
-
 const xAxisGenerator = computed(() => {
 	return axisBottom<Date>(xScale.value)
 		.ticks(plotdata.value.length)
 		.tickSize(5)
 		.tickSizeInner(-height)
-		.tickFormat((d) => (d.getHours() % 6 == 0 ? timeFormat('%H:%M')(d) : ''))
+		.tickFormat((d) =>
+			d.getHours() % 6 == 0 && d.getMinutes() == 0
+				? timeFormat('%H:%M')(d)
+				: '',
+		)
 })
 const yAxisGenerator = computed(() => {
 	return axisLeft<number>(yScale.value)
@@ -252,7 +255,11 @@ const draw = computed(() => {
 		.selectAll('.tick line')
 		.attr('stroke', 'var(--color-bg)')
 		.attr('stroke-width', (d) =>
-			(d as Date).getHours() % 6 == 0 ? '2' : '0.5',
+			(d as Date).getMinutes() == 0
+				? (d as Date).getHours() % 6 == 0
+					? '2'
+					: '0.5'
+				: '0',
 		)
 	xAxis.select('.domain').attr('stroke', 'var(--color-bg')
 	// Y Axis

packages/modules/display_themes/colors/source/src/components/priceChart/processMessages.ts

@@ -1,17 +1,19 @@
+import { globalData } from '@/assets/js/model'
 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
 		}
 	} else if (topic == 'openWB/optional/ep/get/prices') {
 		const plist = JSON.parse(message)
 		etData.etPriceList = new Map<Date, number>()
-		Object.keys(plist).map((datestring) => {
+		Object.keys(plist).forEach((datestring) => {
 			etData.etPriceList.set(
 				new Date(+datestring * 1000),
 				plist[datestring] * 100000,