diff --git a/aleksis/apps/alsijil/frontend/components/coursebook/absences/participationStatus.graphql b/aleksis/apps/alsijil/frontend/components/coursebook/absences/participationStatus.graphql index 4c3f8df66e8236bb126aff29ccf8361931b35f8e..0d139df42a9bfb5deae3cbb88507a3def37827fa 100644 --- a/aleksis/apps/alsijil/frontend/components/coursebook/absences/participationStatus.graphql +++ b/aleksis/apps/alsijil/frontend/components/coursebook/absences/participationStatus.graphql @@ -32,6 +32,16 @@ mutation touchDocumentation($documentationId: ID!) { name shortName } + notesWithExtraMark { + id + extraMark { + id + } + } + notesWithNote { + id + note + } isOptimistic } } diff --git a/aleksis/apps/alsijil/frontend/components/coursebook/coursebook.graphql b/aleksis/apps/alsijil/frontend/components/coursebook/coursebook.graphql index 83a6a459f8bb79a57647e06cc0749cf1e49d447d..1e5ca9e18ba3dda21b056e5654d798003c17e714 100644 --- a/aleksis/apps/alsijil/frontend/components/coursebook/coursebook.graphql +++ b/aleksis/apps/alsijil/frontend/components/coursebook/coursebook.graphql @@ -81,6 +81,16 @@ query documentationsForCoursebook( name shortName } + notesWithExtraMark { + id + extraMark { + id + } + } + notesWithNote { + id + note + } isOptimistic } topic diff --git a/aleksis/apps/alsijil/schema/participation_status.py b/aleksis/apps/alsijil/schema/participation_status.py index ac678e676fbec70f34b5d4928eedf8908070b1ec..2240434380a4f57fbcd1de24e9b202fb9c99b2a5 100644 --- a/aleksis/apps/alsijil/schema/participation_status.py +++ b/aleksis/apps/alsijil/schema/participation_status.py @@ -27,18 +27,18 @@ class ParticipationStatusType( "base_absence", ) - extra_mark_notes = graphene.List(PersonalNoteType) - note_notes = graphene.List(PersonalNoteType) + notes_with_extra_mark = graphene.List(PersonalNoteType) + notes_with_note = graphene.List(PersonalNoteType) @staticmethod - def resolve_extra_mark_notes(root: ParticipationStatus, info, **kwargs): + def resolve_notes_with_extra_mark(root: ParticipationStatus, info, **kwargs): return NewPersonalNote.objects.filter( person=root.person, documentation=root.related_documentation, extra_mark__isnull=False, ) @staticmethod - def resolve_note_notes(root: ParticipationStatus, info, **kwargs): + def resolve_notes_with_note(root: ParticipationStatus, info, **kwargs): return NewPersonalNote.objects.filter( person=root.person, documentation=root.related_documentation,