From af4c815c941865ef1b1df254674d77a5e4c5b41b Mon Sep 17 00:00:00 2001 From: Claus Hagen Date: Sat, 23 Aug 2025 07:46:06 +0200 Subject: [PATCH 1/3] modify powergraph look --- .../colors/source/src/components/powerMeter/PMArc.vue | 4 ++-- packages/modules/web_themes/colors/source/vite.config.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/modules/web_themes/colors/source/src/components/powerMeter/PMArc.vue b/packages/modules/web_themes/colors/source/src/components/powerMeter/PMArc.vue index 0e53cf73af..a794fef532 100644 --- a/packages/modules/web_themes/colors/source/src/components/powerMeter/PMArc.vue +++ b/packages/modules/web_themes/colors/source/src/components/powerMeter/PMArc.vue @@ -56,7 +56,7 @@ const props = defineProps<{ categoriesToShow: PowerItemType[] }>() -const cornerRadius = 20 +const cornerRadius = 10 const circleGapSize = Math.PI / 40 const arcCount = computed(() => props.plotdata.length - 1) const pieGenerator = computed(() => @@ -75,7 +75,7 @@ const pieGenerator = computed(() => const path = computed(() => arc>() //.innerRadius((props.radius / 6) * 5) - .innerRadius(props.radius * 0.88) + .innerRadius(props.radius * 0.87) .outerRadius(props.radius) .cornerRadius(cornerRadius), ) diff --git a/packages/modules/web_themes/colors/source/vite.config.ts b/packages/modules/web_themes/colors/source/vite.config.ts index 3821596212..92912f5309 100755 --- a/packages/modules/web_themes/colors/source/vite.config.ts +++ b/packages/modules/web_themes/colors/source/vite.config.ts @@ -1,5 +1,5 @@ import { fileURLToPath, URL } from 'url' -import { defineConfig, splitVendorChunkPlugin } from 'vite' +import { defineConfig } from 'vite' import vue from '@vitejs/plugin-vue' import { NodeGlobalsPolyfillPlugin } from "@esbuild-plugins/node-globals-polyfill"; import { NodeModulesPolyfillPlugin } from "@esbuild-plugins/node-modules-polyfill"; @@ -14,7 +14,7 @@ export default defineConfig({ } } }), - splitVendorChunkPlugin(), + ], resolve: { alias: { From 851bf44db279aea320668058c9288fee0c7740be Mon Sep 17 00:00:00 2001 From: Claus Hagen Date: Sat, 23 Aug 2025 07:56:56 +0200 Subject: [PATCH 2/3] fix chargepoint display in powergraph --- .../components/powerGraph/processLiveGraphData.ts | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/packages/modules/web_themes/colors/source/src/components/powerGraph/processLiveGraphData.ts b/packages/modules/web_themes/colors/source/src/components/powerGraph/processLiveGraphData.ts index 1f76830556..599a68c22d 100755 --- a/packages/modules/web_themes/colors/source/src/components/powerGraph/processLiveGraphData.ts +++ b/packages/modules/web_themes/colors/source/src/components/powerGraph/processLiveGraphData.ts @@ -79,6 +79,7 @@ function extractValues(data: RawGraphDataItem): GraphDataItem { : 1 const car1id = 'ev' + car1 + '-soc' const car2id = 'ev' + car2 + '-soc' + const re_cp = /cp(\d+)-power/ const values: GraphDataItem = {} values.date = +data.timestamp * 1000 if (+data.grid > 0) { @@ -124,10 +125,18 @@ function extractValues(data: RawGraphDataItem): GraphDataItem { values.charging = +data['charging-all'] // charge points - we only show a maximum of 10 chargepoints in the graph - for (let i = 0; i < 10; i++) { +/* for (let i = 0; i < 10; i++) { const idx = 'cp' + i values[idx] = +(data[idx + '-power'] ?? 0) - } + } */ +Object.keys(data) +.filter(key => re_cp.test(key)) + .forEach((key) => { + const found = key.match(re_cp) + if (found && found[1]) { + values['cp' + found[1]] = +(data[key] ?? 0) + } + }) values.selfUsage = values.pv - values.evuOut if (values.selfUsage < 0) { values.selfUsage = 0 From d206604c6e62e24308d159628964733c5403f0e5 Mon Sep 17 00:00:00 2001 From: Claus Hagen Date: Sat, 23 Aug 2025 08:07:41 +0200 Subject: [PATCH 3/3] hide battery widget when not configured --- .../modules/web_themes/colors/source/src/views/ColorsTheme.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/modules/web_themes/colors/source/src/views/ColorsTheme.vue b/packages/modules/web_themes/colors/source/src/views/ColorsTheme.vue index bec6914be8..b29a1ffe35 100644 --- a/packages/modules/web_themes/colors/source/src/views/ColorsTheme.vue +++ b/packages/modules/web_themes/colors/source/src/views/ColorsTheme.vue @@ -81,7 +81,7 @@ Hagen */ Fahrzeuge