Revert "scheduled charging: fix month change (openWB#2497)"

This reverts commit 756c886.

Author: LKuemmel

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.data.id))
+            log.exception("Fehler im ev-Modul "+str(self.ct_num))
             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.data.id))
+                    log.exception("Fehler im ev-Modul "+str(self.ct_num))
         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]

packages/helpermodules/timecheck.py

@@ -145,12 +145,11 @@ 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)
-        end += datetime.timedelta(days=_get_next_charging_day(plan.frequency.weekly, now.weekday()))
+        end = end.replace(now.year, now.month, now.day + _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)
-            end += datetime.timedelta(days=_get_next_charging_day(plan.frequency.weekly, now.weekday()+1)+1)
+            end = end.replace(now.year, now.month, now.day +
+                              _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}')