+
+ Willkommen, {{ userStore.first_name }}
+ +Deine Kurse
+ +
+
+ Versicherungsvermittler/in
+
+
+ Weiter geht's
+
+
+ {{ pieData }}
{{ render() }}
diff --git a/client/src/components/learningPath/LearningContent.vue b/client/src/components/learningPath/LearningContent.vue
index 8f59ba1d..91bfdd57 100644
--- a/client/src/components/learningPath/LearningContent.vue
+++ b/client/src/components/learningPath/LearningContent.vue
@@ -30,14 +30,14 @@ const block = computed(() => {
type="button"
class="btn-text inline-flex items-center px-3 py-2 font-normal"
data-cy="close-learning-content"
- @click="circleStore.closeLearningContent()"
+ @click="circleStore.closeLearningContent(props.learningContent)"
>
- {{ learningContent?.title }} + {{ learningContent.title }}
-
+
diff --git a/client/src/components/learningPath/LearningContentTypeBadge.vue b/client/src/components/learningPath/LearningContentTypeBadge.vue
index a12b8b26..63dcd50f 100644
--- a/client/src/components/learningPath/LearningContentTypeBadge.vue
+++ b/client/src/components/learningPath/LearningContentTypeBadge.vue
@@ -37,10 +37,11 @@ const props = defineProps<{
v-else-if="props.learningContentType === 'resource'"
class="w-6 h-6"
/>
-
-
+
+
+
+
{{ block.value.description }}
-
+
+
+ {{ block.value.description }}
+{{ learningContent.title }}
+{{ block.value.description }}
{{ learningContentTypesToName.get(props.learningContentType) }}
diff --git a/client/src/pages/LearningPathViewVertical.vue b/client/src/components/learningPath/LearningPathViewVertical.vue similarity index 100% rename from client/src/pages/LearningPathViewVertical.vue rename to client/src/components/learningPath/LearningPathViewVertical.vue diff --git a/client/src/components/learningPath/LearningSequence.vue b/client/src/components/learningPath/LearningSequence.vue index 444c7a89..1fd65536 100644 --- a/client/src/components/learningPath/LearningSequence.vue +++ b/client/src/components/learningPath/LearningSequence.vue @@ -99,6 +99,7 @@ const learningSequenceBorderClass = computed(() => { >
@@ -155,26 +156,30 @@ const learningSequenceBorderClass = computed(() => {
-
Selbsteinschätzung: Ich kann das.
-
- Selbsteinschätzung: Muss ich nochmals anschauen
-
diff --git a/client/src/components/learningPath/SelfEvaluation.vue b/client/src/components/learningPath/SelfEvaluation.vue
index 389cd691..be53ba5b 100644
--- a/client/src/components/learningPath/SelfEvaluation.vue
+++ b/client/src/components/learningPath/SelfEvaluation.vue
@@ -26,7 +26,7 @@ function handleContinue() {
state.questionIndex += 1;
} else {
log.debug("continue to next learning content");
- circleStore.continueFromSelfEvaluation();
+ circleStore.continueFromSelfEvaluation(props.learningUnit);
}
}
@@ -39,18 +39,27 @@ function handleContinue() {
-
+
Selbsteinschätzung
{{ learningUnit.title }}
++ Selbsteinschätzung {{ learningUnit.title }} +
- + -
+
Schritt {{ state.questionIndex + 1 }} von {{ questions.length }}
@@ -73,6 +82,7 @@ function handleContinue() {
'border-2': currentQuestion.completion_status === 'success',
'border-gray-500': currentQuestion.completion_status !== 'success',
}"
+ data-cy="success"
@click="circleStore.markCompletion(currentQuestion, 'success')"
>
+
![]()
(), {
+
{{ call2Action }}
@@ -25,7 +25,7 @@ const props = withDefaults(defineProps(), {
diff --git a/client/src/pages/CockpitPage.vue b/client/src/pages/CockpitPage.vue
new file mode 100644
index 00000000..76cb303e
--- /dev/null
+++ b/client/src/pages/CockpitPage.vue
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
diff --git a/client/src/pages/CockpitView.vue b/client/src/pages/CockpitView.vue
deleted file mode 100644
index 69407013..00000000
--- a/client/src/pages/CockpitView.vue
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/client/src/pages/LoginPage.vue b/client/src/pages/LoginPage.vue
new file mode 100644
index 00000000..7c972ef7
--- /dev/null
+++ b/client/src/pages/LoginPage.vue
@@ -0,0 +1,66 @@
+
+
+
+
+
+
+
+
diff --git a/client/src/pages/LoginView.vue b/client/src/pages/LoginView.vue
deleted file mode 100644
index 8f7c21b2..00000000
--- a/client/src/pages/LoginView.vue
+++ /dev/null
@@ -1,58 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/client/src/pages/MessagesView.vue b/client/src/pages/MessagesPage.vue
similarity index 100%
rename from client/src/pages/MessagesView.vue
rename to client/src/pages/MessagesPage.vue
diff --git a/client/src/pages/ProfileView.vue b/client/src/pages/ProfilePage.vue
similarity index 100%
rename from client/src/pages/ProfileView.vue
rename to client/src/pages/ProfilePage.vue
diff --git a/client/src/pages/ShopView.vue b/client/src/pages/ShopPage.vue
similarity index 100%
rename from client/src/pages/ShopView.vue
rename to client/src/pages/ShopPage.vue
diff --git a/client/src/pages/StyleGuideView.vue b/client/src/pages/StyleGuidePage.vue
similarity index 100%
rename from client/src/pages/StyleGuideView.vue
rename to client/src/pages/StyleGuidePage.vue
diff --git a/client/src/pages/CircleView.vue b/client/src/pages/learningPath/CirclePage.vue
similarity index 88%
rename from client/src/pages/CircleView.vue
rename to client/src/pages/learningPath/CirclePage.vue
index 3f9b3661..123d788a 100644
--- a/client/src/pages/CircleView.vue
+++ b/client/src/pages/learningPath/CirclePage.vue
@@ -40,13 +40,25 @@ onMounted(async () => {
try {
await circleStore.loadCircle(props.learningPathSlug, props.circleSlug);
- if (route.hash.startsWith("#ls-")) {
- const hashLearningSequence = circleStore.circle?.learningSequences.find((ls) => {
- return ls.slug.endsWith(route.hash.replace("#", ""));
- });
- if (hashLearningSequence) {
+ if (route.hash.startsWith("#ls-") || route.hash.startsWith("#lu-")) {
+ const slugEnd = route.hash.replace("#", "");
+ let wagtailPage = null;
+
+ if (slugEnd.startsWith("ls-")) {
+ wagtailPage = circleStore.circle?.learningSequences.find((ls) => {
+ return ls.slug.endsWith(slugEnd);
+ });
+ } else if (slugEnd.startsWith("lu-")) {
+ const learningUnits = circleStore.circle?.learningSequences.flatMap(
+ (ls) => ls.learningUnits
+ );
+ wagtailPage = learningUnits.find((lu) => {
+ return lu.slug.endsWith(slugEnd);
+ });
+ }
+ if (wagtailPage) {
document
- .getElementById(hashLearningSequence.slug)
+ .getElementById(wagtailPage.slug)
?.scrollIntoView({ behavior: "smooth" });
}
}
diff --git a/client/src/pages/LearningContentView.vue b/client/src/pages/learningPath/LearningContentPage.vue
similarity index 100%
rename from client/src/pages/LearningContentView.vue
rename to client/src/pages/learningPath/LearningContentPage.vue
diff --git a/client/src/pages/LearningPathView.vue b/client/src/pages/learningPath/LearningPathPage.vue
similarity index 61%
rename from client/src/pages/LearningPathView.vue
rename to client/src/pages/learningPath/LearningPathPage.vue
index afe187fc..9246d84c 100644
--- a/client/src/pages/LearningPathView.vue
+++ b/client/src/pages/learningPath/LearningPathPage.vue
@@ -6,7 +6,7 @@ import { useUserStore } from "@/stores/user";
import { onMounted } from "vue";
import LearningPathDiagram from "@/components/learningPath/LearningPathDiagram.vue";
-import LearningPathViewVertical from "@/pages/LearningPathViewVertical.vue";
+import LearningPathViewVertical from "@/components/learningPath/LearningPathViewVertical.vue";
import type { LearningPath } from "@/services/learningPath";
log.debug("LearningPathView created");
@@ -74,42 +74,43 @@ const createContinueUrl = (learningPath: LearningPath): [string, boolean] => {
>
-
{{ title }}
diff --git a/client/src/components/mediaLibrary/OverviewCard.vue b/client/src/components/mediaLibrary/OverviewCard.vue index 27ee2a9d..aaf20820 100644 --- a/client/src/components/mediaLibrary/OverviewCard.vue +++ b/client/src/components/mediaLibrary/OverviewCard.vue @@ -16,8 +16,8 @@ const props = withDefaults(defineProps{{ title }}
-{{ description }}
-{{ description }}
+Willkommen, {{ userStore.first_name }}
- -Deine Kurse
- -
-
- Versicherungsvermittler/in
-
-
- Weiter geht's
-
-
-
+
+ Login
+ + + +Login
- - - -- {{ learningPathStore.learningPath.title }} -
- -
-
diff --git a/client/src/pages/LearningUnitSelfEvaluationView.vue b/client/src/pages/learningPath/SelfEvaluationPage.vue
similarity index 100%
rename from client/src/pages/LearningUnitSelfEvaluationView.vue
rename to client/src/pages/learningPath/SelfEvaluationPage.vue
diff --git a/client/src/pages/mediaLibrary/MLCategoryDetailPage.vue b/client/src/pages/mediaLibrary/MLCategoryDetailPage.vue
index 9efbc880..1d822529 100644
--- a/client/src/pages/mediaLibrary/MLCategoryDetailPage.vue
+++ b/client/src/pages/mediaLibrary/MLCategoryDetailPage.vue
@@ -52,27 +52,32 @@ const hasMoreItemsForType = (itemType: string, items: object[]) => {
-
+ Willkommmen zurück, {{ userStore.first_name }}
- -
+
+ {{ learningPathStore.learningPath.title }} +
- Nächster Schritt
-
+
+ - {{ - learningPathStore.learningPath.nextLearningContent.parentCircle.title - }}: - {{ - learningPathStore.learningPath.nextLearningContent - .parentLearningSequence?.title - }} -
-Willkommmen zurück, {{ userStore.first_name }}
+ +
-
- Los geht's
-
- Weiter geht's
-
+ Nächster Schritt
+
+
+ Los geht's
+
+ Weiter geht's
+
+
+ {{ + learningPathStore.learningPath.nextLearningContent.parentCircle.title + }}: + {{ + learningPathStore.learningPath.nextLearningContent + .parentLearningSequence?.title + }} +
+
-
+
+
+ ![]()
- Handlungsfeld
{{ mediaCategory.title }}
-{{ mediaCategory.introduction_text }}
+{{ mediaCategory.introduction_text }}
+
+ ![]()
- {{ mediaCategory.description_title }}
-{{ mediaCategory.description_text }}
+{{ mediaCategory.description_text }}
-
-
+
{{ item.value }}
{{ content_collection.value.title }}
++ {{ content_collection.value.description }} +
-
-
+
+
diff --git a/client/src/pages/mediaLibrary/MLCategoryLayout.vue b/client/src/pages/mediaLibrary/MLCategoryLayout.vue
index 8ad7d5d0..2db10c49 100644
--- a/client/src/pages/mediaLibrary/MLCategoryLayout.vue
+++ b/client/src/pages/mediaLibrary/MLCategoryLayout.vue
@@ -6,16 +6,24 @@ const router = useRouter();
-
Handlungsfelder
-
-
-
+
@@ -24,6 +32,7 @@ const router = useRouter();
.it-icon-hf {
color: blue;
}
+
.it-icon-hf > * {
@apply m-auto;
}
diff --git a/client/src/pages/mediaLibrary/MLIndexPage.vue b/client/src/pages/mediaLibrary/MLIndexPage.vue
index f0b8691c..e8832ab6 100644
--- a/client/src/pages/mediaLibrary/MLIndexPage.vue
+++ b/client/src/pages/mediaLibrary/MLIndexPage.vue
@@ -26,8 +26,8 @@ watch(dropdownSelected, (newValue) =>
-
+
+
+
+
+
+
-
-
+
+
([
["video", "Video"],
["test", "Test"],
["resource", "Hilfsmittel"],
+ ["placeholder", "Platzhalter"],
]);
diff --git a/client/tailwind.css b/client/tailwind.css
index 7ff15ab8..b89819f6 100644
--- a/client/tailwind.css
+++ b/client/tailwind.css
@@ -60,11 +60,11 @@ svg {
}
.container-medium {
- @apply mx-auto max-w-5xl px-4 lg:px-8 py-4;
+ @apply mx-auto max-w-5xl w-full px-4 lg:px-8 py-4;
}
.container-large {
- @apply mx-auto max-w-9xl px-4 lg:px-8 py-4;
+ @apply mx-auto max-w-6xl w-full px-4 lg:px-8 py-4;
}
}
diff --git a/cypress/e2e/circle.cy.js b/cypress/e2e/circle.cy.js
index 7bf1715f..6a6d385c 100644
--- a/cypress/e2e/circle.cy.js
+++ b/cypress/e2e/circle.cy.js
@@ -31,6 +31,10 @@ describe("circle page", () => {
});
it("can open learning contents and complete them by continuing", () => {
+ cy.get(
+ '[data-cy="test-lehrgang-lp-circle-analyse-lu-fahrzeug"] > div'
+ ).should("have.class", "self-evaluation-unknown");
+
cy.get(
'[data-cy="test-lehrgang-lp-circle-analyse-lc-rafael-fasel-wechselt-sein-auto"]'
).click();
@@ -43,12 +47,30 @@ describe("circle page", () => {
cy.get('[data-cy="ln-title"]').should("contain", "Fachcheck Fahrzeug");
cy.get('[data-cy="complete-and-continue"]').click();
+ cy.get('[data-cy="ln-title"]').should(
+ "contain",
+ "Selbsteinschätzung Fahrzeug"
+ );
+ cy.get('[data-cy="success"]').click();
+ cy.get('[data-cy="complete-and-continue"]').click();
+
+ cy.get('[data-cy="ln-title"]').should(
+ "contain",
+ "Selbsteinschätzung Fahrzeug"
+ );
+ cy.get('[data-cy="success"]').click();
+ cy.get('[data-cy="complete-and-continue"]').click();
+
cy.get(
'[data-cy="test-lehrgang-lp-circle-analyse-lc-rafael-fasel-wechselt-sein-auto"] > .cy-checkbox-checked'
).should("have.class", "cy-checkbox-checked");
cy.get(
'[data-cy="test-lehrgang-lp-circle-analyse-lc-fachcheck-fahrzeug"] > .cy-checkbox-checked'
).should("have.class", "cy-checkbox-checked");
+
+ cy.get(
+ '[data-cy="test-lehrgang-lp-circle-analyse-lu-fahrzeug"] > div'
+ ).should("have.class", "self-evaluation-success");
});
it("continue button works", () => {
diff --git a/server/vbv_lernwelt/competence/create_default_competence_profile.py b/server/vbv_lernwelt/competence/create_default_competence_profile.py
index feb410dc..c4491463 100644
--- a/server/vbv_lernwelt/competence/create_default_competence_profile.py
+++ b/server/vbv_lernwelt/competence/create_default_competence_profile.py
@@ -130,6 +130,184 @@ def create_default_competence_profile():
items=[("item", i) for i in c["items"]],
)
+ # Daten anhand von WEVM_Version Oktober 2022
+ # Einstieg/Beobachten – Selbsteinschätzung «Einkommenssicherung»
+ PerformanceCriteriaFactory(
+ parent=CompetencePage.objects.get(competence_id="A2"),
+ competence_id="A2.1",
+ title="Ich bin fähig je nach (Neu-) Kunde Form und Ort für das Gespräch festzulegen.",
+ learning_unit=LearningUnit.objects.get(
+ slug="versicherungsvermittlerin-lp-circle-einstieg-lu-einkommenssicherung"
+ ),
+ )
+ PerformanceCriteriaFactory(
+ parent=CompetencePage.objects.get(competence_id="A2"),
+ competence_id="A2.2",
+ title="Ich bin fähig mir intern und extern die nötigen Informationen über den (Neu-) Kunden zu beschaffen.",
+ learning_unit=LearningUnit.objects.get(
+ slug="versicherungsvermittlerin-lp-circle-einstieg-lu-einkommenssicherung"
+ ),
+ )
+ PerformanceCriteriaFactory(
+ parent=CompetencePage.objects.get(competence_id="A2"),
+ competence_id="A2.3",
+ title="Ich bin fähig die Terminierung auf das Thema Einkommenssicherung auszurichten.",
+ learning_unit=LearningUnit.objects.get(
+ slug="versicherungsvermittlerin-lp-circle-einstieg-lu-einkommenssicherung"
+ ),
+ )
+ PerformanceCriteriaFactory(
+ parent=CompetencePage.objects.get(competence_id="A2"),
+ competence_id="A2.4",
+ title="Ich bin fähig für das zu führende Gespräch eine Agenda zu erstellen.",
+ learning_unit=LearningUnit.objects.get(
+ slug="versicherungsvermittlerin-lp-circle-einstieg-lu-einkommenssicherung"
+ ),
+ )
+ PerformanceCriteriaFactory(
+ parent=CompetencePage.objects.get(competence_id="A2"),
+ competence_id="A2.5",
+ title="Ich bin fähig für das Handlungsfeld «Einkommenssicherung» geeignete Hilfsmittel und Unterlagen zusammenzustellen.",
+ learning_unit=LearningUnit.objects.get(
+ slug="versicherungsvermittlerin-lp-circle-einstieg-lu-einkommenssicherung"
+ ),
+ )
+ PerformanceCriteriaFactory(
+ parent=CompetencePage.objects.get(competence_id="B1"),
+ competence_id="B1.1",
+ title="Ich bin fähig dem Kunden den Gesprächsablauf und den Zeitrahmen (mittels Agenda) aufzuzeigen.",
+ learning_unit=LearningUnit.objects.get(
+ slug="versicherungsvermittlerin-lp-circle-einstieg-lu-einkommenssicherung"
+ ),
+ )
+ PerformanceCriteriaFactory(
+ parent=CompetencePage.objects.get(competence_id="B1"),
+ competence_id="B1.2",
+ title="Ich bin fähig mich beim Kunden korrekt zu identifizieren (VAG 45).",
+ learning_unit=LearningUnit.objects.get(
+ slug="versicherungsvermittlerin-lp-circle-einstieg-lu-einkommenssicherung"
+ ),
+ )
+ PerformanceCriteriaFactory(
+ parent=CompetencePage.objects.get(competence_id="B2"),
+ competence_id="B2.3",
+ title="Ich bin fähig alle erforderlichen Unterlagen einzufordern.",
+ learning_unit=LearningUnit.objects.get(
+ slug="versicherungsvermittlerin-lp-circle-einstieg-lu-einkommenssicherung"
+ ),
+ )
+
+ # Einstieg / Anwenden – Selbsteinschätzung «Fahrzeug»
+ PerformanceCriteriaFactory(
+ parent=CompetencePage.objects.get(competence_id="A1"),
+ competence_id="A1.6",
+ title="Ich bin fähig im täglichen Kontakt potenzielle Kundinnen und Kunden zu erkennen.",
+ learning_unit=LearningUnit.objects.get(
+ slug="versicherungsvermittlerin-lp-circle-einstieg-lu-fahrzeug"
+ ),
+ )
+ PerformanceCriteriaFactory(
+ parent=CompetencePage.objects.get(competence_id="A2"),
+ competence_id="A2.1",
+ title="Ich bin fähig je nach (Neu-) Kunde Form und Ort für das Gespräch festzulegen.",
+ learning_unit=LearningUnit.objects.get(
+ slug="versicherungsvermittlerin-lp-circle-einstieg-lu-fahrzeug"
+ ),
+ )
+ PerformanceCriteriaFactory(
+ parent=CompetencePage.objects.get(competence_id="A2"),
+ competence_id="A2.2",
+ title="Ich bin fähig mir intern und extern die nötigen Informationen über den (Neu-) Kunden zu beschaffen.",
+ learning_unit=LearningUnit.objects.get(
+ slug="versicherungsvermittlerin-lp-circle-einstieg-lu-fahrzeug"
+ ),
+ )
+ PerformanceCriteriaFactory(
+ parent=CompetencePage.objects.get(competence_id="A2"),
+ competence_id="A2.3",
+ title="Ich bin fähig die Terminierung auf das Thema Fahrzeug auszurichten.",
+ learning_unit=LearningUnit.objects.get(
+ slug="versicherungsvermittlerin-lp-circle-einstieg-lu-fahrzeug"
+ ),
+ )
+ PerformanceCriteriaFactory(
+ parent=CompetencePage.objects.get(competence_id="A2"),
+ competence_id="A2.4",
+ title="Ich bin fähig für das zu führende Gespräch eine Agenda zu erstellen.",
+ learning_unit=LearningUnit.objects.get(
+ slug="versicherungsvermittlerin-lp-circle-einstieg-lu-fahrzeug"
+ ),
+ )
+ PerformanceCriteriaFactory(
+ parent=CompetencePage.objects.get(competence_id="A2"),
+ competence_id="A2.5",
+ title="Ich bin fähig für das zu führende Gespräch geeignete Hilfsmittel und Unterlagen zusammenzustellen.",
+ learning_unit=LearningUnit.objects.get(
+ slug="versicherungsvermittlerin-lp-circle-einstieg-lu-fahrzeug"
+ ),
+ )
+
+ # Einstieg / Anwenden – Selbsteinschätzung «Reisen»
+ PerformanceCriteriaFactory(
+ parent=CompetencePage.objects.get(competence_id="A2"),
+ competence_id="A2.3",
+ title="Ich bin fähig die Terminierung auf das Thema Reisen auszurichten.",
+ learning_unit=LearningUnit.objects.get(
+ slug="versicherungsvermittlerin-lp-circle-einstieg-lu-reisen"
+ ),
+ )
+ PerformanceCriteriaFactory(
+ parent=CompetencePage.objects.get(competence_id="A2"),
+ competence_id="A2.4",
+ title="Ich bin fähig für das zu führende Gespräch eine Agenda zu erstellen.",
+ learning_unit=LearningUnit.objects.get(
+ slug="versicherungsvermittlerin-lp-circle-einstieg-lu-reisen"
+ ),
+ )
+ PerformanceCriteriaFactory(
+ parent=CompetencePage.objects.get(competence_id="A2"),
+ competence_id="A2.5",
+ title="Ich bin fähig für das zu führende Gespräch geeignete Hilfsmittel und Unterlagen zusammenzustellen.",
+ learning_unit=LearningUnit.objects.get(
+ slug="versicherungsvermittlerin-lp-circle-einstieg-lu-reisen"
+ ),
+ )
+
+ # Analyse / Beobachten – Selbsteinschätzung «Einkommenssicherung»
+ PerformanceCriteriaFactory(
+ parent=CompetencePage.objects.get(competence_id="A1"),
+ competence_id="A1.5",
+ title="Innerhalb des Handlungsfelds «Einkommenssicherung» bin ich fähig, das Thema Risiko und Sicherheit in einem Gespräch gezielt und auf die Situation des jeweiligen Gesprächspartners bezogen, einfliessen zu lassen.",
+ learning_unit=LearningUnit.objects.get(
+ slug="versicherungsvermittlerin-lp-circle-analyse-lu-einkommenssicherung"
+ ),
+ )
+ PerformanceCriteriaFactory(
+ parent=CompetencePage.objects.get(competence_id="B1"),
+ competence_id="B1.3",
+ title="Innerhalb des Handlungsfelds «Einkommenssicherung» bin ich fähig, die Ziele und Pläne des Kunden zu ergründen (SOLL).",
+ learning_unit=LearningUnit.objects.get(
+ slug="versicherungsvermittlerin-lp-circle-analyse-lu-einkommenssicherung"
+ ),
+ )
+ PerformanceCriteriaFactory(
+ parent=CompetencePage.objects.get(competence_id="B2"),
+ competence_id="B2.1",
+ title="Innerhalb des Handlungsfelds «Einkommenssicherung» bin ich fähig, die IST-Situation des Kunden mit der geeigneten Gesprächs-/Fragetechnik zu erfassen.",
+ learning_unit=LearningUnit.objects.get(
+ slug="versicherungsvermittlerin-lp-circle-analyse-lu-einkommenssicherung"
+ ),
+ )
+ PerformanceCriteriaFactory(
+ parent=CompetencePage.objects.get(competence_id="B2"),
+ competence_id="B2.2",
+ title="Innerhalb des Handlungsfelds «Einkommenssicherung» bin ich fähig, die Risiken aufzuzeigen.",
+ learning_unit=LearningUnit.objects.get(
+ slug="versicherungsvermittlerin-lp-circle-analyse-lu-einkommenssicherung"
+ ),
+ )
+
+ # Analyse/Anwenden – Selbsteinschätzung «Fahrzeug»
PerformanceCriteriaFactory(
parent=CompetencePage.objects.get(competence_id="B1"),
competence_id="B1.3",
@@ -154,3 +332,181 @@ def create_default_competence_profile():
slug="versicherungsvermittlerin-lp-circle-analyse-lu-fahrzeug"
),
)
+
+ # Analyse/Anwenden – Selbsteinschätzung «Reisen»
+ PerformanceCriteriaFactory(
+ parent=CompetencePage.objects.get(competence_id="B1"),
+ competence_id="B1.3",
+ title="Innerhalb des Handlungsfelds «Reisen» bin ich fähig, die Ziele und Pläne des Kunden zu ergründen (SOLL).",
+ learning_unit=LearningUnit.objects.get(
+ slug="versicherungsvermittlerin-lp-circle-analyse-lu-reisen"
+ ),
+ )
+ PerformanceCriteriaFactory(
+ parent=CompetencePage.objects.get(competence_id="B2"),
+ competence_id="B2.1",
+ title="Innerhalb des Handlungsfelds «Reisen» bin ich fähig, die IST-Situation des Kunden mit der geeigneten Gesprächs-/Fragetechnik zu erfassen.",
+ learning_unit=LearningUnit.objects.get(
+ slug="versicherungsvermittlerin-lp-circle-analyse-lu-reisen"
+ ),
+ )
+ PerformanceCriteriaFactory(
+ parent=CompetencePage.objects.get(competence_id="B2"),
+ competence_id="B2.2",
+ title="Innerhalb des Handlungsfelds «Reisen» bin ich fähig, die Risiken aufzuzeigen.",
+ learning_unit=LearningUnit.objects.get(
+ slug="versicherungsvermittlerin-lp-circle-analyse-lu-reisen"
+ ),
+ )
+ PerformanceCriteriaFactory(
+ parent=CompetencePage.objects.get(competence_id="C1"),
+ competence_id="C1.1",
+ title="Innerhalb des Handlungsfelds «Reisen» durch eine Bestandesaufnahme der aktuellen Policen zu prüfen, ob die Leistungen dem Bedarf des Kunden entsprechen.",
+ learning_unit=LearningUnit.objects.get(
+ slug="versicherungsvermittlerin-lp-circle-analyse-lu-reisen"
+ ),
+ )
+
+ # Lösung/Anwenden – Selbsteinschätzung «Fahrzeug»
+ PerformanceCriteriaFactory(
+ parent=CompetencePage.objects.get(competence_id="B4"),
+ competence_id="B4.2",
+ title="Innerhalb des Handlungsfelds «Fahrzeug» bin ich fähig, dem Kunden die Vorschläge verständlich zu erläutern und die entsprechenden Informationspflichten zu erfüllen",
+ learning_unit=LearningUnit.objects.get(
+ slug="versicherungsvermittlerin-lp-circle-analyse-lu-fahrzeug"
+ ),
+ )
+ PerformanceCriteriaFactory(
+ parent=CompetencePage.objects.get(competence_id="B4"),
+ competence_id="B4.3",
+ title="Innerhalb des Handlungsfelds «Fahrzeug» bin ich fähig, auf Vorbehalte und/oder Fragen sachlich korrekt und (verhandlungs-)sicher einzugehen.",
+ learning_unit=LearningUnit.objects.get(
+ slug="versicherungsvermittlerin-lp-circle-analyse-lu-fahrzeug"
+ ),
+ )
+ PerformanceCriteriaFactory(
+ parent=CompetencePage.objects.get(competence_id="B4"),
+ competence_id="B4.4",
+ title="Innerhalb des Handlungsfelds «Fahrzeug» bin ich fähig, nötige Anpassungen flexibel vorzunehmen.",
+ learning_unit=LearningUnit.objects.get(
+ slug="versicherungsvermittlerin-lp-circle-analyse-lu-fahrzeug"
+ ),
+ )
+ PerformanceCriteriaFactory(
+ parent=CompetencePage.objects.get(competence_id="C1"),
+ competence_id="C1.1",
+ title="Innerhalb des Handlungsfelds «Fahrzeug» bin ich fähig durch eine Bestandesaufnahme der aktuellen Policen zu prüfen, ob die Leistungen dem Bedarf des Kunden entsprechen",
+ learning_unit=LearningUnit.objects.get(
+ slug="versicherungsvermittlerin-lp-circle-analyse-lu-fahrzeug"
+ ),
+ )
+ PerformanceCriteriaFactory(
+ parent=CompetencePage.objects.get(competence_id="C1"),
+ competence_id="C1.2",
+ title="Innerhalb des Handlungsfelds «Fahrzeug» bin ich fähig, den Kunden bedarfsgerechte Vorschläge für Anpassungen der Versicherungslösung zu unterbreiten (Up-Selling).",
+ learning_unit=LearningUnit.objects.get(
+ slug="versicherungsvermittlerin-lp-circle-analyse-lu-fahrzeug"
+ ),
+ )
+
+ # Lösung/Anwenden – Selbsteinschätzung «Reisen»
+ PerformanceCriteriaFactory(
+ parent=CompetencePage.objects.get(competence_id="B3"),
+ competence_id="B3.2",
+ title="Innerhalb des Handlungsfelds «Reisen» bin ich fähig, eine Unterversicherung, eine Doppel- oder Überversicherung, einen fehlenden Versicherungsschutz und mögliches Optimierungspotential festzustellen.",
+ learning_unit=LearningUnit.objects.get(
+ slug="versicherungsvermittlerin-lp-circle-analyse-lu-reisen"
+ ),
+ )
+ PerformanceCriteriaFactory(
+ parent=CompetencePage.objects.get(competence_id="B4"),
+ competence_id="B4.2",
+ title="Innerhalb des Handlungsfelds «Reisen» bin ich fähig, dem Kunden die Vorschläge verständlich zu erläutern und die entsprechenden Informationspflichten zu erfüllen.",
+ learning_unit=LearningUnit.objects.get(
+ slug="versicherungsvermittlerin-lp-circle-analyse-lu-reisen"
+ ),
+ )
+ PerformanceCriteriaFactory(
+ parent=CompetencePage.objects.get(competence_id="B4"),
+ competence_id="B4.3",
+ title="Innerhalb des Handlungsfelds «Reisen» bin ich fähig, auf Vorbehalte und/oder Fragen sachlich korrekt und (verhandlungs-)sicher einzugehen.",
+ learning_unit=LearningUnit.objects.get(
+ slug="versicherungsvermittlerin-lp-circle-analyse-lu-reisen"
+ ),
+ )
+ PerformanceCriteriaFactory(
+ parent=CompetencePage.objects.get(competence_id="B4"),
+ competence_id="B4.4",
+ title="Innerhalb des Handlungsfelds «Reisen» bin ich fähig, nötige Anpassungen flexibel vorzunehmen.",
+ learning_unit=LearningUnit.objects.get(
+ slug="versicherungsvermittlerin-lp-circle-analyse-lu-reisen"
+ ),
+ )
+ PerformanceCriteriaFactory(
+ parent=CompetencePage.objects.get(competence_id="C1"),
+ competence_id="C1.2",
+ title="Innerhalb des Handlungsfelds «Reisen» bin ich fähig, den Kunden bedarfsgerechte Vorschläge für Anpassungen der Versicherungslösung zu unterbreiten (Up-Selling).",
+ learning_unit=LearningUnit.objects.get(
+ slug="versicherungsvermittlerin-lp-circle-analyse-lu-reisen"
+ ),
+ )
+ PerformanceCriteriaFactory(
+ parent=CompetencePage.objects.get(competence_id="C1"),
+ competence_id="C1.3",
+ title="Innerhalb des Handlungsfelds «Reisen» bin ich fähig aufgrund des Portfolios passende Zusatzprodukte anzubieten (Cross-Selling).",
+ learning_unit=LearningUnit.objects.get(
+ slug="versicherungsvermittlerin-lp-circle-analyse-lu-reisen"
+ ),
+ )
+
+ # Abschluss/Anwenden – Selbsteinschätzung «Fahrzeug»
+ PerformanceCriteriaFactory(
+ parent=CompetencePage.objects.get(competence_id="A1"),
+ competence_id="A1.2",
+ title="Innerhalb des Handlungsfelds «Fahrzeug» bin ich fähig, geeignete Personen wie z.B. Garagisten, Architekten, Treuhänder auf die Vermittlung/Zusammenarbeit anzusprechen.",
+ learning_unit=LearningUnit.objects.get(
+ slug="versicherungsvermittlerin-lp-circle-analyse-lu-fahrzeug"
+ ),
+ )
+ PerformanceCriteriaFactory(
+ parent=CompetencePage.objects.get(competence_id="A4"),
+ competence_id="A4.1",
+ title="Innerhalb des Handlungsfelds «Fahrzeug» bin ich fähig, Kundendaten in Datenbanken (CRM) korrekt zu erfassen.",
+ learning_unit=LearningUnit.objects.get(
+ slug="versicherungsvermittlerin-lp-circle-analyse-lu-fahrzeug"
+ ),
+ )
+ PerformanceCriteriaFactory(
+ parent=CompetencePage.objects.get(competence_id="B4"),
+ competence_id="B4.6",
+ title="Innerhalb des Handlungsfelds «Fahrzeug» bin ich fähig, Anträge korrekt auszufüllen.",
+ learning_unit=LearningUnit.objects.get(
+ slug="versicherungsvermittlerin-lp-circle-analyse-lu-fahrzeug"
+ ),
+ )
+ PerformanceCriteriaFactory(
+ parent=CompetencePage.objects.get(competence_id="C1"),
+ competence_id="C1.3",
+ title="Innerhalb des Handlungsfelds «Fahrzeug» bin ich fähig, aufgrund des Portfolios passende Zusatzprodukte anzubieten (Cross-Selling).",
+ learning_unit=LearningUnit.objects.get(
+ slug="versicherungsvermittlerin-lp-circle-analyse-lu-fahrzeug"
+ ),
+ )
+
+ # Abschluss / Anwenden – Selbsteinschätzung «Reisen»
+ PerformanceCriteriaFactory(
+ parent=CompetencePage.objects.get(competence_id="B4"),
+ competence_id="B4.6",
+ title="Innerhalb des Handlungsfelds «Reisen» bin ich fähig, Anträge korrekt auszufüllen.",
+ learning_unit=LearningUnit.objects.get(
+ slug="versicherungsvermittlerin-lp-circle-analyse-lu-reisen"
+ ),
+ )
+ PerformanceCriteriaFactory(
+ parent=CompetencePage.objects.get(competence_id="C3"),
+ competence_id="C3.1",
+ title="Innerhalb des Handlungsfelds «Reisen» bin ich fähig, Kunden die Vorgehensweise für die Meldung des Schadens nachvollziehbar zu erläutern und sie bei Bedarf zu unterstützen.",
+ learning_unit=LearningUnit.objects.get(
+ slug="versicherungsvermittlerin-lp-circle-analyse-lu-reisen"
+ ),
+ )
diff --git a/server/vbv_lernwelt/core/management/commands/reset_schema.py b/server/vbv_lernwelt/core/management/commands/reset_schema.py
index 7217e319..4d9c153a 100644
--- a/server/vbv_lernwelt/core/management/commands/reset_schema.py
+++ b/server/vbv_lernwelt/core/management/commands/reset_schema.py
@@ -28,4 +28,4 @@ def command():
call_command("createcachetable")
call_command("migrate")
call_command("create_default_users")
- call_command("create_default_learning_path")
+ call_command("create_default_courses")
diff --git a/server/vbv_lernwelt/learnpath/create_default_learning_path.py b/server/vbv_lernwelt/learnpath/create_default_learning_path.py
index b5a13bf8..21bcc00e 100644
--- a/server/vbv_lernwelt/learnpath/create_default_learning_path.py
+++ b/server/vbv_lernwelt/learnpath/create_default_learning_path.py
@@ -1,6 +1,7 @@
import wagtail_factories
from django.conf import settings
from django.core.management import call_command
+from slugify import slugify
from wagtail.models import Locale, Page, Site
from wagtail_localize.models import LocaleSynchronization
@@ -26,51 +27,659 @@ from vbv_lernwelt.learnpath.tests.learning_path_factories import (
)
-def create_circle(title, learning_path):
- return CircleFactory(
- title=title,
- parent=learning_path,
+def create_default_learning_path(user=None, skip_locales=True):
+ if user is None:
+ user = User.objects.get(username="info@iterativ.ch")
+
+ site = Site.objects.filter(is_default_site=True).first()
+
+ if not site:
+ site = wagtail_factories.SiteFactory(is_default_site=True)
+
+ if settings.APP_ENVIRONMENT == "development":
+ site.port = 8000
+ site.save()
+
+ course_page = CoursePage.objects.get(course_id=COURSE_VERSICHERUNGSVERMITTLERIN_ID)
+ lp = LearningPathFactory(
+ title="Lernpfad",
+ parent=course_page,
+ )
+
+ TopicFactory(title="Basis", is_visible=False, parent=lp)
+ create_circle_basis(lp)
+
+ TopicFactory(title="Gewinnen von Kunden", parent=lp)
+ create_circle_gewinnen(lp)
+
+ TopicFactory(title="Beraten der Kunden", parent=lp)
+ create_circle_einstieg(lp)
+ create_circle_analyse(lp)
+ create_circle_loesung(lp)
+ create_circle_abschluss(lp)
+
+ TopicFactory(title="Betreuen und Ausbauen des Kundenstamms", parent=lp)
+ create_circle_betreuen(lp)
+
+ # 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")
+
+ # locales
+ if not skip_locales:
+ locale_de = Locale.objects.get(language_code="de-CH")
+ locale_fr, _ = Locale.objects.get_or_create(language_code="fr-CH")
+ LocaleSynchronization.objects.get_or_create(
+ locale_id=locale_fr.id, sync_from_id=locale_de.id
+ )
+ locale_it, _ = Locale.objects.get_or_create(language_code="it-CH")
+ LocaleSynchronization.objects.get_or_create(
+ locale_id=locale_it.id, sync_from_id=locale_de.id
+ )
+ call_command("sync_locale_trees")
+
+ # all pages belong to 'admin' by default
+ Page.objects.update(owner=user)
+
+
+def create_circle_basis(lp):
+ circle = CircleFactory(
+ title="Basis",
+ parent=lp,
description="""
- Nach dem Gespräch werten sie die Analyse aus und erstellen mit den
- zur Verfügung stehenden Systemen formal korrekte Lösungsvorschläge bzw.
- Ausschreibungen. Je nach Komplexität der Situation ziehen sie die nötigen
- Fachspezialisten bei.
- """,
- job_situations=[
- ("job_situation", "Absicherung der Familie"),
- ("job_situation", "Prämien einsparen"),
- ("job_situation", "Deckung optimieren"),
- ("job_situation", "Auto kaufen"),
- ("job_situation", "Fahrzeugwechsel"),
- ("job_situation", "Pensionerung inklusive Variante Frühpensionierung"),
- ("job_situation", "Reisen"),
- ],
+In diesem Circle erklären wir dir, wie der Lehrgang
+Versicherungsvermittler / in " aufgebaut ist. Zudem vermitteln wir dir die wichtigsten Grundlagen,
+damit erfolgreich mit deinem Lernpfad starten kannst.
+ """.strip(),
+ )
+ LearningSequenceFactory(title="Starten", parent=circle, icon="it-icon-ls-start")
+ LearningUnitFactory(title="Einführung", parent=circle)
+ LearningContentFactory(
+ title="Willkommen im Lehrgang Versicherungsvermitler VBV",
+ parent=circle,
+ )
+ LearningUnitFactory(title="Arbeits- und Lerntechnik", parent=circle)
+ LearningContentFactory(
+ title="Mediathek",
+ parent=circle,
+ )
+ LearningContentFactory(
+ title="Luca organisiert seinen Arbeitsalltag",
+ parent=circle,
+ )
+ LearningContentFactory(
+ title="Luca legt sich seine Lernstrategie zurecht",
+ parent=circle,
+ )
+ LearningContentFactory(
+ title="Fachcheck Arbeits- und Lerntechnik",
+ parent=circle,
+ )
+ LearningSequenceFactory(title="Grundlagen", parent=circle, icon="it-icon-ls-watch")
+ LearningUnitFactory(title="Versicherung", parent=circle)
+ LearningContentFactory(
+ title="Mediathek",
+ parent=circle,
+ )
+ LearningContentFactory(
+ title="Luca startet durch",
+ parent=circle,
+ )
+ LearningContentFactory(
+ title="Fachcheck Allgemeines zu Versicherungen",
+ parent=circle,
+ )
+ LearningUnitFactory(title="Beratung und Verkauf", parent=circle)
+ LearningContentFactory(
+ title="Mediathek",
+ parent=circle,
+ )
+ LearningContentFactory(
+ title="Luca macht sich fit im Verkauf",
+ parent=circle,
+ )
+ LearningContentFactory(
+ title="Fachcheck Beratung und Verkauf",
+ parent=circle,
+ )
+ LearningSequenceFactory(title="Beenden", parent=circle, icon="it-icon-ls-end")
+ LearningUnitFactory(title="Jetzt kann's los gehen", parent=circle)
+ LearningContentFactory(
+ title="Lerninhalt offen",
+ parent=circle,
+ )
+
+
+def create_circle_gewinnen(lp):
+ circle = CircleFactory(
+ title="Gewinnen",
+ parent=lp,
+ description="""
+Versicherungsvermittlerinnen und -vermittler verfügen über
+ein starkes Netzwerk, das sie gezielt pflegen und ausbauen. Sie beraten und betreuen ihre bestehenden Kundinnen und Kunden professionell und gewinnen so ihr Vertrauen. Dadurch schaffen sie die Basis für das Gewinnen
+von neuen Kundinnen und Kunden. Versicherungsvermittlerinnen und -vermittler sprechen ihre bestehenden Kundinnen
+und Kunden auf Weiterempfehlung an. So nutzen sie ihre
+bestehenden Kontakte geschickt für das Anwerben von
+Neukundinnen und -kunden.""".strip(),
goals=[
(
"goal",
- "... die heutige Versicherungssituation von Privat- oder Geschäftskunden einzuschätzen.",
+ "... Bestehende Kunden so zu beraten, dass sie von diesen weiterempfohlen werden",
),
(
"goal",
- "... deinem Kunden einen ungenügenden oder übermässigen Versicherungsschutz aufzuzeigen.",
+ "... Geeignete Personen wie z.B. Garagisten, Architekten, Treuhänder auf die Vermittlung / Zusammenarbeit anzusprechen",
),
(
"goal",
- "... deinem Kunden zu helfen, sein Optimierungspotential voll auszuschöpfen.",
+ "... Verschiedene Datenquellen wie Internet, Telefonbuch, Handelszeitung, Baugesuche etc. Gezielt für die Gewinnung von Neukunden zu benützen",
),
- ("goal", "... deinem Kunden seine optimale Lösung aufzuzeigen"),
- ],
- experts=[
(
- "person",
- {
- "last_name": "Huggel",
- "first_name": "Patrizia",
- "email": "patrizia.huggel@example.com",
- },
+ "goal",
+ "... Ein beliebiges Gespräch resp. Einen bestehenden Kontakt in die Richtung «Versicherung» zu lenken",
+ ),
+ (
+ "goal",
+ "... Das Thema Risiko und Sicherheit in einem Gespräch gezielt und auf die Situation des jeweiligen Gesprächspartners bezogen einfliessen zu lassen",
+ ),
+ (
+ "goal",
+ "... Im täglichen Kontakt potenzielle Kundinnen und Kunden zu erkennen",
),
],
)
+ LearningSequenceFactory(title="Starten", parent=circle, icon="it-icon-ls-start")
+ LearningUnitFactory(title="Einführung", parent=circle)
+ LearningContentFactory(
+ title="Verschaff dir einen Überblick",
+ parent=circle,
+ )
+
+ LearningSequenceFactory(title="Beobachten", parent=circle, icon="it-icon-ls-watch")
+ LearningUnitFactory(title="Kunden gewinnen", parent=circle)
+ LearningContentFactory(
+ title="Mediathek",
+ parent=circle,
+ )
+ LearningContentFactory(
+ title="Lerninhalt offen",
+ parent=circle,
+ )
+ LearningContentFactory(
+ title="Fachcheck Kunden gewinnen",
+ parent=circle,
+ )
+
+ LearningSequenceFactory(title="Anwenden", parent=circle, icon="it-icon-ls-watch")
+ LearningUnitFactory(title="Sozialer Auftritt", parent=circle)
+ LearningContentFactory(
+ title="Mediathek",
+ parent=circle,
+ )
+ LearningContentFactory(
+ title="Lerninhalt offen",
+ parent=circle,
+ )
+ LearningContentFactory(
+ title="Fachcheck Sozialer Auftritt",
+ parent=circle,
+ )
+
+ LearningSequenceFactory(title="Üben", parent=circle, icon="it-icon-ls-practice")
+ LearningUnitFactory(title="Sozialer Auftritt", parent=circle)
+ LearningContentFactory(
+ title="Mediathek",
+ parent=circle,
+ )
+ LearningContentFactory(
+ title="Lerninhalt offen",
+ parent=circle,
+ )
+
+ LearningSequenceFactory(title="Beenden", parent=circle, icon="it-icon-ls-end")
+ LearningUnitFactory(title="Circle beenden", parent=circle)
+ LearningContentFactory(
+ title="Lerninhalt offen",
+ parent=circle,
+ )
+
+
+def create_circle_einstieg(lp):
+ circle = CircleFactory(
+ title="Einstieg",
+ parent=lp,
+ )
+ LearningSequenceFactory(title="Starten", parent=circle, icon="it-icon-ls-start")
+ LearningUnitFactory(title="Einführung", parent=circle)
+ LearningContentFactory(
+ title="Verschaff dir einen Überblick",
+ parent=circle,
+ contents=[
+ (
+ "video",
+ VideoBlockFactory(
+ url="https://onedrive.live.com/embed?cid=26E4A934B79DCE5E&resid=26E4A934B79DCE5E%2153350&authkey=AId6i7z_X8l2fHw",
+ description="In dieser Circle zeigt dir ein Fachexperte anhand von Kundensituationen, wie du erfolgreich"
+ "den Kundenbedarf ermitteln, analysieren, priorisieren und anschliessend zusammenfassen kannst.",
+ ),
+ )
+ ],
+ )
+
+ LearningSequenceFactory(title="Beobachten", parent=circle, icon="it-icon-ls-watch")
+ create_standard_learning_unit(
+ "Patrizia & Marco sichern sich ab",
+ parent=circle,
+ category_name="Einkommenssicherung",
+ wbt_url="/static/media/web_based_trainings/story-01-a-01-patrizia-marco-sichern-sich-ab-einstieg/scormcontent/index.html",
+ )
+
+ LearningSequenceFactory(title="Anwenden", parent=circle, icon="it-icon-ls-apply")
+ create_standard_learning_unit(
+ "Rafael Fasel wechselt sein Auto",
+ parent=circle,
+ category_name="Fahrzeug",
+ wbt_url="/static/media/web_based_trainings/training-04-a-01-rafael-fasel-wechselt-sein-auto-einstieg/scormcontent/index.html",
+ )
+ create_standard_learning_unit(
+ "Rafael Fasel zieht von zu Hause aus",
+ parent=circle,
+ category_name="Haushalt",
+ )
+ create_standard_learning_unit(
+ "Emma und Ayla campen durch Amerika",
+ parent=circle,
+ category_name="Reisen",
+ wbt_url="/static/media/web_based_trainings/story-06-a-01-emma-und-ayla-campen-durch-amerika-einstieg/scormcontent/index.html",
+ check_url="/static/media/demo_oktober/fach_check_reisen/index.html",
+ )
+ create_standard_learning_unit(
+ "Herr und Frau Russo planen ihre Pensionierung",
+ parent=circle,
+ category_name="Pensionierung",
+ )
+ create_standard_learning_unit(
+ "Familie Babic erwartet Nachwuchs",
+ parent=circle,
+ category_name="Gesundheit",
+ )
+ create_standard_learning_unit(
+ "Anna Fleur übernimmt den Blumenladen",
+ parent=circle,
+ category_name="KMU",
+ )
+
+ LearningSequenceFactory(title="Üben", parent=circle, icon="it-icon-ls-practice")
+ LearningUnitFactory(title="Gesprächseinstieg", parent=circle)
+ LearningContentFactory(
+ title="Mediathek",
+ parent=circle,
+ )
+ LearningContentFactory(
+ title="Der erste Eindruck zählt",
+ parent=circle,
+ )
+
+ LearningSequenceFactory(title="Beenden", parent=circle, icon="it-icon-ls-end")
+ LearningUnitFactory(title="Circle beenden", parent=circle)
+ LearningContentFactory(
+ title="Lerninhalt offen",
+ parent=circle,
+ )
+
+
+def create_circle_analyse(lp):
+ circle = CircleFactory(
+ title="Analyse",
+ parent=lp,
+ )
+ LearningSequenceFactory(title="Starten", parent=circle, icon="it-icon-ls-start")
+ LearningUnitFactory(title="Einführung", parent=circle)
+ LearningContentFactory(
+ title="Verschaff dir einen Überblick",
+ parent=circle,
+ contents=[
+ (
+ "video",
+ VideoBlockFactory(
+ url="https://onedrive.live.com/embed?cid=26E4A934B79DCE5E&resid=26E4A934B79DCE5E%2153352&authkey=ABAdnARrD5VsIG8",
+ description="",
+ ),
+ )
+ ],
+ )
+
+ LearningSequenceFactory(title="Beobachten", parent=circle, icon="it-icon-ls-watch")
+ create_standard_learning_unit(
+ "Patrizia & Marco sichern sich ab",
+ parent=circle,
+ category_name="Einkommenssicherung",
+ )
+
+ LearningSequenceFactory(title="Anwenden", parent=circle, icon="it-icon-ls-apply")
+ create_standard_learning_unit(
+ "Rafael Fasel wechselt sein Auto",
+ parent=circle,
+ category_name="Fahrzeug",
+ wbt_url="/static/media/web_based_trainings/story-04-a-02-rafael-fasel-wechselt-sein-auto-analyse/scormcontent/index.html",
+ )
+ create_standard_learning_unit(
+ "Rafael Fasel zieht von zu Hause aus",
+ parent=circle,
+ category_name="Haushalt",
+ )
+ create_standard_learning_unit(
+ "Emma und Ayla campen durch Amerika",
+ parent=circle,
+ category_name="Reisen",
+ check_url="/static/media/demo_oktober/fach_check_reisen/index.html",
+ )
+ create_standard_learning_unit(
+ "Herr und Frau Russo planen ihre Pensionierung",
+ parent=circle,
+ category_name="Pensionierung",
+ )
+ create_standard_learning_unit(
+ "Familie Babic erwartet Nachwuchs",
+ parent=circle,
+ category_name="Gesundheit",
+ )
+ create_standard_learning_unit(
+ "Anna Fleur übernimmt den Blumenladen",
+ parent=circle,
+ category_name="KMU",
+ )
+
+ LearningSequenceFactory(title="Üben", parent=circle, icon="it-icon-ls-practice")
+ LearningUnitFactory(title="Gesprächseinstieg", parent=circle)
+ LearningContentFactory(
+ title="Mediathek",
+ parent=circle,
+ )
+ LearningContentFactory(
+ title="Lerninhalt offen",
+ parent=circle,
+ )
+
+ LearningSequenceFactory(title="Beenden", parent=circle, icon="it-icon-ls-end")
+ LearningUnitFactory(title="Circle beenden", parent=circle)
+ LearningContentFactory(
+ title="Lerninhalt offen",
+ parent=circle,
+ )
+
+
+def create_circle_loesung(lp):
+ circle = CircleFactory(
+ title="Lösung",
+ parent=lp,
+ )
+ LearningSequenceFactory(title="Starten", parent=circle, icon="it-icon-ls-start")
+ LearningUnitFactory(title="Einführung", parent=circle)
+ LearningContentFactory(
+ title="Verschaff dir einen Überblick",
+ parent=circle,
+ )
+
+ LearningSequenceFactory(title="Beobachten", parent=circle, icon="it-icon-ls-watch")
+ create_standard_learning_unit(
+ "Patrizia & Marco sichern sich ab",
+ parent=circle,
+ category_name="Einkommenssicherung",
+ )
+
+ LearningSequenceFactory(title="Anwenden", parent=circle, icon="it-icon-ls-apply")
+ create_standard_learning_unit(
+ "Rafael Fasel wechselt sein Auto",
+ parent=circle,
+ category_name="Fahrzeug",
+ )
+ create_standard_learning_unit(
+ "Rafael Fasel zieht von zu Hause aus",
+ parent=circle,
+ category_name="Haushalt",
+ )
+ create_standard_learning_unit(
+ "Emma und Ayla campen durch Amerika",
+ parent=circle,
+ category_name="Reisen",
+ check_url="/static/media/demo_oktober/fach_check_reisen/index.html",
+ )
+ create_standard_learning_unit(
+ "Herr und Frau Russo planen ihre Pensionierung",
+ parent=circle,
+ category_name="Pensionierung",
+ )
+ create_standard_learning_unit(
+ "Familie Babic erwartet Nachwuchs",
+ parent=circle,
+ category_name="Gesundheit",
+ )
+ create_standard_learning_unit(
+ "Anna Fleur übernimmt den Blumenladen",
+ parent=circle,
+ category_name="KMU",
+ )
+
+ LearningSequenceFactory(title="Üben", parent=circle, icon="it-icon-ls-practice")
+ LearningUnitFactory(title="Heirat", parent=circle)
+ LearningContentFactory(
+ title="Mediathek",
+ parent=circle,
+ )
+ LearningContentFactory(
+ title="Patrizia & Marco heiraten",
+ parent=circle,
+ )
+ LearningContentFactory(
+ title="Fachcheck Heirat",
+ parent=circle,
+ )
+
+ LearningSequenceFactory(title="Beenden", parent=circle, icon="it-icon-ls-end")
+ LearningUnitFactory(title="Circle beenden", parent=circle)
+ LearningContentFactory(
+ title="Lerninhalt offen",
+ parent=circle,
+ )
+
+
+def create_circle_abschluss(lp):
+ circle = CircleFactory(
+ title="Abschluss",
+ parent=lp,
+ )
+ LearningSequenceFactory(title="Starten", parent=circle, icon="it-icon-ls-start")
+ LearningUnitFactory(title="Einführung", parent=circle)
+ LearningContentFactory(
+ title="Verschaff dir einen Überblick",
+ parent=circle,
+ )
+
+ LearningSequenceFactory(title="Beobachten", parent=circle, icon="it-icon-ls-watch")
+ create_standard_learning_unit(
+ "Patrizia & Marco sichern sich ab",
+ parent=circle,
+ category_name="Einkommenssicherung",
+ )
+
+ LearningSequenceFactory(title="Anwenden", parent=circle, icon="it-icon-ls-apply")
+ create_standard_learning_unit(
+ "Rafael Fasel wechselt sein Auto",
+ parent=circle,
+ category_name="Fahrzeug",
+ )
+ create_standard_learning_unit(
+ "Rafael Fasel zieht von zu Hause aus",
+ parent=circle,
+ category_name="Haushalt",
+ )
+ create_standard_learning_unit(
+ "Emma und Ayla campen durch Amerika",
+ parent=circle,
+ category_name="Reisen",
+ check_url="/static/media/demo_oktober/fach_check_reisen/index.html",
+ )
+ create_standard_learning_unit(
+ "Herr und Frau Russo planen ihre Pensionierung",
+ parent=circle,
+ category_name="Pensionierung",
+ )
+ create_standard_learning_unit(
+ "Familie Babic erwartet Nachwuchs",
+ parent=circle,
+ category_name="Gesundheit",
+ )
+ create_standard_learning_unit(
+ "Anna Fleur übernimmt den Blumenladen",
+ parent=circle,
+ category_name="KMU",
+ )
+
+ LearningSequenceFactory(title="Üben", parent=circle, icon="it-icon-ls-practice")
+ LearningUnitFactory(title="Auswandern", parent=circle)
+ LearningContentFactory(
+ title="Mediathek",
+ parent=circle,
+ )
+ LearningContentFactory(
+ title="Emma und Ayla wandern nach Amerika aus",
+ parent=circle,
+ )
+ LearningContentFactory(
+ title="Fachcheck Auswandern",
+ parent=circle,
+ )
+
+ LearningSequenceFactory(title="Beenden", parent=circle, icon="it-icon-ls-end")
+ LearningUnitFactory(title="Circle beenden", parent=circle)
+ LearningContentFactory(
+ title="Lerninhalt offen",
+ parent=circle,
+ )
+
+
+def create_circle_betreuen(lp):
+ circle = CircleFactory(
+ title="Abschluss",
+ parent=lp,
+ )
+ LearningSequenceFactory(title="Starten", parent=circle, icon="it-icon-ls-start")
+ LearningUnitFactory(title="Einführung", parent=circle)
+ LearningContentFactory(
+ title="Verschaff dir einen Überblick",
+ parent=circle,
+ )
+
+ LearningSequenceFactory(title="Beobachten", parent=circle, icon="it-icon-ls-watch")
+ create_standard_learning_unit(
+ "Patrizia Feller macht sich selbsständig",
+ parent=circle,
+ category_name="Selbständigkeit",
+ )
+
+ LearningSequenceFactory(title="Anwenden", parent=circle, icon="it-icon-ls-apply")
+ create_standard_learning_unit(
+ "Familie Feller Bonsera kaufen ein Haus",
+ parent=circle,
+ category_name="Wohneigentum",
+ )
+ create_standard_learning_unit(
+ "Rafael Fasel hat Ärger mit dem Vermieter",
+ parent=circle,
+ category_name="Rechtsstreitigkeiten",
+ )
+ create_standard_learning_unit(
+ "Familie Babic spart auf ein Ziel",
+ parent=circle,
+ category_name="Sparen",
+ )
+ create_standard_learning_unit(
+ "Chiara übernimmt das Haus der Eltern",
+ parent=circle,
+ category_name="Erben / Vererben",
+ )
+
+ LearningSequenceFactory(title="Üben", parent=circle, icon="it-icon-ls-practice")
+ LearningUnitFactory(title="Bauen", parent=circle)
+ create_standard_learning_unit(
+ "Blumenladen Fleur expandiert",
+ parent=circle,
+ category_name="Wohneigentum",
+ )
+ create_standard_learning_unit(
+ "Davide & Giulia verkaufen ihr Haus an Chiara",
+ parent=circle,
+ category_name="Wohneigentum",
+ )
+
+ LearningSequenceFactory(title="Beenden", parent=circle, icon="it-icon-ls-end")
+ LearningUnitFactory(title="Circle beenden", parent=circle)
+ LearningContentFactory(
+ title="Lerninhalt offen",
+ parent=circle,
+ )
+
+
+def create_standard_learning_unit(
+ title, parent, category_name, wbt_url=None, check_url=None
+):
+ LearningUnitFactory(
+ title=category_name,
+ parent=parent,
+ course_category=CourseCategory.objects.get(
+ course_id=COURSE_VERSICHERUNGSVERMITTLERIN_ID, title=category_name
+ ),
+ )
+ LearningContentFactory(
+ title=f"Mediathek {category_name}",
+ parent=parent,
+ contents=[
+ (
+ "media_library",
+ MediaLibraryBlockFactory(
+ url=f"/media/versicherungsvermittlerin-media/category/{slugify(category_name)}"
+ ),
+ )
+ ],
+ )
+
+ if wbt_url is None:
+ LearningContentFactory(
+ title=title,
+ parent=parent,
+ )
+ else:
+ LearningContentFactory(
+ title=title,
+ parent=parent,
+ contents=[
+ (
+ "exercise",
+ ExerciseBlockFactory(url=wbt_url),
+ )
+ ],
+ )
+
+ if check_url is None:
+ LearningContentFactory(
+ title=f"Fachcheck {category_name}",
+ parent=parent,
+ )
+ else:
+ LearningContentFactory(
+ title=f"Fachcheck {category_name}",
+ parent=parent,
+ contents=[
+ (
+ "test",
+ TestBlockFactory(url=check_url),
+ )
+ ],
+ )
def create_circle_children(circle, title):
@@ -398,148 +1007,3 @@ def create_circle_children(circle, title):
minutes=30,
contents=[("document", DocumentBlockFactory())],
)
-
-
-def create_default_learning_path(user=None, skip_locales=True):
- if user is None:
- user = User.objects.get(username="info@iterativ.ch")
-
- site = Site.objects.filter(is_default_site=True).first()
-
- if not site:
- site = wagtail_factories.SiteFactory(is_default_site=True)
-
- if settings.APP_ENVIRONMENT == "development":
- site.port = 8000
- site.save()
-
- # create_default_competences()
-
- course_page = CoursePage.objects.get(course_id=COURSE_VERSICHERUNGSVERMITTLERIN_ID)
- lp = LearningPathFactory(
- title="Versicherungsvermittler/in",
- parent=course_page,
- )
-
- TopicFactory(title="Basis", is_visible=False, parent=lp)
-
- circle_basis = CircleFactory(
- title="Basis",
- parent=lp,
- description="""
-In diesem Circle erklären wir dir, wie der Lehrgang
-Versicherungsvermittler / in " aufgebaut ist. Zudem vermitteln wir dir die wichtigsten Grundlagen,
-damit erfolgreich mit deinem Lernpfad starten kannst.
-""",
- )
- LearningSequenceFactory(
- title="Starten", parent=circle_basis, icon="it-icon-ls-start"
- )
- LearningContentFactory(
- title='Einleitung Circle "Basis"',
- parent=circle_basis,
- 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.",
- ),
- )
- ],
- )
- LearningSequenceFactory(title="Beenden", parent=circle_basis, icon="it-icon-ls-end")
- LearningContentFactory(
- title="Kompetenzprofil anschauen",
- parent=circle_basis,
- minutes=30,
- contents=[("document", DocumentBlockFactory())],
- )
- LearningContentFactory(
- title='Circle "Analyse" abschliessen',
- parent=circle_basis,
- minutes=30,
- contents=[("document", DocumentBlockFactory())],
- )
-
- TopicFactory(title="Gewinnen von Kunden", parent=lp)
-
- circle_gewinnen = CircleFactory(
- title="Gewinnen",
- parent=lp,
- description="""
-Versicherungsvermittlerinnen und -vermittler verfügen über
-ein starkes Netzwerk, das sie gezielt pflegen und ausbauen. Sie beraten und betreuen ihre bestehenden Kundinnen und Kunden professionell und gewinnen so ihr Vertrauen. Dadurch schaffen sie die Basis für das Gewinnen
-von neuen Kundinnen und Kunden. Versicherungsvermittlerinnen und -vermittler sprechen ihre bestehenden Kundinnen
-und Kunden auf Weiterempfehlung an. So nutzen sie ihre
-bestehenden Kontakte geschickt für das Anwerben von
-Neukundinnen und -kunden.""",
- goals=[
- (
- "goal",
- "... Bestehende Kunden so zu beraten, dass sie von diesen weiterempfohlen werden",
- ),
- (
- "goal",
- "... Geeignete Personen wie z.B. Garagisten, Architekten, Treuhänder auf die Vermittlung / Zusammenarbeit anzusprechen",
- ),
- (
- "goal",
- "... Verschiedene Datenquellen wie Internet, Telefonbuch, Handelszeitung, Baugesuche etc. Gezielt für die Gewinnung von Neukunden zu benützen",
- ),
- (
- "goal",
- "... Ein beliebiges Gespräch resp. Einen bestehenden Kontakt in die Richtung «Versicherung» zu lenken",
- ),
- (
- "goal",
- "... Das Thema Risiko und Sicherheit in einem Gespräch gezielt und auf die Situation des jeweiligen Gesprächspartners bezogen einfliessen zu lassen",
- ),
- (
- "goal",
- "... Im täglichen Kontakt potenzielle Kundinnen und Kunden zu erkennen",
- ),
- ],
- )
- create_circle_children(circle_gewinnen, "Gewinnen")
-
- TopicFactory(title="Beraten der Kunden", parent=lp)
-
- circle_einstieg = create_circle("Einstieg", lp)
- create_circle_children(circle_einstieg, "Einstieg")
-
- circle_analyse = create_circle("Analyse", lp)
- create_circle_children(circle_analyse, "Analyse")
-
- circle_analyse = create_circle("Lösung", lp)
- create_circle_children(circle_analyse, "Lösung")
-
- circle_analyse = create_circle("Abschluss", lp)
- create_circle_children(circle_analyse, "Abschluss")
-
- TopicFactory(title="Betreuen und Ausbauen des Kundenstamms", parent=lp)
-
- 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")
-
- # locales
- if not skip_locales:
- locale_de = Locale.objects.get(language_code="de-CH")
- locale_fr, _ = Locale.objects.get_or_create(language_code="fr-CH")
- LocaleSynchronization.objects.get_or_create(
- locale_id=locale_fr.id, sync_from_id=locale_de.id
- )
- locale_it, _ = Locale.objects.get_or_create(language_code="it-CH")
- LocaleSynchronization.objects.get_or_create(
- locale_id=locale_it.id, sync_from_id=locale_de.id
- )
- call_command("sync_locale_trees")
-
- # all pages belong to 'admin' by default
- Page.objects.update(owner=user)
diff --git a/server/vbv_lernwelt/learnpath/migrations/0002_alter_learningcontent_contents.py b/server/vbv_lernwelt/learnpath/migrations/0002_alter_learningcontent_contents.py
new file mode 100644
index 00000000..39521cad
--- /dev/null
+++ b/server/vbv_lernwelt/learnpath/migrations/0002_alter_learningcontent_contents.py
@@ -0,0 +1,114 @@
+# Generated by Django 3.2.13 on 2022-10-04 13:34
+
+import wagtail.blocks
+import wagtail.fields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("learnpath", "0001_initial"),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name="learningcontent",
+ name="contents",
+ field=wagtail.fields.StreamField(
+ [
+ (
+ "video",
+ wagtail.blocks.StructBlock(
+ [
+ ("description", wagtail.blocks.TextBlock()),
+ ("url", wagtail.blocks.URLBlock()),
+ ]
+ ),
+ ),
+ (
+ "resource",
+ wagtail.blocks.StructBlock(
+ [
+ ("description", wagtail.blocks.TextBlock()),
+ ("url", wagtail.blocks.URLBlock()),
+ ]
+ ),
+ ),
+ (
+ "exercise",
+ wagtail.blocks.StructBlock(
+ [
+ ("description", wagtail.blocks.TextBlock()),
+ ("url", wagtail.blocks.URLBlock()),
+ ]
+ ),
+ ),
+ (
+ "online_training",
+ wagtail.blocks.StructBlock(
+ [
+ ("description", wagtail.blocks.TextBlock()),
+ ("url", wagtail.blocks.URLBlock()),
+ ]
+ ),
+ ),
+ (
+ "media_library",
+ wagtail.blocks.StructBlock(
+ [
+ ("description", wagtail.blocks.TextBlock()),
+ ("url", wagtail.blocks.URLBlock()),
+ ]
+ ),
+ ),
+ (
+ "document",
+ wagtail.blocks.StructBlock(
+ [
+ ("description", wagtail.blocks.TextBlock()),
+ ("url", wagtail.blocks.URLBlock()),
+ ]
+ ),
+ ),
+ (
+ "test",
+ wagtail.blocks.StructBlock(
+ [
+ ("description", wagtail.blocks.TextBlock()),
+ ("url", wagtail.blocks.URLBlock()),
+ ]
+ ),
+ ),
+ (
+ "book",
+ wagtail.blocks.StructBlock(
+ [
+ ("description", wagtail.blocks.TextBlock()),
+ ("url", wagtail.blocks.URLBlock()),
+ ]
+ ),
+ ),
+ (
+ "assignment",
+ wagtail.blocks.StructBlock(
+ [
+ ("description", wagtail.blocks.TextBlock()),
+ ("url", wagtail.blocks.URLBlock()),
+ ]
+ ),
+ ),
+ (
+ "placeholder",
+ wagtail.blocks.StructBlock(
+ [
+ ("description", wagtail.blocks.TextBlock()),
+ ("url", wagtail.blocks.URLBlock()),
+ ]
+ ),
+ ),
+ ],
+ use_json_field=None,
+ ),
+ ),
+ ]
diff --git a/server/vbv_lernwelt/learnpath/migrations/0003_alter_learningcontent_contents.py b/server/vbv_lernwelt/learnpath/migrations/0003_alter_learningcontent_contents.py
new file mode 100644
index 00000000..d631dc9d
--- /dev/null
+++ b/server/vbv_lernwelt/learnpath/migrations/0003_alter_learningcontent_contents.py
@@ -0,0 +1,114 @@
+# Generated by Django 3.2.13 on 2022-10-05 10:06
+
+import wagtail.blocks
+import wagtail.fields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("learnpath", "0002_alter_learningcontent_contents"),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name="learningcontent",
+ name="contents",
+ field=wagtail.fields.StreamField(
+ [
+ (
+ "video",
+ wagtail.blocks.StructBlock(
+ [
+ ("description", wagtail.blocks.TextBlock()),
+ ("url", wagtail.blocks.TextBlock()),
+ ]
+ ),
+ ),
+ (
+ "resource",
+ wagtail.blocks.StructBlock(
+ [
+ ("description", wagtail.blocks.TextBlock()),
+ ("url", wagtail.blocks.TextBlock()),
+ ]
+ ),
+ ),
+ (
+ "exercise",
+ wagtail.blocks.StructBlock(
+ [
+ ("description", wagtail.blocks.TextBlock()),
+ ("url", wagtail.blocks.TextBlock()),
+ ]
+ ),
+ ),
+ (
+ "online_training",
+ wagtail.blocks.StructBlock(
+ [
+ ("description", wagtail.blocks.TextBlock()),
+ ("url", wagtail.blocks.TextBlock()),
+ ]
+ ),
+ ),
+ (
+ "media_library",
+ wagtail.blocks.StructBlock(
+ [
+ ("description", wagtail.blocks.TextBlock()),
+ ("url", wagtail.blocks.TextBlock()),
+ ]
+ ),
+ ),
+ (
+ "document",
+ wagtail.blocks.StructBlock(
+ [
+ ("description", wagtail.blocks.TextBlock()),
+ ("url", wagtail.blocks.TextBlock()),
+ ]
+ ),
+ ),
+ (
+ "test",
+ wagtail.blocks.StructBlock(
+ [
+ ("description", wagtail.blocks.TextBlock()),
+ ("url", wagtail.blocks.TextBlock()),
+ ]
+ ),
+ ),
+ (
+ "book",
+ wagtail.blocks.StructBlock(
+ [
+ ("description", wagtail.blocks.TextBlock()),
+ ("url", wagtail.blocks.TextBlock()),
+ ]
+ ),
+ ),
+ (
+ "assignment",
+ wagtail.blocks.StructBlock(
+ [
+ ("description", wagtail.blocks.TextBlock()),
+ ("url", wagtail.blocks.TextBlock()),
+ ]
+ ),
+ ),
+ (
+ "placeholder",
+ wagtail.blocks.StructBlock(
+ [
+ ("description", wagtail.blocks.TextBlock()),
+ ("url", wagtail.blocks.TextBlock()),
+ ]
+ ),
+ ),
+ ],
+ use_json_field=None,
+ ),
+ ),
+ ]
diff --git a/server/vbv_lernwelt/learnpath/models.py b/server/vbv_lernwelt/learnpath/models.py
index ac861d1c..31a1d794 100644
--- a/server/vbv_lernwelt/learnpath/models.py
+++ b/server/vbv_lernwelt/learnpath/models.py
@@ -16,6 +16,7 @@ from vbv_lernwelt.learnpath.models_learning_unit_content import (
ExerciseBlock,
MediaLibraryBlock,
OnlineTrainingBlock,
+ PlaceholderBlock,
ResourceBlock,
TestBlock,
VideoBlock,
@@ -86,6 +87,9 @@ class Topic(Page):
],
)
+ def get_admin_display_title(self):
+ return f"Thema: {self.draft_title}"
+
class Meta:
verbose_name = "Topic"
@@ -197,6 +201,9 @@ class LearningSequence(Page):
{self.draft_title}
"""
+ def get_admin_display_title(self):
+ return f"LS: {self.draft_title}"
+
def full_clean(self, *args, **kwargs):
self.slug = find_slug_with_parent_prefix(self, "ls")
super(LearningSequence, self).full_clean(*args, **kwargs)
@@ -246,6 +253,9 @@ class LearningUnit(Page):
short_slug = self.slug.replace(f"{self.get_parent().slug}-lu-", "")
return f"{self.get_parent().specific.get_frontend_url()}/evaluate/{short_slug}"
+ def get_admin_display_title(self):
+ return f"LE: {self.draft_title}"
+
@classmethod
def get_serializer_class(cls):
from vbv_lernwelt.learnpath.serializers import LearningUnitSerializer
@@ -272,6 +282,7 @@ class LearningContent(Page):
("test", TestBlock()),
("book", BookBlock()),
("assignment", AssignmentBlock()),
+ ("placeholder", PlaceholderBlock()),
]
contents = StreamField(
diff --git a/server/vbv_lernwelt/learnpath/models_learning_unit_content.py b/server/vbv_lernwelt/learnpath/models_learning_unit_content.py
index cb3148f7..c3bca514 100644
--- a/server/vbv_lernwelt/learnpath/models_learning_unit_content.py
+++ b/server/vbv_lernwelt/learnpath/models_learning_unit_content.py
@@ -3,7 +3,7 @@ from wagtail import blocks
class AssignmentBlock(blocks.StructBlock):
description = blocks.TextBlock()
- url = blocks.URLBlock()
+ url = blocks.TextBlock()
class Meta:
icon = "media"
@@ -11,7 +11,7 @@ class AssignmentBlock(blocks.StructBlock):
class BookBlock(blocks.StructBlock):
description = blocks.TextBlock()
- url = blocks.URLBlock()
+ url = blocks.TextBlock()
class Meta:
icon = "media"
@@ -19,7 +19,15 @@ class BookBlock(blocks.StructBlock):
class DocumentBlock(blocks.StructBlock):
description = blocks.TextBlock()
- url = blocks.URLBlock()
+ url = blocks.TextBlock()
+
+ class Meta:
+ icon = "media"
+
+
+class PlaceholderBlock(blocks.StructBlock):
+ description = blocks.TextBlock()
+ url = blocks.TextBlock()
class Meta:
icon = "media"
@@ -27,7 +35,7 @@ class DocumentBlock(blocks.StructBlock):
class ExerciseBlock(blocks.StructBlock):
description = blocks.TextBlock()
- url = blocks.URLBlock()
+ url = blocks.TextBlock()
class Meta:
icon = "media"
@@ -35,7 +43,7 @@ class ExerciseBlock(blocks.StructBlock):
class MediaLibraryBlock(blocks.StructBlock):
description = blocks.TextBlock()
- url = blocks.URLBlock()
+ url = blocks.TextBlock()
class Meta:
icon = "media"
@@ -43,7 +51,7 @@ class MediaLibraryBlock(blocks.StructBlock):
class OnlineTrainingBlock(blocks.StructBlock):
description = blocks.TextBlock()
- url = blocks.URLBlock()
+ url = blocks.TextBlock()
class Meta:
icon = "media"
@@ -51,7 +59,7 @@ class OnlineTrainingBlock(blocks.StructBlock):
class ResourceBlock(blocks.StructBlock):
description = blocks.TextBlock()
- url = blocks.URLBlock()
+ url = blocks.TextBlock()
class Meta:
icon = "media"
@@ -59,7 +67,7 @@ class ResourceBlock(blocks.StructBlock):
class TestBlock(blocks.StructBlock):
description = blocks.TextBlock()
- url = blocks.URLBlock()
+ url = blocks.TextBlock()
class Meta:
icon = "media"
@@ -68,7 +76,7 @@ class TestBlock(blocks.StructBlock):
class VideoBlock(blocks.StructBlock):
# TODO: Possible video Types for the user, upload file, add URL
description = blocks.TextBlock()
- url = blocks.URLBlock()
+ url = blocks.TextBlock()
class Meta:
icon = "media"
diff --git a/server/vbv_lernwelt/learnpath/tests/learning_path_factories.py b/server/vbv_lernwelt/learnpath/tests/learning_path_factories.py
index ff3beb3f..36d761c7 100644
--- a/server/vbv_lernwelt/learnpath/tests/learning_path_factories.py
+++ b/server/vbv_lernwelt/learnpath/tests/learning_path_factories.py
@@ -15,6 +15,7 @@ from vbv_lernwelt.learnpath.models_learning_unit_content import (
ExerciseBlock,
MediaLibraryBlock,
OnlineTrainingBlock,
+ PlaceholderBlock,
ResourceBlock,
TestBlock,
VideoBlock,
@@ -36,34 +37,6 @@ class TopicFactory(wagtail_factories.PageFactory):
model = Topic
-class CircleFactory(wagtail_factories.PageFactory):
- title = "Gewinnen"
-
- class Meta:
- model = Circle
-
-
-class LearningSequenceFactory(wagtail_factories.PageFactory):
- title = "Grundlagen"
-
- class Meta:
- model = LearningSequence
-
-
-class LearningUnitFactory(wagtail_factories.PageFactory):
- title = "Lerneinheit"
-
- class Meta:
- model = LearningUnit
-
-
-class LearningContentFactory(wagtail_factories.PageFactory):
- title = "Lerninhalt"
-
- class Meta:
- model = LearningContent
-
-
class VideoBlockFactory(wagtail_factories.StructBlockFactory):
url = "https://www.youtube.com/embed/qhPIfxS2hvI"
description = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam"
@@ -93,6 +66,13 @@ class DocumentBlockFactory(wagtail_factories.StructBlockFactory):
model = DocumentBlock
+class PlaceholderBlockFactory(wagtail_factories.StructBlockFactory):
+ description = "Platzhalter"
+
+ class Meta:
+ model = PlaceholderBlock
+
+
class ExerciseBlockFactory(wagtail_factories.StructBlockFactory):
description = "Beispiel Übung"
@@ -123,7 +103,58 @@ class ResourceBlockFactory(wagtail_factories.StructBlockFactory):
class MediaLibraryBlockFactory(wagtail_factories.StructBlockFactory):
- description = "Beispiel Mediathekeninhalt"
+ description = "Sie erreichen die Mediathek mit einem Klick auf den unteren Link"
class Meta:
model = MediaLibraryBlock
+
+
+class CircleFactory(wagtail_factories.PageFactory):
+ title = "Analyse"
+ description = """
+Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor.
+Aenean massa. Cum sociis natoque penatibus et magnis dis parturient montes,
+nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu,
+pretium quis, sem. Nulla consequat massa quis enim. Donec.
+ """.strip()
+ job_situations = [("job_situation", f"Job Situation {x + 1}") for x in range(7)]
+ goals = [
+ ("goal", f"... hier ein Beispieltext für ein Ziel {x + 1}") for x in range(3)
+ ]
+ experts = [
+ (
+ "person",
+ {
+ "last_name": "Mustermann",
+ "first_name": "Patrizia",
+ "email": "patrizia.mustermann@example.com",
+ },
+ ),
+ ]
+
+ class Meta:
+ model = Circle
+
+
+class LearningSequenceFactory(wagtail_factories.PageFactory):
+ title = "Anwenden"
+ icon = "it-icon-ls-apply"
+
+ class Meta:
+ model = LearningSequence
+
+
+class LearningUnitFactory(wagtail_factories.PageFactory):
+ title = "Fahrzeug"
+
+ class Meta:
+ model = LearningUnit
+
+
+class LearningContentFactory(wagtail_factories.PageFactory):
+ title = "Platzhalter Inhalt"
+ contents = [("placeholder", PlaceholderBlockFactory())]
+ minutes = 15
+
+ class Meta:
+ model = LearningContent
diff --git a/server/vbv_lernwelt/media_library/content_blocks.py b/server/vbv_lernwelt/media_library/content_blocks.py
index 88dfb9f7..2094e22a 100644
--- a/server/vbv_lernwelt/media_library/content_blocks.py
+++ b/server/vbv_lernwelt/media_library/content_blocks.py
@@ -2,7 +2,7 @@ from wagtail import blocks
class MediaLibraryContentBlock(blocks.StructBlock):
- title = blocks.TextBlock(blank=False, null=False)
+ title = blocks.TextBlock()
description = blocks.TextBlock(default="", required=False)
icon_url = blocks.TextBlock(default="", required=False)
link_display_text = blocks.CharBlock(max_length=255, default="Link öffnen")
@@ -35,6 +35,7 @@ class MediaContentCollection(blocks.StructBlock):
"""
title = blocks.TextBlock()
+ description = blocks.TextBlock(default="", required=False)
contents = blocks.StreamBlock(
[
("learn_media", MediaLibraryContentBlock()),
diff --git a/server/vbv_lernwelt/media_library/create_default_media_library.py b/server/vbv_lernwelt/media_library/create_default_media_library.py
index 83d61b99..aa10ca6e 100644
--- a/server/vbv_lernwelt/media_library/create_default_media_library.py
+++ b/server/vbv_lernwelt/media_library/create_default_media_library.py
@@ -115,13 +115,32 @@ die der Fahrzeugbesitzer und die Fahrzeugbesitzerin in einem grösseren Schadenf
),
create_media_collection(
title="Verankerung im Lernpfad",
+ description="Anhand der Story von Rafael Fasel und seinem Ford Mustang lernst du in diesem berufstypischem Handlungsfeld alles rund um Motorfahrzeugversicherungen, wie man sein Auto optimal schützen kann, wie du vorgehst bei einem Fahrzeugwechsel, welche Aspekte du bei einer Offerte beachten musst und wie du dem Kunden die Lösung präsentierst.",
contents=[
create_internal_link_block(
InternalLinkBlockFactory(
- title="Rafael kauft einen Ford Mustang",
- description="Anhand der Story von Rafael Fasel und seinem Ford Mustang lernst du in diesem berufstypischem Handlungsfeld alles rund um Motorfahrzeugversicherungen, wie man sein Auto optimal schützen kann, wie du vorgehst bei einem Fahrzeugwechsel, welche Aspekte du bei einer Offerte beachten musst und wie du dem Kunden die Lösung präsentierst.",
+ title="Circle: Einstieg – Lernsequenz: Anwenden",
+ url="/learn/versicherungsvermittlerin-lp/einstieg#lu-fahrzeug",
)
- )
+ ),
+ create_internal_link_block(
+ InternalLinkBlockFactory(
+ title="Circle: Analyse – Lernsequenz: Anwenden",
+ url="/learn/versicherungsvermittlerin-lp/analyse#lu-fahrzeug",
+ )
+ ),
+ create_internal_link_block(
+ InternalLinkBlockFactory(
+ title="Circle: Lösung – Lernsequenz: Anwenden",
+ url="/learn/versicherungsvermittlerin-lp/lösung#lu-fahrzeug",
+ )
+ ),
+ create_internal_link_block(
+ InternalLinkBlockFactory(
+ title="Circle: Abschluss – Lernsequenz: Anwenden",
+ url="/learn/versicherungsvermittlerin-lp/abschluss#lu-fahrzeug",
+ )
+ ),
],
),
create_media_collection(
@@ -198,13 +217,32 @@ Diese können negative Folgen verschiedener Art nach sich ziehen, darunter recht
),
create_media_collection(
title="Verankerung im Lernpfad",
+ description="Begleite Emma Durand und Ayla Yilmaz bei den Vorbereitungen auf ihre grosse Reise durch Amerika und lerne dabei, welche Risiken durch welche Versicherungen abgedeckt werden können.",
contents=[
create_internal_link_block(
InternalLinkBlockFactory(
- title="Emma und Ayla campen durch Amerika",
- description="Begleite Emma Durand und Ayla Yilmaz bei den Vorbereitungen auf ihre grosse Reise durch Amerika und lerne dabei, welche Risiken durch welche Versicherungen abgedeckt werden können.",
+ title="Circle: Einstieg – Lernsequenz: Anwenden",
+ url="/learn/versicherungsvermittlerin-lp/einstieg#lu-reisen",
)
- )
+ ),
+ create_internal_link_block(
+ InternalLinkBlockFactory(
+ title="Circle: Analyse – Lernsequenz: Anwenden",
+ url="/learn/versicherungsvermittlerin-lp/analyse#lu-reisen",
+ )
+ ),
+ create_internal_link_block(
+ InternalLinkBlockFactory(
+ title="Circle: Lösung – Lernsequenz: Anwenden",
+ url="/learn/versicherungsvermittlerin-lp/lösung#lu-reisen",
+ )
+ ),
+ create_internal_link_block(
+ InternalLinkBlockFactory(
+ title="Circle: Abschluss – Lernsequenz: Anwenden",
+ url="/learn/versicherungsvermittlerin-lp/abschluss#lu-reisen",
+ )
+ ),
],
),
create_media_collection(
diff --git a/server/vbv_lernwelt/media_library/migrations/0002_alter_mediacategorypage_body.py b/server/vbv_lernwelt/media_library/migrations/0002_alter_mediacategorypage_body.py
new file mode 100644
index 00000000..1cfb7c1a
--- /dev/null
+++ b/server/vbv_lernwelt/media_library/migrations/0002_alter_mediacategorypage_body.py
@@ -0,0 +1,262 @@
+# Generated by Django 3.2.13 on 2022-10-05 12:18
+
+import wagtail.blocks
+import wagtail.fields
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("media_library", "0001_initial"),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name="mediacategorypage",
+ name="body",
+ field=wagtail.fields.StreamField(
+ [
+ (
+ "content_collection",
+ wagtail.blocks.StructBlock(
+ [
+ ("title", wagtail.blocks.TextBlock()),
+ (
+ "description",
+ wagtail.blocks.TextBlock(
+ default="", required=False
+ ),
+ ),
+ (
+ "contents",
+ wagtail.blocks.StreamBlock(
+ [
+ (
+ "learn_media",
+ wagtail.blocks.StructBlock(
+ [
+ (
+ "title",
+ wagtail.blocks.TextBlock(),
+ ),
+ (
+ "description",
+ wagtail.blocks.TextBlock(
+ default="",
+ required=False,
+ ),
+ ),
+ (
+ "icon_url",
+ wagtail.blocks.TextBlock(
+ default="",
+ required=False,
+ ),
+ ),
+ (
+ "link_display_text",
+ wagtail.blocks.CharBlock(
+ default="Link öffnen",
+ max_length=255,
+ ),
+ ),
+ (
+ "url",
+ wagtail.blocks.TextBlock(
+ default="",
+ required=False,
+ ),
+ ),
+ (
+ "open_window",
+ wagtail.blocks.BooleanBlock(
+ default=False
+ ),
+ ),
+ (
+ "page",
+ wagtail.blocks.PageChooserBlock(
+ page_type=[
+ "learnpath.LearningContent"
+ ],
+ required=False,
+ ),
+ ),
+ ]
+ ),
+ ),
+ (
+ "external_link",
+ wagtail.blocks.StructBlock(
+ [
+ (
+ "title",
+ wagtail.blocks.TextBlock(),
+ ),
+ (
+ "description",
+ wagtail.blocks.TextBlock(
+ default="",
+ required=False,
+ ),
+ ),
+ (
+ "icon_url",
+ wagtail.blocks.TextBlock(
+ default="",
+ required=False,
+ ),
+ ),
+ (
+ "link_display_text",
+ wagtail.blocks.CharBlock(
+ default="Link öffnen",
+ max_length=255,
+ ),
+ ),
+ (
+ "url",
+ wagtail.blocks.TextBlock(
+ default="",
+ required=False,
+ ),
+ ),
+ (
+ "open_window",
+ wagtail.blocks.BooleanBlock(
+ default=False
+ ),
+ ),
+ (
+ "page",
+ wagtail.blocks.PageChooserBlock(
+ page_type=[
+ "learnpath.LearningContent"
+ ],
+ required=False,
+ ),
+ ),
+ ]
+ ),
+ ),
+ (
+ "internal_link",
+ wagtail.blocks.StructBlock(
+ [
+ (
+ "title",
+ wagtail.blocks.TextBlock(),
+ ),
+ (
+ "description",
+ wagtail.blocks.TextBlock(
+ default="",
+ required=False,
+ ),
+ ),
+ (
+ "icon_url",
+ wagtail.blocks.TextBlock(
+ default="",
+ required=False,
+ ),
+ ),
+ (
+ "link_display_text",
+ wagtail.blocks.CharBlock(
+ default="Link öffnen",
+ max_length=255,
+ ),
+ ),
+ (
+ "url",
+ wagtail.blocks.TextBlock(
+ default="",
+ required=False,
+ ),
+ ),
+ (
+ "open_window",
+ wagtail.blocks.BooleanBlock(
+ default=False
+ ),
+ ),
+ (
+ "page",
+ wagtail.blocks.PageChooserBlock(
+ page_type=[
+ "learnpath.LearningContent"
+ ],
+ required=False,
+ ),
+ ),
+ ]
+ ),
+ ),
+ (
+ "relative_link",
+ wagtail.blocks.StructBlock(
+ [
+ (
+ "title",
+ wagtail.blocks.TextBlock(),
+ ),
+ (
+ "description",
+ wagtail.blocks.TextBlock(
+ default="",
+ required=False,
+ ),
+ ),
+ (
+ "icon_url",
+ wagtail.blocks.TextBlock(
+ default="",
+ required=False,
+ ),
+ ),
+ (
+ "link_display_text",
+ wagtail.blocks.CharBlock(
+ default="Link öffnen",
+ max_length=255,
+ ),
+ ),
+ (
+ "url",
+ wagtail.blocks.TextBlock(
+ default="",
+ required=False,
+ ),
+ ),
+ (
+ "open_window",
+ wagtail.blocks.BooleanBlock(
+ default=False
+ ),
+ ),
+ (
+ "page",
+ wagtail.blocks.PageChooserBlock(
+ page_type=[
+ "learnpath.LearningContent"
+ ],
+ required=False,
+ ),
+ ),
+ ]
+ ),
+ ),
+ ]
+ ),
+ ),
+ ]
+ ),
+ )
+ ],
+ null=True,
+ use_json_field=True,
+ ),
+ ),
+ ]
diff --git a/server/vbv_lernwelt/media_library/tests/media_library_factories.py b/server/vbv_lernwelt/media_library/tests/media_library_factories.py
index 0071830d..6ec3a27e 100644
--- a/server/vbv_lernwelt/media_library/tests/media_library_factories.py
+++ b/server/vbv_lernwelt/media_library/tests/media_library_factories.py
@@ -81,7 +81,7 @@ class InternalLinkBlockFactory(wagtail_factories.StructBlockFactory):
title = "Platzhalter interner Link"
description = "Link to a Learning Content"
link_display_text = "Lerneinheit anzeigen"
- url = "/learn/versicherungsvermittlerin-lp/basis/einleitung-circle-basis"
+ url = "/learn/versicherungsvermittlerin-lp/basis"
# TODO: page = blocks.PageChooserBlock mit Titel etc
@@ -100,7 +100,7 @@ class RelativeLinkBlockFactory(wagtail_factories.StructBlockFactory):
model = RelativeLinkBlock
title = "Platzhalter Querverweis"
- description = "Lernmedium: Verkehrsrechtsschutz – Buch «Sach- und Vermögensversicherungen/Kapitel 12.3»"
+ description = "Handlungsfeld"
link_display_text = "Handlungsfeld anzeigen"
icon_url = "/static/icons/demo/icon-hf-reisen.svg"
url = "/media/versicherungsvermittlerin-media/category/fahrzeug"
@@ -117,11 +117,11 @@ def create_relative_link_block(link_block=None):
}
-def create_media_collection(title, contents=None):
+def create_media_collection(title, contents=None, description=None):
if contents is None:
contents = []
- return {
+ result = {
"id": str(uuid.uuid4()),
"type": "content_collection",
"value": {
@@ -130,6 +130,11 @@ def create_media_collection(title, contents=None):
},
}
+ if description:
+ result["value"]["description"] = description
+
+ return result
+
def create_document_collection(document_ids=None):
if document_ids is None:
@@ -175,7 +180,7 @@ Nulla consequat massa quis enim. Donec.
contents=[create_external_link_block() for _ in range(4)],
),
create_media_collection(
- title="Links",
+ title="Verankerung im Lernpfad",
contents=[create_internal_link_block() for _ in range(3)],
),
create_media_collection(
diff --git a/server/vbv_lernwelt/static/icons/demo/category-large.png b/server/vbv_lernwelt/static/icons/demo/category-large.png
new file mode 100644
index 00000000..6db96806
Binary files /dev/null and b/server/vbv_lernwelt/static/icons/demo/category-large.png differ
Mediathek
diff --git a/client/src/pages/mediaLibrary/MLParentPage.vue b/client/src/pages/mediaLibrary/MLParentPage.vue index 9af63eef..bf9e4719 100644 --- a/client/src/pages/mediaLibrary/MLParentPage.vue +++ b/client/src/pages/mediaLibrary/MLParentPage.vue @@ -24,18 +24,18 @@ onMounted(async () => {
-
diff --git a/client/src/router/index.ts b/client/src/router/index.ts
index 2f23c424..24285c6e 100644
--- a/client/src/router/index.ts
+++ b/client/src/router/index.ts
@@ -1,11 +1,18 @@
-import CockpitView from "@/pages/CockpitView.vue";
-import LoginView from "@/pages/LoginView.vue";
+import CockpitView from "@/pages/CockpitPage.vue";
+import LoginView from "@/pages/LoginPage.vue";
import { redirectToLoginIfRequired, updateLoggedIn } from "@/router/guards";
import { useAppStore } from "@/stores/app";
import { createRouter, createWebHistory } from "vue-router";
const router = createRouter({
history: createWebHistory(import.meta.env.BASE_URL),
+ scrollBehavior(to, from, savedPosition) {
+ if (savedPosition) {
+ return savedPosition;
+ } else {
+ return { top: 0 };
+ }
+ },
routes: [
{
path: "/login",
@@ -20,10 +27,6 @@ const router = createRouter({
name: "home",
component: CockpitView,
},
- {
- path: "/shop",
- component: () => import("@/pages/ShopView.vue"),
- },
{
path: "/media/:mediaLibraryPageSlug",
props: true,
@@ -49,37 +52,41 @@ const router = createRouter({
},
],
},
- {
- path: "/messages",
- component: () => import("@/pages/MessagesView.vue"),
- },
- {
- path: "/profile",
- component: () => import("@/pages/ProfileView.vue"),
- },
{
path: "/learn/:learningPathSlug",
- component: () => import("../pages/LearningPathView.vue"),
+ component: () => import("../pages/learningPath/LearningPathPage.vue"),
props: true,
},
{
path: "/learn/:learningPathSlug/:circleSlug",
- component: () => import("../pages/CircleView.vue"),
+ component: () => import("../pages/learningPath/CirclePage.vue"),
props: true,
},
{
path: "/learn/:learningPathSlug/:circleSlug/evaluate/:learningUnitSlug",
- component: () => import("../pages/LearningUnitSelfEvaluationView.vue"),
+ component: () => import("../pages/learningPath/SelfEvaluationPage.vue"),
props: true,
},
{
path: "/learn/:learningPathSlug/:circleSlug/:contentSlug",
- component: () => import("../pages/LearningContentView.vue"),
+ component: () => import("../pages/learningPath/LearningContentPage.vue"),
props: true,
},
+ {
+ path: "/shop",
+ component: () => import("@/pages/ShopPage.vue"),
+ },
+ {
+ path: "/messages",
+ component: () => import("@/pages/MessagesPage.vue"),
+ },
+ {
+ path: "/profile",
+ component: () => import("@/pages/ProfilePage.vue"),
+ },
{
path: "/styleguide",
- component: () => import("../pages/StyleGuideView.vue"),
+ component: () => import("../pages/StyleGuidePage.vue"),
meta: {
public: true,
},
diff --git a/client/src/services/circle.ts b/client/src/services/circle.ts
index 4d69baa9..4a523793 100644
--- a/client/src/services/circle.ts
+++ b/client/src/services/circle.ts
@@ -9,7 +9,7 @@ import type {
LearningContent,
LearningSequence,
LearningUnit,
- LearningUnitQuestion,
+ LearningUnitPerformanceCriteria,
} from "@/types";
function _createEmptyLearningUnit(
@@ -66,6 +66,7 @@ export function parseLearningSequences(
learningUnit = Object.assign(child, {
learningContents: [],
parentLearningSequence: learningSequence,
+ parentCircle: circle,
children: child.children.map((c) => {
c.parentLearningUnit = learningUnit;
c.parentLearningSequence = learningSequence;
@@ -158,12 +159,12 @@ export class Circle implements CourseWagtailPage {
);
}
- public get flatChildren(): (LearningContent | LearningUnitQuestion)[] {
- const result: (LearningContent | LearningUnitQuestion)[] = [];
+ public get flatChildren(): (LearningContent | LearningUnitPerformanceCriteria)[] {
+ const result: (LearningContent | LearningUnitPerformanceCriteria)[] = [];
this.learningSequences.forEach((learningSequence) => {
learningSequence.learningUnits.forEach((learningUnit) => {
- learningUnit.children.forEach((learningUnitQuestion) => {
- result.push(learningUnitQuestion);
+ learningUnit.children.forEach((performanceCriteria) => {
+ result.push(performanceCriteria);
});
learningUnit.learningContents.forEach((learningContent) => {
result.push(learningContent);
diff --git a/client/src/services/learningPath.ts b/client/src/services/learningPath.ts
index 94a85cbc..eafdf083 100644
--- a/client/src/services/learningPath.ts
+++ b/client/src/services/learningPath.ts
@@ -33,7 +33,7 @@ export class LearningPath implements CourseWagtailPage {
return new LearningPath(
json.id,
json.slug,
- json.title,
+ json.course.title,
json.translation_key,
json.frontend_url,
json.course.id,
diff --git a/client/src/stores/circle.ts b/client/src/stores/circle.ts
index 11c729c1..d0c39151 100644
--- a/client/src/stores/circle.ts
+++ b/client/src/stores/circle.ts
@@ -9,7 +9,7 @@ import type {
CourseCompletionStatus,
LearningContent,
LearningUnit,
- LearningUnitQuestion,
+ LearningUnitPerformanceCriteria,
} from "@/types";
export type CircleStoreState = {
@@ -17,6 +17,16 @@ export type CircleStoreState = {
page: "INDEX" | "OVERVIEW";
};
+function createLearningUnitHash(learningUnit: LearningUnit | undefined) {
+ const luSlug = learningUnit?.slug;
+ const circleSlug = learningUnit?.parentCircle?.slug;
+ if (luSlug && circleSlug) {
+ return "#" + luSlug.replace(`${circleSlug}-`, "");
+ }
+
+ return "";
+}
+
export const useCircleStore = defineStore({
id: "circle",
state: () => {
@@ -76,7 +86,7 @@ export const useCircleStore = defineStore({
return learningUnit;
},
async markCompletion(
- page: LearningContent | LearningUnitQuestion,
+ page: LearningContent | LearningUnitPerformanceCriteria,
completion_status: CourseCompletionStatus = "success"
) {
try {
@@ -98,9 +108,10 @@ export const useCircleStore = defineStore({
path: learningContent.frontend_url,
});
},
- closeLearningContent() {
+ closeLearningContent(learningContent: LearningContent) {
this.router.push({
path: `${this.circle?.frontend_url}`,
+ hash: createLearningUnitHash(learningContent.parentLearningUnit),
});
},
openSelfEvaluation(learningUnit: LearningUnit) {
@@ -108,9 +119,10 @@ export const useCircleStore = defineStore({
path: learningUnit.frontend_url,
});
},
- closeSelfEvaluation() {
+ closeSelfEvaluation(learningUnit: LearningUnit) {
this.router.push({
path: `${this.circle?.frontend_url}`,
+ hash: createLearningUnitHash(learningUnit),
});
},
calcSelfEvaluationStatus(learningUnit: LearningUnit) {
@@ -139,42 +151,26 @@ export const useCircleStore = defineStore({
currentParent.children.length > 0
) {
// go to self evaluation
- // this.openSelfEvaluation(currentParent);
- this.closeLearningContent();
+ this.openSelfEvaluation(currentParent);
} else if (currentLearningContent.nextLearningContent) {
if (
- currentLearningContent.parentLearningSequence &&
- currentLearningContent.parentLearningSequence.id ===
- nextLearningContent?.parentLearningSequence?.id
+ currentLearningContent.parentLearningUnit &&
+ currentLearningContent.parentLearningUnit.id ===
+ nextLearningContent?.parentLearningUnit?.id
) {
this.openLearningContent(currentLearningContent.nextLearningContent);
} else {
- this.closeLearningContent();
+ this.closeLearningContent(currentLearningContent);
}
} else {
- this.closeLearningContent();
+ this.closeLearningContent(currentLearningContent);
}
} else {
log.error("currentLearningContent is undefined");
}
},
- continueFromSelfEvaluation() {
- this.closeSelfEvaluation();
- // if (this.currentSelfEvaluation) {
- // const nextContent = this.currentSelfEvaluation.learningContents[this.currentSelfEvaluation.learningContents.length - 1].nextLearningContent;
- //
- // if (nextContent) {
- // if (this.currentSelfEvaluation?.parentLearningSequence?.id === nextContent?.parentLearningSequence?.id) {
- // this.openLearningContent(nextContent);
- // } else {
- // this.closeSelfEvaluation();
- // }
- // } else {
- // this.closeSelfEvaluation();
- // }
- // } else {
- // log.error('currentSelfEvaluation is undefined');
- // }
+ continueFromSelfEvaluation(learningUnit: LearningUnit) {
+ this.closeSelfEvaluation(learningUnit);
},
},
});
diff --git a/client/src/types.ts b/client/src/types.ts
index 8b049f0d..9470caee 100644
--- a/client/src/types.ts
+++ b/client/src/types.ts
@@ -11,7 +11,8 @@ export type LearningContentType =
| "online_training"
| "resource"
| "test"
- | "video";
+ | "video"
+ | "placeholder";
export interface LearningContentBlock {
type: LearningContentType;
@@ -144,8 +145,8 @@ export interface LearningContent extends CourseWagtailPage {
previousLearningContent?: LearningContent;
}
-export interface LearningUnitQuestion extends CourseWagtailPage {
- type: "learnpath.LearningUnitQuestion";
+export interface LearningUnitPerformanceCriteria extends CourseWagtailPage {
+ type: "competence.PerformanceCriteria";
parentLearningSequence?: LearningSequence;
parentLearningUnit?: LearningUnit;
}
@@ -155,7 +156,8 @@ export interface LearningUnit extends CourseWagtailPage {
learningContents: LearningContent[];
minutes: number;
parentLearningSequence?: LearningSequence;
- children: LearningUnitQuestion[];
+ parentCircle?: Circle;
+ children: LearningUnitPerformanceCriteria[];
last?: boolean;
}
@@ -170,7 +172,7 @@ export type CircleChild =
| LearningContent
| LearningUnit
| LearningSequence
- | LearningUnitQuestion;
+ | LearningUnitPerformanceCriteria;
export interface WagtailCircle extends CourseWagtailPage {
type: "learnpath.Circle";
diff --git a/client/src/utils/typeMaps.ts b/client/src/utils/typeMaps.ts
index 02ec2b6b..81631956 100644
--- a/client/src/utils/typeMaps.ts
+++ b/client/src/utils/typeMaps.ts
@@ -10,4 +10,5 @@ export const learningContentTypesToName = new Map