From 8dc2fabb032a9425b511d0c74b81cc36d7d8d582 Mon Sep 17 00:00:00 2001 From: Christian Cueni Date: Wed, 1 Mar 2023 07:09:02 +0100 Subject: [PATCH] =?UTF-8?q?Add=20missing=20circles=20to=20=C3=BCK?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../create_uk_competence_profile.py | 4 +-- server/vbv_lernwelt/course/consts.py | 2 +- .../commands/create_default_courses.py | 14 ++++---- .../management/commands/create_uk_course.py | 33 +++++++++---------- 4 files changed, 26 insertions(+), 27 deletions(-) diff --git a/server/vbv_lernwelt/competence/create_uk_competence_profile.py b/server/vbv_lernwelt/competence/create_uk_competence_profile.py index db091068..9d9a44fd 100644 --- a/server/vbv_lernwelt/competence/create_uk_competence_profile.py +++ b/server/vbv_lernwelt/competence/create_uk_competence_profile.py @@ -4,12 +4,12 @@ from vbv_lernwelt.competence.factories import ( PerformanceCriteriaFactory, ) from vbv_lernwelt.competence.models import CompetencePage -from vbv_lernwelt.course.consts import COURSE_UK1 +from vbv_lernwelt.course.consts import COURSE_UK from vbv_lernwelt.course.models import CoursePage from vbv_lernwelt.learnpath.models import LearningPath, LearningUnit -def create_uk_competence_profile(course_id=COURSE_UK1): +def create_uk_competence_profile(course_id=COURSE_UK): course_page = CoursePage.objects.get(course_id=course_id) slug_prefix = course_page.get_children().exact_type(LearningPath).first().slug diff --git a/server/vbv_lernwelt/course/consts.py b/server/vbv_lernwelt/course/consts.py index ee148f60..d5e1459f 100644 --- a/server/vbv_lernwelt/course/consts.py +++ b/server/vbv_lernwelt/course/consts.py @@ -1,4 +1,4 @@ COURSE_TEST_ID = -1 COURSE_VERSICHERUNGSVERMITTLERIN_OLD_ID = -2 -COURSE_UK1 = -3 +COURSE_UK = -3 COURSE_VERSICHERUNGSVERMITTLERIN_ID = -4 diff --git a/server/vbv_lernwelt/course/management/commands/create_default_courses.py b/server/vbv_lernwelt/course/management/commands/create_default_courses.py index de61b412..172ab036 100644 --- a/server/vbv_lernwelt/course/management/commands/create_default_courses.py +++ b/server/vbv_lernwelt/course/management/commands/create_default_courses.py @@ -14,7 +14,7 @@ from vbv_lernwelt.core.create_default_users import default_users from vbv_lernwelt.core.models import User from vbv_lernwelt.course.consts import ( COURSE_TEST_ID, - COURSE_UK1, + COURSE_UK, COURSE_VERSICHERUNGSVERMITTLERIN_ID, COURSE_VERSICHERUNGSVERMITTLERIN_OLD_ID, ) @@ -68,11 +68,11 @@ def command(): # Überbetriebliche Kurse create_versicherungsvermittlerin_with_categories( - course_id=COURSE_UK1, title="Überbetriebliche Kurse" + course_id=COURSE_UK, title="Überbetriebliche Kurse" ) - create_uk_learning_path(course_id=COURSE_UK1) - create_uk_competence_profile(course_id=COURSE_UK1) - create_default_media_library(course_id=COURSE_UK1) + create_uk_learning_path(course_id=COURSE_UK) + create_uk_competence_profile(course_id=COURSE_UK) + create_default_media_library(course_id=COURSE_UK) # test course create_test_course() @@ -138,7 +138,7 @@ def command(): # course session Überbetriebliche Kurse Lehrjahr 1 - Region Bern cs = CourseSession.objects.create( - course_id=COURSE_UK1, + course_id=COURSE_UK, title="Überbetriebliche Kurse Lehrjahr 1 - Region Bern", ) # for user_data in default_users: @@ -218,7 +218,7 @@ def command(): # course session Überbetriebliche Kurse Lehrjahr 1 - Region Zürich cs = CourseSession.objects.create( - course_id=COURSE_UK1, + course_id=COURSE_UK, title="Überbetriebliche Kurse Lehrjahr 1 - Region Zürich", ) # for user_data in default_users: diff --git a/server/vbv_lernwelt/course/management/commands/create_uk_course.py b/server/vbv_lernwelt/course/management/commands/create_uk_course.py index 372f24d7..21d7987e 100644 --- a/server/vbv_lernwelt/course/management/commands/create_uk_course.py +++ b/server/vbv_lernwelt/course/management/commands/create_uk_course.py @@ -5,7 +5,7 @@ from wagtail.models import Locale, Page, Site from wagtail_localize.models import LocaleSynchronization from vbv_lernwelt.core.admin import User -from vbv_lernwelt.course.consts import COURSE_UK1 +from vbv_lernwelt.course.consts import COURSE_UK from vbv_lernwelt.course.models import CoursePage from vbv_lernwelt.learnpath.create_vv_learning_path import ( create_learning_content_beenden, @@ -23,7 +23,7 @@ from vbv_lernwelt.learnpath.tests.learning_path_factories import ( READY_HF = ["Fahrzeug", "Reisen"] -def create_uk_learning_path(course_id=COURSE_UK1, user=None, skip_locales=True): +def create_uk_learning_path(course_id=COURSE_UK, user=None, skip_locales=True): if user is None: user = User.objects.get(username="info@iterativ.ch") @@ -42,27 +42,26 @@ def create_uk_learning_path(course_id=COURSE_UK1, user=None, skip_locales=True): parent=course_page, ) - TopicFactory(title="Kickoff", is_visible=False, parent=lp) + TopicFactory(title="üK1", is_visible=True, parent=lp) create_uk_circle(lp, title="Kickoff") - - TopicFactory(title="Basis", is_visible=False, parent=lp) create_uk_circle(lp, title="Basis") - - TopicFactory(title="Fahrzeug", is_visible=False, parent=lp) create_uk_circle(lp, title="Fahrzeug") - - TopicFactory(title="Haushalt Teil 1", is_visible=False, parent=lp) create_uk_circle(lp, title="Haushalt Teil 1") - - TopicFactory(title="Haushalt Teil 2", is_visible=False, parent=lp) create_uk_circle(lp, title="Haushalt Teil 2") - # circle_analyse = create_circle("Betreuen", lp) - # create_circle_children(circle_analyse, "Betreuen") - # - # TopicFactory(title="Prüfung", is_visible=True, parent=lp) - # circle_analyse = create_circle("Prüfungsvorbereitung", lp) - # create_circle_children(circle_analyse, "Prüfungsvorbereitung") + TopicFactory(title="üK2", is_visible=True, parent=lp) + create_uk_circle(lp, title="Reisen & Rechtsstreitigkeiten") + create_uk_circle(lp, title="Wohneigentum") + create_uk_circle(lp, title="KMU Teil 1") + create_uk_circle(lp, title="KMU Teil 2") + create_uk_circle(lp, title="3-Säulenkonzept") + create_uk_circle(lp, title="Einkommenssicherung (Invalidität)") + create_uk_circle(lp, title="Einkommenssicherung (Todesfall)") + create_uk_circle(lp, title="Pensionierung (Todesfall)") + TopicFactory(title="üK3", is_visible=True, parent=lp) + create_uk_circle(lp, title="Gesundheit") + create_uk_circle(lp, title="Prüfungsvorbereitung Teil 1") + create_uk_circle(lp, title="Prüfungsvorbereitung Teil 2") # locales if not skip_locales: