From f68e20515d68d66f264f1c5b84ba1a4c20b7f68c Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Tue, 14 Mar 2023 15:03:01 +0100
Subject: [PATCH 1/4] =?UTF-8?q?VBV-293:=20Link=20zu=20Mediathek=20in=20Ver?=
 =?UTF-8?q?sicherungsvermittlerin=20Lehrgang=20wieder=20eingef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../learningPath/LearningContent.vue          |  9 ++-
 .../commands/create_default_courses.py        |  2 +-
 .../learnpath/create_vv_new_learning_path.py  | 62 +++++++++++++++++--
 3 files changed, 64 insertions(+), 9 deletions(-)

diff --git a/client/src/components/learningPath/LearningContent.vue b/client/src/components/learningPath/LearningContent.vue
index ea678518..2726f0c4 100644
--- a/client/src/components/learningPath/LearningContent.vue
+++ b/client/src/components/learningPath/LearningContent.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import LearningContentContainer from "@/components/learningPath/LearningContentContainer.vue";
 import { useCircleStore } from "@/stores/circle";
-import type { LearningContent } from "@/types";
+import type { LearningContent, LearningContentType } from "@/types";
 import log from "loglevel";
 import { computed } from "vue";
 
@@ -9,6 +9,7 @@ import DescriptionBlock from "@/components/learningPath/blocks/DescriptionBlock.
 import DescriptionTextBlock from "@/components/learningPath/blocks/DescriptionTextBlock.vue";
 import FeedbackBlock from "@/components/learningPath/blocks/FeedbackBlock.vue";
 import IframeBlock from "@/components/learningPath/blocks/IframeBlock.vue";
+import MediaLibraryBlock from "@/components/learningPath/blocks/MediaLibraryBlock.vue";
 import PlaceholderBlock from "@/components/learningPath/blocks/PlaceholderBlock.vue";
 import VideoBlock from "@/components/learningPath/blocks/VideoBlock.vue";
 
@@ -29,7 +30,7 @@ const block = computed(() => {
 });
 
 // can't use the type as component name, as some are reserved HTML components, e.g. video
-const COMPONENTS: Record<string, any> = {
+const COMPONENTS: Record<LearningContentType, any> = {
   // todo: can we find a better type here than any? ^
   placeholder: PlaceholderBlock,
   video: VideoBlock,
@@ -39,6 +40,10 @@ const COMPONENTS: Record<string, any> = {
   test: IframeBlock,
   learningmodule: IframeBlock,
   feedback: FeedbackBlock,
+  book: DescriptionBlock,
+  document: DescriptionBlock,
+  media_library: MediaLibraryBlock,
+  online_training: DescriptionBlock,
 };
 const DEFAULT_BLOCK = DescriptionBlock;
 
diff --git a/server/vbv_lernwelt/course/management/commands/create_default_courses.py b/server/vbv_lernwelt/course/management/commands/create_default_courses.py
index 90e41f52..41690366 100644
--- a/server/vbv_lernwelt/course/management/commands/create_default_courses.py
+++ b/server/vbv_lernwelt/course/management/commands/create_default_courses.py
@@ -66,8 +66,8 @@ def command():
         title="Versicherungsvermittler/-in",
     )
     create_vv_new_competence_profile(course_id=COURSE_VERSICHERUNGSVERMITTLERIN_ID)
-    create_vv_new_learning_path()
     create_default_media_library(course_id=COURSE_VERSICHERUNGSVERMITTLERIN_ID)
+    create_vv_new_learning_path()
 
     # Überbetriebliche Kurse DE
     create_versicherungsvermittlerin_with_categories(
diff --git a/server/vbv_lernwelt/learnpath/create_vv_new_learning_path.py b/server/vbv_lernwelt/learnpath/create_vv_new_learning_path.py
index b55bcccb..01dd3ba9 100644
--- a/server/vbv_lernwelt/learnpath/create_vv_new_learning_path.py
+++ b/server/vbv_lernwelt/learnpath/create_vv_new_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.rich_text import RichText
 from wagtail_localize.models import LocaleSynchronization
@@ -23,6 +24,7 @@ from vbv_lernwelt.learnpath.tests.learning_path_factories import (
     TestBlockFactory,
     TopicFactory,
     VideoBlockFactory,
+    MediaLibraryBlockFactory,
 )
 from vbv_lernwelt.learnpath.vv_circle_goals import GoalsType, VV_CIRCLE_GOALS
 
@@ -372,8 +374,16 @@ def create_circle_fahrzeug(lp, title="Fahrzeug"):
         ],
     )
     LearningContentFactory(
-        title="Mediathek",
+        title=f"Mediathek {title}",
         parent=circle,
+        contents=[
+            (
+                "media_library",
+                MediaLibraryBlockFactory(
+                    url=f"/media/versicherungsvermittler-in-media/category/{slugify(title)}"
+                ),
+            )
+        ],
     )
 
     LearningSequenceFactory(title="Einstieg", parent=circle, icon="it-icon-ls-watch")
