From 8bd384506157cf56ea324a008cbd194733c37b68 Mon Sep 17 00:00:00 2001 From: Lutz Bender Date: Fri, 23 Oct 2026 12:21:00 +0200 Subject: [PATCH 1/2] remove outdated vehicle prio --- .../ChargePoints/ChargeModeModal.vue | 40 --------------- .../ChargePoints/ChargePointCard.vue | 28 ---------- .../cards/source/src/stores/mqtt.js | 10 ---- .../source/src/views/ChargePointsView.vue | 5 -- .../source/src/components/ChargePointCard.vue | 5 -- .../src/components/ChargePointPriority.vue | 51 ------------------- .../src/components/ChargePointSettings.vue | 9 ---- .../koala/source/src/stores/mqtt-store.ts | 23 --------- .../web_themes/standard_legacy/web/index.html | 15 ------ 9 files changed, 186 deletions(-) delete mode 100644 packages/modules/web_themes/koala/source/src/components/ChargePointPriority.vue diff --git a/packages/modules/display_themes/cards/source/src/components/ChargePoints/ChargeModeModal.vue b/packages/modules/display_themes/cards/source/src/components/ChargePoints/ChargeModeModal.vue index d78420dabc..d028c8c03c 100644 --- a/packages/modules/display_themes/cards/source/src/components/ChargePoints/ChargeModeModal.vue +++ b/packages/modules/display_themes/cards/source/src/components/ChargePoints/ChargeModeModal.vue @@ -48,11 +48,6 @@ export default { this.updateChargePointChargeTemplate(this.chargePointId, modeId, "chargemode.selected"); } }, - setChargePointConnectedVehiclePriority(priority) { - if (priority != this.mqttStore.getChargePointConnectedVehiclePriority(this.chargePointId)) { - this.updateChargePointChargeTemplate(this.chargePointId, priority, "prio"); - } - }, }, } @@ -99,41 +94,6 @@ export default { - - Priorität - - - Nein - - - Ja - - - diff --git a/packages/modules/display_themes/cards/source/src/components/ChargePoints/ChargePointCard.vue b/packages/modules/display_themes/cards/source/src/components/ChargePoints/ChargePointCard.vue index f289e1e7e8..edad04ce54 100644 --- a/packages/modules/display_themes/cards/source/src/components/ChargePoints/ChargePointCard.vue +++ b/packages/modules/display_themes/cards/source/src/components/ChargePoints/ChargePointCard.vue @@ -232,34 +232,6 @@ export default { - - - {{ - mqttStore.getChargePointConnectedVehicleChargeMode(chargePointId)?.label - }} - - - { - if (state.getChargePointConnectedVehicleChargeTemplate(chargePointId)) { - return state.getChargePointConnectedVehicleChargeTemplate( - chargePointId, - ).prio; - } - return undefined; - }; - }, getChargePointConnectedVehicleInfo(state) { return (chargePointId) => { return state.topics[ diff --git a/packages/modules/display_themes/cards/source/src/views/ChargePointsView.vue b/packages/modules/display_themes/cards/source/src/views/ChargePointsView.vue index 2ba286e972..a727861121 100644 --- a/packages/modules/display_themes/cards/source/src/views/ChargePointsView.vue +++ b/packages/modules/display_themes/cards/source/src/views/ChargePointsView.vue @@ -154,11 +154,6 @@ export default { this.updateChargePointChargeTemplate(id, event, "chargemode.selected"); } }, - setChargePointConnectedVehiclePriority(id, event) { - if (event != this.mqttStore.getChargePointConnectedVehiclePriority(id)) { - this.updateChargePointChargeTemplate(id, event, "prio"); - } - }, setChargePointConnectedVehicleTimeChargingActive(id, event) { if ( event != diff --git a/packages/modules/web_themes/koala/source/src/components/ChargePointCard.vue b/packages/modules/web_themes/koala/source/src/components/ChargePointCard.vue index ccf8f5aef8..65cdea210e 100644 --- a/packages/modules/web_themes/koala/source/src/components/ChargePointCard.vue +++ b/packages/modules/web_themes/koala/source/src/components/ChargePointCard.vue @@ -54,10 +54,6 @@ class="col" :charge-point-id="Number(props.chargePointId)" /> - @@ -129,7 +125,6 @@ import { useMqttStore } from 'src/stores/mqtt-store'; import SliderDouble from './SliderDouble.vue'; import ChargePointLock from './ChargePointLock.vue'; import ChargePointStateIcon from './ChargePointStateIcon.vue'; -import ChargePointPriority from './ChargePointPriority.vue'; import ChargePointModeButtons from './ChargePointModeButtons.vue'; import BaseMessage from './BaseMessage.vue'; import BaseFaultMessage from './BaseFaultMessage.vue'; diff --git a/packages/modules/web_themes/koala/source/src/components/ChargePointPriority.vue b/packages/modules/web_themes/koala/source/src/components/ChargePointPriority.vue deleted file mode 100644 index 28c5e335e6..0000000000 --- a/packages/modules/web_themes/koala/source/src/components/ChargePointPriority.vue +++ /dev/null @@ -1,51 +0,0 @@ - - - diff --git a/packages/modules/web_themes/koala/source/src/components/ChargePointSettings.vue b/packages/modules/web_themes/koala/source/src/components/ChargePointSettings.vue index 8c4a856f22..26a220232c 100644 --- a/packages/modules/web_themes/koala/source/src/components/ChargePointSettings.vue +++ b/packages/modules/web_themes/koala/source/src/components/ChargePointSettings.vue @@ -30,14 +30,6 @@ /> -
-
Priorität
- -
@@ -81,7 +73,6 @@ import ChargePointPvSettings from './ChargePointPvSettings.vue'; import ChargePointEcoSettings from './ChargePointEcoSettings.vue'; import ChargePointScheduledSettings from './ChargePointScheduledSettings.vue'; import ChargePointTimeChargingSettings from './ChargePointTimeChargingSettings.vue'; -import ChargePointPriority from './ChargePointPriority.vue'; import ChargePointLock from './ChargePointLock.vue'; import ChargePointModeButtons from './ChargePointModeButtons.vue'; import ChargePointVehicleSelect from './ChargePointVehicleSelect.vue'; diff --git a/packages/modules/web_themes/koala/source/src/stores/mqtt-store.ts b/packages/modules/web_themes/koala/source/src/stores/mqtt-store.ts index 002a2254f4..69dcb0dcee 100644 --- a/packages/modules/web_themes/koala/source/src/stores/mqtt-store.ts +++ b/packages/modules/web_themes/koala/source/src/stores/mqtt-store.ts @@ -2040,28 +2040,6 @@ export const useMqttStore = defineStore('mqtt', () => { }); }; - /** - * Get or set the charge point connected vehicle charge priority identified by the charge point id - * @param chargePointId charge point id - * @returns boolean | undefined - */ - const chargePointConnectedVehiclePriority = (chargePointId: number) => { - return computed({ - get() { - return chargePointConnectedVehicleChargeTemplate(chargePointId).value - ?.prio; - }, - set(newValue: boolean) { - return updateTopic( - `openWB/chargepoint/${chargePointId}/set/charge_template`, - newValue, - 'prio', - true, - ); - }, - }); - }; - /** * Get or set the charge point connected vehicle time charging identified by the charge point id * @param chargePointId charge point id @@ -4893,7 +4871,6 @@ export const useMqttStore = defineStore('mqtt', () => { chargePointConnectedVehicleEcoChargeLimitSoC, chargePointConnectedVehicleEcoChargeLimitEnergy, chargePointConnectedVehicleEcoChargeMaxPrice, - chargePointConnectedVehiclePriority, chargePointConnectedVehicleTimeCharging, chargePointConnectedVehicleChargeTemplate, chargePointConnectedVehicleBidiEnabled, diff --git a/packages/modules/web_themes/standard_legacy/web/index.html b/packages/modules/web_themes/standard_legacy/web/index.html index 6208e79c60..516513f217 100644 --- a/packages/modules/web_themes/standard_legacy/web/index.html +++ b/packages/modules/web_themes/standard_legacy/web/index.html @@ -520,21 +520,6 @@
- -
-
- - Priorität -
-
- -
-
From 67053abc8fb908ce870abb836863668c00ad1686 Mon Sep 17 00:00:00 2001 From: Lutz Bender Date: Mon, 26 Oct 2026 10:30:06 +0100 Subject: [PATCH 2/2] review fixes --- .../components/ChargePoints/ChargePointCard.vue | 15 +++++++++++++++ .../ChargePoints/SimpleChargePointCard.vue | 14 -------------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/packages/modules/display_themes/cards/source/src/components/ChargePoints/ChargePointCard.vue b/packages/modules/display_themes/cards/source/src/components/ChargePoints/ChargePointCard.vue index edad04ce54..9dd4da8a83 100644 --- a/packages/modules/display_themes/cards/source/src/components/ChargePoints/ChargePointCard.vue +++ b/packages/modules/display_themes/cards/source/src/components/ChargePoints/ChargePointCard.vue @@ -232,6 +232,21 @@ export default { + + + {{ + mqttStore.getChargePointConnectedVehicleChargeMode(chargePointId)?.label + }} + + {{ mqttStore.getChargePointConnectedVehicleName(chargePointId) }} -