Skip to content
Snippets Groups Projects
Verified Commit bb438cc7 authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Reformat and fix lint

parent 0e1ffed5
No related branches found
No related tags found
1 merge request!310Resolve "Implement Vue substitution frontend"
Pipeline #174217 failed
...@@ -3,27 +3,28 @@ ...@@ -3,27 +3,28 @@
<edit-button <edit-button
i18n-key="chronos.event.amend.edit_button" i18n-key="chronos.event.amend.edit_button"
@click="edit = true" @click="edit = true"
/> />
<delete-button <delete-button
v-if="selectedEvent.meta.amended" v-if="selectedEvent.meta.amended"
i18n-key="chronos.event.amend.delete_button" i18n-key="chronos.event.amend.delete_button"
@click="deleteEvent = true" @click="deleteEvent = true"
/> />
<dialog-object-form <dialog-object-form
v-model="edit" v-model="edit"
:fields="fields" :fields="fields"
:is-create="!selectedEvent.meta.amended" :is-create="!selectedEvent.meta.amended"
createItemI18nKey="chronos.event.amend.title" create-item-i18n-key="chronos.event.amend.title"
:gql-create-mutation="gqlCreateMutation" :gql-create-mutation="gqlCreateMutation"
:get-create-data="transformCreateData" :get-create-data="transformCreateData"
:default-item="defaultItem" :default-item="defaultItem"
editItemI18nKey="chronos.event.amend.title" edit-item-i18n-key="chronos.event.amend.title"
:gql-patch-mutation="gqlPatchMutation" :gql-patch-mutation="gqlPatchMutation"
:get-patch-data="transformPatchData" :get-patch-data="transformPatchData"
:edit-item="initPatchData" :edit-item="initPatchData"
@cancel="open = false" @cancel="open = false"
@save="updateOnSave()" @save="updateOnSave()"
> >
<!-- eslint-disable-next-line vue/valid-v-slot -->
<template #subject.field="{ attrs, on, item }"> <template #subject.field="{ attrs, on, item }">
<v-autocomplete <v-autocomplete
:disabled="item.cancelled" :disabled="item.cancelled"
...@@ -32,8 +33,9 @@ ...@@ -32,8 +33,9 @@
item-value="id" item-value="id"
v-bind="attrs" v-bind="attrs"
v-on="on" v-on="on"
/> />
</template> </template>
<!-- eslint-disable-next-line vue/valid-v-slot -->
<template #teachers.field="{ attrs, on, item }"> <template #teachers.field="{ attrs, on, item }">
<v-autocomplete <v-autocomplete
:disabled="item.cancelled" :disabled="item.cancelled"
...@@ -45,8 +47,9 @@ ...@@ -45,8 +47,9 @@
v-on="on" v-on="on"
chips chips
deletable-chips deletable-chips
/> />
</template> </template>
<!-- eslint-disable-next-line vue/valid-v-slot -->
<template #rooms.field="{ attrs, on, item }"> <template #rooms.field="{ attrs, on, item }">
<v-autocomplete <v-autocomplete
:disabled="item.cancelled" :disabled="item.cancelled"
...@@ -58,22 +61,24 @@ ...@@ -58,22 +61,24 @@
v-on="on" v-on="on"
chips chips
deletable-chips deletable-chips
/> />
</template> </template>
<!-- eslint-disable-next-line vue/valid-v-slot -->
<template #cancelled.field="{ attrs, on }"> <template #cancelled.field="{ attrs, on }">
<v-checkbox v-bind="attrs" v-on="on" /> <v-checkbox v-bind="attrs" v-on="on" />
</template> </template>
<!-- eslint-disable-next-line vue/valid-v-slot -->
<template #comment.field="{ attrs, on }"> <template #comment.field="{ attrs, on }">
<v-textarea v-bind="attrs" v-on="on" /> <v-textarea v-bind="attrs" v-on="on" />
</template> </template>
</dialog-object-form> </dialog-object-form>
<delete-dialog <delete-dialog
deleteSuccessMessageI18nKey="chronos.event.amend.delete_success" delete-success-message-i18n-key="chronos.event.amend.delete_success"
:gql-delete-mutation="gqlDeleteMutation" :gql-delete-mutation="gqlDeleteMutation"
v-model="deleteEvent" v-model="deleteEvent"
:items="[selectedEvent.meta]" :items="[selectedEvent.meta]"
@save="updateOnSave()" @save="updateOnSave()"
> >
<template #title> <template #title>
{{ $t("chronos.event.amend.delete_dialog") }} {{ $t("chronos.event.amend.delete_dialog") }}
</template> </template>
...@@ -109,7 +114,7 @@ export default { ...@@ -109,7 +114,7 @@ export default {
selectedEvent: { selectedEvent: {
type: Object, type: Object,
required: true, required: true,
} },
}, },
data() { data() {
return { return {
...@@ -165,7 +170,7 @@ export default { ...@@ -165,7 +170,7 @@ export default {
}; };
}, },
updateOnSave() { updateOnSave() {
this.$emit('refreshCalendar'); this.$emit("refreshCalendar");
this.model = false; this.model = false;
}, },
}, },
...@@ -174,7 +179,9 @@ export default { ...@@ -174,7 +179,9 @@ export default {
return { return {
id: this.selectedEvent.meta.id, id: this.selectedEvent.meta.id,
subject: this.selectedEvent.meta.subject?.id.toString(), 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()), rooms: this.selectedEvent.meta.rooms.map((room) => room.id.toString()),
cancelled: this.selectedEvent.meta.cancelled, cancelled: this.selectedEvent.meta.cancelled,
comment: this.selectedEvent.meta.comment, comment: this.selectedEvent.meta.comment,
......
...@@ -1461,7 +1461,10 @@ class LessonEvent(CalendarEvent): ...@@ -1461,7 +1461,10 @@ class LessonEvent(CalendarEvent):
elif request: elif request:
title += " · " + reference_object.teacher_names_with_amends title += " · " + reference_object.teacher_names_with_amends
else: 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(): if reference_object.rooms.all().exists():
title += " · " + reference_object.room_names_with_amends title += " · " + reference_object.room_names_with_amends
return title return title
......
...@@ -2,7 +2,11 @@ from datetime import timezone ...@@ -2,7 +2,11 @@ from datetime import timezone
import graphene import graphene
from graphene_django import DjangoObjectType 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 from aleksis.core.models import CalendarEvent, Group, Person, Room
...@@ -97,7 +101,7 @@ class AmendLessonBatchCreateMutation(DatetimeTimezoneMixin, DjangoBatchCreateMut ...@@ -97,7 +101,7 @@ class AmendLessonBatchCreateMutation(DatetimeTimezoneMixin, DjangoBatchCreateMut
) )
@classmethod @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: for obj in created_objects:
obj.timezone = obj.amends.timezone obj.timezone = obj.amends.timezone
return created_objects return created_objects
...@@ -110,7 +114,7 @@ class AmendLessonBatchPatchMutation(DatetimeTimezoneMixin, DjangoBatchPatchMutat ...@@ -110,7 +114,7 @@ class AmendLessonBatchPatchMutation(DatetimeTimezoneMixin, DjangoBatchPatchMutat
only_fields = ("subject", "teachers", "groups", "rooms", "cancelled", "comment") only_fields = ("subject", "teachers", "groups", "rooms", "cancelled", "comment")
@classmethod @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: for obj in updated_objects:
obj.timezone = obj.amends.timezone obj.timezone = obj.amends.timezone
return updated_objects return updated_objects
......
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