diff --git a/aleksis/apps/alsijil/frontend/components/coursebook/absences/absenceCreation.graphql b/aleksis/apps/alsijil/frontend/components/coursebook/absences/absenceCreation.graphql index a7028c74f0bb3f97c54326cae5242f70f3fdafdd..f0820c6753a65f9327ef7515e20a9189a80d273e 100644 --- a/aleksis/apps/alsijil/frontend/components/coursebook/absences/absenceCreation.graphql +++ b/aleksis/apps/alsijil/frontend/components/coursebook/absences/absenceCreation.graphql @@ -21,12 +21,20 @@ query lessonsForPersons( id datetimeStart datetimeEnd - course - subject + course { + id + name + } + subject { + id + name + shortName + colourFg + colourBg + } } } } -# TODO: course is missing in LessonEventType # Use absencesInputType mutation createAbsences( diff --git a/aleksis/apps/alsijil/schema/__init__.py b/aleksis/apps/alsijil/schema/__init__.py index f9241adb9c5bcdadf0e55ad73a6b2ef52d8957bd..612d00d04163b9875bdcfa9f299c54a8913afc60 100644 --- a/aleksis/apps/alsijil/schema/__init__.py +++ b/aleksis/apps/alsijil/schema/__init__.py @@ -18,7 +18,10 @@ from .documentation import ( DocumentationBatchCreateOrUpdateMutation, DocumentationType, ) - +from .absences import ( + LessonsForPersonType, + AbsencesBatchCreateMutation, +) class Query(graphene.ObjectType): documentations = FilterOrderList(DocumentationType) @@ -159,15 +162,19 @@ class Query(graphene.ObjectType): "obj_id": PERSON_ID, } + events = LessonEvent.get_single_events( + datetime.combine(start, datetime.min.time()), + datetime.combine(end, datetime.max.time()), + None, + event_params, + with_reference_object=True, + ) + + docs, dummies = Documentation.get_documentations_for_events(events) + lessons_for_person.append( id=person, - lessons=LessonEvent.get_single_events( - datetime.combine(start, datetime.min.time()), - datetime.combine(date_end, datetime.max.time()), - None, - event_params, - with_reference_object=True, - ) + lessons=docs + dummies ) return lessons_for_person diff --git a/aleksis/apps/alsijil/schema/absences.py b/aleksis/apps/alsijil/schema/absences.py index 00304a581a27bb04a4c8cf1903d1de0e6046a990..42dfce4668c41db830facacb352871ebc3a619ee 100644 --- a/aleksis/apps/alsijil/schema/absences.py +++ b/aleksis/apps/alsijil/schema/absences.py @@ -1,9 +1,9 @@ import graphene -from aleksis.apps.chronos.schema import LessonEventType +from .documentation import DocumentationType class LessonsForPersonType(graphene.ObjectType): id = graphene.ID() # noqa - lessons = graphene.List(LessonEventType) + lessons = graphene.List(DocumentationType) class AbsencesBatchCreateMutation(graphene.Mutation): class Arguments: