From c143964732012a073e027ff3cdd092258e3d2047 Mon Sep 17 00:00:00 2001 From: Lutz Bender Date: Fri, 1 Aug 2025 08:45:38 +0200 Subject: [PATCH] fix plan selection --- .../web_themes/standard_legacy/web/index.html | 21 ++++++++++++------- .../standard_legacy/web/processAllMqttMsg.js | 6 ++++-- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/packages/modules/web_themes/standard_legacy/web/index.html b/packages/modules/web_themes/standard_legacy/web/index.html index 10452acab4..b85e13f554 100644 --- a/packages/modules/web_themes/standard_legacy/web/index.html +++ b/packages/modules/web_themes/standard_legacy/web/index.html @@ -579,6 +579,7 @@

Termine Zeitladen

-- @@ -995,7 +996,9 @@

Einstellungen für "Ziel"

Es wurden noch keine Zeitpläne eingerichtet!
+ data-plan="" + data-index="" + >
--
@@ -1549,7 +1552,7 @@

// some helper functions 'helperFunctions.js?ver=20250217', // functions for processing messages - 'processAllMqttMsg.js?ver=20250731', + 'processAllMqttMsg.js?ver=20250801', // respective Chart.js definition live 'livechart.js?ver=20250404', // respective Chart.js definition price based charging @@ -1632,12 +1635,13 @@

const parentChargePoint = $(this).closest('[data-cp]'); const chargePointIndex = parseInt(parentChargePoint.data('cp')); const planId = parseInt($(this).closest('.charge-point-time-charge-plan').data('plan')); - if (!isNaN(chargePointIndex) && !isNaN(planId)) { - console.log('toggle time charge plan', chargePointIndex, planId); + const planIndex = parseInt($(this).closest('.charge-point-time-charge-plan').data('plan-index')); + if (!isNaN(chargePointIndex) && !isNaN(planId) && !isNaN(planIndex)) { const object = "chargeTemplate"; - const objectPath = "time_charging.plans." + planId + ".active"; + const objectPath = "time_charging.plans." + planIndex + ".active"; const topic = "openWB/set/chargepoint/" + chargePointIndex + "/set/charge_template"; const option = !$(this).hasClass('charge-point-plan-pill-active'); + console.log('toggle time charge plan', chargePointIndex, planId, planIndex, option); if (typeof window[object] !== undefined && window[object][chargePointIndex] !== undefined) { let currentObjectState = JSON.parse(JSON.stringify(window[object][chargePointIndex])); currentObjectState = updateObject(currentObjectState, objectPath, option); @@ -1665,12 +1669,13 @@

const parentChargePoint = $(this).closest('[data-cp]'); const chargePointIndex = parseInt(parentChargePoint.data('cp')); const planId = parseInt($(this).closest('.charge-point-schedule-plan').data('plan')); - if (!isNaN(chargePointIndex) && !isNaN(planId)) { - console.log('toggle schedule plan', chargePointIndex, planId); + const planIndex = parseInt($(this).closest('.charge-point-schedule-plan').data('plan-index')); + if (!isNaN(chargePointIndex) && !isNaN(planId) && !isNaN(planIndex)) { const object = "chargeTemplate"; - const objectPath = "chargemode.scheduled_charging.plans." + planId + ".active"; + const objectPath = "chargemode.scheduled_charging.plans." + planIndex + ".active"; const topic = "openWB/set/chargepoint/" + chargePointIndex + "/set/charge_template"; const option = !$(this).hasClass('charge-point-plan-pill-active'); + console.log('toggle schedule plan', chargePointIndex, planId, planIndex, option); if (typeof window[object] !== undefined && window[object][chargePointIndex] !== undefined) { let currentObjectState = JSON.parse(JSON.stringify(window[object][chargePointIndex])); currentObjectState = updateObject(currentObjectState, objectPath, option); diff --git a/packages/modules/web_themes/standard_legacy/web/processAllMqttMsg.js b/packages/modules/web_themes/standard_legacy/web/processAllMqttMsg.js index 74a6617c2f..747ea53868 100644 --- a/packages/modules/web_themes/standard_legacy/web/processAllMqttMsg.js +++ b/packages/modules/web_themes/standard_legacy/web/processAllMqttMsg.js @@ -268,7 +268,7 @@ function refreshChargeTemplate(chargePointIndex) { chargeTemplate[chargePointIndex].chargemode.scheduled_charging.plans.length > 0 ) { chargePoint.find(".charge-point-schedule-plan-missing").addClass("hide"); - for (const value of chargeTemplate[chargePointIndex].chargemode.scheduled_charging.plans) { + for (const [index, value] of chargeTemplate[chargePointIndex].chargemode.scheduled_charging.plans.entries()) { const key = value.id; // console.debug("schedule", key, value); if (chargePoint.find('.charge-point-schedule-plan[data-plan=' + key + ']').length == 0) { @@ -276,6 +276,7 @@ function refreshChargeTemplate(chargePointIndex) { var clonedElement = sourceElement.clone(); // update all data referencing the old index in our clone clonedElement.attr('data-plan', key).data('plan', key); + clonedElement.attr('data-plan-index', index).data('plan-index', index); // insert after last existing plan to honor sorting from the array target = chargePoint.find('.charge-point-schedule-plan').last(); // console.log("target: "+target.data('plan')+" index: "+key); @@ -360,7 +361,7 @@ function refreshChargeTemplate(chargePointIndex) { chargeTemplate[chargePointIndex].time_charging.plans.length > 0 ) { chargePoint.find(".charge-point-time-charge-plan-missing").addClass("hide"); - for (const value of chargeTemplate[chargePointIndex].time_charging.plans) { + for (const [index, value] of chargeTemplate[chargePointIndex].time_charging.plans.entries()) { const key = value.id; // console.debug("schedule", key, value); if (chargePoint.find('.charge-point-time-charge-plan[data-plan=' + key + ']').length == 0) { @@ -368,6 +369,7 @@ function refreshChargeTemplate(chargePointIndex) { var clonedElement = sourceElement.clone(); // update all data referencing the old index in our clone clonedElement.attr('data-plan', key).data('plan', key); + clonedElement.attr('data-plan-index', index).data('plan-index', index); // insert after last existing plan to honor sorting from the array target = chargePoint.find('.charge-point-time-charge-plan').last(); // console.log("target: "+target.data('plan')+" index: "+key);