ramon
/
vbv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename Vermittler courses

This commit is contained in:
Christian Cueni 2023-01-19 16:07:04 +01:00
parent 429f6241d2
commit 6c0aaaa9cf
10 changed files with 74 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cypress/e2e/competence.cy.js
View File

@ -1,16 +1,16 @@
import { login } from "./helpers"; import {login} from "./helpers";
describe("Competence", () => { describe("Competence", () => {
beforeEach(() => { beforeEach(() => {
cy.manageCommand("cypress_reset"); cy.manageCommand("cypress_reset");
login("admin", "test"); login("admin", "test");
cy.visit("/course/versicherungsvermittler-in/learn/analyse"); cy.visit("/course/versicherungsvermittler-in-alt/learn/analyse");
}); });
it("self evaluation should be neutral", () => { it("self evaluation should be neutral", () => {
cy.get( cy.get(
'[data-cy="versicherungsvermittler-in-lp-circle-analyse-lu-fahrzeug"]' '[data-cy="versicherungsvermittler-in-alt-lp-circle-analyse-lu-fahrzeug"]'
) )
.find('[data-cy="unknown"]') .find('[data-cy="unknown"]')
.should("exist"); .should("exist");
@ -18,11 +18,11 @@ describe("Competence", () => {
it("should be able to make a happy self evaluation", () => { it("should be able to make a happy self evaluation", () => {
cy.get( cy.get(
'[data-cy="versicherungsvermittler-in-lp-circle-analyse-lu-fahrzeug"]' '[data-cy="versicherungsvermittler-in-alt-lp-circle-analyse-lu-fahrzeug"]'
).click(); ).click();
cy.makeSelfEvaluation([true, true, true]); cy.makeSelfEvaluation([true, true, true]);
cy.get( cy.get(
'[data-cy="versicherungsvermittler-in-lp-circle-analyse-lu-fahrzeug"]' '[data-cy="versicherungsvermittler-in-alt-lp-circle-analyse-lu-fahrzeug"]'
) )
.find('[data-cy="success"]') .find('[data-cy="success"]')
.should("exist"); .should("exist");
@ -30,11 +30,11 @@ describe("Competence", () => {
it("should be able to make a fail self evaluation", () => { it("should be able to make a fail self evaluation", () => {
cy.get( cy.get(
'[data-cy="versicherungsvermittler-in-lp-circle-analyse-lu-fahrzeug"]' '[data-cy="versicherungsvermittler-in-alt-lp-circle-analyse-lu-fahrzeug"]'
).click(); ).click();
cy.makeSelfEvaluation([false, false, false]); cy.makeSelfEvaluation([false, false, false]);
cy.get( cy.get(
'[data-cy="versicherungsvermittler-in-lp-circle-analyse-lu-fahrzeug"]' '[data-cy="versicherungsvermittler-in-alt-lp-circle-analyse-lu-fahrzeug"]'
) )
.find('[data-cy="fail"]') .find('[data-cy="fail"]')
.should("exist"); .should("exist");
@ -42,11 +42,11 @@ describe("Competence", () => {
it("should be able to make a mixed self evaluation", () => { it("should be able to make a mixed self evaluation", () => {
cy.get( cy.get(
'[data-cy="versicherungsvermittler-in-lp-circle-analyse-lu-fahrzeug"]' '[data-cy="versicherungsvermittler-in-alt-lp-circle-analyse-lu-fahrzeug"]'
).click(); ).click();
cy.makeSelfEvaluation([false, true, true]); cy.makeSelfEvaluation([false, true, true]);
cy.get( cy.get(
'[data-cy="versicherungsvermittler-in-lp-circle-analyse-lu-fahrzeug"]' '[data-cy="versicherungsvermittler-in-alt-lp-circle-analyse-lu-fahrzeug"]'
) )
.find('[data-cy="fail"]') .find('[data-cy="fail"]')
.should("exist"); .should("exist");

20
cypress/e2e/learningPath.cy.js
View File

@ -1,4 +1,4 @@
import { login } from "./helpers"; import {login} from "./helpers";
describe("learningPath page", () => { describe("learningPath page", () => {
beforeEach(() => { beforeEach(() => {
@ -15,27 +15,27 @@ describe("learningPath page", () => {
); );
}); });
it("/course/versicherungsvermittler-in/learn", () => { it("/course/versicherungsvermittler-in-alt/learn", () => {
login("admin", "test"); login("admin", "test");
cy.visit("/course/versicherungsvermittler-in/learn"); cy.visit("/course/versicherungsvermittler-in-alt/learn");
cy.get('[data-cy="circle-analyse"]').click({ force: true }); cy.get('[data-cy="circle-analyse"]').click({force: true});
cy.url().should( cy.url().should(
"include", "include",
"/course/versicherungsvermittler-in/learn/analyse" "/course/versicherungsvermittler-in-alt/learn/analyse"
); );
cy.get('[data-cy="circle-title"]').should("contain", "Analyse"); cy.get('[data-cy="circle-title"]').should("contain", "Analyse");
}); });
it("open listView and click on circle will open circle", () => { it("open listView and click on circle will open circle", () => {
login("admin", "test"); login("admin", "test");
cy.visit("/course/versicherungsvermittler-in/learn"); cy.visit("/course/versicherungsvermittler-in-alt/learn");
cy.get('[data-cy="show-list-view"]').click(); cy.get('[data-cy="show-list-view"]').click();
cy.get('[data-cy="full-screen-modal"]').should("be.visible"); cy.get('[data-cy="full-screen-modal"]').should("be.visible");
cy.get('[data-cy="circle-analyse-vertical"]').click({ force: true }); cy.get('[data-cy="circle-analyse-vertical"]').click({force: true});
cy.url().should( cy.url().should(
"include", "include",
@ -46,7 +46,7 @@ describe("learningPath page", () => {
it("weiter gehts button will open next circle", () => { it("weiter gehts button will open next circle", () => {
login("admin", "test"); login("admin", "test");
cy.visit("/course/versicherungsvermittler-in/learn"); cy.visit("/course/versicherungsvermittler-in-alt/learn");
// first click will open first circle // first click will open first circle
cy.get('[data-cy="lp-continue-button"]').should("contain", "Los geht's"); cy.get('[data-cy="lp-continue-button"]').should("contain", "Los geht's");
@ -55,9 +55,9 @@ describe("learningPath page", () => {
cy.get('[data-cy="back-to-learning-path-button"]').click(); cy.get('[data-cy="back-to-learning-path-button"]').click();
// mark a learning content in second circle // mark a learning content in second circle
cy.get('[data-cy="circle-analyse"]').click({ force: true }); cy.get('[data-cy="circle-analyse"]').click({force: true});
cy.get( cy.get(
'[data-cy="versicherungsvermittler-in-lp-circle-analyse-lc-fachcheck-fahrzeug-checkbox"] > .cy-checkbox' '[data-cy="versicherungsvermittler-in-alt-lp-circle-analyse-lc-fachcheck-fahrzeug-checkbox"] > .cy-checkbox'
).click(); ).click();
cy.get('[data-cy="back-to-learning-path-button"]').click(); cy.get('[data-cy="back-to-learning-path-button"]').click();

4
server/vbv_lernwelt/competence/create_vv_competence_profile.py
View File

@ -4,12 +4,12 @@ from vbv_lernwelt.competence.factories import (
PerformanceCriteriaFactory, PerformanceCriteriaFactory,
) )
from vbv_lernwelt.competence.models import CompetencePage from vbv_lernwelt.competence.models import CompetencePage
from vbv_lernwelt.course.consts import COURSE_VERSICHERUNGSVERMITTLERIN_ID from vbv_lernwelt.course.consts import COURSE_VERSICHERUNGSVERMITTLERIN_OLD_ID
from vbv_lernwelt.course.models import CoursePage from vbv_lernwelt.course.models import CoursePage
from vbv_lernwelt.learnpath.models import LearningPath, LearningUnit from vbv_lernwelt.learnpath.models import LearningPath, LearningUnit
def create_vv_competence_profile(course_id=COURSE_VERSICHERUNGSVERMITTLERIN_ID): def create_vv_competence_profile(course_id=COURSE_VERSICHERUNGSVERMITTLERIN_OLD_ID):
course_page = CoursePage.objects.get(course_id=course_id) course_page = CoursePage.objects.get(course_id=course_id)
slug_prefix = course_page.get_children().exact_type(LearningPath).first().slug slug_prefix = course_page.get_children().exact_type(LearningPath).first().slug

4
server/vbv_lernwelt/competence/create_vv_new_competence_profile.py
View File

@ -2,11 +2,11 @@ from vbv_lernwelt.competence.factories import (
CompetencePageFactory, CompetencePageFactory,
CompetenceProfilePageFactory, CompetenceProfilePageFactory,
) )
from vbv_lernwelt.course.consts import COURSE_VERSICHERUNGSVERMITTLERIN_NEW_ID from vbv_lernwelt.course.consts import COURSE_VERSICHERUNGSVERMITTLERIN_ID
from vbv_lernwelt.course.models import CoursePage from vbv_lernwelt.course.models import CoursePage
def create_vv_new_competence_profile(course_id=COURSE_VERSICHERUNGSVERMITTLERIN_NEW_ID): def create_vv_new_competence_profile(course_id=COURSE_VERSICHERUNGSVERMITTLERIN_ID):
course_page = CoursePage.objects.get(course_id=course_id) course_page = CoursePage.objects.get(course_id=course_id)
competence_profile_page = CompetenceProfilePageFactory( competence_profile_page = CompetenceProfilePageFactory(

4
server/vbv_lernwelt/course/consts.py
View File

@ -1,4 +1,4 @@
COURSE_TEST_ID = -1 COURSE_TEST_ID = -1
COURSE_VERSICHERUNGSVERMITTLERIN_ID = -2 COURSE_VERSICHERUNGSVERMITTLERIN_OLD_ID = -2
COURSE_UK1 = -3 COURSE_UK1 = -3
COURSE_VERSICHERUNGSVERMITTLERIN_NEW_ID = -4 COURSE_VERSICHERUNGSVERMITTLERIN_ID = -4

6
server/vbv_lernwelt/course/creators/versicherungsvermittlerin.py
View File

@ -2,15 +2,15 @@ import wagtail_factories
from django.conf import settings from django.conf import settings
from wagtail.models import Site from wagtail.models import Site
from vbv_lernwelt.course.consts import COURSE_VERSICHERUNGSVERMITTLERIN_ID from vbv_lernwelt.course.consts import COURSE_VERSICHERUNGSVERMITTLERIN_OLD_ID
from vbv_lernwelt.course.factories import CoursePageFactory from vbv_lernwelt.course.factories import CoursePageFactory
def create_versicherungsvermittlerin_with_categories( def create_versicherungsvermittlerin_with_categories(
apps=None, apps=None,
schema_editor=None, schema_editor=None,
course_id=COURSE_VERSICHERUNGSVERMITTLERIN_ID, course_id=COURSE_VERSICHERUNGSVERMITTLERIN_OLD_ID,
title="Versicherungsvermittler/-in", title="Versicherungsvermittler/-in (alt)",
): ):
if apps is not None: if apps is not None:
Course = apps.get_model("course", "Course") Course = apps.get_model("course", "Course")

76
server/vbv_lernwelt/course/management/commands/create_default_courses.py
View File

@ -16,7 +16,7 @@ from vbv_lernwelt.course.consts import (
COURSE_TEST_ID, COURSE_TEST_ID,
COURSE_UK1, COURSE_UK1,
COURSE_VERSICHERUNGSVERMITTLERIN_ID, COURSE_VERSICHERUNGSVERMITTLERIN_ID,
COURSE_VERSICHERUNGSVERMITTLERIN_NEW_ID, COURSE_VERSICHERUNGSVERMITTLERIN_OLD_ID,
) )
from vbv_lernwelt.course.creators.test_course import create_test_course from vbv_lernwelt.course.creators.test_course import create_test_course
from vbv_lernwelt.course.creators.versicherungsvermittlerin import ( from vbv_lernwelt.course.creators.versicherungsvermittlerin import (
@ -56,12 +56,12 @@ def command():
# Versicherungsvermittler/in mit neuen Circles # Versicherungsvermittler/in mit neuen Circles
create_versicherungsvermittlerin_with_categories( create_versicherungsvermittlerin_with_categories(
course_id=COURSE_VERSICHERUNGSVERMITTLERIN_NEW_ID, course_id=COURSE_VERSICHERUNGSVERMITTLERIN_ID,
title="Versicherungsvermittler/-in (neu)", title="Versicherungsvermittler/-in",
) )
create_vv_new_competence_profile(course_id=COURSE_VERSICHERUNGSVERMITTLERIN_NEW_ID) create_vv_new_competence_profile(course_id=COURSE_VERSICHERUNGSVERMITTLERIN_ID)
create_vv_new_learning_path() create_vv_new_learning_path()
create_default_media_library(course_id=COURSE_VERSICHERUNGSVERMITTLERIN_NEW_ID) create_default_media_library(course_id=COURSE_VERSICHERUNGSVERMITTLERIN_ID)
# Überbetriebliche Kurse # Überbetriebliche Kurse
create_versicherungsvermittlerin_with_categories( create_versicherungsvermittlerin_with_categories(
@ -81,6 +81,37 @@ def command():
) )
# course session Versicherungsvermittler/in # course session Versicherungsvermittler/in
cs = CourseSession.objects.create(
course_id=COURSE_VERSICHERUNGSVERMITTLERIN_OLD_ID,
title="Versicherungsvermittler/-in",
)
for user_data in default_users:
CourseSessionUser.objects.create(
course_session=cs,
user=User.objects.get(username=user_data["email"]),
)
csu = CourseSessionUser.objects.create(
course_session=cs,
user=User.objects.get(username="student-vv@eiger-versicherungen.ch"),
)
csu = CourseSessionUser.objects.create(
course_session=cs,
user=User.objects.get(username="expert-vv.einstieg@eiger-versicherungen.ch"),
role=CourseSessionUser.Role.EXPERT,
)
csu.expert.add(
Circle.objects.get(slug="versicherungsvermittler-in-lp-circle-gewinnen")
)
csu = CourseSessionUser.objects.create(
course_session=cs,
user=User.objects.get(username="expert-vv.analyse@eiger-versicherungen.ch"),
role=CourseSessionUser.Role.EXPERT,
)
csu.expert.add(
Circle.objects.get(slug="versicherungsvermittler-in-lp-circle-fahrzeug")
)
# course session Versicherungsvermittler/in (neu)
cs = CourseSession.objects.create( cs = CourseSession.objects.create(
course_id=COURSE_VERSICHERUNGSVERMITTLERIN_ID, course_id=COURSE_VERSICHERUNGSVERMITTLERIN_ID,
title="Versicherungsvermittler/-in", title="Versicherungsvermittler/-in",
@ -100,7 +131,7 @@ def command():
role=CourseSessionUser.Role.EXPERT, role=CourseSessionUser.Role.EXPERT,
) )
csu.expert.add( csu.expert.add(
Circle.objects.get(slug="versicherungsvermittler-in-lp-circle-einstieg") Circle.objects.get(slug="versicherungsvermittler-in-lp-circle-basis")
) )
csu = CourseSessionUser.objects.create( csu = CourseSessionUser.objects.create(
course_session=cs, course_session=cs,
@ -108,38 +139,7 @@ def command():
role=CourseSessionUser.Role.EXPERT, role=CourseSessionUser.Role.EXPERT,
) )
csu.expert.add( csu.expert.add(
Circle.objects.get(slug="versicherungsvermittler-in-lp-circle-basis") Circle.objects.get(slug="versicherungsvermittler-in-lp-circle-haushalt")
)
# course session Versicherungsvermittler/in (neu)
cs = CourseSession.objects.create(
course_id=COURSE_VERSICHERUNGSVERMITTLERIN_NEW_ID,
title="Versicherungsvermittler/-in",
)
for user_data in default_users:
CourseSessionUser.objects.create(
course_session=cs,
user=User.objects.get(username=user_data["email"]),
)
csu = CourseSessionUser.objects.create(
course_session=cs,
user=User.objects.get(username="student-vv@eiger-versicherungen.ch"),
)
csu = CourseSessionUser.objects.create(
course_session=cs,
user=User.objects.get(username="expert-vv.einstieg@eiger-versicherungen.ch"),
role=CourseSessionUser.Role.EXPERT,
)
csu.expert.add(
Circle.objects.get(slug="versicherungsvermittler-in-lp-circle-einstieg")
)
csu = CourseSessionUser.objects.create(
course_session=cs,
user=User.objects.get(username="expert-vv.analyse@eiger-versicherungen.ch"),
role=CourseSessionUser.Role.EXPERT,
)
csu.expert.add(
Circle.objects.get(slug="versicherungsvermittler-in-lp-circle-basis")
) )
# course session Überbetriebliche Kurse Lehrjahr 1 - Region Bern # course session Überbetriebliche Kurse Lehrjahr 1 - Region Bern

6
server/vbv_lernwelt/learnpath/create_vv_learning_path.py
View File

@ -7,7 +7,7 @@ from wagtail.rich_text import RichText
from wagtail_localize.models import LocaleSynchronization from wagtail_localize.models import LocaleSynchronization
from vbv_lernwelt.core.admin import User from vbv_lernwelt.core.admin import User
from vbv_lernwelt.course.consts import COURSE_VERSICHERUNGSVERMITTLERIN_ID from vbv_lernwelt.course.consts import COURSE_VERSICHERUNGSVERMITTLERIN_OLD_ID
from vbv_lernwelt.course.models import CourseCategory, CoursePage from vbv_lernwelt.course.models import CourseCategory, CoursePage
from vbv_lernwelt.learnpath.tests.learning_path_factories import ( from vbv_lernwelt.learnpath.tests.learning_path_factories import (
AssignmentBlockFactory, AssignmentBlockFactory,
@ -30,7 +30,7 @@ READY_HF = ["Fahrzeug", "Reisen"]
def create_vv_learning_path( def create_vv_learning_path(
course_id=COURSE_VERSICHERUNGSVERMITTLERIN_ID, user=None, skip_locales=True course_id=COURSE_VERSICHERUNGSVERMITTLERIN_OLD_ID, user=None, skip_locales=True
): ):
if user is None: if user is None:
user = User.objects.get(username="info@iterativ.ch") user = User.objects.get(username="info@iterativ.ch")
@ -800,7 +800,7 @@ def create_standard_learning_unit(
title=learning_unit_title, title=learning_unit_title,
parent=parent, parent=parent,
course_category=CourseCategory.objects.get( course_category=CourseCategory.objects.get(
course_id=COURSE_VERSICHERUNGSVERMITTLERIN_ID, title=category_name course_id=COURSE_VERSICHERUNGSVERMITTLERIN_OLD_ID, title=category_name
), ),
) )

6
server/vbv_lernwelt/learnpath/create_vv_new_learning_path.py
View File

@ -8,7 +8,7 @@ from wagtail_localize.models import LocaleSynchronization
from vbv_lernwelt.competence.factories import PerformanceCriteriaFactory from vbv_lernwelt.competence.factories import PerformanceCriteriaFactory
from vbv_lernwelt.competence.models import CompetencePage from vbv_lernwelt.competence.models import CompetencePage
from vbv_lernwelt.core.admin import User from vbv_lernwelt.core.admin import User
from vbv_lernwelt.course.consts import COURSE_VERSICHERUNGSVERMITTLERIN_NEW_ID from vbv_lernwelt.course.consts import COURSE_VERSICHERUNGSVERMITTLERIN_ID
from vbv_lernwelt.course.models import CourseCategory, CoursePage from vbv_lernwelt.course.models import CourseCategory, CoursePage
from vbv_lernwelt.learnpath.tests.learning_path_factories import ( from vbv_lernwelt.learnpath.tests.learning_path_factories import (
AssignmentBlockFactory, AssignmentBlockFactory,
@ -29,7 +29,7 @@ READY_HF = ["Fahrzeug", "Reisen"]
def create_vv_new_learning_path( def create_vv_new_learning_path(
course_id=COURSE_VERSICHERUNGSVERMITTLERIN_NEW_ID, user=None, skip_locales=True course_id=COURSE_VERSICHERUNGSVERMITTLERIN_ID, user=None, skip_locales=True
): ):
if user is None: if user is None:
user = User.objects.get(username="info@iterativ.ch") user = User.objects.get(username="info@iterativ.ch")
@ -783,7 +783,7 @@ def create_standard_learning_unit(
title=learning_unit_title, title=learning_unit_title,
parent=parent, parent=parent,
course_category=CourseCategory.objects.get( course_category=CourseCategory.objects.get(
course_id=COURSE_VERSICHERUNGSVERMITTLERIN_NEW_ID, title=category_name course_id=COURSE_VERSICHERUNGSVERMITTLERIN_ID, title=category_name
), ),
) )

4
server/vbv_lernwelt/media_library/create_default_media_library.py
View File

@ -1,6 +1,6 @@
import json import json
from vbv_lernwelt.course.consts import COURSE_VERSICHERUNGSVERMITTLERIN_ID from vbv_lernwelt.course.consts import COURSE_VERSICHERUNGSVERMITTLERIN_OLD_ID
from vbv_lernwelt.course.models import Course, CoursePage from vbv_lernwelt.course.models import Course, CoursePage
from vbv_lernwelt.media_library.tests.media_library_factories import ( from vbv_lernwelt.media_library.tests.media_library_factories import (
create_external_link_block, create_external_link_block,
@ -17,7 +17,7 @@ from vbv_lernwelt.media_library.tests.media_library_factories import (
) )
def create_default_media_library(course_id=COURSE_VERSICHERUNGSVERMITTLERIN_ID): def create_default_media_library(course_id=COURSE_VERSICHERUNGSVERMITTLERIN_OLD_ID):
course = Course.objects.get(id=course_id) course = Course.objects.get(id=course_id)
course_page = CoursePage.objects.get(course_id=course_id) course_page = CoursePage.objects.get(course_id=course_id)