diff --git a/aleksis/apps/chronos/frontend/components/AmendLesson.vue b/aleksis/apps/chronos/frontend/components/AmendLesson.vue index 3b8c2a1a8bdff8bfbb38b8e4e1bda35a97b04837..1d6ac1fadd0570fdf85aeb429bebc0ed3a210e6c 100644 --- a/aleksis/apps/chronos/frontend/components/AmendLesson.vue +++ b/aleksis/apps/chronos/frontend/components/AmendLesson.vue @@ -3,27 +3,28 @@ <edit-button i18n-key="chronos.event.amend.edit_button" @click="edit = true" - /> + /> <delete-button v-if="selectedEvent.meta.amended" i18n-key="chronos.event.amend.delete_button" @click="deleteEvent = true" - /> + /> <dialog-object-form v-model="edit" :fields="fields" :is-create="!selectedEvent.meta.amended" - createItemI18nKey="chronos.event.amend.title" + create-item-i18n-key="chronos.event.amend.title" :gql-create-mutation="gqlCreateMutation" :get-create-data="transformCreateData" :default-item="defaultItem" - editItemI18nKey="chronos.event.amend.title" + edit-item-i18n-key="chronos.event.amend.title" :gql-patch-mutation="gqlPatchMutation" :get-patch-data="transformPatchData" :edit-item="initPatchData" @cancel="open = false" @save="updateOnSave()" - > + > + <!-- eslint-disable-next-line vue/valid-v-slot --> <template #subject.field="{ attrs, on, item }"> <v-autocomplete :disabled="item.cancelled" @@ -32,8 +33,9 @@ item-value="id" v-bind="attrs" v-on="on" - /> + /> </template> + <!-- eslint-disable-next-line vue/valid-v-slot --> <template #teachers.field="{ attrs, on, item }"> <v-autocomplete :disabled="item.cancelled" @@ -45,8 +47,9 @@ v-on="on" chips deletable-chips - /> + /> </template> + <!-- eslint-disable-next-line vue/valid-v-slot --> <template #rooms.field="{ attrs, on, item }"> <v-autocomplete :disabled="item.cancelled" @@ -58,22 +61,24 @@ v-on="on" chips deletable-chips - /> + /> </template> + <!-- eslint-disable-next-line vue/valid-v-slot --> <template #cancelled.field="{ attrs, on }"> <v-checkbox v-bind="attrs" v-on="on" /> </template> + <!-- eslint-disable-next-line vue/valid-v-slot --> <template #comment.field="{ attrs, on }"> <v-textarea v-bind="attrs" v-on="on" /> </template> </dialog-object-form> <delete-dialog - deleteSuccessMessageI18nKey="chronos.event.amend.delete_success" + delete-success-message-i18n-key="chronos.event.amend.delete_success" :gql-delete-mutation="gqlDeleteMutation" v-model="deleteEvent" :items="[selectedEvent.meta]" @save="updateOnSave()" - > + > <template #title> {{ $t("chronos.event.amend.delete_dialog") }} </template> @@ -109,7 +114,7 @@ export default { selectedEvent: { type: Object, required: true, - } + }, }, data() { return { @@ -165,7 +170,7 @@ export default { }; }, updateOnSave() { - this.$emit('refreshCalendar'); + this.$emit("refreshCalendar"); this.model = false; }, }, @@ -174,7 +179,9 @@ export default { return { id: this.selectedEvent.meta.id, subject: this.selectedEvent.meta.subject?.id.toString(), - teachers: this.selectedEvent.meta.teachers.map((teacher) => teacher.id.toString()), + teachers: this.selectedEvent.meta.teachers.map((teacher) => + teacher.id.toString(), + ), rooms: this.selectedEvent.meta.rooms.map((room) => room.id.toString()), cancelled: this.selectedEvent.meta.cancelled, comment: this.selectedEvent.meta.comment, diff --git a/aleksis/apps/chronos/models.py b/aleksis/apps/chronos/models.py index 12df770fc553cc7bb969a5de1467a66d96dc2c70..7d14c0f74e45c76418a5b27276f09779ce3d4cc6 100644 --- a/aleksis/apps/chronos/models.py +++ b/aleksis/apps/chronos/models.py @@ -1461,7 +1461,10 @@ class LessonEvent(CalendarEvent): elif request: title += " · " + reference_object.teacher_names_with_amends else: - title += f" · {reference_object.group_names} · {reference_object.teacher_names_with_amends}" + title += ( + f" · {reference_object.group_names} · " + + f"{reference_object.teacher_names_with_amends}" + ) if reference_object.rooms.all().exists(): title += " · " + reference_object.room_names_with_amends return title diff --git a/aleksis/apps/chronos/schema/__init__.py b/aleksis/apps/chronos/schema/__init__.py index 713155204b2047103a7c1e111cf9b3d0a1e53662..f62355e35af5da2b9e23faf4c3ff192678826fdb 100644 --- a/aleksis/apps/chronos/schema/__init__.py +++ b/aleksis/apps/chronos/schema/__init__.py @@ -2,7 +2,11 @@ from datetime import timezone import graphene from graphene_django import DjangoObjectType -from graphene_django_cud.mutations import DjangoBatchCreateMutation, DjangoBatchDeleteMutation, DjangoBatchPatchMutation +from graphene_django_cud.mutations import ( + DjangoBatchCreateMutation, + DjangoBatchDeleteMutation, + DjangoBatchPatchMutation, +) from aleksis.core.models import CalendarEvent, Group, Person, Room @@ -97,7 +101,7 @@ class AmendLessonBatchCreateMutation(DatetimeTimezoneMixin, DjangoBatchCreateMut ) @classmethod - def before_save(cls, root, info, input, created_objects): + def before_save(cls, root, info, input, created_objects): # noqa: A002 for obj in created_objects: obj.timezone = obj.amends.timezone return created_objects @@ -110,7 +114,7 @@ class AmendLessonBatchPatchMutation(DatetimeTimezoneMixin, DjangoBatchPatchMutat only_fields = ("subject", "teachers", "groups", "rooms", "cancelled", "comment") @classmethod - def before_save(cls, root, info, input, updated_objects): + def before_save(cls, root, info, input, updated_objects): # noqa: A002 for obj in updated_objects: obj.timezone = obj.amends.timezone return updated_objects