Merge master into Beta

packages/helpermodules/subdata.py

@@ -315,19 +315,7 @@ def process_vehicle_topic(self, client: mqtt.Client, var: Dict[str, ev.Ev], msg:
                             Pub().pub("openWB/system/subdata_initialized", True)
                         self.event_soc.set()
                     else:
-                        # temporäres ChargeTemplate aktualisieren, wenn dem Fahrzeug ein anderes Ladeprofil zugeordnet
-                        # wird
                         self.set_json_payload_class(var["ev"+index].data, msg)
-                        if re.search("/vehicle/[0-9]+/charge_template$", msg.topic) is not None:
-                            charge_template_id = int(decode_payload(msg.payload))
-                            if var["ev"+index].data.charge_template != charge_template_id:
-                                ev_id = get_index(msg.topic)
-                                for cp in self.cp_data.values():
-                                    if ((cp.chargepoint.data.set.charging_ev != -1 and
-                                         cp.chargepoint.data.set.charging_ev == ev_id) or
-                                            cp.chargepoint.data.config.ev == ev_id):
-                                        cp.chargepoint.update_charge_template(
-                                            self.ev_charge_template_data[f"ct{charge_template_id}"])
         except Exception:
             log.exception("Fehler im subdata-Modul")
 
@@ -350,20 +338,6 @@ def process_vehicle_charge_template_topic(self, var: Dict[str, ChargeTemplate],
                 if "ct"+index not in var:
                     var["ct"+index] = ChargeTemplate()
                 var["ct"+index].data = dataclass_from_dict(ChargeTemplateData, decode_payload(msg.payload))
-                # Temporäres ChargeTemplate aktualisieren, wenn persistentes geändert wird
-                for vehicle in self.ev_data.values():
-                    if vehicle.data.charge_template == int(index):
-                        for cp in self.cp_data.values():
-                            if ((cp.chargepoint.data.set.charging_ev != -1 and
-                                    cp.chargepoint.data.set.charging_ev == vehicle.num) or
-                                    cp.chargepoint.data.config.ev == vehicle.num):
-                                # UI sendet immer alle Topics, auch nicht geänderte. Damit die temporären Topics nicht
-                                # mehrfach gepbulished werden, muss das publishen der temporären Topics 1:1 erfolgen.
-                                if re.search("/vehicle/template/charge_template/[0-9]+$", msg.topic) is not None:
-                                    if decode_payload(msg.payload) == "":
-                                        Pub().pub(f"openWB/chargepoint/{cp.chargepoint.num}/set/charge_template", "")
-                                    else:
-                                        cp.chargepoint.update_charge_template(var["ct"+index])
         except Exception:
             log.exception("Fehler im subdata-Modul")
 

packages/modules/common/store/_chargepoint_internal.py

@@ -25,6 +25,7 @@ def update(self):
         pub_to_broker(f"{topic_prefix}/charge_state", self.state.charge_state, 2)
         pub_to_broker(f"{topic_prefix}/plug_state", self.state.plug_state, 2)
         pub_to_broker(f"{topic_prefix}/vehicle_id", self.state.vehicle_id)
+        pub_to_broker(f"{topic_prefix}/rfid", self.state.rfid)
         pub_to_broker(f"{topic_prefix}/serial_number", self.state.serial_number)
         pub_to_broker(f"{topic_prefix}/evse_current", self.state.evse_current, 2)
         pub_to_broker(f"{topic_prefix}/max_evse_current", self.state.max_evse_current, 2)
@@ -36,7 +37,6 @@ def update(self):
         if self.state.soc_timestamp is not None:
             pub_to_broker(f"{topic_prefix}/soc_timestamp", self.state.soc_timestamp)
         if self.state.rfid_timestamp is not None:
-            pub_to_broker(f"{topic_prefix}/rfid", self.state.rfid)
             pub_to_broker(f"{topic_prefix}/rfid_timestamp", self.state.rfid_timestamp)
 
 

packages/modules/display_themes/cards/source/src/views/ChargePointsView.vue

@@ -1304,7 +1304,7 @@ export default {
                   @click="
                     setChargePointConnectedVehicleScheduledChargingPlanActive(
                       modalChargePointId,
-                      plan.id,
+                      planKey,
                       !plan.active,
                     )
                   "
@@ -1444,7 +1444,7 @@ export default {
                     @click="
                       setChargePointConnectedVehicleTimeChargingPlanActive(
                         modalChargePointId,
-                        plan.id,
+                        planKey,
                         !plan.active,
                       )
                     "