@@ -467,8 +477,16 @@ def create_circle_rechtsstreitigkeiten(lp, title="Rechtsstreitigkeiten"):
         ],
     )
     LearningContentFactory(
-        title="Mediathek",
+        title=f"Mediathek {title}",
         parent=circle,
+        contents=[
+            (
+                "media_library",
+                MediaLibraryBlockFactory(
+                    url=f"/media/versicherungsvermittler-in-media/category/{slugify(title)}"
+                ),
+            )
+        ],
     )
 
     LearningSequenceFactory(
@@ -507,8 +525,16 @@ def create_circle_reisen(lp, title="Reisen"):
         ],
     )
     LearningContentFactory(
-        title="Mediathek",
+        title=f"Mediathek {title}",
         parent=circle,
+        contents=[
+            (
+                "media_library",
+                MediaLibraryBlockFactory(
+                    url=f"/media/versicherungsvermittler-in-media/category/{slugify(title)}"
+                ),
+            )
+        ],
     )
 
     LearningSequenceFactory(title="Einstieg", parent=circle, icon="it-icon-ls-watch")
@@ -577,8 +603,16 @@ def create_circle_einkommenssicherung(lp, title="Einkommenssicherung"):
         ],
     )
     LearningContentFactory(
-        title="Mediathek",
+        title=f"Mediathek {title}",
         parent=circle,
+        contents=[
+            (
+                "media_library",
+                MediaLibraryBlockFactory(
+                    url=f"/media/versicherungsvermittler-in-media/category/{slugify(title)}"
+                ),
+            )
+        ],
     )
 
     LearningSequenceFactory(title="Einstieg", parent=circle, icon="it-icon-ls-watch")
@@ -652,8 +686,16 @@ def create_circle_standard_small(
         ],
     )
     LearningContentFactory(
-        title="Mediathek",
+        title=f"Mediathek {title}",
         parent=circle,
+        contents=[
+            (
+                "media_library",
+                MediaLibraryBlockFactory(
+                    url=f"/media/versicherungsvermittler-in-media/category/{slugify(title, allow_unicode=True)}"
+                ),
+            )
+        ],
     )
 
     if lu_title is None:
@@ -688,8 +730,16 @@ def create_circle_standard(lp, title, lc_title, goals=None, description=None):
         ],
     )
     LearningContentFactory(
-        title="Mediathek",
+        title=f"Mediathek {title}",
         parent=circle,
+        contents=[
+            (
+                "media_library",
+                MediaLibraryBlockFactory(
+                    url=f"/media/versicherungsvermittler-in-media/category/{slugify(title)}"
+                ),
+            )
+        ],
     )
 
     LearningSequenceFactory(title="Einstieg", parent=circle, icon="it-icon-ls-watch")

