diff --git a/server/vbv_lernwelt/competence/create_uk_competence_profile.py b/server/vbv_lernwelt/competence/create_uk_competence_profile.py index a70e3cf9..488c2d34 100644 --- a/server/vbv_lernwelt/competence/create_uk_competence_profile.py +++ b/server/vbv_lernwelt/competence/create_uk_competence_profile.py @@ -3,7 +3,7 @@ from vbv_lernwelt.competence.factories import ( CompetenceProfilePageFactory, PerformanceCriteriaFactory, ) -from vbv_lernwelt.competence.models import CompetencePage +from vbv_lernwelt.competence.models import ActionCompetence from vbv_lernwelt.course.consts import COURSE_UK, COURSE_UK_FR, COURSE_UK_IT from vbv_lernwelt.course.models import CoursePage from vbv_lernwelt.learnpath.models import LearningPath, LearningUnit @@ -60,7 +60,7 @@ def create_uk_competence_profile(course_id=COURSE_UK): ) # Circle Kickoff PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="c3" ), competence_id="c3.pv.ük6", @@ -70,7 +70,7 @@ def create_uk_competence_profile(course_id=COURSE_UK): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="d2" ), competence_id="d2.pv.ük1", @@ -81,7 +81,7 @@ def create_uk_competence_profile(course_id=COURSE_UK): ) # Circle Basis PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="c3" ), competence_id="c3.pv.ük2", @@ -91,7 +91,7 @@ def create_uk_competence_profile(course_id=COURSE_UK): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="c3" ), competence_id="c3.pv.ük5", @@ -101,7 +101,7 @@ def create_uk_competence_profile(course_id=COURSE_UK): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="c3" ), competence_id="c3.pv.ük6", @@ -111,7 +111,7 @@ def create_uk_competence_profile(course_id=COURSE_UK): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="e2" ), competence_id="e2.pv.ük3", @@ -122,7 +122,7 @@ def create_uk_competence_profile(course_id=COURSE_UK): ) # Circle Fahrzeug PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="c3" ), competence_id="c3.pv.ük2", @@ -132,7 +132,7 @@ def create_uk_competence_profile(course_id=COURSE_UK): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="c3" ), competence_id="c3.pv.ük7", @@ -142,7 +142,7 @@ def create_uk_competence_profile(course_id=COURSE_UK): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="c3" ), competence_id="c3.pv.ük11", @@ -152,7 +152,7 @@ def create_uk_competence_profile(course_id=COURSE_UK): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="d2" ), competence_id="d2.pv.ük1", @@ -162,7 +162,7 @@ def create_uk_competence_profile(course_id=COURSE_UK): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="d2" ), competence_id="d2.pv.ük2", @@ -172,7 +172,7 @@ def create_uk_competence_profile(course_id=COURSE_UK): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="d2" ), competence_id="d2.pv.ük3", @@ -182,7 +182,7 @@ def create_uk_competence_profile(course_id=COURSE_UK): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="d2" ), competence_id="d2.pv.ük4", @@ -192,7 +192,7 @@ def create_uk_competence_profile(course_id=COURSE_UK): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="e4" ), competence_id="e4.pv.ük1", @@ -202,7 +202,7 @@ def create_uk_competence_profile(course_id=COURSE_UK): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="e4" ), competence_id="e4.pv.ük2", @@ -212,7 +212,7 @@ def create_uk_competence_profile(course_id=COURSE_UK): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="e4" ), competence_id="e4.pv.ük4", @@ -275,7 +275,7 @@ def create_uk_fr_competence_profile(course_id=COURSE_UK_FR): # Circle Fahrzeug PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="c3" ), competence_id="c3.pv.ci2", @@ -285,7 +285,7 @@ def create_uk_fr_competence_profile(course_id=COURSE_UK_FR): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="c3" ), competence_id="c3.pv.ci7", @@ -295,7 +295,7 @@ def create_uk_fr_competence_profile(course_id=COURSE_UK_FR): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="c3" ), competence_id="c3.pv.ci11", @@ -305,7 +305,7 @@ def create_uk_fr_competence_profile(course_id=COURSE_UK_FR): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="d2" ), competence_id="d2.pv.ci1", @@ -315,7 +315,7 @@ def create_uk_fr_competence_profile(course_id=COURSE_UK_FR): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="d2" ), competence_id="d2.pv.ci2", @@ -325,7 +325,7 @@ def create_uk_fr_competence_profile(course_id=COURSE_UK_FR): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="d2" ), competence_id="d2.pv.ci3", @@ -335,7 +335,7 @@ def create_uk_fr_competence_profile(course_id=COURSE_UK_FR): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="d2" ), competence_id="d2.pv.ci4", @@ -345,7 +345,7 @@ def create_uk_fr_competence_profile(course_id=COURSE_UK_FR): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="e4" ), competence_id="e4.pv.ci1", @@ -355,7 +355,7 @@ def create_uk_fr_competence_profile(course_id=COURSE_UK_FR): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="e4" ), competence_id="e4.pv.ci2", @@ -365,7 +365,7 @@ def create_uk_fr_competence_profile(course_id=COURSE_UK_FR): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="e4" ), competence_id="e4.pv.ci4", @@ -428,7 +428,7 @@ def create_uk_it_competence_profile(course_id=COURSE_UK_IT): # Circle Fahrzeug PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="c3" ), competence_id="c3.pv.ci2", @@ -438,7 +438,7 @@ def create_uk_it_competence_profile(course_id=COURSE_UK_IT): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="c3" ), competence_id="c3.pv.ci7", @@ -448,7 +448,7 @@ def create_uk_it_competence_profile(course_id=COURSE_UK_IT): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="c3" ), competence_id="c3.pv.ci11", @@ -458,7 +458,7 @@ def create_uk_it_competence_profile(course_id=COURSE_UK_IT): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="d2" ), competence_id="d2.pv.ci1", @@ -468,7 +468,7 @@ def create_uk_it_competence_profile(course_id=COURSE_UK_IT): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="d2" ), competence_id="d2.pv.ci2", @@ -478,7 +478,7 @@ def create_uk_it_competence_profile(course_id=COURSE_UK_IT): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="d2" ), competence_id="d2.pv.ci3", @@ -488,7 +488,7 @@ def create_uk_it_competence_profile(course_id=COURSE_UK_IT): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="d2" ), competence_id="d2.pv.ci4", @@ -498,7 +498,7 @@ def create_uk_it_competence_profile(course_id=COURSE_UK_IT): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="e4" ), competence_id="e4.pv.ci1", @@ -508,7 +508,7 @@ def create_uk_it_competence_profile(course_id=COURSE_UK_IT): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="e4" ), competence_id="e4.pv.ci2", @@ -518,7 +518,7 @@ def create_uk_it_competence_profile(course_id=COURSE_UK_IT): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="e4" ), competence_id="e4.pv.ci4", diff --git a/server/vbv_lernwelt/competence/create_uk_training_competence_profile.py b/server/vbv_lernwelt/competence/create_uk_training_competence_profile.py index fbf81220..b2e3bb9a 100644 --- a/server/vbv_lernwelt/competence/create_uk_training_competence_profile.py +++ b/server/vbv_lernwelt/competence/create_uk_training_competence_profile.py @@ -3,7 +3,7 @@ from vbv_lernwelt.competence.factories import ( CompetenceProfilePageFactory, PerformanceCriteriaFactory, ) -from vbv_lernwelt.competence.models import CompetencePage +from vbv_lernwelt.competence.models import ActionCompetence from vbv_lernwelt.course.consts import COURSE_UK from vbv_lernwelt.course.models import CoursePage from vbv_lernwelt.learnpath.models import LearningPath, LearningUnit @@ -61,7 +61,7 @@ def create_uk_training_competence_profile(course_id=COURSE_UK): ) # Circle Fahrzeug PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="c3" ), competence_id="c3.pv.ük2", @@ -71,7 +71,7 @@ def create_uk_training_competence_profile(course_id=COURSE_UK): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="c3" ), competence_id="c3.pv.ük7", @@ -81,7 +81,7 @@ def create_uk_training_competence_profile(course_id=COURSE_UK): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="c3" ), competence_id="c3.pv.ük11", @@ -91,7 +91,7 @@ def create_uk_training_competence_profile(course_id=COURSE_UK): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="d2" ), competence_id="d2.pv.ük1", @@ -101,7 +101,7 @@ def create_uk_training_competence_profile(course_id=COURSE_UK): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="d2" ), competence_id="d2.pv.ük2", @@ -111,7 +111,7 @@ def create_uk_training_competence_profile(course_id=COURSE_UK): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="d2" ), competence_id="d2.pv.ük3", @@ -121,7 +121,7 @@ def create_uk_training_competence_profile(course_id=COURSE_UK): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="d2" ), competence_id="d2.pv.ük4", @@ -131,7 +131,7 @@ def create_uk_training_competence_profile(course_id=COURSE_UK): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="e4" ), competence_id="e4.pv.ük1", @@ -141,7 +141,7 @@ def create_uk_training_competence_profile(course_id=COURSE_UK): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="e4" ), competence_id="e4.pv.ük2", @@ -151,7 +151,7 @@ def create_uk_training_competence_profile(course_id=COURSE_UK): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="e4" ), competence_id="e4.pv.ük4", @@ -214,7 +214,7 @@ def create_uk_fr_training_competence_profile(course_id=COURSE_UK): ) # Circle Fahrzeug PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="c3" ), competence_id="c3.pv.ci2", @@ -224,7 +224,7 @@ def create_uk_fr_training_competence_profile(course_id=COURSE_UK): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="c3" ), competence_id="c3.pv.ci7", @@ -234,7 +234,7 @@ def create_uk_fr_training_competence_profile(course_id=COURSE_UK): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="c3" ), competence_id="c3.pv.ci11", @@ -244,7 +244,7 @@ def create_uk_fr_training_competence_profile(course_id=COURSE_UK): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="d2" ), competence_id="d2.pv.ci1", @@ -254,7 +254,7 @@ def create_uk_fr_training_competence_profile(course_id=COURSE_UK): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="d2" ), competence_id="d2.pv.ci2", @@ -264,7 +264,7 @@ def create_uk_fr_training_competence_profile(course_id=COURSE_UK): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="d2" ), competence_id="d2.pv.ci3", @@ -274,7 +274,7 @@ def create_uk_fr_training_competence_profile(course_id=COURSE_UK): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="d2" ), competence_id="d2.pv.ci4", @@ -284,7 +284,7 @@ def create_uk_fr_training_competence_profile(course_id=COURSE_UK): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="e4" ), competence_id="e4.pv.ci1", @@ -294,7 +294,7 @@ def create_uk_fr_training_competence_profile(course_id=COURSE_UK): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="e4" ), competence_id="e4.pv.ci2", @@ -304,7 +304,7 @@ def create_uk_fr_training_competence_profile(course_id=COURSE_UK): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="e4" ), competence_id="e4.pv.ci4", @@ -367,7 +367,7 @@ def create_uk_it_training_competence_profile(course_id=COURSE_UK): ) # Circle Fahrzeug PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="c3" ), competence_id="c3.pv.ci2", @@ -377,7 +377,7 @@ def create_uk_it_training_competence_profile(course_id=COURSE_UK): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="c3" ), competence_id="c3.pv.ci7", @@ -387,7 +387,7 @@ def create_uk_it_training_competence_profile(course_id=COURSE_UK): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="c3" ), competence_id="c3.pv.ci11", @@ -397,7 +397,7 @@ def create_uk_it_training_competence_profile(course_id=COURSE_UK): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="d2" ), competence_id="d2.pv.ci1", @@ -407,7 +407,7 @@ def create_uk_it_training_competence_profile(course_id=COURSE_UK): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="d2" ), competence_id="d2.pv.ci2", @@ -417,7 +417,7 @@ def create_uk_it_training_competence_profile(course_id=COURSE_UK): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="d2" ), competence_id="d2.pv.ci3", @@ -427,7 +427,7 @@ def create_uk_it_training_competence_profile(course_id=COURSE_UK): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="d2" ), competence_id="d2.pv.ci4", @@ -437,7 +437,7 @@ def create_uk_it_training_competence_profile(course_id=COURSE_UK): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="e4" ), competence_id="e4.pv.ci1", @@ -447,7 +447,7 @@ def create_uk_it_training_competence_profile(course_id=COURSE_UK): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="e4" ), competence_id="e4.pv.ci2", @@ -457,7 +457,7 @@ def create_uk_it_training_competence_profile(course_id=COURSE_UK): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="e4" ), competence_id="e4.pv.ci4", diff --git a/server/vbv_lernwelt/competence/create_vv_competence_profile.py b/server/vbv_lernwelt/competence/create_vv_competence_profile.py index eb279405..886c612d 100644 --- a/server/vbv_lernwelt/competence/create_vv_competence_profile.py +++ b/server/vbv_lernwelt/competence/create_vv_competence_profile.py @@ -3,7 +3,7 @@ from vbv_lernwelt.competence.factories import ( CompetenceProfilePageFactory, PerformanceCriteriaFactory, ) -from vbv_lernwelt.competence.models import CompetencePage +from vbv_lernwelt.competence.models import ActionCompetence from vbv_lernwelt.course.models import CoursePage from vbv_lernwelt.learnpath.models import LearningPath, LearningUnit @@ -132,7 +132,7 @@ def create_vv_competence_profile(course_id): # Daten anhand von WEVM_Version Oktober 2022 # Einstieg/Beobachten – Selbsteinschätzung «Einkommenssicherung» PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="A2" ), competence_id="A2.1", @@ -142,7 +142,7 @@ def create_vv_competence_profile(course_id): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="A2" ), competence_id="A2.2", @@ -152,7 +152,7 @@ def create_vv_competence_profile(course_id): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="A2" ), competence_id="A2.3", @@ -162,7 +162,7 @@ def create_vv_competence_profile(course_id): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="A2" ), competence_id="A2.4", @@ -172,7 +172,7 @@ def create_vv_competence_profile(course_id): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="A2" ), competence_id="A2.5", @@ -182,7 +182,7 @@ def create_vv_competence_profile(course_id): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="B1" ), competence_id="B1.1", @@ -192,7 +192,7 @@ def create_vv_competence_profile(course_id): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="B1" ), competence_id="B1.2", @@ -202,7 +202,7 @@ def create_vv_competence_profile(course_id): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="B2" ), competence_id="B2.3", @@ -214,7 +214,7 @@ def create_vv_competence_profile(course_id): # Einstieg / Anwenden – Selbsteinschätzung «Fahrzeug» PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="A1" ), competence_id="A1.6", @@ -224,7 +224,7 @@ def create_vv_competence_profile(course_id): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="A2" ), competence_id="A2.1", @@ -234,7 +234,7 @@ def create_vv_competence_profile(course_id): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="A2" ), competence_id="A2.2", @@ -244,7 +244,7 @@ def create_vv_competence_profile(course_id): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="A2" ), competence_id="A2.3", @@ -254,7 +254,7 @@ def create_vv_competence_profile(course_id): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="A2" ), competence_id="A2.4", @@ -264,7 +264,7 @@ def create_vv_competence_profile(course_id): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="A2" ), competence_id="A2.5", @@ -276,7 +276,7 @@ def create_vv_competence_profile(course_id): # Einstieg / Anwenden – Selbsteinschätzung «Reisen» PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="A2" ), competence_id="A2.3", @@ -286,7 +286,7 @@ def create_vv_competence_profile(course_id): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="A2" ), competence_id="A2.4", @@ -296,7 +296,7 @@ def create_vv_competence_profile(course_id): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="A2" ), competence_id="A2.5", @@ -308,7 +308,7 @@ def create_vv_competence_profile(course_id): # Analyse / Beobachten – Selbsteinschätzung «Einkommenssicherung» PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="A1" ), competence_id="A1.5", @@ -318,7 +318,7 @@ def create_vv_competence_profile(course_id): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="B1" ), competence_id="B1.3", @@ -328,7 +328,7 @@ def create_vv_competence_profile(course_id): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="B2" ), competence_id="B2.1", @@ -338,7 +338,7 @@ def create_vv_competence_profile(course_id): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="B2" ), competence_id="B2.2", @@ -350,7 +350,7 @@ def create_vv_competence_profile(course_id): # Analyse/Anwenden – Selbsteinschätzung «Fahrzeug» PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="B1" ), competence_id="B1.3", @@ -360,7 +360,7 @@ def create_vv_competence_profile(course_id): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="B2" ), competence_id="B2.1", @@ -370,7 +370,7 @@ def create_vv_competence_profile(course_id): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="B2" ), competence_id="B2.2", @@ -382,7 +382,7 @@ def create_vv_competence_profile(course_id): # Analyse/Anwenden – Selbsteinschätzung «Reisen» PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="B1" ), competence_id="B1.3", @@ -392,7 +392,7 @@ def create_vv_competence_profile(course_id): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="B2" ), competence_id="B2.1", @@ -402,7 +402,7 @@ def create_vv_competence_profile(course_id): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="B2" ), competence_id="B2.2", @@ -412,7 +412,7 @@ def create_vv_competence_profile(course_id): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="C1" ), competence_id="C1.1", @@ -424,7 +424,7 @@ def create_vv_competence_profile(course_id): # Lösung/Anwenden – Selbsteinschätzung «Fahrzeug» PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="B4" ), competence_id="B4.2", @@ -434,7 +434,7 @@ def create_vv_competence_profile(course_id): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="B4" ), competence_id="B4.3", @@ -444,7 +444,7 @@ def create_vv_competence_profile(course_id): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="B4" ), competence_id="B4.4", @@ -454,7 +454,7 @@ def create_vv_competence_profile(course_id): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="C1" ), competence_id="C1.1", @@ -464,7 +464,7 @@ def create_vv_competence_profile(course_id): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="C1" ), competence_id="C1.2", @@ -476,7 +476,7 @@ def create_vv_competence_profile(course_id): # Lösung/Anwenden – Selbsteinschätzung «Reisen» PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="B3" ), competence_id="B3.2", @@ -486,7 +486,7 @@ def create_vv_competence_profile(course_id): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="B4" ), competence_id="B4.2", @@ -496,7 +496,7 @@ def create_vv_competence_profile(course_id): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="B4" ), competence_id="B4.3", @@ -506,7 +506,7 @@ def create_vv_competence_profile(course_id): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="B4" ), competence_id="B4.4", @@ -516,7 +516,7 @@ def create_vv_competence_profile(course_id): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="C1" ), competence_id="C1.2", @@ -526,7 +526,7 @@ def create_vv_competence_profile(course_id): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="C1" ), competence_id="C1.3", @@ -538,7 +538,7 @@ def create_vv_competence_profile(course_id): # Abschluss/Anwenden – Selbsteinschätzung «Fahrzeug» PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="A1" ), competence_id="A1.2", @@ -548,7 +548,7 @@ def create_vv_competence_profile(course_id): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="A4" ), competence_id="A4.1", @@ -558,7 +558,7 @@ def create_vv_competence_profile(course_id): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="B4" ), competence_id="B4.6", @@ -568,7 +568,7 @@ def create_vv_competence_profile(course_id): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="C1" ), competence_id="C1.3", @@ -580,7 +580,7 @@ def create_vv_competence_profile(course_id): # Abschluss / Anwenden – Selbsteinschätzung «Reisen» PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="B4" ), competence_id="B4.6", @@ -590,7 +590,7 @@ def create_vv_competence_profile(course_id): ), ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get( + parent=ActionCompetence.objects.get( slug__startswith=slug_prefix.replace("-lp", ""), competence_id="C3" ), competence_id="C3.1", diff --git a/server/vbv_lernwelt/competence/factories.py b/server/vbv_lernwelt/competence/factories.py index a4bc8176..fde1f16c 100644 --- a/server/vbv_lernwelt/competence/factories.py +++ b/server/vbv_lernwelt/competence/factories.py @@ -4,8 +4,8 @@ from vbv_lernwelt.competence.models import ( CompetenceCertificate, CompetenceCertificateList, CompetenceNaviPage, - CompetencePage, - CompetenceProfilePage, + ActionCompetence, + ActionCompetenceListPage, PerformanceCriteria, ) @@ -35,7 +35,7 @@ class CompetenceProfilePageFactory(wagtail_factories.PageFactory): title = "KompetenzNavi" class Meta: - model = CompetenceProfilePage + model = ActionCompetenceListPage class CompetencePageFactory(wagtail_factories.PageFactory): @@ -43,7 +43,7 @@ class CompetencePageFactory(wagtail_factories.PageFactory): title = "Weiterempfehlung für Neukunden generieren" class Meta: - model = CompetencePage + model = ActionCompetence class PerformanceCriteriaFactory(wagtail_factories.PageFactory): diff --git a/server/vbv_lernwelt/competence/migrations/0004_rename_models.py b/server/vbv_lernwelt/competence/migrations/0004_rename_models.py new file mode 100644 index 00000000..0f278cca --- /dev/null +++ b/server/vbv_lernwelt/competence/migrations/0004_rename_models.py @@ -0,0 +1,29 @@ +# Generated by Django 3.2.20 on 2023-09-11 14:36 + +from django.conf import settings +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('wagtailforms', '0005_alter_formsubmission_form_data'), + ('wagtailcore', '0089_log_entry_data_json_null_to_object'), + ('wagtailredirects', '0008_add_verbose_name_plural'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('course', '0004_auto_20230823_1744'), + ('duedate', '0004_alter_duedate_start'), + ('contenttypes', '0002_remove_content_type_name'), + ('competence', '0003_competencecertificate_competencecertificatelist_competencenavipage'), + ] + + operations = [ + migrations.RenameModel( + old_name='CompetencePage', + new_name='ActionCompetence', + ), + migrations.RenameModel( + old_name='CompetenceProfilePage', + new_name='ActionCompetenceListPage', + ), + ] diff --git a/server/vbv_lernwelt/competence/migrations/0005_move_action_competence.py b/server/vbv_lernwelt/competence/migrations/0005_move_action_competence.py new file mode 100644 index 00000000..37732c04 --- /dev/null +++ b/server/vbv_lernwelt/competence/migrations/0005_move_action_competence.py @@ -0,0 +1,103 @@ +# Generated by Django 3.2.20 on 2023-09-11 14:39 + +from django.db import migrations +from django.db.models import Q + +from vbv_lernwelt.assignment.models import Assignment +from vbv_lernwelt.competence.models import ( + ActionCompetenceListPage, + CompetenceNaviPage, + CompetenceCertificateList, + CompetenceCertificate, +) +from vbv_lernwelt.course.consts import ( + COURSE_TEST_ID, + COURSE_UK, + COURSE_UK_FR, + COURSE_UK_IT, +) +from vbv_lernwelt.course.creators.test_course import create_edoniq_test_assignment +from vbv_lernwelt.course.models import CoursePage +from vbv_lernwelt.learnpath.models import Circle, LearningContentEdoniqTest + + +def refactor_competence_wagtail_tree(apps=None, schema_editor=None): + # create `CompetenceNaviPage` for every course where there is none + for course_page in CoursePage.objects.all(): + competence_navi_page = ( + course_page.get_descendants().exact_type(CompetenceNaviPage).first() + ) + if not competence_navi_page: + competence_navi_page = CompetenceNaviPage( + title="KompetenzNavi", + ) + course_page.add_child(instance=competence_navi_page) + + acl = course_page.get_descendants().exact_type(ActionCompetenceListPage).first() + acl.title = "Kompetenzprofil" + acl.save() + acl.specific.save_revision().publish() + + acl = course_page.get_descendants().exact_type(ActionCompetenceListPage).first() + acl.move(competence_navi_page, pos="last-child") + + # create `CompetenceCertificateList` + competence_certificate_list = ( + competence_navi_page.get_descendants() + .exact_type(CompetenceCertificateList) + .first() + ) + + if course_page.course.id in [ + COURSE_TEST_ID, + COURSE_UK, + COURSE_UK_FR, + COURSE_UK_IT, + ]: + if not competence_certificate_list: + competence_certificate_list = CompetenceCertificateList( + title="Kompetenznachweise", + ) + competence_navi_page.add_child(instance=competence_certificate_list) + competence_certificate = CompetenceCertificate( + title="Kompetenznachweis 1", + ) + competence_certificate_list.add_child(instance=competence_certificate) + + for casework_assignment in Assignment.objects.filter( + assignment_type="CASEWORK" + ).descendant_of(course_page): + casework_assignment.competence_certificate = competence_certificate + casework_assignment.save() + + edoniq_test = create_edoniq_test_assignment( + course_id=course_page.course.id, + title="Edoniq Wissens- und Verständisfragen", + competence_certificate=competence_certificate, + ) + + circle_basis = ( + Circle.objects.descendant_of(course_page) + .filter(Q(title="Basis") | Q(title="Base")) + .first() + ) + + if circle_basis: + for ( + learning_content_edoniq + ) in LearningContentEdoniqTest.objects.all().descendant_of( + circle_basis + ): + learning_content_edoniq.content_assignment = edoniq_test + learning_content_edoniq.save() + + +class Migration(migrations.Migration): + dependencies = [ + ("competence", "0004_rename_models"), + ("learnpath", "0005_alter_learningcontentedoniqtest_content_assignment"), + ] + + operations = [ + migrations.RunPython(refactor_competence_wagtail_tree), + ] diff --git a/server/vbv_lernwelt/competence/models.py b/server/vbv_lernwelt/competence/models.py index b823ec0b..2c08bbcf 100644 --- a/server/vbv_lernwelt/competence/models.py +++ b/server/vbv_lernwelt/competence/models.py @@ -17,10 +17,11 @@ class CompetenceNaviPage(CourseBasePage): return f"/course/{self.slug.replace('-competencenavi', '')}/competence" def save(self, clean=True, user=None, log_action=False, **kwargs): - self.slug = find_available_slug( - slugify(f"{self.get_parent().slug}-competencenavi", allow_unicode=True), - ignore_page_id=self.id, - ) + if self.get_parent(): + self.slug = find_available_slug( + slugify(f"{self.get_parent().slug}-competencenavi", allow_unicode=True), + ignore_page_id=self.id, + ) super(CompetenceNaviPage, self).save(clean, user, log_action, **kwargs) @@ -61,15 +62,15 @@ class CompetenceCertificate(CourseBasePage): super(CompetenceCertificate, self).save(clean, user, log_action, **kwargs) -class CompetenceProfilePage(CourseBasePage): +class ActionCompetenceListPage(CourseBasePage): serialize_field_names = [ "course", "circles", "children", ] - parent_page_types = ["course.CoursePage"] - subpage_types = ["competence.CompetencePage"] + parent_page_types = ["competence.CompetenceNaviPage"] + subpage_types = ["competence.ActionCompetence"] content_panels = [ FieldPanel("title", classname="full title"), @@ -83,10 +84,10 @@ class CompetenceProfilePage(CourseBasePage): slugify(f"{self.get_parent().slug}-competence", allow_unicode=True), ignore_page_id=self.id, ) - super(CompetenceProfilePage, self).save(clean, user, log_action, **kwargs) + super(ActionCompetenceListPage, self).save(clean, user, log_action, **kwargs) -class CompetencePage(CourseBasePage): +class ActionCompetence(CourseBasePage): """Handlungskompetenz""" serialize_field_names = [ @@ -94,7 +95,7 @@ class CompetencePage(CourseBasePage): "children", ] - parent_page_types = ["competence.CompetenceProfilePage"] + parent_page_types = ["competence.ActionCompetenceListPage"] subpage_types = ["competence.PerformanceCriteria"] competence_id = models.TextField(default="A1") items = StreamField( @@ -117,11 +118,13 @@ class CompetencePage(CourseBasePage): ), ignore_page_id=self.id, ) - super(CompetencePage, self).save(clean, user, log_action, **kwargs) + super(ActionCompetence, self).save(clean, user, log_action, **kwargs) class PerformanceCriteria(CourseBasePage): - parent_page_types = ["competence.CompetencePage"] + """Leistungskriterium""" + + parent_page_types = ["competence.ActionCompetence"] competence_id = models.TextField(default="A1.1") learning_unit = models.ForeignKey( "learnpath.LearningUnit", @@ -139,7 +142,9 @@ class PerformanceCriteria(CourseBasePage): ] def save(self, clean=True, user=None, log_action=False, **kwargs): - profile_parent = self.get_ancestors().exact_type(CompetenceProfilePage).last() + profile_parent = ( + self.get_ancestors().exact_type(ActionCompetenceListPage).last() + ) if self.learning_unit and self.learning_unit.course_category: self.slug = find_available_slug( slugify( diff --git a/server/vbv_lernwelt/competence/tests/test_api.py b/server/vbv_lernwelt/competence/tests/test_api.py index 9294ce62..857ffe14 100644 --- a/server/vbv_lernwelt/competence/tests/test_api.py +++ b/server/vbv_lernwelt/competence/tests/test_api.py @@ -1,6 +1,6 @@ from rest_framework.test import APITestCase -from vbv_lernwelt.competence.models import CompetenceProfilePage +from vbv_lernwelt.competence.models import ActionCompetenceListPage from vbv_lernwelt.core.admin import User from vbv_lernwelt.core.create_default_users import create_default_users from vbv_lernwelt.course.creators.test_course import create_test_course @@ -15,7 +15,7 @@ class CompetenceAPITestCase(APITestCase): def test_get_compentence_page(self): slug = "test-lehrgang-competence" - competence_profile = CompetenceProfilePage.objects.get(slug=slug) + competence_profile = ActionCompetenceListPage.objects.get(slug=slug) response = self.client.get(f"/api/course/page/{slug}/") self.assertEqual(response.status_code, 200) diff --git a/server/vbv_lernwelt/course/creators/test_course.py b/server/vbv_lernwelt/course/creators/test_course.py index 005b6f99..284b181f 100644 --- a/server/vbv_lernwelt/course/creators/test_course.py +++ b/server/vbv_lernwelt/course/creators/test_course.py @@ -30,7 +30,7 @@ from vbv_lernwelt.competence.factories import ( CompetenceProfilePageFactory, PerformanceCriteriaFactory, ) -from vbv_lernwelt.competence.models import CompetencePage +from vbv_lernwelt.competence.models import ActionCompetence from vbv_lernwelt.core.constants import ( TEST_COURSE_SESSION_BERN_ID, TEST_COURSE_SESSION_ZURICH_ID, @@ -388,13 +388,13 @@ damit du erfolgreich mit deinem Lernpfad (durch-)starten kannst. ), PerformanceCriteriaFactory( - parent=CompetencePage.objects.get(competence_id="X1"), + parent=ActionCompetence.objects.get(competence_id="X1"), competence_id="X1.1", title="Innerhalb des Handlungsfelds «Fahrzeug» bin ich fähig, die Ziele und Pläne des Kunden zu ergründen (SOLL).", learning_unit=lu, ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get(competence_id="X1"), + parent=ActionCompetence.objects.get(competence_id="X1"), competence_id="X1.1", title="Innerhalb des Handlungsfelds «Fahrzeug» bin ich fähig, die IST-Situation des Kunden mit der geeigneten Gesprächs-/Fragetechnik zu erfassen.", learning_unit=lu, @@ -485,13 +485,13 @@ def create_test_circle_reisen(lp): ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get(competence_id="Y1"), + parent=ActionCompetence.objects.get(competence_id="Y1"), competence_id=f"Y1.1", title=f"Ich bin fähig zu Reisen eine Gesprächsführung zu machen", learning_unit=lu, ) PerformanceCriteriaFactory( - parent=CompetencePage.objects.get(competence_id="Y2"), + parent=ActionCompetence.objects.get(competence_id="Y2"), competence_id=f"Y2.1", title=f"Ich bin fähig zu Reisen eine Analyse zu machen", learning_unit=lu, diff --git a/server/vbv_lernwelt/course/models.py b/server/vbv_lernwelt/course/models.py index b4097344..86bfccdc 100644 --- a/server/vbv_lernwelt/course/models.py +++ b/server/vbv_lernwelt/course/models.py @@ -39,10 +39,10 @@ class Course(models.Model): return self.get_learning_path().get_cockpit_url() def get_competence_url(self): - from vbv_lernwelt.competence.models import CompetenceProfilePage + from vbv_lernwelt.competence.models import CompetenceNaviPage competence_page = ( - self.coursepage.get_children().exact_type(CompetenceProfilePage).first() + self.coursepage.get_children().exact_type(CompetenceNaviPage).first() ) return competence_page.specific.get_frontend_url() @@ -156,12 +156,12 @@ class CourseBasePage(Page): class CoursePage(CourseBasePage): content_panels = Page.content_panels - subpage_types = [ - "learnpath.LearningPath", - "competence.CompetenceProfilePage", - "media_library.MediaLibraryPage", - "assignment.AssignmentListPage", - ] + # subpage_types = [ + # "learnpath.LearningPath", + # "competence.CompetenceProfilePage", + # "media_library.MediaLibraryPage", + # "assignment.AssignmentListPage", + # ] course = models.OneToOneField("course.Course", on_delete=models.PROTECT) class Meta: diff --git a/server/vbv_lernwelt/learnpath/create_vv_new_learning_path.py b/server/vbv_lernwelt/learnpath/create_vv_new_learning_path.py index 0b8bf6c9..2d55374a 100644 --- a/server/vbv_lernwelt/learnpath/create_vv_new_learning_path.py +++ b/server/vbv_lernwelt/learnpath/create_vv_new_learning_path.py @@ -6,7 +6,7 @@ from wagtail_localize.models import LocaleSynchronization from vbv_lernwelt.assignment.models import Assignment from vbv_lernwelt.competence.factories import PerformanceCriteriaFactory -from vbv_lernwelt.competence.models import CompetencePage +from vbv_lernwelt.competence.models import ActionCompetence from vbv_lernwelt.core.admin import User from vbv_lernwelt.course.consts import COURSE_VERSICHERUNGSVERMITTLERIN_ID from vbv_lernwelt.course.models import CourseCategory, CoursePage @@ -1314,7 +1314,7 @@ def create_standard_learning_unit( content_url=wbt_url, ) - competence_pages = CompetencePage.objects.filter(competence_id=competence_id) + competence_pages = ActionCompetence.objects.filter(competence_id=competence_id) course_page = CoursePage.objects.get(course=course) # As the competences have all the same name, we need to pick the correct one