Merge branch 'master' into 189-improve-design-of-detail-view-for-one-register-object

CHANGELOG.rst

@@ -13,6 +13,7 @@ Fixed
 ~~~~~
 
 * Translate table columns and filter button on person overview page.
+* Show correct status icon for events.
 
 `2.0rc6`_ - 2021-08-25
 ----------------------

aleksis/apps/alsijil/util/alsijil_helpers.py

@@ -85,7 +85,8 @@ def annotate_documentations(
     instances = instances.annotate(
         has_documentation=Exists(
             LessonDocumentation.objects.filter(
-                ~Q(topic__exact=""), week=wanted_week.week, year=wanted_week.year,
+                ~Q(topic__exact=""),
+                Q(week=wanted_week.week, year=wanted_week.year) | Q(week=None, year=None),
             ).filter(**{klass.label_: OuterRef("pk")})
         )
     )