diff --git a/aleksis/apps/alsijil/schema/__init__.py b/aleksis/apps/alsijil/schema/__init__.py index 5a99230c29b476f1f23c82395d7b6f497c455351..f503b01d85e9142be6b51f3450256b0d80936416 100644 --- a/aleksis/apps/alsijil/schema/__init__.py +++ b/aleksis/apps/alsijil/schema/__init__.py @@ -12,27 +12,27 @@ from aleksis.core.models import Group, Person from aleksis.core.schema.base import FilterOrderList from aleksis.core.schema.group import GroupType from aleksis.core.util.core_helpers import has_person + +from ..models import Documentation +from .documentation import ( + DocumentationBatchCreateOrUpdateMutation, + DocumentationType, + LessonsForPersonType, + TouchDocumentationMutation, +) from .extra_marks import ( ExtraMarkBatchCreateMutation, - ExtraMarkBatchPatchMutation, ExtraMarkBatchDeleteMutation, + ExtraMarkBatchPatchMutation, ExtraMarkType, ) +from .participation_status import ParticipationStatusBatchPatchMutation from .personal_note import ( PersonalNoteBatchCreateMutation, PersonalNoteBatchDeleteMutation, PersonalNoteBatchPatchMutation, ) -from ..models import Documentation -from .documentation import ( - DocumentationBatchCreateOrUpdateMutation, - DocumentationType, - LessonsForPersonType, - TouchDocumentationMutation, -) -from .participation_status import ParticipationStatusBatchPatchMutation - class Query(graphene.ObjectType): documentations = FilterOrderList(DocumentationType) diff --git a/aleksis/apps/alsijil/schema/extra_marks.py b/aleksis/apps/alsijil/schema/extra_marks.py index 2ee2bdc09188df2713ea392882400286f6ca8bcd..90f3e28d2a07b818240d484ed2b5c46a8dd9ba37 100644 --- a/aleksis/apps/alsijil/schema/extra_marks.py +++ b/aleksis/apps/alsijil/schema/extra_marks.py @@ -1,8 +1,14 @@ from graphene_django import DjangoObjectType from aleksis.apps.alsijil.models import ExtraMark -from aleksis.core.schema.base import OptimisticResponseTypeMixin, PermissionsTypeMixin, DjangoFilterMixin, \ - BaseBatchCreateMutation, BaseBatchDeleteMutation, BaseBatchPatchMutation +from aleksis.core.schema.base import ( + BaseBatchCreateMutation, + BaseBatchDeleteMutation, + BaseBatchPatchMutation, + DjangoFilterMixin, + OptimisticResponseTypeMixin, + PermissionsTypeMixin, +) class ExtraMarkType( @@ -13,14 +19,8 @@ class ExtraMarkType( ): class Meta: model = ExtraMark - fields = ( - "id", - "short_name", - "name", - "colour_fg", - "colour_bg", - "show_in_coursebook" - ) + fields = ("id", "short_name", "name", "colour_fg", "colour_bg", "show_in_coursebook") + class ExtraMarkBatchCreateMutation(BaseBatchCreateMutation): class Meta: diff --git a/aleksis/apps/alsijil/schema/participation_status.py b/aleksis/apps/alsijil/schema/participation_status.py index 2240434380a4f57fbcd1de24e9b202fb9c99b2a5..d12ea83addc0e1cf3b2910d8dd7f5ba1e519eaed 100644 --- a/aleksis/apps/alsijil/schema/participation_status.py +++ b/aleksis/apps/alsijil/schema/participation_status.py @@ -1,7 +1,7 @@ import graphene from graphene_django import DjangoObjectType -from aleksis.apps.alsijil.models import ParticipationStatus, NewPersonalNote +from aleksis.apps.alsijil.models import NewPersonalNote, ParticipationStatus from aleksis.apps.alsijil.schema.personal_note import PersonalNoteType from aleksis.core.schema.base import ( BaseBatchPatchMutation, @@ -37,6 +37,7 @@ class ParticipationStatusType( documentation=root.related_documentation, extra_mark__isnull=False, ) + @staticmethod def resolve_notes_with_note(root: ParticipationStatus, info, **kwargs): return NewPersonalNote.objects.filter( diff --git a/aleksis/apps/alsijil/schema/personal_note.py b/aleksis/apps/alsijil/schema/personal_note.py index 05ffd78258f5eb2cbe036b2531f7f701577a14a9..7558378aefcefbef8b86d8ed694e5266317ff713 100644 --- a/aleksis/apps/alsijil/schema/personal_note.py +++ b/aleksis/apps/alsijil/schema/personal_note.py @@ -2,10 +2,10 @@ from graphene_django import DjangoObjectType from aleksis.apps.alsijil.models import NewPersonalNote from aleksis.core.schema.base import ( - DjangoFilterMixin, BaseBatchCreateMutation, BaseBatchDeleteMutation, BaseBatchPatchMutation, + DjangoFilterMixin, OptimisticResponseTypeMixin, PermissionsTypeMixin, ) @@ -25,6 +25,7 @@ class PersonalNoteType( "extra_mark", ) + class PersonalNoteBatchCreateMutation(BaseBatchCreateMutation): class Meta: model = NewPersonalNote @@ -42,6 +43,7 @@ class PersonalNoteBatchPatchMutation(BaseBatchPatchMutation): fields = ("id", "note", "extra_mark", "documentation", "person") permissions = ("alsijil.change_personal_note",) # FIXME + class PersonalNoteBatchDeleteMutation(BaseBatchDeleteMutation): class Meta: model = NewPersonalNote