Resolve "Go to next week if current day is out of range (weekly timetable view)"

Closes #69 (closed)

aleksis/apps/chronos/models.py

@@ -201,6 +201,26 @@ class TimePeriod(ValidityRangeRelatedExtensibleModel):
 
         return day
 
+    @classmethod
+    def get_relevant_week_from_datetime(
+        cls, when: Optional[datetime] = None
+    ) -> CalendarWeek:
+        """Return currently relevant week depending on current date and time."""
+        if not when:
+            when = timezone.now()
+
+        day = when.date()
+        time = when.time()
+
+        week = CalendarWeek.from_date(day)
+
+        if cls.weekday_max and day.weekday() > cls.weekday_max:
+            week += 1
+        elif cls.time_max and time > cls.time_max and day.weekday() == cls.weekday_max:
+            week += 1
+
+        return week
+
     @classmethod
     def get_prev_next_by_day(cls, day: date, url: str) -> Tuple[str, str]:
         """Build URLs for previous/next day."""

[Nik | Klampfradler]

Two separate conditions that lead to the same code?