[Week view] Show this or next week depending on date and time

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."""

aleksis/apps/chronos/views.py

@@ -126,8 +126,7 @@ def timetable(
     if year and week:
         wanted_week = CalendarWeek(year=year, week=week)
     else:
-        # TODO: On not used days show next week
-        wanted_week = CalendarWeek()
+        wanted_week = TimePeriod.get_relevant_week_from_datetime()
 
     # Build timetable
     timetable = build_timetable(type_, el, wanted_week)