diff --git a/aleksis/apps/alsijil/frontend/components/coursebook/absences/ManageStudentsDialog.vue b/aleksis/apps/alsijil/frontend/components/coursebook/absences/ManageStudentsDialog.vue index 15248b362ef0c04f422609308931853fbe742952..b4d206f940bf324cf9dd8e3dc1992aa4dfba2e32 100644 --- a/aleksis/apps/alsijil/frontend/components/coursebook/absences/ManageStudentsDialog.vue +++ b/aleksis/apps/alsijil/frontend/components/coursebook/absences/ManageStudentsDialog.vue @@ -151,7 +151,11 @@ export default { {{ item.person.fullName }} </v-list-item-title> <v-list-item-subtitle - v-if="item.absenceReason || item.notesWithExtraMark?.length > 0 || item.noteWithTardiness" + v-if=" + item.absenceReason || + item.notesWithExtraMark?.length > 0 || + item.noteWithTardiness + " > <absence-reason-chip v-if="item.absenceReason" diff --git a/aleksis/apps/alsijil/frontend/components/coursebook/documentation/LessonNotes.vue b/aleksis/apps/alsijil/frontend/components/coursebook/documentation/LessonNotes.vue index 57c76774b88188114ea792f713048b7ec9160e1a..fbda8ab66b4c5d5eef22a329e1cd23a9151d3027 100644 --- a/aleksis/apps/alsijil/frontend/components/coursebook/documentation/LessonNotes.vue +++ b/aleksis/apps/alsijil/frontend/components/coursebook/documentation/LessonNotes.vue @@ -69,7 +69,8 @@ import TardinessChip from "../personal_notes/TardinessChip.vue"; {{ $t("alsijil.personal_notes.late") }} <template #append> - <span>: + <span + >: {{ tardyParticipations .slice(0, 5) @@ -134,8 +135,9 @@ export default { }, {}); }, tardyParticipations() { - return this.documentation.participations.filter(p => - p.noteWithTardiness != null && p.noteWithTardiness.tardiness > 0); + return this.documentation.participations.filter( + (p) => p.noteWithTardiness != null && p.noteWithTardiness.tardiness > 0, + ); }, }, }; diff --git a/aleksis/apps/alsijil/frontend/components/coursebook/personal_notes/PersonalNotes.vue b/aleksis/apps/alsijil/frontend/components/coursebook/personal_notes/PersonalNotes.vue index 1885e5ff09eeb8107f558f9d6cc4964c9119e1f7..e010d2800a35516cf7a7fddc5a01172327e0eebe 100644 --- a/aleksis/apps/alsijil/frontend/components/coursebook/personal_notes/PersonalNotes.vue +++ b/aleksis/apps/alsijil/frontend/components/coursebook/personal_notes/PersonalNotes.vue @@ -24,9 +24,7 @@ export default { :value="participation.notesWithExtraMark" /> - <tardiness-note - v-bind="personalNoteRelatedProps" - /> + <tardiness-note v-bind="personalNoteRelatedProps" /> </div> </template> diff --git a/aleksis/apps/alsijil/frontend/components/coursebook/personal_notes/TardinessChip.vue b/aleksis/apps/alsijil/frontend/components/coursebook/personal_notes/TardinessChip.vue index b78825aa00fd30e620e772a4b8391d5c6a0c4b7e..6be1fea3942fed64d37d2a68dde699344e55c35b 100644 --- a/aleksis/apps/alsijil/frontend/components/coursebook/personal_notes/TardinessChip.vue +++ b/aleksis/apps/alsijil/frontend/components/coursebook/personal_notes/TardinessChip.vue @@ -1,5 +1,4 @@ <script> - export default { name: "TardinessChip", props: { @@ -19,12 +18,7 @@ export default { </script> <template> - <v-chip - dense - outlined - v-bind="$attrs" - v-on="$listeners" - > + <v-chip dense outlined v-bind="$attrs" v-on="$listeners"> <v-avatar left> <v-icon small>mdi-clock-alert-outline</v-icon> </v-avatar> diff --git a/aleksis/apps/alsijil/frontend/components/coursebook/personal_notes/TardinessNote.vue b/aleksis/apps/alsijil/frontend/components/coursebook/personal_notes/TardinessNote.vue index a65c6bf5fe2e9425d31b5ba8bd68a8bd4497ebe1..5b9afc789288b205539fe4bc0ec72153eb4374ab 100644 --- a/aleksis/apps/alsijil/frontend/components/coursebook/personal_notes/TardinessNote.vue +++ b/aleksis/apps/alsijil/frontend/components/coursebook/personal_notes/TardinessNote.vue @@ -22,7 +22,7 @@ export default { const lessonStart = DateTime.fromISO(this.documentation.datetimeStart); const lessonEnd = DateTime.fromISO(this.documentation.datetimeEnd); - let diff = lessonEnd.diff(lessonStart, 'minutes'); + let diff = lessonEnd.diff(lessonStart, "minutes"); return diff.toObject().minutes; }, model: { @@ -102,8 +102,12 @@ export default { }; }, lessonLengthRule(time) { - return time == null || time <= this.lessonLength || this.$t("alsijil.personal_notes.lesson_length_exceeded"); - } + return ( + time == null || + time <= this.lessonLength || + this.$t("alsijil.personal_notes.lesson_length_exceeded") + ); + }, }, data() { return { @@ -111,7 +115,7 @@ export default { deletePersonalNotes, }; }, -} +}; </script> <template> @@ -128,7 +132,12 @@ export default { > <template #append> <v-slide-x-reverse-transition> - <v-btn v-if="!!model" icon @click="showDeleteConfirm = true" class="mt-n1-5"> + <v-btn + v-if="!!model" + icon + @click="showDeleteConfirm = true" + class="mt-n1-5" + > <v-icon> $deleteContent </v-icon> </v-btn> </v-slide-x-reverse-transition> diff --git a/aleksis/apps/alsijil/frontend/components/coursebook/personal_notes/TextNote.vue b/aleksis/apps/alsijil/frontend/components/coursebook/personal_notes/TextNote.vue index b92a86ed3c0fae5b5a784db01d8703b5db85ae58..43175c7402100c5ef9e4b84c153a8e79a9bb7f76 100644 --- a/aleksis/apps/alsijil/frontend/components/coursebook/personal_notes/TextNote.vue +++ b/aleksis/apps/alsijil/frontend/components/coursebook/personal_notes/TextNote.vue @@ -123,7 +123,12 @@ export default { > <template #append> <v-slide-x-reverse-transition> - <v-btn v-if="!!model" icon @click="showDeleteConfirm = true" class="mt-n1-5"> + <v-btn + v-if="!!model" + icon + @click="showDeleteConfirm = true" + class="mt-n1-5" + > <v-icon> $deleteContent </v-icon> </v-btn> </v-slide-x-reverse-transition> diff --git a/aleksis/apps/alsijil/models.py b/aleksis/apps/alsijil/models.py index 27cc30510198d8a8f9767eb52046c5c387bb4232..3c152000ff907b2689edc64fc9ebd9a9cc90a13b 100644 --- a/aleksis/apps/alsijil/models.py +++ b/aleksis/apps/alsijil/models.py @@ -842,20 +842,20 @@ class NewPersonalNote(ExtensibleModel): verbose_name_plural = _("Personal Notes") constraints = [ models.CheckConstraint( - check=Q(note__isnull=False, extra_mark__isnull=True, tardiness__isnull=True) | - Q(note__isnull=True, extra_mark__isnull=False, tardiness__isnull=True) | - Q(note__isnull=True, extra_mark__isnull=True, tardiness__isnull=False), + check=Q(note__isnull=False, extra_mark__isnull=True, tardiness__isnull=True) + | Q(note__isnull=True, extra_mark__isnull=False, tardiness__isnull=True) + | Q(note__isnull=True, extra_mark__isnull=True, tardiness__isnull=False), name="one_value_per_personal_note", ), models.UniqueConstraint( fields=["person", "documentation"], name="unique_person_documentation_tardiness", - condition=~Q(tardiness=None) + condition=~Q(tardiness=None), ), models.UniqueConstraint( fields=["person", "documentation", "extra_mark"], name="unique_person_documentation_extra_mark", - condition=~Q(extra_mark=None) + condition=~Q(extra_mark=None), ), ] diff --git a/aleksis/apps/alsijil/schema/participation_status.py b/aleksis/apps/alsijil/schema/participation_status.py index 173ddeaab757a0211036a0df1219999ad1a81cb3..a36354928031bd2521f49b775426d0f44c688d8e 100644 --- a/aleksis/apps/alsijil/schema/participation_status.py +++ b/aleksis/apps/alsijil/schema/participation_status.py @@ -51,7 +51,7 @@ class ParticipationStatusType( @staticmethod def resolve_note_with_tardiness(root: ParticipationStatus, info, **kwargs): - notes = NewPersonalNote.objects.filter( + notes = NewPersonalNote.objects.filter( person=root.person, documentation=root.related_documentation, tardiness__isnull=False,