From 208569325aed976907fb8abf8dbd12e2862c6922 Mon Sep 17 00:00:00 2001
From: Julian Leucker <leuckerj@gmail.com>
Date: Wed, 6 Jul 2022 01:06:24 +0200
Subject: [PATCH] Pass excuse types and extra marks to personal note component
---
.../static/js/vue/components/alsijil/CourseBook.js | 2 +-
.../js/vue/components/alsijil/LessonDocumentation.js | 9 +++++++--
.../static/js/vue/components/alsijil/PersonalNotes.js | 2 +-
3 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/aleksis/apps/alsijil/static/js/vue/components/alsijil/CourseBook.js b/aleksis/apps/alsijil/static/js/vue/components/alsijil/CourseBook.js
index c3807301a..deedc2f0b 100644
--- a/aleksis/apps/alsijil/static/js/vue/components/alsijil/CourseBook.js
+++ b/aleksis/apps/alsijil/static/js/vue/components/alsijil/CourseBook.js
@@ -151,7 +151,7 @@ export default {
<v-subheader>{{ lesson.subject.name }}</v-subheader>
<v-row>
<v-col v-for="item in lesson_documentations" cols="12" v-bind:key="item.id">
- <lesson-documentation v-bind:key="item.id" :groups="lesson.groups"
+ <lesson-documentation v-bind:key="item.id" :groups="lesson.groups" :excuse-types="excuse_types" :extra-marks="extra_marks"
:period="item.period_formatted" :personal-notes="item.personal_notes"
:date="item.date" :topic="item.topic" :homework="item.homework" :group-note="item.group_note"
></lesson-documentation>
diff --git a/aleksis/apps/alsijil/static/js/vue/components/alsijil/LessonDocumentation.js b/aleksis/apps/alsijil/static/js/vue/components/alsijil/LessonDocumentation.js
index 7aa4e2c8e..13386394d 100644
--- a/aleksis/apps/alsijil/static/js/vue/components/alsijil/LessonDocumentation.js
+++ b/aleksis/apps/alsijil/static/js/vue/components/alsijil/LessonDocumentation.js
@@ -1,6 +1,6 @@
export default {
methods: {},
- props: ["date", "period", "topic", "homework", "groupNote", "personalNotes", "groups"],
+ props: ["date", "period", "topic", "homework", "groupNote", "personalNotes", "groups", "excuseTypes", "extraMarks"],
name: "lesson-documentation",
data: () => {
return {
@@ -93,7 +93,12 @@ export default {
></v-textarea>
</v-col>
<v-col sm="12" md="4" lg="3">
- <personal-notes :groups="groups" :personal-notes="personalNotes"></personal-notes>
+ <personal-notes
+ :groups="groups"
+ :personal-notes="personalNotes"
+ :excuse-types="excuseTypes"
+ :extra-marks="extraMarks"
+ ></personal-notes>
</v-col>
</v-row>
</v-form>
diff --git a/aleksis/apps/alsijil/static/js/vue/components/alsijil/PersonalNotes.js b/aleksis/apps/alsijil/static/js/vue/components/alsijil/PersonalNotes.js
index d1e08232c..6e54bbf8e 100644
--- a/aleksis/apps/alsijil/static/js/vue/components/alsijil/PersonalNotes.js
+++ b/aleksis/apps/alsijil/static/js/vue/components/alsijil/PersonalNotes.js
@@ -21,7 +21,7 @@ export default {
return this.personalNotes.filter(item => item.student.id === studentID)[0] || {};
}
},
- props: ["personalNotes", "groups"],
+ props: ["personalNotes", "groups", "excuseTypes", "extraMarks"],
name: "personal-notes",
data: () => {
return {
--
GitLab