From 78a94773bcebe15f964f09596d281faff9f4b59c Mon Sep 17 00:00:00 2001 From: electron Date: Mon, 12 Oct 2026 19:33:52 +0100 Subject: [PATCH 1/2] fix powergraph problem --- .../components/powerGraph/PgUsageGraph.vue | 16 ++++++------ .../source/src/components/powerGraph/model.ts | 2 +- .../powerGraph/processDayGraphData.ts | 9 ++++--- .../powerGraph/processMonthYearGraphData.ts | 26 ++++++++++++------- .../src/components/powerMeter/PMUsageArc.vue | 2 +- 5 files changed, 32 insertions(+), 23 deletions(-) diff --git a/packages/modules/web_themes/colors/source/src/components/powerGraph/PgUsageGraph.vue b/packages/modules/web_themes/colors/source/src/components/powerGraph/PgUsageGraph.vue index bad582a782..a10dd3eecc 100755 --- a/packages/modules/web_themes/colors/source/src/components/powerGraph/PgUsageGraph.vue +++ b/packages/modules/web_themes/colors/source/src/components/powerGraph/PgUsageGraph.vue @@ -319,10 +319,10 @@ function drawGraph(graph: Selection) { function drawBarGraph( graph: Selection, ) { - console.log("drawbargraph") + console.log('drawbargraph') if (animateUsageGraph) { graph.selectAll('*').remove() - + rects = graph .selectAll('.usagebar') .data(stackedSeries.value as [number, number][][]) @@ -339,7 +339,7 @@ function drawBarGraph( .attr('y', () => yScale.value(0)) .attr('height', 0) .attr('width', xScaleMonth.value.bandwidth()) - + rects .transition() .duration(duration) @@ -382,16 +382,16 @@ function drawBarGraph( .attr('height', (d) => { console.log(d[1]) console.log(d[0]) - console.log(yScale.value(d[1]/1000)) - console.log(yScale.value(d[0]/1000)) + console.log(yScale.value(d[1] / 1000)) + console.log(yScale.value(d[0] / 1000)) console.log(yScale.value(d[1] / 1000) - yScale.value(d[0] / 1000)) return graphData.graphMode == 'year' ? yScale.value(d[1] / 1000) - yScale.value(d[0] / 1000) : yScale.value(d[1]) - yScale.value(d[0]) - }) + }) .attr('width', xScaleMonth.value.bandwidth()) - console.log(rects) - } + console.log(rects) + } } const autozoom = computed(() => { diff --git a/packages/modules/web_themes/colors/source/src/components/powerGraph/model.ts b/packages/modules/web_themes/colors/source/src/components/powerGraph/model.ts index 8d15e434f5..09281bbf6a 100755 --- a/packages/modules/web_themes/colors/source/src/components/powerGraph/model.ts +++ b/packages/modules/web_themes/colors/source/src/components/powerGraph/model.ts @@ -112,7 +112,7 @@ export function setGraphData(d: GraphDataItem[]) { } else { graphData.data = d graphData.waitForData = false - console.log("graph data set") + console.log('graph data set') } } // LIVE GRAPH 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 ff227268a6..c64e88fb4d 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 @@ -7,14 +7,14 @@ import { updateEnergyValues, } from './model' -import { registry, resetHistoricData } from '@/assets/js/model' +import { createPowerItem, registry, resetHistoricData } from '@/assets/js/model' import { globalConfig } from '@/assets/js/themeConfig' import { shDevices } from '../smartHome/model' import { itemNames } from './model' import { addCounter, Counter, counters } from '../counterList/model' import { chargePoints } from '../chargePointList/model' import { addConsumer, consumers } from '../consumerList/model' -import type { PowerItem } from '@/assets/js/types' +import { PowerItemType, type PowerItem } from '@/assets/js/types' import { add } from '../mqttViewer/model' // methods: let gridCounters: string[] = [] @@ -140,7 +140,10 @@ function transformRow(currentRow: RawDayGraphDataItem): GraphDataItem { if (id != 'all') { currentItem[id] = values.power_imported ?? 0 if (!registry.keys().includes(id)) { - registry.duplicateItem(id, shDevices.get(id)!) + const dev = + shDevices.get(id) ?? + createPowerItem(id, PowerItemType.device, 'var(--color-device)') + registry.duplicateItem(id, dev) } if (shDevices.get(id)?.countAsHouse) { shEnergyToBeExtractedFromHouse += values.power_imported diff --git a/packages/modules/web_themes/colors/source/src/components/powerGraph/processMonthYearGraphData.ts b/packages/modules/web_themes/colors/source/src/components/powerGraph/processMonthYearGraphData.ts index f2b6db11bd..3c5f67e075 100755 --- a/packages/modules/web_themes/colors/source/src/components/powerGraph/processMonthYearGraphData.ts +++ b/packages/modules/web_themes/colors/source/src/components/powerGraph/processMonthYearGraphData.ts @@ -112,9 +112,11 @@ function transformDatatable( function transformRow(inputRow: RawDayGraphDataItem): GraphDataItem { const outputRow: GraphDataItem = {} // date - console.log('date: '+ inputRow.date) - const d = (graphData.graphMode == 'month') ? timeParse('%Y%m%d')(inputRow.date as string) - : timeParse('%Y%m')(inputRow.date as string) + console.log('date: ' + inputRow.date) + const d = + graphData.graphMode == 'month' + ? timeParse('%Y%m%d')(inputRow.date as string) + : timeParse('%Y%m')(inputRow.date as string) if (d) { outputRow.date = graphData.graphMode == 'month' ? d.getDate() : d.getMonth() + 1 @@ -166,7 +168,7 @@ function transformRow(inputRow: RawDayGraphDataItem): GraphDataItem { Object.entries(inputRow.cp).forEach(([id, values]) => { if (id != 'all') { if (!registry.keys().includes(id)) { - const cp: PowerItem = + const cp: PowerItem = chargePoints[+id.slice(2)] ?? createPowerItem( id, @@ -190,7 +192,9 @@ function transformRow(inputRow: RawDayGraphDataItem): GraphDataItem { outputRow.devices = Object.entries(inputRow.sh).reduce( (sum: number, item) => { if (!registry.keys().includes(item[0])) { - const dev = shDevices.get(item[0]) ?? createPowerItem (item[0], PowerItemType.device, 'var(--color-devices') + const dev = + shDevices.get(item[0]) ?? + createPowerItem(item[0], PowerItemType.device, 'var(--color-devices') registry.duplicateItem(item[0], dev) } if (item[1].energy_imported >= 0) { @@ -205,13 +209,13 @@ function transformRow(inputRow: RawDayGraphDataItem): GraphDataItem { 0, ) // Consumers - Object.entries(inputRow.consumer).forEach(([id,values]) => { + Object.entries(inputRow.consumer).forEach(([id, values]) => { if (id != 'all') { if (!registry.keys().includes(id)) { - const cns : PowerItem = + const cns: PowerItem = consumers.get(+id.slice(8)) ?? - createPowerItem(id, PowerItemType.consumer,'var(--color-consumer') - registry.duplicateItem (id,cns) + createPowerItem(id, PowerItemType.consumer, 'var(--color-consumer') + registry.duplicateItem(id, cns) } outputRow[id] = values.energy_imported } else { @@ -226,7 +230,9 @@ function transformRow(inputRow: RawDayGraphDataItem): GraphDataItem { outputRow.counters += values.power_imported ?? 0 outputRow[id] = values.power_imported ?? 0 if (!registry.keys().includes(id)) { - const ctr = counters.get(+id.slice(7)) ?? createPowerItem (id, PowerItemType.counter, 'var(--color-counter)') + const ctr = + counters.get(+id.slice(7)) ?? + createPowerItem(id, PowerItemType.counter, 'var(--color-counter)') registry.duplicateItem(id, ctr) registry.items.get(id)!.showInGraph = true } diff --git a/packages/modules/web_themes/colors/source/src/components/powerMeter/PMUsageArc.vue b/packages/modules/web_themes/colors/source/src/components/powerMeter/PMUsageArc.vue index 9d2022287c..e7f5047c68 100755 --- a/packages/modules/web_themes/colors/source/src/components/powerMeter/PMUsageArc.vue +++ b/packages/modules/web_themes/colors/source/src/components/powerMeter/PMUsageArc.vue @@ -119,7 +119,7 @@ const devicesToShow = computed(() => { return b.power - a.power }), ) - : [registry.getItem('consumers')] + : [] }) const consumersToShow = computed(() => { From 7126f298e8a909985018bcda8fbb28c69582acc8 Mon Sep 17 00:00:00 2001 From: electron Date: Mon, 12 Oct 2026 20:12:56 +0100 Subject: [PATCH 2/2] fix priority display --- .../source/src/components/chargePointList/CPChargePoint.vue | 5 ++++- .../source/src/components/chargePointList/VehicleData.vue | 3 --- .../chargePointList/compactList/CompactListItem.vue | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/modules/web_themes/colors/source/src/components/chargePointList/CPChargePoint.vue b/packages/modules/web_themes/colors/source/src/components/chargePointList/CPChargePoint.vue index c03f0cb499..09b4f41054 100644 --- a/packages/modules/web_themes/colors/source/src/components/chargePointList/CPChargePoint.vue +++ b/packages/modules/web_themes/colors/source/src/components/chargePointList/CPChargePoint.vue @@ -35,9 +35,12 @@ - + + + {{ chargepoint.priority }} +
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 a764cded78..570a6be4ba 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 @@ -18,9 +18,6 @@ />
- Prio: {{ chargepoint.priority }} - Prio: {{ chargepoint.priority }}