Das lernst du in diesem Circle.
-
+
{{ circleStore.circle?.description }}
@@ -92,7 +116,9 @@ onMounted(async () => {
Hast du Fragen?
-
Tausche dich mit der Fachexpertin aus für den Circle Analyse aus.
+
+ Tausche dich mit der Fachexpertin aus für den Circle Analyse aus.
+
@@ -116,12 +142,12 @@ onMounted(async () => {
+
diff --git a/client/tailwind.config.js b/client/tailwind.config.js
index 920c7b2b..be837b6e 100644
--- a/client/tailwind.config.js
+++ b/client/tailwind.config.js
@@ -15,6 +15,10 @@ module.exports = {
spacing: {
'128': '32rem',
},
+ maxWidth: {
+ '8xl': '88rem',
+ '9xl': '96rem',
+ },
backgroundImage: {
}
},
diff --git a/client/tailwind.css b/client/tailwind.css
index 8a361e65..b369767a 100644
--- a/client/tailwind.css
+++ b/client/tailwind.css
@@ -6,6 +6,10 @@ html {
@apply text-black
}
+body {
+ hyphens: auto;
+}
+
svg {
@apply fill-current
}
@@ -55,6 +59,14 @@ svg {
@apply text-base font-bold
}
+ .container-medium {
+ @apply mx-auto max-w-5xl px-4 lg:px-8 py-4
+ }
+
+ .container-large {
+ @apply mx-auto max-w-9xl px-4 lg:px-8 py-4
+ }
+
}
@layer components {
diff --git a/cypress/e2e/circle.cy.js b/cypress/e2e/circle.cy.js
index 676975a6..c7e41ae6 100644
--- a/cypress/e2e/circle.cy.js
+++ b/cypress/e2e/circle.cy.js
@@ -5,50 +5,90 @@ describe("circle page", () => {
cy.manageCommand("cypress_reset");
login("admin", "test");
- cy.visit("/learn/versicherungsvermittlerin/analyse");
+ cy.visit("/learn/unit-test-lernpfad/unit-test-circle");
});
it("can open circle page", () => {
- cy.get('[data-cy="circle-title"]').should("contain", "Analyse");
+ cy.get('[data-cy="circle-title"]').should("contain", "Unit-Test Circle");
});
it("can toggle learning content", () => {
- cy.get('[data-cy="circle-title"]').should("contain", "Analyse");
+ cy.get('[data-cy="circle-title"]').should("contain", "Unit-Test Circle");
cy.get(
- '[data-cy="versicherungsvermittlerin-circle-analyse-lc-ermittlung-des-kundenbedarfs"] > .cy-checkbox'
+ '[data-cy="unit-test-lernpfad-circle-unit-test-circle-lc-ermittlung-des-kundenbedarfs"] > .cy-checkbox'
).click();
cy.get(
- '[data-cy="versicherungsvermittlerin-circle-analyse-lc-ermittlung-des-kundenbedarfs"] > .cy-checkbox-checked'
+ '[data-cy="unit-test-lernpfad-circle-unit-test-circle-lc-ermittlung-des-kundenbedarfs"] > .cy-checkbox-checked'
).should("have.class", "cy-checkbox-checked");
// completion data should still be there after reload
cy.reload();
cy.get(
- '[data-cy="versicherungsvermittlerin-circle-analyse-lc-ermittlung-des-kundenbedarfs"] > .cy-checkbox-checked'
+ '[data-cy="unit-test-lernpfad-circle-unit-test-circle-lc-ermittlung-des-kundenbedarfs"] > .cy-checkbox-checked'
).should("have.class", "cy-checkbox-checked");
});
it("can open learning contents and complete them by continuing", () => {
cy.get(
- '[data-cy="versicherungsvermittlerin-circle-analyse-lc-ermittlung-des-kundenbedarfs"]'
+ '[data-cy="unit-test-lernpfad-circle-unit-test-circle-lc-ermittlung-des-kundenbedarfs"]'
).click();
+ cy.get('[data-cy="ln-title"]').should(
+ "contain",
+ "Ermittlung des Kundenbedarfs"
+ );
cy.get('[data-cy="complete-and-continue"]').click();
- cy.get('[data-cy="complete-and-continue"]').click();
- cy.get('[data-cy="complete-and-continue"]').click();
+ cy.get('[data-cy="ln-title"]').should(
+ "contain",
+ "Kundenbedürfnisse erkennen"
+ );
- cy.get('[data-cy="close-learnng-content"]').click();
+ cy.get('[data-cy="complete-and-continue"]').click();
+ cy.get('[data-cy="ln-title"]').should(
+ "contain",
+ "Was braucht eine Familie"
+ );
+
+ cy.get('[data-cy="complete-and-continue"]').click();
cy.get(
- '[data-cy="versicherungsvermittlerin-circle-analyse-lc-ermittlung-des-kundenbedarfs"] > .cy-checkbox-checked'
+ '[data-cy="unit-test-lernpfad-circle-unit-test-circle-lc-ermittlung-des-kundenbedarfs"] > .cy-checkbox-checked'
).should("have.class", "cy-checkbox-checked");
cy.get(
- '[data-cy="versicherungsvermittlerin-circle-analyse-lc-kundenanalyse"] > .cy-checkbox-checked'
+ '[data-cy="unit-test-lernpfad-circle-unit-test-circle-lc-kundenbedürfnisse-erkennen"] > .cy-checkbox-checked'
).should("have.class", "cy-checkbox-checked");
cy.get(
- '[data-cy="versicherungsvermittlerin-circle-analyse-lc-kundenbedürfnisse-erkennen"] > .cy-checkbox-checked'
+ '[data-cy="unit-test-lernpfad-circle-unit-test-circle-lc-was-braucht-eine-familie"] > .cy-checkbox-checked'
).should("have.class", "cy-checkbox-checked");
});
+
+ it("continue button works", () => {
+ cy.get('[data-cy="ls-continue-button"]').should("contain", "Los geht's");
+ cy.get('[data-cy="ls-continue-button"]').click();
+
+ cy.get('[data-cy="ln-title"]').should(
+ "contain",
+ 'Einleitung Circle "Unit-Test Circle"'
+ );
+ cy.get('[data-cy="complete-and-continue"]').click();
+
+ cy.get('[data-cy="ls-continue-button"]').should("contain", "Weiter geht's");
+ cy.get('[data-cy="ls-continue-button"]').click();
+ cy.get('[data-cy="ln-title"]').should(
+ "contain",
+ "Ermittlung des Kundenbedarfs"
+ );
+ });
+
+ it("can open learning content by url", () => {
+ cy.visit(
+ "/learn/unit-test-lernpfad/unit-test-circle/ermittlung-des-kundenbedarfs"
+ );
+ cy.get('[data-cy="ln-title"]').should(
+ "contain",
+ "Ermittlung des Kundenbedarfs"
+ );
+ });
});
diff --git a/cypress/e2e/learningPath.cy.js b/cypress/e2e/learningPath.cy.js
index 3e393166..10594182 100644
--- a/cypress/e2e/learningPath.cy.js
+++ b/cypress/e2e/learningPath.cy.js
@@ -25,7 +25,7 @@ describe("learningPath page", () => {
cy.get('[data-cy="circle-title"]').should("contain", "Analyse");
});
- it("open listView and click on cirle will open circle", () => {
+ it("open listView and click on circle will open circle", () => {
login("admin", "test");
cy.visit("/learn/versicherungsvermittlerin");
@@ -43,7 +43,8 @@ describe("learningPath page", () => {
cy.visit("/learn/unit-test-lernpfad");
// first click will open first circle
- cy.get('[data-cy="continue-button"]').click();
+ cy.get('[data-cy="lp-continue-button"]').should("contain", "Los geht's");
+ cy.get('[data-cy="lp-continue-button"]').click();
cy.get('[data-cy="circle-title"]').should("contain", "Basis");
cy.get('[data-cy="back-to-learning-path-button"]').click();
@@ -55,7 +56,8 @@ describe("learningPath page", () => {
cy.get('[data-cy="back-to-learning-path-button"]').click();
// click on continue should go to unit-test-circle
- cy.get('[data-cy="continue-button"]').click();
+ cy.get('[data-cy="lp-continue-button"]').should("contain", "Weiter geht's");
+ cy.get('[data-cy="lp-continue-button"]').click();
cy.get('[data-cy="circle-title"]').should("contain", "Unit-Test Circle");
});
});
diff --git a/server/vbv_lernwelt/learnpath/create_default_learning_path.py b/server/vbv_lernwelt/learnpath/create_default_learning_path.py
index a69ff1c8..a1f27c12 100644
--- a/server/vbv_lernwelt/learnpath/create_default_learning_path.py
+++ b/server/vbv_lernwelt/learnpath/create_default_learning_path.py
@@ -425,8 +425,8 @@ Neukundinnen und -kunden.""",
create_circle_children(circle_analyse, 'Betreuen')
TopicFactory(title="Prüfung", is_visible=True, parent=lp)
- circle_analyse = create_circle('Prüfungs- vorbereitung', lp)
- create_circle_children(circle_analyse, 'Prüfungs- vorbereitung')
+ circle_analyse = create_circle('Prüfungsvorbereitung', lp)
+ create_circle_children(circle_analyse, 'Prüfungsvorbereitung')
# locales
if not skip_locales:
diff --git a/server/vbv_lernwelt/learnpath/tests/create_simple_test_learning_path.py b/server/vbv_lernwelt/learnpath/tests/create_simple_test_learning_path.py
index eae819c5..7b74a154 100644
--- a/server/vbv_lernwelt/learnpath/tests/create_simple_test_learning_path.py
+++ b/server/vbv_lernwelt/learnpath/tests/create_simple_test_learning_path.py
@@ -4,7 +4,7 @@ from wagtail.models import Site, Page
from vbv_lernwelt.core.admin import User
from vbv_lernwelt.learnpath.tests.learning_path_factories import LearningPathFactory, TopicFactory, CircleFactory, \
- LearningSequenceFactory, LearningContentFactory, VideoBlockFactory, PodcastBlockFactory, CompetenceBlockFactory, \
+ LearningSequenceFactory, LearningContentFactory, CompetenceBlockFactory, \
ExerciseBlockFactory, LearningUnitFactory, LearningUnitQuestionFactory
@@ -33,11 +33,7 @@ def create_circle_children(circle, title):
title=f'Einleitung Circle "{title}"',
parent=circle,
minutes=15,
- contents=[('video', VideoBlockFactory(
- url='https://www.youtube.com/embed/qhPIfxS2hvI',
- description='In dieser Circle zeigt dir ein Fachexperte anhand von Kundensituationen, wie du erfolgreich'
- 'den Kundenbedarf ermitteln, analysieren, priorisieren und anschliessend zusammenfassen kannst.'
- ))]
+ contents=[('competence', CompetenceBlockFactory())]
)
LearningSequenceFactory(title='Beobachten', parent=circle, icon='it-icon-ls-watch')
@@ -57,10 +53,7 @@ def create_circle_children(circle, title):
title='Ermittlung des Kundenbedarfs',
parent=circle,
minutes=30,
- contents=[('podcast', PodcastBlockFactory(
- description='Die Ermittlung des Kundenbedarfs muss in einem eingehenden Gespräch herausgefunden werden. Höre dazu auch diesen Podcast an.',
- url='https://w.soundcloud.com/player/?url=https%3A//api.soundcloud.com/tracks/325190984&color=%23ff5500&auto_play=false&hide_related=false&show_comments=true&show_user=true&show_reposts=false&show_teaser=true&visual=true',
- ))]
+ contents=[('competence', CompetenceBlockFactory())]
)
LearningContentFactory(
title='Kundenbedürfnisse erkennen',
@@ -138,10 +131,7 @@ def create_simple_test_learning_path(user=None, skip_locales=True):
title='Einleitung Circle "Basis"',
parent=circle_basis,
minutes=15,
- contents=[('video', VideoBlockFactory(
- url='https://www.youtube.com/embed/qhPIfxS2hvI',
- description='Basis Video'
- ))]
+ contents=[('competence', CompetenceBlockFactory())]
)
LearningSequenceFactory(title='Beenden', parent=circle_basis, icon='it-icon-ls-end')
LearningContentFactory(
diff --git a/server/vbv_lernwelt/templates/admin/index.html b/server/vbv_lernwelt/templates/admin/index.html
index 27e592a4..ec7a425d 100644
--- a/server/vbv_lernwelt/templates/admin/index.html
+++ b/server/vbv_lernwelt/templates/admin/index.html
@@ -5,11 +5,11 @@
{% include "admin/app_list.html" with app_list=app_list show_changelinks=True %}
-
-