Skip to content
Snippets Groups Projects
Commit cb58f33c authored by Julian's avatar Julian
Browse files

Reformat

parent a665caf3
No related branches found
No related tags found
1 merge request!362Resolve "Add personal note management dialog in course book"
Pipeline #186184 failed
...@@ -12,27 +12,27 @@ from aleksis.core.models import Group, Person ...@@ -12,27 +12,27 @@ from aleksis.core.models import Group, Person
from aleksis.core.schema.base import FilterOrderList from aleksis.core.schema.base import FilterOrderList
from aleksis.core.schema.group import GroupType from aleksis.core.schema.group import GroupType
from aleksis.core.util.core_helpers import has_person from aleksis.core.util.core_helpers import has_person
from ..models import Documentation
from .documentation import (
DocumentationBatchCreateOrUpdateMutation,
DocumentationType,
LessonsForPersonType,
TouchDocumentationMutation,
)
from .extra_marks import ( from .extra_marks import (
ExtraMarkBatchCreateMutation, ExtraMarkBatchCreateMutation,
ExtraMarkBatchPatchMutation,
ExtraMarkBatchDeleteMutation, ExtraMarkBatchDeleteMutation,
ExtraMarkBatchPatchMutation,
ExtraMarkType, ExtraMarkType,
) )
from .participation_status import ParticipationStatusBatchPatchMutation
from .personal_note import ( from .personal_note import (
PersonalNoteBatchCreateMutation, PersonalNoteBatchCreateMutation,
PersonalNoteBatchDeleteMutation, PersonalNoteBatchDeleteMutation,
PersonalNoteBatchPatchMutation, PersonalNoteBatchPatchMutation,
) )
from ..models import Documentation
from .documentation import (
DocumentationBatchCreateOrUpdateMutation,
DocumentationType,
LessonsForPersonType,
TouchDocumentationMutation,
)
from .participation_status import ParticipationStatusBatchPatchMutation
class Query(graphene.ObjectType): class Query(graphene.ObjectType):
documentations = FilterOrderList(DocumentationType) documentations = FilterOrderList(DocumentationType)
......
from graphene_django import DjangoObjectType from graphene_django import DjangoObjectType
from aleksis.apps.alsijil.models import ExtraMark from aleksis.apps.alsijil.models import ExtraMark
from aleksis.core.schema.base import OptimisticResponseTypeMixin, PermissionsTypeMixin, DjangoFilterMixin, \ from aleksis.core.schema.base import (
BaseBatchCreateMutation, BaseBatchDeleteMutation, BaseBatchPatchMutation BaseBatchCreateMutation,
BaseBatchDeleteMutation,
BaseBatchPatchMutation,
DjangoFilterMixin,
OptimisticResponseTypeMixin,
PermissionsTypeMixin,
)
class ExtraMarkType( class ExtraMarkType(
...@@ -13,14 +19,8 @@ class ExtraMarkType( ...@@ -13,14 +19,8 @@ class ExtraMarkType(
): ):
class Meta: class Meta:
model = ExtraMark model = ExtraMark
fields = ( fields = ("id", "short_name", "name", "colour_fg", "colour_bg", "show_in_coursebook")
"id",
"short_name",
"name",
"colour_fg",
"colour_bg",
"show_in_coursebook"
)
class ExtraMarkBatchCreateMutation(BaseBatchCreateMutation): class ExtraMarkBatchCreateMutation(BaseBatchCreateMutation):
class Meta: class Meta:
......
import graphene import graphene
from graphene_django import DjangoObjectType 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.apps.alsijil.schema.personal_note import PersonalNoteType
from aleksis.core.schema.base import ( from aleksis.core.schema.base import (
BaseBatchPatchMutation, BaseBatchPatchMutation,
...@@ -37,6 +37,7 @@ class ParticipationStatusType( ...@@ -37,6 +37,7 @@ class ParticipationStatusType(
documentation=root.related_documentation, documentation=root.related_documentation,
extra_mark__isnull=False, extra_mark__isnull=False,
) )
@staticmethod @staticmethod
def resolve_notes_with_note(root: ParticipationStatus, info, **kwargs): def resolve_notes_with_note(root: ParticipationStatus, info, **kwargs):
return NewPersonalNote.objects.filter( return NewPersonalNote.objects.filter(
......
...@@ -2,10 +2,10 @@ from graphene_django import DjangoObjectType ...@@ -2,10 +2,10 @@ from graphene_django import DjangoObjectType
from aleksis.apps.alsijil.models import NewPersonalNote from aleksis.apps.alsijil.models import NewPersonalNote
from aleksis.core.schema.base import ( from aleksis.core.schema.base import (
DjangoFilterMixin,
BaseBatchCreateMutation, BaseBatchCreateMutation,
BaseBatchDeleteMutation, BaseBatchDeleteMutation,
BaseBatchPatchMutation, BaseBatchPatchMutation,
DjangoFilterMixin,
OptimisticResponseTypeMixin, OptimisticResponseTypeMixin,
PermissionsTypeMixin, PermissionsTypeMixin,
) )
...@@ -25,6 +25,7 @@ class PersonalNoteType( ...@@ -25,6 +25,7 @@ class PersonalNoteType(
"extra_mark", "extra_mark",
) )
class PersonalNoteBatchCreateMutation(BaseBatchCreateMutation): class PersonalNoteBatchCreateMutation(BaseBatchCreateMutation):
class Meta: class Meta:
model = NewPersonalNote model = NewPersonalNote
...@@ -42,6 +43,7 @@ class PersonalNoteBatchPatchMutation(BaseBatchPatchMutation): ...@@ -42,6 +43,7 @@ class PersonalNoteBatchPatchMutation(BaseBatchPatchMutation):
fields = ("id", "note", "extra_mark", "documentation", "person") fields = ("id", "note", "extra_mark", "documentation", "person")
permissions = ("alsijil.change_personal_note",) # FIXME permissions = ("alsijil.change_personal_note",) # FIXME
class PersonalNoteBatchDeleteMutation(BaseBatchDeleteMutation): class PersonalNoteBatchDeleteMutation(BaseBatchDeleteMutation):
class Meta: class Meta:
model = NewPersonalNote model = NewPersonalNote
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment