Improve handling of date-time before the first schedule point

Author: bouwew

plugwise/helper.py

@@ -149,12 +149,19 @@ def schedules_temps(
         now = dt.datetime.now().time()
         today = dt.datetime.now().weekday()
         day_0 = schedule_list[i][0]
-        day_1 = schedule_list[j][0]
-        # Roll over from end to beginning of schedule = monday
-        if j < i:
-            day_1 = 7  # day 7 = day 0
         time_0 = schedule_list[i][1]
+        day_1 = schedule_list[j][0]
         time_1 = schedule_list[j][1]
+        # Handle Monday-now is before first schedule point
+        if i == 0 and now < time_0:
+            before_first = True
+            first_schedule_day = day_0
+        # Roll over from end to beginning of schedule = next Monday
+        if j < i:
+            day_1 = first_schedule_day + 7  # day_7 = day_0, day_8 = day_1 etc.
+            # Roll over to next Monday when now is before first schedule point
+            if today == 0 and before_first:
+                today = 7
         if in_between(today, day_0, day_1, now, time_0, time_1):
             return schedule_list[i][2]