diff --git a/server/vbv_lernwelt/course/creators/uk_course.py b/server/vbv_lernwelt/course/creators/uk_course.py index 9b844e61..0cfcc871 100644 --- a/server/vbv_lernwelt/course/creators/uk_course.py +++ b/server/vbv_lernwelt/course/creators/uk_course.py @@ -55,17 +55,17 @@ def create_uk_learning_path(course_id=COURSE_UK, user=None, skip_locales=True): create_uk_circle_basis(lp) create_uk_circle_fahrzeug(lp) create_uk_circle(lp, title="Haushalt Teil 1") - create_uk_circle(lp, title="Haushalt Teil 2") + create_uk_circle(lp, title="Haushalt Teil 2", show_test=False) TopicFactory(title="2. Lehrjahr", is_visible=True, parent=lp) create_uk_circle(lp, title="Reisen & Rechtsstreitigkeiten") - create_uk_circle(lp, title="Wohneigentum") + create_uk_circle(lp, title="Wohneigentum", show_test=False) 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)") + create_uk_circle(lp, title="Pensionierung (Todesfall)", show_test=False) TopicFactory(title="3. Lehrjahr", is_visible=True, parent=lp) create_uk_circle(lp, title="Gesundheit") create_uk_circle(lp, title="Prüfungsvorbereitung Teil 1") @@ -112,17 +112,17 @@ def create_uk_fr_learning_path(course_id=COURSE_UK_FR, user=None, skip_locales=T create_uk_fr_circle_basis(lp, title="Base") create_uk_fr_circle_fahrzeug(lp, title="Véhicule") create_uk_circle(lp, title="Budget Partie 1") - create_uk_circle(lp, title="Budget Partie 2") + create_uk_circle(lp, title="Budget Partie 2", show_test=False) TopicFactory(title="2ème année", is_visible=True, parent=lp) create_uk_circle(lp, title="Voyages / Protection juridique") - create_uk_circle(lp, title="Proprieté du logement") + create_uk_circle(lp, title="Proprieté du logement", show_test=False) create_uk_circle(lp, title="PME Partie 1") create_uk_circle(lp, title="PME Partie 2") create_uk_circle(lp, title="Concept des 3") create_uk_circle(lp, title="Garantie des revenus, Partie 1") create_uk_circle(lp, title="Garantie des revenus, Partie 2") - create_uk_circle(lp, title="Retraite") + create_uk_circle(lp, title="Retraite", show_test=False) TopicFactory(title="3ème année", is_visible=True, parent=lp) create_uk_circle(lp, title="Santé") create_uk_circle(lp, title="Préparation à l'examen, Partie 1") @@ -168,17 +168,17 @@ def create_uk_it_learning_path(course_id=COURSE_UK_IT, user=None, skip_locales=T create_uk_fr_circle_basis(lp, title="Base") create_uk_it_circle_fahrzeug(lp, title="Veicolo") create_uk_circle(lp, title="Budget Partie 1") - create_uk_circle(lp, title="Budget Partie 2") + create_uk_circle(lp, title="Budget Partie 2", show_test=False) TopicFactory(title="2ème année", is_visible=True, parent=lp) create_uk_circle(lp, title="Voyages / Protection juridique") - create_uk_circle(lp, title="Proprieté du logement") + create_uk_circle(lp, title="Proprieté du logement", show_test=False) create_uk_circle(lp, title="PME Partie 1") create_uk_circle(lp, title="PME Partie 2") create_uk_circle(lp, title="Concept des 3") create_uk_circle(lp, title="Garantie des revenus, Partie 1") create_uk_circle(lp, title="Garantie des revenus, Partie 2") - create_uk_circle(lp, title="Retraite") + create_uk_circle(lp, title="Retraite", show_test=False) TopicFactory(title="3ème année", is_visible=True, parent=lp) create_uk_circle(lp, title="Santé") create_uk_circle(lp, title="Préparation à l'examen, Partie 1") @@ -200,7 +200,7 @@ def create_uk_it_learning_path(course_id=COURSE_UK_IT, user=None, skip_locales=T Page.objects.update(owner=user) -def create_uk_circle(lp, title="Kickoff"): +def create_uk_circle(lp, title="Kickoff", show_test=True): circle = CircleFactory( title=title, parent=lp, @@ -259,19 +259,17 @@ damit du erfolgreich mit deinem Lernpfad (durch-)starten kannst. parent=circle, ) LearningSequenceFactory(title="Transfer", parent=circle, icon="it-icon-ls-end") - LearningUnitFactory(title="Kompetenznachweis", title_hidden=True, parent=circle) + + LearningUnitFactory(title="Transfer", title_hidden=True, parent=circle) + kn_title = "Wissens- und Verständnisfragen" if show_test else "Geleitete Fallarbeit" LearningContentPlaceholderFactory( - title="Wissens- und Verständnisfragen", + title=kn_title, parent=circle, ) - LearningUnitFactory(title="Transfer", parent=circle) LearningContentPlaceholderFactory( title="Reflexion", parent=circle, ) - LearningContentFeedbackFactory( - parent=circle, - ) def create_uk_circle_kickoff(lp, title="Kickoff"): diff --git a/server/vbv_lernwelt/importer/services.py b/server/vbv_lernwelt/importer/services.py index 91e583e4..c3a29d96 100644 --- a/server/vbv_lernwelt/importer/services.py +++ b/server/vbv_lernwelt/importer/services.py @@ -116,13 +116,11 @@ def create_or_update_course_session( add_attendance_course_date(cs, attendance_course_lp_qs, circle, data) elif language == "fr": # todo: this is a hack remove me - print(f"{course.slug}-lp-circle-véhicule-lc-cours-de-présence-véhicule") attendance_course_lp_qs = LearningContentAttendanceCourse.objects.filter( slug=f"{course.slug}-lp-circle-véhicule-lc-cours-de-présence-véhicule-à-moteur" ) add_attendance_course_date(cs, attendance_course_lp_qs, circle, data) elif language == "it": - print(course.slug, f"{course.slug}-lp-circle-veicolo-lc-classi-di-frequenza-veicolo") # todo: this is a hack remove me attendance_course_lp_qs = LearningContentAttendanceCourse.objects.filter( slug=f"{course.slug}-lp-circle-veicolo-lc-corso-di-presenza-veicolo"