CHANGELOG.rst

@@ -16,6 +16,9 @@ If you're upgrading from 3.x, there is now a migration path to use.
 Therefore, please install ``AlekSIS-App-Lesrooster`` which now
 includes parts of the legacy Chronos and the migration path.
 
+`4.0.0.dev8`_ - 2024-11-15
+--------------------------
+
 Added
 ~~~~~
 
@@ -393,3 +396,4 @@ Fixed
 .. _4.0.0.dev1: https://edugit.org/AlekSIS/Official/AlekSIS-App-Alsijil/-/tags/4.0.0.dev1
 .. _4.0.0.dev2: https://edugit.org/AlekSIS/Official/AlekSIS-App-Alsijil/-/tags/4.0.0.dev2
 .. _4.0.0.dev3: https://edugit.org/AlekSIS/Official/AlekSIS-App-Alsijil/-/tags/4.0.0.dev3
+.. _4.0.0.dev8: https://edugit.org/AlekSIS/Official/AlekSIS-App-Alsijil/-/tags/4.0.0.dev8

aleksis/apps/alsijil/frontend/components/coursebook/Coursebook.vue

@@ -84,11 +84,11 @@ import CoursebookLoader from "./CoursebookLoader.vue";
 import DocumentationModal from "./documentation/DocumentationModal.vue";
 import DocumentationAbsencesModal from "./absences/DocumentationAbsencesModal.vue";
 import AbsenceCreationDialog from "./absences/AbsenceCreationDialog.vue";
-import { extraMarks } from "../extra_marks/extra_marks.graphql";
+import { extraMarks } from "./queries/extraMarks.graphql";
 import DocumentationLoader from "./documentation/DocumentationLoader.vue";
 import sendToServerMixin from "./absences/sendToServerMixin";
-import { absenceReasons } from "./absences/absenceReasons.graphql";
-import { subjects } from "aleksis.apps.cursus/components/subject.graphql";
+import { absenceReasons } from "./queries/absenceReasons.graphql";
+import { subjects } from "./queries/subjects.graphql";
 
 export default {
   name: "Coursebook",

aleksis/apps/alsijil/frontend/components/coursebook/queries/absenceReasons.graphql

+query absenceReasons {
+  items: coursebookAbsenceReasons {
+    id
+    shortName
+    name
+    colour
+    default
+  }
+}

aleksis/apps/alsijil/frontend/components/coursebook/queries/extraMarks.graphql

+query extraMarks {
+  items: extraMarks {
+    id
+    shortName
+    name
+    colourFg
+    colourBg
+    showInCoursebook
+  }
+}

aleksis/apps/alsijil/frontend/components/coursebook/queries/subjects.graphql

+query subjects {
+  items: subjects {
+    id
+    name
+    shortName
+    colourFg
+    colourBg
+  }
+}

aleksis/apps/alsijil/models.py

@@ -292,12 +292,11 @@ class Documentation(CalendarEvent):
                 lesson_event.teachers,
             )
 
-        obj = cls.objects.create(
+        obj, __ = cls.objects.get_or_create(
             datetime_start=datetime_start,
             datetime_end=datetime_end,
-            amends=lesson_event,
             course=course,
-            subject=subject,
+            defaults=dict(subject=subject, amends=lesson_event),
         )
         obj.teachers.set(teachers.all())
         obj.save()
@@ -308,7 +307,7 @@ class Documentation(CalendarEvent):
         return obj
 
     @classmethod
-    def get_or_create_by_id(cls, _id: str | int, user):
+    def get_or_create_by_id(cls, _id: str, user):
         if _id.startswith("DUMMY"):
             return cls.create_from_lesson_event(
                 user,

pyproject.toml

 [tool.poetry]
 name = "AlekSIS-App-Alsijil"
-version = "4.0.0.dev8"
+version = "4.0.0.dev9"
 packages = [
     { include = "aleksis" }
 ]