Merge branch '246-roadmap-migrate-to-new-data-model' into 256-add-simple-course-book-list

aleksis/apps/alsijil/migrations/0022_documentation_teachers.py

+# Generated by Django 4.2.9 on 2024-03-16 00:59
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("core", "0061_remove_group_additional_fields"),
+        ("alsijil", "0021_participationstatus"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="documentation",
+            name="teachers",
+            field=models.ManyToManyField(
+                blank=True,
+                null=True,
+                related_name="documentations_as_teacher",
+                to="core.person",
+                verbose_name="Teachers",
+            ),
+        ),
+    ]

aleksis/apps/alsijil/migrations/0023_extramark_colour_bg_extramark_colour_fg_and_more.py

+# Generated by Django 4.2.9 on 2024-03-16 01:05
+
+import colorfield.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("alsijil", "0022_documentation_teachers"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="extramark",
+            name="colour_bg",
+            field=colorfield.fields.ColorField(
+                blank=True,
+                default="",
+                image_field=None,
+                max_length=25,
+                samples=None,
+                verbose_name="Background colour",
+            ),
+        ),
+        migrations.AddField(
+            model_name="extramark",
+            name="colour_fg",
+            field=colorfield.fields.ColorField(
+                blank=True,
+                default="",
+                image_field=None,
+                max_length=25,
+                samples=None,
+                verbose_name="Foreground colour",
+            ),
+        ),
+        migrations.AddField(
+            model_name="extramark",
+            name="show_in_coursebook",
+            field=models.BooleanField(default=True, verbose_name="Show in coursebook"),
+        ),
+    ]

aleksis/apps/alsijil/models.py

@@ -432,6 +432,11 @@ class ExtraMark(ExtensibleModel):
     short_name = models.CharField(max_length=255, unique=True, verbose_name=_("Short name"))
     name = models.CharField(max_length=255, unique=True, verbose_name=_("Name"))
 
+    colour_fg = ColorField(verbose_name=_("Foreground colour"), blank=True)
+    colour_bg = ColorField(verbose_name=_("Background colour"), blank=True)
+
+    show_in_coursebook = models.BooleanField(default=True, verbose_name=_("Show in coursebook"))
+
     def __str__(self):
         return f"{self.name}"
 
@@ -475,6 +480,10 @@ class Documentation(CalendarEvent):
         Subject, models.PROTECT, related_name="+", blank=True, null=True, verbose_name=_("Subject")
     )
 
+    teachers = models.ManyToManyField(
+        "core.Person", related_name="documentations_as_teacher", blank=True, null=True, verbose_name=_("Teachers")
+    )
+
     topic = models.CharField(verbose_name=_("Lesson Topic"), max_length=255, blank=True)
     homework = models.CharField(verbose_name=_("Homework"), max_length=255, blank=True)
     group_note = models.CharField(verbose_name=_("Group Note"), max_length=255, blank=True)