From 57c25da5426823be4c0a7862f68b4b19245084b2 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Tue, 14 Mar 2023 17:16:40 +0100
Subject: [PATCH 2/4] =?UTF-8?q?VBV-293:=20Link=20zu=20Mediathek=20in=20?=
 =?UTF-8?q?=C3=9CK?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commands/create_default_courses.py        | 26 +++++-----
 .../management/commands/create_uk_course.py   | 47 +++++++++++++++++--
 2 files changed, 55 insertions(+), 18 deletions(-)

diff --git a/server/vbv_lernwelt/course/management/commands/create_default_courses.py b/server/vbv_lernwelt/course/management/commands/create_default_courses.py
index 41690366..7e6ce9d1 100644
--- a/server/vbv_lernwelt/course/management/commands/create_default_courses.py
+++ b/server/vbv_lernwelt/course/management/commands/create_default_courses.py
@@ -429,7 +429,7 @@ def command():
             "michael.meier@example.com",
         ),
         (
-            "überbetriebliche-kurse-lp-circle-fahrzeug-lc-mediathek",
+            "überbetriebliche-kurse-lp-circle-fahrzeug-lc-mediathek-fahrzeug",
             "success",
             "michael.meier@example.com",
         ),
@@ -494,7 +494,7 @@ def command():
             "michael.meier@example.com",
         ),
         (
-            "überbetriebliche-kurse-lp-circle-haushalt-teil-1-lc-mediathek",
+            "überbetriebliche-kurse-lp-circle-haushalt-teil-1-lc-mediathek-haushalt-teil-1",
             "success",
             "michael.meier@example.com",
         ),
@@ -509,7 +509,7 @@ def command():
             "michael.meier@example.com",
         ),
         (
-            "überbetriebliche-kurse-lp-circle-haushalt-teil-1-lc-mediathek",
+            "überbetriebliche-kurse-lp-circle-haushalt-teil-1-lc-mediathek-haushalt-teil-1",
             "success",
             "michael.meier@example.com",
         ),
@@ -534,7 +534,7 @@ def command():
             "michael.meier@example.com",
         ),
         (
-            "überbetriebliche-kurse-lp-circle-haushalt-teil-1-lc-mediathek",
+            "überbetriebliche-kurse-lp-circle-haushalt-teil-1-lc-mediathek-haushalt-teil-1",
             "success",
             "michael.meier@example.com",
         ),
@@ -674,7 +674,7 @@ def command():
             "lina.egger@example.com",
         ),
         (
-            "überbetriebliche-kurse-lp-circle-fahrzeug-lc-mediathek",
+            "überbetriebliche-kurse-lp-circle-fahrzeug-lc-mediathek-fahrzeug",
             "success",
             "lina.egger@example.com",
         ),
@@ -739,7 +739,7 @@ def command():
             "lina.egger@example.com",
         ),
         (
-            "überbetriebliche-kurse-lp-circle-haushalt-teil-1-lc-mediathek",
+            "überbetriebliche-kurse-lp-circle-haushalt-teil-1-lc-mediathek-haushalt-teil-1",
             "success",
             "lina.egger@example.com",
         ),
@@ -779,7 +779,7 @@ def command():
             "lina.egger@example.com",
         ),
         (
-            "überbetriebliche-kurse-lp-circle-haushalt-teil-1-lc-mediathek",
+            "überbetriebliche-kurse-lp-circle-haushalt-teil-1-lc-mediathek-haushalt-teil-1",
             "success",
             "lina.egger@example.com",
         ),
@@ -804,7 +804,7 @@ def command():
             "lina.egger@example.com",
         ),
         (
-            "überbetriebliche-kurse-lp-circle-haushalt-teil-2-lc-mediathek",
+            "überbetriebliche-kurse-lp-circle-haushalt-teil-2-lc-mediathek-haushalt-teil-2",
             "success",
             "lina.egger@example.com",
         ),
