From 2dfe44de19eb13a267f384ee6398e86e9ec54dcf Mon Sep 17 00:00:00 2001 From: magicfelix <felix@felix-zauberer.de> Date: Sun, 7 Aug 2022 12:41:08 +0200 Subject: [PATCH] Pass week documentation preference to frontend --- .../apps/alsijil/assets/components/coursebook/CourseBook.vue | 2 ++ .../assets/components/coursebook/LessonDocumentations.vue | 2 +- .../alsijil/templates/alsijil/class_register/coursebook.html | 4 ++-- aleksis/apps/alsijil/views.py | 5 +++++ 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/aleksis/apps/alsijil/assets/components/coursebook/CourseBook.vue b/aleksis/apps/alsijil/assets/components/coursebook/CourseBook.vue index f8921271c..551ac3ca9 100644 --- a/aleksis/apps/alsijil/assets/components/coursebook/CourseBook.vue +++ b/aleksis/apps/alsijil/assets/components/coursebook/CourseBook.vue @@ -19,6 +19,7 @@ :groups="data.lesson.groups" :excuseTypes="data.excuseTypes" :extraMarks="data.extraMarks" + :documentLessonTopicsByWeek="documentlessontopicsbyweek" /> </v-col> </v-row> @@ -45,6 +46,7 @@ export default { UpdateIndicator, LessonDocumentations }, + props: [ "documentlessontopicsbyweek" ], methods: { processDataChange(event) { this.status = CHANGES; diff --git a/aleksis/apps/alsijil/assets/components/coursebook/LessonDocumentations.vue b/aleksis/apps/alsijil/assets/components/coursebook/LessonDocumentations.vue index ca6d81494..f95152c66 100644 --- a/aleksis/apps/alsijil/assets/components/coursebook/LessonDocumentations.vue +++ b/aleksis/apps/alsijil/assets/components/coursebook/LessonDocumentations.vue @@ -57,7 +57,7 @@ import LessonDocumentation from "./LessonDocumentation.vue"; export default { components: { LessonDocumentation }, - props: [ "lessonDocumentations","plannedLessonperiodsDatetimes", "groups", "excuseTypes", "extraMarks" ], + props: [ "lessonDocumentations","plannedLessonperiodsDatetimes", "groups", "excuseTypes", "extraMarks", "documentLessonTopicsByWeek" ], name: "lesson-documentations", data () { return { diff --git a/aleksis/apps/alsijil/templates/alsijil/class_register/coursebook.html b/aleksis/apps/alsijil/templates/alsijil/class_register/coursebook.html index efb2effa5..b30133faa 100644 --- a/aleksis/apps/alsijil/templates/alsijil/class_register/coursebook.html +++ b/aleksis/apps/alsijil/templates/alsijil/class_register/coursebook.html @@ -9,9 +9,9 @@ {% endblock %} {% block browser_title %}{% trans "Coursebook" %} {{ lesson }}{% endblock %} {% block content %} -<router-view/> +<router-view documentlessontopicsbyweek="{{ documentLessonTopicsByWeek }}"/><!-- FIXME --> {% endblock %} {% block extra_body %} {% render_bundle "aleksis.apps.alsijil" %} -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/aleksis/apps/alsijil/views.py b/aleksis/apps/alsijil/views.py index 57480b712..8340cb956 100644 --- a/aleksis/apps/alsijil/views.py +++ b/aleksis/apps/alsijil/views.py @@ -1363,6 +1363,11 @@ class CoursebookView(DetailView): template_name = "alsijil/class_register/coursebook.html" permission_required = "" # FIXME + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context["documentLessonTopicsByWeek"] = get_site_preferences()["alsijil__document_lesson_topics_by_week"] + return context + class SelectCoursebookView(TemplateView): template_name = "alsijil/class_register/select_coursebook.html" -- GitLab