diff --git a/aleksis/apps/alsijil/assets/components/coursebook/CourseBook.graphql b/aleksis/apps/alsijil/assets/components/coursebook/CourseBook.graphql index aecf2aa39d7497f46038e8cb45303950722317be..9af1bf9dd9ffb33e16f12ebdd969393f40cab7f1 100644 --- a/aleksis/apps/alsijil/assets/components/coursebook/CourseBook.graphql +++ b/aleksis/apps/alsijil/assets/components/coursebook/CourseBook.graphql @@ -56,7 +56,7 @@ query CourseBook($lessonId: ID!) { id fullName } - late + tardiness absent excused excuseType { diff --git a/aleksis/apps/alsijil/assets/components/coursebook/LessonDocumentation.graphql b/aleksis/apps/alsijil/assets/components/coursebook/LessonDocumentation.graphql index 89b5f83edd2a0e040ffa1f4de44ef37bb6fd6f54..c591598ae52bd8a72caa67d3e6e974ae78743257 100644 --- a/aleksis/apps/alsijil/assets/components/coursebook/LessonDocumentation.graphql +++ b/aleksis/apps/alsijil/assets/components/coursebook/LessonDocumentation.graphql @@ -12,7 +12,7 @@ mutation UpdateOrCreateLessonDocumentation($year:Int!, $week:Int!, $lessonPeriod id fullName } - late + tardiness absent excused excuseType { diff --git a/aleksis/apps/alsijil/assets/components/coursebook/LessonDocumentations.vue b/aleksis/apps/alsijil/assets/components/coursebook/LessonDocumentations.vue index 894f4d0f4c58d9113746c38aa7b9633b34103c92..0fdb51f7768bc8292f65a74ad86d877ef892f5aa 100644 --- a/aleksis/apps/alsijil/assets/components/coursebook/LessonDocumentations.vue +++ b/aleksis/apps/alsijil/assets/components/coursebook/LessonDocumentations.vue @@ -253,8 +253,8 @@ }, personalNoteString(personalNote) { let personalNoteString = ""; - if (personalNote.late > 0) { - personalNoteString += personalNote.late + "', "; + if (personalNote.tardiness > 0) { + personalNoteString += personalNote.tardiness + " min. "; } if (personalNote.absent) { personalNoteString += this.$t("absent") + ", "; diff --git a/aleksis/apps/alsijil/assets/components/coursebook/PersonalNotes.vue b/aleksis/apps/alsijil/assets/components/coursebook/PersonalNotes.vue index c237a2ad0230eada28d721f24e03edf46e29dee3..a7b8e3f5d304b32652793e90247a0bee28724725 100644 --- a/aleksis/apps/alsijil/assets/components/coursebook/PersonalNotes.vue +++ b/aleksis/apps/alsijil/assets/components/coursebook/PersonalNotes.vue @@ -148,7 +148,7 @@ export default { }, updatePersonalNote() { let personalNote = this.personalNoteByStudentID(this.editedPersonID); - this.editedTardiness = personalNote.late || 0; + this.editedTardiness = personalNote.tardiness || 0; this.editedAbsent = personalNote.absent || false; this.editedExcused = personalNote.excused || false; this.editedExcuseType = personalNote.excuseType || null; @@ -186,7 +186,7 @@ export default { // We save the user input in case of an error const variables = { "personId": this.editedPersonID, - "late": this.editedTardiness, + "tardiness": this.editedTardiness, "absent": this.editedAbsent, "excused": this.editedExcused, "excuseType": editedExcuseTypeID, @@ -203,7 +203,7 @@ export default { mutation: gql`mutation updateOrCreatePersonalNote( $personId: ID!, $lessonDocumentation: ID!, - $late: Int, + $tardiness: Int, $absent: Boolean, $excused: Boolean, $excuseType: ID, @@ -212,7 +212,7 @@ export default { ) { updateOrCreatePersonalNote(personId: $personId, lessonDocumentation: $lessonDocumentation, - late: $late, + tardiness: $tardiness, absent: $absent, excused: $excused, excuseType: $excuseType, @@ -225,7 +225,7 @@ export default { id fullName } - late + tardiness remarks absent excused @@ -290,8 +290,8 @@ export default { }, personalNoteString(personalNote) { let personalNoteString = ""; - if (personalNote.late > 0) { - personalNoteString += personalNote.late + "', "; + if (personalNote.tardiness > 0) { + personalNoteString += personalNote.tardiness + " min. "; } if (personalNote.absent) { personalNoteString += $t("alsijil.absent") + " ";