Merge branch 'master' into 156-add-page-missing-entries

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

 # Generated by Django 3.0.6 on 2020-05-29 10:29
 
-import django.contrib.postgres.fields.jsonb
 import django.contrib.sites.managers
 import django.db.models.deletion
 from django.db import migrations, models
@@ -33,7 +32,7 @@ class Migration(migrations.Migration):
                 ),
                 (
                     "extended_data",
-                    django.contrib.postgres.fields.jsonb.JSONField(
+                    models.JSONField(
                         default=dict, editable=False
                     ),
                 ),
@@ -92,7 +91,7 @@ class Migration(migrations.Migration):
                 ),
                 (
                     "extended_data",
-                    django.contrib.postgres.fields.jsonb.JSONField(
+                    models.JSONField(
                         default=dict, editable=False
                     ),
                 ),
@@ -140,7 +139,7 @@ class Migration(migrations.Migration):
                 ],
                 "unique_together": {("lesson_period", "week", "person")},
             },
-            managers=[("objects", django.contrib.sites.managers.CurrentSiteManager()),],
+            managers=[],
         ),
         migrations.CreateModel(
             name="LessonDocumentation",
@@ -156,7 +155,7 @@ class Migration(migrations.Migration):
                 ),
                 (
                     "extended_data",
-                    django.contrib.postgres.fields.jsonb.JSONField(
+                    models.JSONField(
                         default=dict, editable=False
                     ),
                 ),
@@ -202,6 +201,6 @@ class Migration(migrations.Migration):
                 ],
                 "unique_together": {("lesson_period", "week")},
             },
-            managers=[("objects", django.contrib.sites.managers.CurrentSiteManager()),],
+            managers=[],
         ),
     ]

aleksis/apps/alsijil/migrations/0002_excuse_type.py

 # Generated by Django 3.0.8 on 2020-07-10 10:46
 
-import django.contrib.postgres.fields.jsonb
 import django.contrib.sites.managers
 import django.db.models.deletion
 from django.db import migrations, models
@@ -28,7 +27,7 @@ class Migration(migrations.Migration):
                 ),
                 (
                     "extended_data",
-                    django.contrib.postgres.fields.jsonb.JSONField(
+                    models.JSONField(
                         default=dict, editable=False
                     ),
                 ),

aleksis/apps/alsijil/migrations/0003_extra_mark.py

 # Generated by Django 3.0.8 on 2020-07-12 12:43
 
-import django.contrib.postgres.fields.jsonb
 import django.contrib.sites.managers
 import django.db.models.deletion
 from django.db import migrations, models
@@ -28,7 +27,7 @@ class Migration(migrations.Migration):
                 ),
                 (
                     "extended_data",
-                    django.contrib.postgres.fields.jsonb.JSONField(
+                    models.JSONField(
                         default=dict, editable=False
                     ),
                 ),

aleksis/apps/alsijil/migrations/0008_global_permissions.py

@@ -18,7 +18,6 @@ class Migration(migrations.Migration):
                 ('extended_data', models.JSONField(default=dict, editable=False)),
             ],
             options={
-                "default_permissions": (),
                 'permissions': (('view_week', 'Can view week overview'), ('register_absence', 'Can register absence'), ('list_personal_note_filters', 'Can list all personal note filters')),
                 'managed': False,
             },

aleksis/apps/alsijil/migrations/0010_events_extra_lessons.py

@@ -55,7 +55,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='lessondocumentation',
             name='year',
-            field=models.IntegerField(blank=True, default=aleksis.apps.chronos.util.date.get_current_year, null=True, verbose_name='Year'),
+            field=models.IntegerField(blank=True, null=True, verbose_name='Year'),
         ),
         migrations.AlterField(
             model_name='personalnote',
@@ -70,7 +70,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='personalnote',
             name='year',
-            field=models.IntegerField(blank=True, default=aleksis.apps.chronos.util.date.get_current_year, null=True, verbose_name='Year'),
+            field=models.IntegerField(blank=True, null=True, verbose_name='Year'),
         ),
         migrations.AlterUniqueTogether(
             name='lessondocumentation',

aleksis/apps/alsijil/util/alsijil_helpers.py

@@ -168,8 +168,9 @@ def _generate_dicts_for_lesson_periods(
     """Generate a list of dicts for use with ``RegisterObjectTable``."""
     if not holiday_days:
         holiday_days = []
-    date_start = lesson_periods.first().lesson.validity.date_start
-    date_end = lesson_periods.last().lesson.validity.date_end
+    lesson_periods = list(lesson_periods)
+    date_start = lesson_periods[0].lesson.validity.date_start
+    date_end = lesson_periods[-1].lesson.validity.date_end
     if (
         filter_dict["filter_date"]
         and filter_dict.get("date_start") > date_start
@@ -288,6 +289,7 @@ def _generate_dicts_for_events_and_extra_lessons(
             period = f"{register_object.period.period}."
             period_sort = register_object.period.period
         else:
+            register_object.annotate_day(register_object.date_end)
             day = (
                 f"{date_format(register_object.date_start)}"
                 f"–{date_format(register_object.date_end)}"