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

Reformat

parent 948a8d9e
No related branches found
No related tags found
1 merge request!362Resolve "Add personal note management dialog in course book"
Pipeline #191304 failed
...@@ -151,7 +151,11 @@ export default { ...@@ -151,7 +151,11 @@ export default {
{{ item.person.fullName }} {{ item.person.fullName }}
</v-list-item-title> </v-list-item-title>
<v-list-item-subtitle <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 <absence-reason-chip
v-if="item.absenceReason" v-if="item.absenceReason"
......
...@@ -69,7 +69,8 @@ import TardinessChip from "../personal_notes/TardinessChip.vue"; ...@@ -69,7 +69,8 @@ import TardinessChip from "../personal_notes/TardinessChip.vue";
{{ $t("alsijil.personal_notes.late") }} {{ $t("alsijil.personal_notes.late") }}
<template #append> <template #append>
<span>: <span
>:
{{ {{
tardyParticipations tardyParticipations
.slice(0, 5) .slice(0, 5)
...@@ -134,8 +135,9 @@ export default { ...@@ -134,8 +135,9 @@ export default {
}, {}); }, {});
}, },
tardyParticipations() { tardyParticipations() {
return this.documentation.participations.filter(p => return this.documentation.participations.filter(
p.noteWithTardiness != null && p.noteWithTardiness.tardiness > 0); (p) => p.noteWithTardiness != null && p.noteWithTardiness.tardiness > 0,
);
}, },
}, },
}; };
......
...@@ -24,9 +24,7 @@ export default { ...@@ -24,9 +24,7 @@ export default {
:value="participation.notesWithExtraMark" :value="participation.notesWithExtraMark"
/> />
<tardiness-note <tardiness-note v-bind="personalNoteRelatedProps" />
v-bind="personalNoteRelatedProps"
/>
</div> </div>
</template> </template>
......
<script> <script>
export default { export default {
name: "TardinessChip", name: "TardinessChip",
props: { props: {
...@@ -19,12 +18,7 @@ export default { ...@@ -19,12 +18,7 @@ export default {
</script> </script>
<template> <template>
<v-chip <v-chip dense outlined v-bind="$attrs" v-on="$listeners">
dense
outlined
v-bind="$attrs"
v-on="$listeners"
>
<v-avatar left> <v-avatar left>
<v-icon small>mdi-clock-alert-outline</v-icon> <v-icon small>mdi-clock-alert-outline</v-icon>
</v-avatar> </v-avatar>
......
...@@ -22,7 +22,7 @@ export default { ...@@ -22,7 +22,7 @@ export default {
const lessonStart = DateTime.fromISO(this.documentation.datetimeStart); const lessonStart = DateTime.fromISO(this.documentation.datetimeStart);
const lessonEnd = DateTime.fromISO(this.documentation.datetimeEnd); const lessonEnd = DateTime.fromISO(this.documentation.datetimeEnd);
let diff = lessonEnd.diff(lessonStart, 'minutes'); let diff = lessonEnd.diff(lessonStart, "minutes");
return diff.toObject().minutes; return diff.toObject().minutes;
}, },
model: { model: {
...@@ -102,8 +102,12 @@ export default { ...@@ -102,8 +102,12 @@ export default {
}; };
}, },
lessonLengthRule(time) { 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() { data() {
return { return {
...@@ -111,7 +115,7 @@ export default { ...@@ -111,7 +115,7 @@ export default {
deletePersonalNotes, deletePersonalNotes,
}; };
}, },
} };
</script> </script>
<template> <template>
...@@ -128,7 +132,12 @@ export default { ...@@ -128,7 +132,12 @@ export default {
> >
<template #append> <template #append>
<v-slide-x-reverse-transition> <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-icon> $deleteContent </v-icon>
</v-btn> </v-btn>
</v-slide-x-reverse-transition> </v-slide-x-reverse-transition>
......
...@@ -123,7 +123,12 @@ export default { ...@@ -123,7 +123,12 @@ export default {
> >
<template #append> <template #append>
<v-slide-x-reverse-transition> <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-icon> $deleteContent </v-icon>
</v-btn> </v-btn>
</v-slide-x-reverse-transition> </v-slide-x-reverse-transition>
......
...@@ -842,20 +842,20 @@ class NewPersonalNote(ExtensibleModel): ...@@ -842,20 +842,20 @@ class NewPersonalNote(ExtensibleModel):
verbose_name_plural = _("Personal Notes") verbose_name_plural = _("Personal Notes")
constraints = [ constraints = [
models.CheckConstraint( models.CheckConstraint(
check=Q(note__isnull=False, extra_mark__isnull=True, tardiness__isnull=True) | 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=False, tardiness__isnull=True)
Q(note__isnull=True, extra_mark__isnull=True, tardiness__isnull=False), | Q(note__isnull=True, extra_mark__isnull=True, tardiness__isnull=False),
name="one_value_per_personal_note", name="one_value_per_personal_note",
), ),
models.UniqueConstraint( models.UniqueConstraint(
fields=["person", "documentation"], fields=["person", "documentation"],
name="unique_person_documentation_tardiness", name="unique_person_documentation_tardiness",
condition=~Q(tardiness=None) condition=~Q(tardiness=None),
), ),
models.UniqueConstraint( models.UniqueConstraint(
fields=["person", "documentation", "extra_mark"], fields=["person", "documentation", "extra_mark"],
name="unique_person_documentation_extra_mark", name="unique_person_documentation_extra_mark",
condition=~Q(extra_mark=None) condition=~Q(extra_mark=None),
), ),
] ]
......
...@@ -51,7 +51,7 @@ class ParticipationStatusType( ...@@ -51,7 +51,7 @@ class ParticipationStatusType(
@staticmethod @staticmethod
def resolve_note_with_tardiness(root: ParticipationStatus, info, **kwargs): def resolve_note_with_tardiness(root: ParticipationStatus, info, **kwargs):
notes = NewPersonalNote.objects.filter( notes = NewPersonalNote.objects.filter(
person=root.person, person=root.person,
documentation=root.related_documentation, documentation=root.related_documentation,
tardiness__isnull=False, tardiness__isnull=False,
......
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