diff --git a/packages/control/ev/charge_template.py b/packages/control/ev/charge_template.py index 6e73c827c1..e1b822304d 100644 --- a/packages/control/ev/charge_template.py +++ b/packages/control/ev/charge_template.py @@ -264,7 +264,7 @@ def pv_charging(self, message = self.PV_CHARGING_MIN_CURRENT_CHARGING return current, sub_mode, message, phases except Exception: - log.exception("Fehler im ev-Modul "+str(self.ct_num)) + log.exception("Fehler im ev-Modul "+str(self.data.id)) return 0, "stop", "Keine Ladung, da ein interner Fehler aufgetreten ist: "+traceback.format_exc(), 1 def eco_charging(self, @@ -337,7 +337,7 @@ def scheduled_charging_recent_plan(self, log.debug(f"Verbleibende Zeit bis zum Zieltermin [s]: {plans_diff_end_date}, " f"Plan erfüllt: {plan_fulfilled}") except Exception: - log.exception("Fehler im ev-Modul "+str(self.ct_num)) + log.exception("Fehler im ev-Modul "+str(self.data.id)) if plans_diff_end_date: # ermittle den Key vom kleinsten value in plans_diff_end_date filtered_plans = [d for d in plans_diff_end_date if list(d.values())[0] is not None] diff --git a/packages/helpermodules/timecheck.py b/packages/helpermodules/timecheck.py index c68855bc6d..6568379b59 100644 --- a/packages/helpermodules/timecheck.py +++ b/packages/helpermodules/timecheck.py @@ -145,11 +145,12 @@ def missed_date_still_active(remaining_time: float) -> bool: elif plan.frequency.selected == "weekly": if not any(plan.frequency.weekly): raise ValueError("Es muss mindestens ein Tag ausgewählt werden.") - end = end.replace(now.year, now.month, now.day + _get_next_charging_day(plan.frequency.weekly, now.weekday())) + end = end.replace(now.year, now.month, now.day) + end += datetime.timedelta(days=_get_next_charging_day(plan.frequency.weekly, now.weekday())) remaining_time = end - now if missed_date_still_active(remaining_time): - end = end.replace(now.year, now.month, now.day + - _get_next_charging_day(plan.frequency.weekly, now.weekday()+1)+1) + end = end.replace(now.year, now.month, now.day) + end += datetime.timedelta(days=_get_next_charging_day(plan.frequency.weekly, now.weekday()+1)+1) remaining_time = end - now else: raise TypeError(f'Unbekannte Häufigkeit {plan.frequency.selected}')