Merge branch 'master' into...

Merge branch 'master' into 122-next_lesson-doesn-t-correctly-work-with-changing-validity-ranges-and-probably-also-year-changes

.gitlab-ci.yml

@@ -11,5 +11,9 @@ include:
       file: /ci/build/dist.yml
     - project: "AlekSIS/official/AlekSIS"
       file: "/ci/deploy/trigger_dist.yml"
+    - project: "AlekSIS/official/AlekSIS"
+      file: "/ci/docker/image.yml"
     - project: "AlekSIS/official/AlekSIS"
       file: /ci/publish/pypi.yml
+    - project: "AlekSIS/official/AlekSIS"
+      file: /ci/deploy/review.yml

Dockerfile

+ARG APPS="AlekSIS-App-Chronos"
+FROM registry.edugit.org/aleksis/official/aleksis-core:master

aleksis/apps/chronos/migrations/0001_initial.py

@@ -41,6 +41,7 @@ class Migration(migrations.Migration):
                 ),
             ],
             options={
+                "default_permissions": (),
                 "permissions": (
                     ("view_all_timetables", "Can view all timetables"),
                     ("view_timetable_overview", "Can view timetable overview"),

aleksis/apps/chronos/model_extensions.py

@@ -83,7 +83,7 @@ def lesson_periods_as_teacher(self):
 @Person.method
 def lessons_on_day(self, day: date):
     """Get all lessons of this person (either as participant or teacher) on the given day."""
-    return LessonPeriod.objects.order_by("period__period").on_day(day).filter_from_person(self)
+    return LessonPeriod.objects.on_day(day).filter_from_person(self).order_by("period__period")
 
 
 @Person.method

aleksis/apps/chronos/models.py

@@ -48,7 +48,11 @@ from aleksis.apps.chronos.mixins import (
 from aleksis.apps.chronos.util.date import get_current_year
 from aleksis.apps.chronos.util.format import format_m2m
 from aleksis.core.managers import CurrentSiteManagerWithoutMigrations
-from aleksis.core.mixins import ExtensibleModel, SchoolTermRelatedExtensibleModel
+from aleksis.core.mixins import (
+    ExtensibleModel,
+    GlobalPermissionModel,
+    SchoolTermRelatedExtensibleModel,
+)
 from aleksis.core.models import DashboardWidget, SchoolTerm
 from aleksis.core.util.core_helpers import has_person
 
@@ -1044,7 +1048,7 @@ class ExtraLesson(
         verbose_name_plural = _("Extra lessons")
 
 
-class ChronosGlobalPermissions(ExtensibleModel):
+class ChronosGlobalPermissions(GlobalPermissionModel):
     class Meta:
         managed = False
         permissions = (

pyproject.toml

@@ -31,7 +31,7 @@ secondary = true
 
 [tool.poetry.dependencies]
 python = "^3.7"
-calendarweek = "^0.4.6"
+calendarweek = "^0.5.0"
 aleksis-core = "^2.0a3.dev0"
 
 [tool.poetry.dev-dependencies]