Fix unmerged personal notes and page breaks

aleksis/apps/alsijil/tasks.py

@@ -16,6 +16,7 @@ from aleksis.apps.chronos.models import (
 )
 from aleksis.core.celery import app
 from aleksis.core.models import Group, PDFFile
+from aleksis.core.util.core_helpers import get_site_preferences
 from aleksis.core.util.celery_progress import ProgressRecorder, recorded_task
 from aleksis.core.util.pdf import generate_pdf_from_template
 
@@ -47,6 +48,17 @@ def generate_full_register_printout(group: int, file_object: int, recorder: Prog
         .filter(groups_of_person=group)
     )
 
+    if get_site_preferences()["alsijil__merge_personal_notes_of_parallel_lessons"]:
+        personal_notes = personal_notes.distinct(
+            "year",
+            "week",
+            "lesson_period__period__weekday",
+            "lesson_period__period__period",
+            "person__last_name",
+            "person__first_name",
+            "person__id",
+        )
+
     recorder.set_progress(2, _number_of_steps, _("Sort data ..."))
 
     sorted_personal_notes = {"lesson_period": {}, "person": {}}

aleksis/apps/alsijil/templates/alsijil/print/full_coursebook.html

@@ -422,7 +422,7 @@
     {% endif %}
 
     {% endwith %}
-    {% if week.week|divisibleby:4 %}
+    {% if week.week|divisibleby:2 %}
     <div class="page-break">&nbsp;</div>
     {% endif %}
   {% endfor %}