@@ -814,7 +814,7 @@ def command():
             "lina.egger@example.com",
         ),
         (
-            "überbetriebliche-kurse-lp-circle-haushalt-teil-1-lc-mediathek",
+            "überbetriebliche-kurse-lp-circle-haushalt-teil-1-lc-mediathek-haushalt-teil-1",
             "success",
             "lina.egger@example.com",
         ),
@@ -929,7 +929,7 @@ def command():
             "evelyn.schmid@example.com",
         ),
         (
-            "überbetriebliche-kurse-lp-circle-fahrzeug-lc-mediathek",
+            "überbetriebliche-kurse-lp-circle-fahrzeug-lc-mediathek-fahrzeug",
             "success",
             "evelyn.schmid@example.com",
         ),
@@ -994,7 +994,7 @@ def command():
             "evelyn.schmid@example.com",
         ),
         (
-            "überbetriebliche-kurse-lp-circle-haushalt-teil-1-lc-mediathek",
+            "überbetriebliche-kurse-lp-circle-haushalt-teil-1-lc-mediathek-haushalt-teil-1",
             "success",
             "evelyn.schmid@example.com",
         ),
@@ -1024,7 +1024,7 @@ def command():
             "evelyn.schmid@example.com",
         ),
         (
-            "überbetriebliche-kurse-lp-circle-haushalt-teil-1-lc-mediathek",
+            "überbetriebliche-kurse-lp-circle-haushalt-teil-1-lc-mediathek-haushalt-teil-1",
             "success",
             "evelyn.schmid@example.com",
         ),
@@ -1059,7 +1059,7 @@ def command():
             "evelyn.schmid@example.com",
         ),
         (
-            "überbetriebliche-kurse-lp-circle-haushalt-teil-2-lc-mediathek",
+            "überbetriebliche-kurse-lp-circle-haushalt-teil-2-lc-mediathek-haushalt-teil-2",
             "success",
             "evelyn.schmid@example.com",
         ),
diff --git a/server/vbv_lernwelt/course/management/commands/create_uk_course.py b/server/vbv_lernwelt/course/management/commands/create_uk_course.py
index dbeca34c..89e07d00 100644
--- a/server/vbv_lernwelt/course/management/commands/create_uk_course.py
+++ b/server/vbv_lernwelt/course/management/commands/create_uk_course.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
 
@@ -15,6 +16,7 @@ from vbv_lernwelt.learnpath.tests.learning_path_factories import (
     LearningSequenceFactory,
     LearningUnitFactory,
     TopicFactory,
+    MediaLibraryBlockFactory,
 )
 
 
@@ -149,10 +151,37 @@ damit du erfolgreich mit deinem Lernpfad (durch-)starten kannst.
         title="Verschaffe dir einen Überblick",
         parent=circle,
     )
-    LearningContentFactory(
-        title="Mediathek",
-        parent=circle,
-    )
+
+    first_title = title.split()[0]
+    if first_title in [
+        "Haushalt",
+        "Reisen",
+        "Wohneigentum",
+        "KMU",
+        "Einkommenssicherung",
+        "Pensionierung",
+        "Gesundheit",
+    ]:
+        LearningContentFactory(
+            title=f"Mediathek {title}",
+            parent=circle,
+            contents=[
+                (
+                    "media_library",
+                    MediaLibraryBlockFactory(
+                        # TODO: sollen die ÜKs auf die gleichen Mediatheken verlinken
+                        #  wie im Verischerungsvermittler?
+                        url=f"/media/versicherungsvermittler-in-media/category/{slugify(first_title)}"
+                    ),
+                )
+            ],
+        )
+    else:
+        LearningContentFactory(
+            title="Mediathek",
+            parent=circle,
+        )
+
     LearningContentFactory(
         title="Vorbereitungsauftrag",
         parent=circle,
@@ -209,8 +238,16 @@ damit du erfolgreich mit deinem Lernpfad (durch-)starten kannst.
         parent=circle,
     )
     LearningContentFactory(
-        title="Mediathek",
+        title=f"Mediathek {title}",
         parent=circle,
+        contents=[
+            (
+                "media_library",
+                MediaLibraryBlockFactory(
+                    url=f"/media/versicherungsvermittler-in-media/category/{slugify(title)}"
+                ),
+            )
+        ],
     )
     LearningContentFactory(
         title="Vorbereitungsauftrag",

From 8d0386c945c6518328e9ea957ec3a605dcd7e367 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Tue, 14 Mar 2023 17:20:14 +0100
Subject: [PATCH 3/4] Fix formatting

---
 .../vbv_lernwelt/course/management/commands/create_uk_course.py | 2 +-
 server/vbv_lernwelt/learnpath/create_vv_new_learning_path.py    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/vbv_lernwelt/course/management/commands/create_uk_course.py b/server/vbv_lernwelt/course/management/commands/create_uk_course.py
index 89e07d00..2f6c1b91 100644
--- a/server/vbv_lernwelt/course/management/commands/create_uk_course.py
+++ b/server/vbv_lernwelt/course/management/commands/create_uk_course.py
@@ -15,8 +15,8 @@ from vbv_lernwelt.learnpath.tests.learning_path_factories import (
     LearningPathFactory,
     LearningSequenceFactory,
     LearningUnitFactory,
-    TopicFactory,
     MediaLibraryBlockFactory,
+    TopicFactory,
 )
 
 
diff --git a/server/vbv_lernwelt/learnpath/create_vv_new_learning_path.py b/server/vbv_lernwelt/learnpath/create_vv_new_learning_path.py
index 01dd3ba9..d5af0f48 100644
--- a/server/vbv_lernwelt/learnpath/create_vv_new_learning_path.py
+++ b/server/vbv_lernwelt/learnpath/create_vv_new_learning_path.py
@@ -20,11 +20,11 @@ from vbv_lernwelt.learnpath.tests.learning_path_factories import (
     LearningPathFactory,
     LearningSequenceFactory,
     LearningUnitFactory,
+    MediaLibraryBlockFactory,
     ResourceBlockFactory,
     TestBlockFactory,
     TopicFactory,
     VideoBlockFactory,
-    MediaLibraryBlockFactory,
 )
 from vbv_lernwelt.learnpath.vv_circle_goals import GoalsType, VV_CIRCLE_GOALS
 

From b1a1d5281039cbbd7abb464a1d98eda02222a40d Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Tue, 14 Mar 2023 17:27:31 +0100
Subject: [PATCH 4/4] =?UTF-8?q?VBV-293:=20Link=20zu=20Mediathek=20in=20?=
 =?UTF-8?q?=C3=9CK=20upgrade?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../course/management/commands/create_uk_course.py            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/vbv_lernwelt/course/management/commands/create_uk_course.py b/server/vbv_lernwelt/course/management/commands/create_uk_course.py
index 2f6c1b91..9a1d31b5 100644
--- a/server/vbv_lernwelt/course/management/commands/create_uk_course.py
+++ b/server/vbv_lernwelt/course/management/commands/create_uk_course.py
@@ -171,7 +171,7 @@ damit du erfolgreich mit deinem Lernpfad (durch-)starten kannst.
                     MediaLibraryBlockFactory(
                         # TODO: sollen die ÜKs auf die gleichen Mediatheken verlinken
                         #  wie im Verischerungsvermittler?
-                        url=f"/media/versicherungsvermittler-in-media/category/{slugify(first_title)}"
+                        url=f"/media/überbetriebliche-kurse-media/category/{slugify(first_title)}"
                     ),
                 )
             ],
@@ -244,7 +244,7 @@ damit du erfolgreich mit deinem Lernpfad (durch-)starten kannst.
             (
                 "media_library",
                 MediaLibraryBlockFactory(
-                    url=f"/media/versicherungsvermittler-in-media/category/{slugify(title)}"
+                    url=f"/media/überbetriebliche-kurse-media/category/{slugify(title)}"
                 ),
             )
         ],