From 56fa5372b7b1e86ef3b9a36af428c4b873f586a7 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Thu, 7 Sep 2023 19:01:17 +0200
Subject: [PATCH 01/49] Remove sentry from supercronic docker_start.sh

---
 compose/django/docker_start.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/compose/django/docker_start.sh b/compose/django/docker_start.sh
index d88f2e2b..8da059c4 100644
--- a/compose/django/docker_start.sh
+++ b/compose/django/docker_start.sh
@@ -16,9 +16,10 @@ else
 fi
 
 # Use sentry for supercronic only in prod* environments
-if [[ $IT_APP_ENVIRONMENT == prod* ]]; then
-    sed -i "s|command=/usr/local/bin/supercronic /app/supercronic_crontab|command=/usr/local/bin/supercronic /app/supercronic_crontab -sentry-dsn '$IT_SENTRY_DSN'|" /app/supervisord.conf
-fi
+# FIXME: does not seem to work
+#if [[ $IT_APP_ENVIRONMENT == prod* ]]; then
+#    sed -i "s|command=/usr/local/bin/supercronic /app/supercronic_crontab|command=/usr/local/bin/supercronic /app/supercronic_crontab -sentry-dsn '$IT_SENTRY_DSN'|" /app/supervisord.conf
+#fi
 
 # Set the command to run supervisord
 /home/django/.local/bin/supervisord -c /app/supervisord.conf

From 06a3706d29ea825ea19de5030ac4276f5a43606e Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Fri, 8 Sep 2023 09:53:43 +0200
Subject: [PATCH 02/49] =?UTF-8?q?VBV-489:=20=C3=9Cbersetzungen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/components/header/MobileMenu.vue               | 2 +-
 .../src/pages/learningPath/circlePage/CircleOverview.vue  | 2 +-
 .../learningContentPage/blocks/EdoniqTestBlock.vue        | 2 +-
 .../learningPath/selfEvaluationPage/SelfEvaluation.vue    | 8 ++++----
 client/src/utils/typeMaps.ts                              | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/client/src/components/header/MobileMenu.vue b/client/src/components/header/MobileMenu.vue
index 7be14ab6..c1549b9e 100644
--- a/client/src/components/header/MobileMenu.vue
+++ b/client/src/components/header/MobileMenu.vue
@@ -67,7 +67,7 @@ const clickLink = (to: string | undefined) => {
                   data-cy="medialibrary-link"
                   @click="clickLink(`${courseSession?.media_library_url}`)"
                 >
-                  {{ $t("mediaLibrary.title") }}
+                  {{ $t("a.Mediathek") }}
                 </button>
               </li>
             </ul>
diff --git a/client/src/pages/learningPath/circlePage/CircleOverview.vue b/client/src/pages/learningPath/circlePage/CircleOverview.vue
index 581be517..e0ce4c39 100644
--- a/client/src/pages/learningPath/circlePage/CircleOverview.vue
+++ b/client/src/pages/learningPath/circlePage/CircleOverview.vue
@@ -13,7 +13,7 @@ const emit = defineEmits(["closemodal"]);
 <template>
   <ItFullScreenModal :show="show" @closemodal="emit('closemodal')">
     <div v-if="circle" class="container-medium">
-      <h2 data-cy="lc-title">Überblick: Circle «{{ circle.title }}»</h2>
+      <h2 data-cy="lc-title">{{ $t("a.Übersicht") }}: Circle «{{ circle.title }}»</h2>
 
       <!-- eslint-disable vue/no-v-html -->
       <div
diff --git a/client/src/pages/learningPath/learningContentPage/blocks/EdoniqTestBlock.vue b/client/src/pages/learningPath/learningContentPage/blocks/EdoniqTestBlock.vue
index 9ef40312..478b75e1 100644
--- a/client/src/pages/learningPath/learningContentPage/blocks/EdoniqTestBlock.vue
+++ b/client/src/pages/learningPath/learningContentPage/blocks/EdoniqTestBlock.vue
@@ -69,7 +69,7 @@ async function startTest() {
           class="btn-primary inline-flex items-center"
           @click="startTest()"
         >
-          Test starten
+          {{ $t("edoniqTest.startTest") }}
           <it-icon-external-link class="it-icon ml-2 h-5 w-5"></it-icon-external-link>
         </button>
       </div>
diff --git a/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluation.vue b/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluation.vue
index d2c1c350..b244271a 100644
--- a/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluation.vue
+++ b/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluation.vue
@@ -69,8 +69,8 @@ onUnmounted(() => {
     >
       <LearningContentMultiLayout
         :current-step="questionIndex"
-        :sub-title="$t('selfEvaluation.title')"
-        :title="$t('selfEvaluation.title', { title: learningUnit.title })"
+        :sub-title="$t('a.Selbsteinschätzung')"
+        :title="`${$t('a.Selbsteinschätzung')}: ${learningUnit.title}`"
         icon="it-icon-lc-learning-module"
         :steps-count="questions.length"
         :show-next-button="showNextButton"
@@ -101,7 +101,7 @@ onUnmounted(() => {
               >
                 <it-icon-smiley-happy class="mr-4 h-16 w-16"></it-icon-smiley-happy>
                 <span class="text-large font-bold">
-                  {{ $t("selfEvaluation.yes") }}.
+                  {{ $t("selfEvaluation.yes") }}
                 </span>
               </button>
               <button
@@ -117,7 +117,7 @@ onUnmounted(() => {
                 <it-icon-smiley-thinking
                   class="mr-4 h-16 w-16"
                 ></it-icon-smiley-thinking>
-                <span class="text-xl font-bold">{{ $t("selfEvaluation.no") }}.</span>
+                <span class="text-xl font-bold">{{ $t("selfEvaluation.no") }}</span>
               </button>
             </div>
 
diff --git a/client/src/utils/typeMaps.ts b/client/src/utils/typeMaps.ts
index d31f518d..28954851 100644
--- a/client/src/utils/typeMaps.ts
+++ b/client/src/utils/typeMaps.ts
@@ -44,7 +44,7 @@ export function learningContentTypeData(
         icon: "it-icon-lc-learning-module",
       };
     case "learnpath.LearningContentMediaLibrary":
-      return { title: t("mediaLibrary.title"), icon: "it-icon-lc-media-library" };
+      return { title: t("a.Mediathek"), icon: "it-icon-lc-media-library" };
     case "learnpath.LearningContentVideo":
       return { title: t("learningContentTypes.video"), icon: "it-icon-lc-video" };
     case "learnpath.LearningContentEdoniqTest":

From bc011e47be6083b35d8c0fa1e0a713274bb39f17 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Fri, 8 Sep 2023 11:33:42 +0200
Subject: [PATCH 03/49] VBV-489: Open external links in new tab in assignment

---
 .../LearningContentPage.vue                   | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/client/src/pages/learningPath/learningContentPage/LearningContentPage.vue b/client/src/pages/learningPath/learningContentPage/LearningContentPage.vue
index bc3a36f0..079a2a93 100644
--- a/client/src/pages/learningPath/learningContentPage/LearningContentPage.vue
+++ b/client/src/pages/learningPath/learningContentPage/LearningContentPage.vue
@@ -4,7 +4,7 @@ import { useCircleStore } from "@/stores/circle";
 import type { LearningContent } from "@/types";
 import * as log from "loglevel";
 import type { Ref } from "vue";
-import { onMounted, ref, watch } from "vue";
+import { getCurrentInstance, onMounted, onUpdated, ref, watch } from "vue";
 
 log.debug("LearningContentView created");
 
@@ -52,6 +52,24 @@ onMounted(async () => {
   );
   await loadLearningContent();
 });
+
+onUpdated(() => {
+  const vueInstance = getCurrentInstance();
+  if (vueInstance) {
+    // VBV-489: open external links in new tab
+    const rootElement: HTMLElement = vueInstance.proxy?.$el;
+    const anchors = rootElement.querySelectorAll("a");
+    anchors.forEach((anchor: HTMLAnchorElement) => {
+      if (
+        /^https?\:\/\//i.test(anchor.href) &&
+        !anchor.href.includes(window.location.hostname)
+      ) {
+        anchor.setAttribute("target", "_blank");
+        anchor.setAttribute("rel", "noopener noreferrer");
+      }
+    });
+  }
+});
 </script>
 
 <template>

From 5b01a68cdbc122705502283fcb0125e2cd914c92 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Fri, 8 Sep 2023 14:39:13 +0200
Subject: [PATCH 04/49] Translate notifications

---
 server/vbv_lernwelt/notify/services.py | 37 +++++++++++++++++++-------
 1 file changed, 28 insertions(+), 9 deletions(-)

diff --git a/server/vbv_lernwelt/notify/services.py b/server/vbv_lernwelt/notify/services.py
index 6cc2848e..fa2956b8 100644
--- a/server/vbv_lernwelt/notify/services.py
+++ b/server/vbv_lernwelt/notify/services.py
@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-from gettext import gettext
 from typing import TYPE_CHECKING
 
 import structlog
@@ -33,9 +32,12 @@ class NotificationService:
     def send_assignment_submitted_notification(
         cls, recipient: User, sender: User, assignment_completion: AssignmentCompletion
     ):
-        verb = gettext(
-            "%(sender)s hat die geleitete Fallarbeit «%(assignment_title)s» abgegeben."
-        ) % {
+        texts = {
+            "de": "%(sender)s hat die geleitete Fallarbeit «%(assignment_title)s» abgegeben.",
+            "fr": "%(sender)s a soumis l'étude de cas dirigée «%(assignment_title)s».",
+            "it": "%(sender)s ha consegnato il caso di studio guidato «%(assignment_title)s».",
+        }
+        verb = texts.get(recipient.language, "de") % {
             "sender": sender.get_full_name(),
             "assignment_title": assignment_completion.assignment.title,
         }
@@ -60,9 +62,12 @@ class NotificationService:
         assignment_completion: AssignmentCompletion,
         target_url: str,
     ):
-        verb = gettext(
-            "%(sender)s hat die geleitete Fallarbeit «%(assignment_title)s» bewertet."
-        ) % {
+        texts = {
+            "de": "%(sender)s hat die geleitete Fallarbeit «%(assignment_title)s» bewertet.",
+            "fr": "%(sender)s a évalué l'étude de cas dirigée «%(assignment_title)s».",
+            "it": "%(sender)s ha valutato il caso di studio guidato «%(assignment_title)s».",
+        }
+        verb = texts.get(recipient.language, "de") % {
             "sender": sender.get_full_name(),
             "assignment_title": assignment_completion.assignment.title,
         }
@@ -85,7 +90,14 @@ class NotificationService:
         recipient: User,
         feedback_response: FeedbackResponse,
     ):
-        verb = f"New feedback for circle {feedback_response.circle.title}"
+        texts = {
+            "de": "Feedback abgeschickt für Circle «%(circle_title)s»",
+            "fr": "Feedback envoyé pour le cercle «%(circle_title)s»",
+            "it": "Feedback inviato per il cerchio «%(circle_title)s»",
+        }
+        verb = texts.get(recipient.language, "de") % {
+            "circle_title": feedback_response.circle.title,
+        }
 
         return cls._send_notification(
             recipient=recipient,
@@ -104,9 +116,16 @@ class NotificationService:
         recipient: User,
         attendance_course: CourseSessionAttendanceCourse,
     ):
+        texts = {
+            "de": "Erinnerung: Bald findet ein Präsenzkurs statt",
+            "fr": "Rappel: Un cours de présence aura lieu bientôt.",
+            "it": "Promemoria: Un corso di presenza avrà luogo presto.",
+        }
+        verb = texts.get(recipient.language, "de")
+
         return cls._send_notification(
             recipient=recipient,
-            verb="Erinnerung: Bald findet ein Präsenzkurs statt",
+            verb=verb,
             notification_category=NotificationCategory.INFORMATION,
             notification_trigger=NotificationTrigger.ATTENDANCE_COURSE_REMINDER,
             target_url=attendance_course.learning_content.get_frontend_url(),

From 4909b38428f4a450f091fbdd20de3bd2882dfd83 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Fri, 8 Sep 2023 15:08:12 +0200
Subject: [PATCH 05/49] Translations assignment frontend

---
 .../AssignmentEvaluationPage.vue              |  6 ++--
 .../EvaluationContainer.vue                   |  2 +-
 .../EvaluationIntro.vue                       | 36 +++++++++++--------
 .../EvaluationSummary.vue                     | 11 +++---
 .../assignment/AssignmentIntroductionView.vue |  2 +-
 5 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/client/src/pages/cockpit/assignmentEvaluationPage/AssignmentEvaluationPage.vue b/client/src/pages/cockpit/assignmentEvaluationPage/AssignmentEvaluationPage.vue
index b71cf356..1b1f40ed 100644
--- a/client/src/pages/cockpit/assignmentEvaluationPage/AssignmentEvaluationPage.vue
+++ b/client/src/pages/cockpit/assignmentEvaluationPage/AssignmentEvaluationPage.vue
@@ -79,7 +79,9 @@ const assignment = computed(
       >
         <div class="flex items-center text-gray-900">
           <it-icon-assignment class="h-6 w-6"></it-icon-assignment>
-          <div class="ml-2">Geleitete Fallarbeit: {{ assignment?.title }}</div>
+          <div class="ml-2">
+            {{ $t("a.Geleitete Fallarbeit") }}: {{ assignment?.title }}
+          </div>
         </div>
         <button
           type="button"
@@ -98,7 +100,7 @@ const assignment = computed(
           <div class="h-full overflow-y-auto bg-white sm:w-1/2">
             <!-- Left part content goes here -->
             <div class="p-10" data-cy="student-submission">
-              <h3>Ergebnisse</h3>
+              <h3>{{ $t("a.Ergebnisse") }}</h3>
 
               <div class="my-6 flex items-center">
                 <img
diff --git a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationContainer.vue b/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationContainer.vue
index 0ff0f641..36fb835c 100644
--- a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationContainer.vue
+++ b/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationContainer.vue
@@ -155,7 +155,7 @@ function finishButtonEnabled() {
           @click="emit('close')"
         >
           <span class="flex items-center">
-            Bewertung abschliessen
+            {{ $t("a.Bewertung abschliessen") }}
             <it-icon-check class="ml-2 h-6 w-6"></it-icon-check>
           </span>
         </button>
diff --git a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationIntro.vue b/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationIntro.vue
index 26557de1..19186c0a 100644
--- a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationIntro.vue
+++ b/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationIntro.vue
@@ -48,28 +48,36 @@ async function startEvaluation() {
 <template>
   <div>
     <div class="mb-4">
-      {{ props.assignmentUser.first_name }} {{ props.assignmentUser.last_name }} hat die
-      Ergebnisse am
-      {{ dayjs(props.assignmentCompletion.submitted_at).format("DD.MM.YYYY") }} um
-      {{ dayjs(props.assignmentCompletion.submitted_at).format("HH.mm") }} Uhr
-      abgegeben.
+      {{
+        $t("assignment.x hat die Ergebnisse am y um z Uhr abgegeben", {
+          x: props.assignmentUser.first_name + " " + props.assignmentUser.last_name,
+          y: dayjs(props.assignmentCompletion.submitted_at).format("DD.MM.YYYY"),
+          z: dayjs(props.assignmentCompletion.submitted_at).format("HH.mm"),
+        })
+      }}
     </div>
 
-    <h3>Bewertung</h3>
+    <h3>{{ $t("a.Bewertung") }}</h3>
 
     <p v-if="props.dueDate" class="my-4">
-      Du musst die Bewertung bis am {{ props.dueDate.format("DD.MM.YYYY") }} um
-      {{ props.dueDate.format("HH.mm") }} Uhr abschliessen und freigeben.
+      {{
+        $t(
+          "assignment.Du musst die Bewertung bis am x um y Uhr abschliessen und freigeben",
+          {
+            x: props.dueDate.format("DD.MM.YYYY"),
+            y: props.dueDate.format("HH.mm"),
+          }
+        )
+      }}
     </p>
 
     <p class="my-4">
-      Die Gesamtpunktzahl und die daraus resultierende Note wird auf Grund des
-      hinterlegeten Beurteilungsinstrument berechnet.
+      {{ $t("assignment.evaluationInstrumentDescriptionText") }}
     </p>
 
     <p class="my-4">
       <a :href="props.assignment.evaluation_document_url" class="link" target="_blank">
-        Beurteilungsinstrument anzeigen
+        {{ $t("a.Beurteilungsinstrument anzeigen") }}
       </a>
     </p>
 
@@ -84,16 +92,16 @@ async function startEvaluation() {
             props.assignmentCompletion.completion_status === 'EVALUATION_IN_PROGRESS'
           "
         >
-          Bewertung fortsetzen
+          {{ $t("a.Bewertung fortsetzen") }}
         </span>
         <span
           v-else-if="
             props.assignmentCompletion.completion_status === 'EVALUATION_SUBMITTED'
           "
         >
-          Bewertung ansehen
+          {{ $t("a.Bewertung ansehen") }}
         </span>
-        <span v-else>Bewertung starten</span>
+        <span v-else>{{ $t("a.Bewertung starten") }}</span>
       </button>
     </div>
   </div>
diff --git a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationSummary.vue b/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationSummary.vue
index 2826bb50..bf067201 100644
--- a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationSummary.vue
+++ b/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationSummary.vue
@@ -102,17 +102,16 @@ const evaluationUser = computed(() => {
     <h3 v-if="evaluationUser && props.showEvaluationUser" class="mb-6">
       Bewertung von {{ evaluationUser.first_name }} {{ evaluationUser.last_name }}
     </h3>
-    <h3 v-else class="mb-6">Bewertung Freigabe</h3>
+    <h3 v-else class="mb-6">{{ $t("a.Bewertung Freigabe") }}</h3>
 
     <section class="mb-6 border p-6">
       <div class="text-lg font-bold">Note: {{ grade }}</div>
       <div class="text-gray-900">
-        Gesamtpunktezahl {{ userPoints }} / {{ maxPoints }}
+        {{ $t("a.Gesamtpunktzahl") }} {{ userPoints }} / {{ maxPoints }}
       </div>
 
       <p class="my-4">
-        Die Gesamtpunktzahl und die daraus resultierende Note wird auf Grund des
-        hinterlegeten Beurteilungsinstrument berechnet.
+        {{ $t("assignment.evaluationInstrumentDescriptionText") }}
       </p>
 
       <p class="my-4">
@@ -121,7 +120,7 @@ const evaluationUser = computed(() => {
           class="link"
           target="_blank"
         >
-          Beurteilungsinstrument anzeigen
+          {{ $t("a.Beurteilungsinstrument anzeigen") }}
         </a>
       </p>
 
@@ -138,7 +137,7 @@ const evaluationUser = computed(() => {
       </div>
       <div v-else>
         <button class="btn-primary text-large" @click="submitEvaluation()">
-          Bewertung freigeben
+          {{ $t("a.Bewertung freigeben") }}
         </button>
       </div>
 
diff --git a/client/src/pages/learningPath/learningContentPage/assignment/AssignmentIntroductionView.vue b/client/src/pages/learningPath/learningContentPage/assignment/AssignmentIntroductionView.vue
index 0603eea5..06485fba 100644
--- a/client/src/pages/learningPath/learningContentPage/assignment/AssignmentIntroductionView.vue
+++ b/client/src/pages/learningPath/learningContentPage/assignment/AssignmentIntroductionView.vue
@@ -74,7 +74,7 @@ const step = useRouteQuery("step");
       props.assignment.evaluation_document_url
     "
   >
-    <h3 class="mb-4 mt-8">{{ $t("assignment.assessmentTitle") }}</h3>
+    <h3 class="mb-4 mt-8">{{ $t("a.Bewertung") }}</h3>
     <p
       v-if="props.assignment.evaluation_description"
       class="default-wagtail-rich-text text-large"

From abf83b9fb8fd45afab3786c455260f66d284f6fa Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Fri, 8 Sep 2023 15:23:49 +0200
Subject: [PATCH 06/49] VBV-512: Anwesenheit erneut bearbeiten

---
 .../cockpit/attendanceCheckPage/AttendanceCheckPage.vue  | 9 ++++++++-
 .../learningContentPage/LearningContentPage.vue          | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/client/src/pages/cockpit/attendanceCheckPage/AttendanceCheckPage.vue b/client/src/pages/cockpit/attendanceCheckPage/AttendanceCheckPage.vue
index 2d22699a..053bd059 100644
--- a/client/src/pages/cockpit/attendanceCheckPage/AttendanceCheckPage.vue
+++ b/client/src/pages/cockpit/attendanceCheckPage/AttendanceCheckPage.vue
@@ -96,6 +96,10 @@ const loadAttendanceData = async () => {
   }
 };
 
+function editAgain() {
+  state.attendanceSaved = false;
+}
+
 onMounted(() => {
   log.debug("AttendanceCheckPage mounted");
   loadAttendanceData();
@@ -153,8 +157,11 @@ watch(
         </div>
         <div v-else class="self-center">
           <p class="text-base">
-            {{ $t("Die Anwesenheit wurde definitiv bestätigt.") }}
+            {{ $t("a.Die Anwesenheit wurde definitiv bestätigt") }}
           </p>
+          <button class="btn-link link" @click="editAgain()">
+            {{ $t("a.Erneut bearbeiten") }}
+          </button>
         </div>
       </div>
 
diff --git a/client/src/pages/learningPath/learningContentPage/LearningContentPage.vue b/client/src/pages/learningPath/learningContentPage/LearningContentPage.vue
index 079a2a93..1245e9bf 100644
--- a/client/src/pages/learningPath/learningContentPage/LearningContentPage.vue
+++ b/client/src/pages/learningPath/learningContentPage/LearningContentPage.vue
@@ -61,7 +61,7 @@ onUpdated(() => {
     const anchors = rootElement.querySelectorAll("a");
     anchors.forEach((anchor: HTMLAnchorElement) => {
       if (
-        /^https?\:\/\//i.test(anchor.href) &&
+        /^https?:\/\//i.test(anchor.href) &&
         !anchor.href.includes(window.location.hostname)
       ) {
         anchor.setAttribute("target", "_blank");

From cff3d6e49b5673f276bfbb685e69ce877f12ec09 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Fri, 8 Sep 2023 16:25:33 +0200
Subject: [PATCH 07/49] Fix unit test

---
 server/vbv_lernwelt/feedback/tests/test_feedback_api.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/vbv_lernwelt/feedback/tests/test_feedback_api.py b/server/vbv_lernwelt/feedback/tests/test_feedback_api.py
index 020f0fc7..6b15d207 100644
--- a/server/vbv_lernwelt/feedback/tests/test_feedback_api.py
+++ b/server/vbv_lernwelt/feedback/tests/test_feedback_api.py
@@ -74,7 +74,7 @@ class FeedbackSummaryApiTestCase(FeedbackApiBaseTestCase):
         notification = Notification.objects.first()
         self.assertEqual(notification.recipient, expert)
         self.assertEqual(
-            notification.verb, f"New feedback for circle {basis_circle.title}"
+            notification.verb, f"Feedback abgeschickt für Circle «{basis_circle.title}»"
         )
         self.assertEqual(
             notification.target_url,

From 0537d96dbbdf5346b9e45100db28d72b53435de8 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Fri, 1 Sep 2023 11:15:11 +0200
Subject: [PATCH 08/49] Add models for KompetenzNavi and GraphQL-Types

---
 client/src/gql/graphql.ts                     |  67 ++++++++
 client/src/gql/schema.graphql                 | 147 +++++++++++++-----
 client/src/gql/typenames.ts                   |   1 +
 scripts/competenceCertificate.graphql         |  15 ++
 scripts/learningPath.graphql                  |  30 ++++
 .../assignment/creators/create_assignments.py |   3 +-
 .../vbv_lernwelt/assignment/graphql/types.py  |  10 ++
 .../migrations/0007_auto_20230901_1112.py     |  25 +++
 server/vbv_lernwelt/assignment/models.py      |  28 +++-
 server/vbv_lernwelt/competence/factories.py   |  24 +++
 .../competence/graphql/__init__.py            |   0
 .../competence/graphql/queries.py             |  14 ++
 .../vbv_lernwelt/competence/graphql/types.py  |  19 +++
 ...tencecertificatelist_competencenavipage.py |  45 ++++++
 server/vbv_lernwelt/competence/models.py      |  34 ++++
 server/vbv_lernwelt/core/schema.py            |   8 +-
 .../course/creators/test_course.py            |  84 +++++++++-
 .../vbv_lernwelt/course/graphql/interfaces.py |  12 ++
 .../vbv_lernwelt/learnpath/graphql/types.py   |   4 +-
 .../migrations/0004_auto_20230901_1112.py     |  25 +++
 server/vbv_lernwelt/learnpath/models.py       |   8 +
 ...alter_notification_notification_trigger.py |  18 +++
 22 files changed, 573 insertions(+), 48 deletions(-)
 create mode 100644 scripts/competenceCertificate.graphql
 create mode 100644 scripts/learningPath.graphql
 create mode 100644 server/vbv_lernwelt/assignment/migrations/0007_auto_20230901_1112.py
 create mode 100644 server/vbv_lernwelt/competence/graphql/__init__.py
 create mode 100644 server/vbv_lernwelt/competence/graphql/queries.py
 create mode 100644 server/vbv_lernwelt/competence/graphql/types.py
 create mode 100644 server/vbv_lernwelt/competence/migrations/0003_competencecertificate_competencecertificatelist_competencenavipage.py
 create mode 100644 server/vbv_lernwelt/learnpath/migrations/0004_auto_20230901_1112.py
 create mode 100644 server/vbv_lernwelt/notify/migrations/0004_alter_notification_notification_trigger.py

diff --git a/client/src/gql/graphql.ts b/client/src/gql/graphql.ts
index 09584176..a23ed2ab 100644
--- a/client/src/gql/graphql.ts
+++ b/client/src/gql/graphql.ts
@@ -45,6 +45,10 @@ export type Scalars = {
 export type AssignmentAssignmentAssignmentTypeChoices =
   /** CASEWORK */
   | 'CASEWORK'
+  /** CONDITION_ACCEPTANCE */
+  | 'CONDITION_ACCEPTANCE'
+  /** EDONIQ_TEST */
+  | 'EDONIQ_TEST'
   /** PREP_ASSIGNMENT */
   | 'PREP_ASSIGNMENT'
   /** REFLECTION */
@@ -94,7 +98,9 @@ export type AssignmentCompletionStatus =
 export type AssignmentObjectType = CoursePageInterface & {
   __typename?: 'AssignmentObjectType';
   assignment_type: AssignmentAssignmentAssignmentTypeChoices;
+  circle?: Maybe<CircleObjectType>;
   content_type?: Maybe<Scalars['String']['output']>;
+  course?: Maybe<CourseObjectType>;
   /** Zeitaufwand als Text */
   effort_required: Scalars['String']['output'];
   /** Beschreibung der Bewertung */
@@ -106,7 +112,9 @@ export type AssignmentObjectType = CoursePageInterface & {
   id?: Maybe<Scalars['ID']['output']>;
   /** Erläuterung der Ausgangslage */
   intro_text: Scalars['String']['output'];
+  learning_content?: Maybe<LearningContentInterface>;
   live?: Maybe<Scalars['Boolean']['output']>;
+  max_points?: Maybe<Scalars['Int']['output']>;
   performance_objectives?: Maybe<Scalars['JSONStreamField']['output']>;
   slug?: Maybe<Scalars['String']['output']>;
   tasks?: Maybe<Scalars['JSONStreamField']['output']>;
@@ -140,7 +148,9 @@ export type AttendanceUserType = {
 
 export type CircleObjectType = CoursePageInterface & {
   __typename?: 'CircleObjectType';
+  circle?: Maybe<CircleObjectType>;
   content_type?: Maybe<Scalars['String']['output']>;
+  course?: Maybe<CourseObjectType>;
   description: Scalars['String']['output'];
   frontend_url?: Maybe<Scalars['String']['output']>;
   goals: Scalars['String']['output'];
@@ -152,6 +162,20 @@ export type CircleObjectType = CoursePageInterface & {
   translation_key?: Maybe<Scalars['String']['output']>;
 };
 
+export type CompetenceCertificateObjectType = CoursePageInterface & {
+  __typename?: 'CompetenceCertificateObjectType';
+  assignments?: Maybe<Array<Maybe<AssignmentObjectType>>>;
+  circle?: Maybe<CircleObjectType>;
+  content_type?: Maybe<Scalars['String']['output']>;
+  course?: Maybe<CourseObjectType>;
+  frontend_url?: Maybe<Scalars['String']['output']>;
+  id?: Maybe<Scalars['ID']['output']>;
+  live?: Maybe<Scalars['Boolean']['output']>;
+  slug?: Maybe<Scalars['String']['output']>;
+  title?: Maybe<Scalars['String']['output']>;
+  translation_key?: Maybe<Scalars['String']['output']>;
+};
+
 /** An enumeration. */
 export type CoreUserLanguageChoices =
   /** Deutsch */
@@ -171,7 +195,9 @@ export type CourseObjectType = {
 };
 
 export type CoursePageInterface = {
+  circle?: Maybe<CircleObjectType>;
   content_type?: Maybe<Scalars['String']['output']>;
+  course?: Maybe<CourseObjectType>;
   frontend_url?: Maybe<Scalars['String']['output']>;
   id?: Maybe<Scalars['ID']['output']>;
   live?: Maybe<Scalars['Boolean']['output']>;
@@ -211,9 +237,11 @@ export type FeedbackResponse = Node & {
 export type LearningContentAssignmentObjectType = LearningContentInterface & {
   __typename?: 'LearningContentAssignmentObjectType';
   assignment_type: LearnpathLearningContentAssignmentAssignmentTypeChoices;
+  circle?: Maybe<CircleObjectType>;
   content?: Maybe<Scalars['String']['output']>;
   content_assignment: AssignmentObjectType;
   content_type?: Maybe<Scalars['String']['output']>;
+  course?: Maybe<CourseObjectType>;
   description?: Maybe<Scalars['String']['output']>;
   frontend_url?: Maybe<Scalars['String']['output']>;
   id?: Maybe<Scalars['ID']['output']>;
@@ -226,8 +254,10 @@ export type LearningContentAssignmentObjectType = LearningContentInterface & {
 
 export type LearningContentAttendanceCourseObjectType = LearningContentInterface & {
   __typename?: 'LearningContentAttendanceCourseObjectType';
+  circle?: Maybe<CircleObjectType>;
   content?: Maybe<Scalars['String']['output']>;
   content_type?: Maybe<Scalars['String']['output']>;
+  course?: Maybe<CourseObjectType>;
   description?: Maybe<Scalars['String']['output']>;
   frontend_url?: Maybe<Scalars['String']['output']>;
   id?: Maybe<Scalars['ID']['output']>;
@@ -240,8 +270,10 @@ export type LearningContentAttendanceCourseObjectType = LearningContentInterface
 
 export type LearningContentDocumentListObjectType = LearningContentInterface & {
   __typename?: 'LearningContentDocumentListObjectType';
+  circle?: Maybe<CircleObjectType>;
   content?: Maybe<Scalars['String']['output']>;
   content_type?: Maybe<Scalars['String']['output']>;
+  course?: Maybe<CourseObjectType>;
   description?: Maybe<Scalars['String']['output']>;
   frontend_url?: Maybe<Scalars['String']['output']>;
   id?: Maybe<Scalars['ID']['output']>;
@@ -254,8 +286,10 @@ export type LearningContentDocumentListObjectType = LearningContentInterface & {
 
 export type LearningContentFeedbackObjectType = LearningContentInterface & {
   __typename?: 'LearningContentFeedbackObjectType';
+  circle?: Maybe<CircleObjectType>;
   content?: Maybe<Scalars['String']['output']>;
   content_type?: Maybe<Scalars['String']['output']>;
+  course?: Maybe<CourseObjectType>;
   description?: Maybe<Scalars['String']['output']>;
   frontend_url?: Maybe<Scalars['String']['output']>;
   id?: Maybe<Scalars['ID']['output']>;
@@ -267,8 +301,10 @@ export type LearningContentFeedbackObjectType = LearningContentInterface & {
 };
 
 export type LearningContentInterface = {
+  circle?: Maybe<CircleObjectType>;
   content?: Maybe<Scalars['String']['output']>;
   content_type?: Maybe<Scalars['String']['output']>;
+  course?: Maybe<CourseObjectType>;
   description?: Maybe<Scalars['String']['output']>;
   frontend_url?: Maybe<Scalars['String']['output']>;
   id?: Maybe<Scalars['ID']['output']>;
@@ -281,8 +317,10 @@ export type LearningContentInterface = {
 
 export type LearningContentLearningModuleObjectType = LearningContentInterface & {
   __typename?: 'LearningContentLearningModuleObjectType';
+  circle?: Maybe<CircleObjectType>;
   content?: Maybe<Scalars['String']['output']>;
   content_type?: Maybe<Scalars['String']['output']>;
+  course?: Maybe<CourseObjectType>;
   description?: Maybe<Scalars['String']['output']>;
   frontend_url?: Maybe<Scalars['String']['output']>;
   id?: Maybe<Scalars['ID']['output']>;
@@ -295,8 +333,10 @@ export type LearningContentLearningModuleObjectType = LearningContentInterface &
 
 export type LearningContentMediaLibraryObjectType = LearningContentInterface & {
   __typename?: 'LearningContentMediaLibraryObjectType';
+  circle?: Maybe<CircleObjectType>;
   content?: Maybe<Scalars['String']['output']>;
   content_type?: Maybe<Scalars['String']['output']>;
+  course?: Maybe<CourseObjectType>;
   description?: Maybe<Scalars['String']['output']>;
   frontend_url?: Maybe<Scalars['String']['output']>;
   id?: Maybe<Scalars['ID']['output']>;
@@ -309,8 +349,10 @@ export type LearningContentMediaLibraryObjectType = LearningContentInterface & {
 
 export type LearningContentPlaceholderObjectType = LearningContentInterface & {
   __typename?: 'LearningContentPlaceholderObjectType';
+  circle?: Maybe<CircleObjectType>;
   content?: Maybe<Scalars['String']['output']>;
   content_type?: Maybe<Scalars['String']['output']>;
+  course?: Maybe<CourseObjectType>;
   description?: Maybe<Scalars['String']['output']>;
   frontend_url?: Maybe<Scalars['String']['output']>;
   id?: Maybe<Scalars['ID']['output']>;
@@ -323,8 +365,10 @@ export type LearningContentPlaceholderObjectType = LearningContentInterface & {
 
 export type LearningContentRichTextObjectType = LearningContentInterface & {
   __typename?: 'LearningContentRichTextObjectType';
+  circle?: Maybe<CircleObjectType>;
   content?: Maybe<Scalars['String']['output']>;
   content_type?: Maybe<Scalars['String']['output']>;
+  course?: Maybe<CourseObjectType>;
   description?: Maybe<Scalars['String']['output']>;
   frontend_url?: Maybe<Scalars['String']['output']>;
   id?: Maybe<Scalars['ID']['output']>;
@@ -337,8 +381,11 @@ export type LearningContentRichTextObjectType = LearningContentInterface & {
 
 export type LearningContentTestObjectType = LearningContentInterface & {
   __typename?: 'LearningContentTestObjectType';
+  circle?: Maybe<CircleObjectType>;
   content?: Maybe<Scalars['String']['output']>;
+  content_assignment?: Maybe<AssignmentObjectType>;
   content_type?: Maybe<Scalars['String']['output']>;
+  course?: Maybe<CourseObjectType>;
   description?: Maybe<Scalars['String']['output']>;
   frontend_url?: Maybe<Scalars['String']['output']>;
   id?: Maybe<Scalars['ID']['output']>;
@@ -351,8 +398,10 @@ export type LearningContentTestObjectType = LearningContentInterface & {
 
 export type LearningContentVideoObjectType = LearningContentInterface & {
   __typename?: 'LearningContentVideoObjectType';
+  circle?: Maybe<CircleObjectType>;
   content?: Maybe<Scalars['String']['output']>;
   content_type?: Maybe<Scalars['String']['output']>;
+  course?: Maybe<CourseObjectType>;
   description?: Maybe<Scalars['String']['output']>;
   frontend_url?: Maybe<Scalars['String']['output']>;
   id?: Maybe<Scalars['ID']['output']>;
@@ -365,7 +414,9 @@ export type LearningContentVideoObjectType = LearningContentInterface & {
 
 export type LearningPathObjectType = CoursePageInterface & {
   __typename?: 'LearningPathObjectType';
+  circle?: Maybe<CircleObjectType>;
   content_type?: Maybe<Scalars['String']['output']>;
+  course?: Maybe<CourseObjectType>;
   depth: Scalars['Int']['output'];
   draft_title: Scalars['String']['output'];
   expire_at?: Maybe<Scalars['DateTime']['output']>;
@@ -399,7 +450,9 @@ export type LearningPathObjectType = CoursePageInterface & {
 
 export type LearningSequenceObjectType = CoursePageInterface & {
   __typename?: 'LearningSequenceObjectType';
+  circle?: Maybe<CircleObjectType>;
   content_type?: Maybe<Scalars['String']['output']>;
+  course?: Maybe<CourseObjectType>;
   frontend_url?: Maybe<Scalars['String']['output']>;
   icon: Scalars['String']['output'];
   id?: Maybe<Scalars['ID']['output']>;
@@ -412,7 +465,9 @@ export type LearningSequenceObjectType = CoursePageInterface & {
 
 export type LearningUnitObjectType = CoursePageInterface & {
   __typename?: 'LearningUnitObjectType';
+  circle?: Maybe<CircleObjectType>;
   content_type?: Maybe<Scalars['String']['output']>;
+  course?: Maybe<CourseObjectType>;
   frontend_url?: Maybe<Scalars['String']['output']>;
   id?: Maybe<Scalars['ID']['output']>;
   learning_contents?: Maybe<Array<Maybe<LearningContentInterface>>>;
@@ -426,6 +481,10 @@ export type LearningUnitObjectType = CoursePageInterface & {
 export type LearnpathLearningContentAssignmentAssignmentTypeChoices =
   /** CASEWORK */
   | 'CASEWORK'
+  /** CONDITION_ACCEPTANCE */
+  | 'CONDITION_ACCEPTANCE'
+  /** EDONIQ_TEST */
+  | 'EDONIQ_TEST'
   /** PREP_ASSIGNMENT */
   | 'PREP_ASSIGNMENT'
   /** REFLECTION */
@@ -472,6 +531,7 @@ export type Query = {
   assignment?: Maybe<AssignmentObjectType>;
   assignment_completion?: Maybe<AssignmentCompletionObjectType>;
   circle?: Maybe<CircleObjectType>;
+  competence_certificate?: Maybe<CompetenceCertificateObjectType>;
   course?: Maybe<CourseObjectType>;
   course_session_attendance_course?: Maybe<CourseSessionAttendanceCourseType>;
   learning_content_assignment?: Maybe<LearningContentAssignmentObjectType>;
@@ -508,6 +568,11 @@ export type QueryCircleArgs = {
 };
 
 
+export type QueryCompetenceCertificateArgs = {
+  id?: InputMaybe<Scalars['ID']['input']>;
+};
+
+
 export type QueryCourseArgs = {
   id?: InputMaybe<Scalars['Int']['input']>;
 };
@@ -541,8 +606,10 @@ export type SendFeedbackPayload = {
 
 export type TopicObjectType = CoursePageInterface & {
   __typename?: 'TopicObjectType';
+  circle?: Maybe<CircleObjectType>;
   circles?: Maybe<Array<Maybe<CircleObjectType>>>;
   content_type?: Maybe<Scalars['String']['output']>;
+  course?: Maybe<CourseObjectType>;
   frontend_url?: Maybe<Scalars['String']['output']>;
   id?: Maybe<Scalars['ID']['output']>;
   is_visible: Scalars['Boolean']['output'];
diff --git a/client/src/gql/schema.graphql b/client/src/gql/schema.graphql
index 47a08ee2..cc80187a 100644
--- a/client/src/gql/schema.graphql
+++ b/client/src/gql/schema.graphql
@@ -13,6 +13,7 @@ type Query {
   learning_content_document_list: LearningContentDocumentListObjectType
   course_session_attendance_course(id: ID!, assignment_user_id: ID): CourseSessionAttendanceCourseType
   course(id: Int): CourseObjectType
+  competence_certificate(id: ID): CompetenceCertificateObjectType
   assignment(id: ID, slug: String): AssignmentObjectType
   assignment_completion(assignment_id: ID!, course_session_id: ID!, learning_content_page_id: ID, assignment_user_id: UUID): AssignmentCompletionObjectType
 }
@@ -27,6 +28,8 @@ type CircleObjectType implements CoursePageInterface {
   live: Boolean
   translation_key: String
   frontend_url: String
+  circle: CircleObjectType
+  course: CourseObjectType
   learning_sequences: [LearningSequenceObjectType]
 }
 
@@ -38,42 +41,16 @@ interface CoursePageInterface {
   live: Boolean
   translation_key: String
   frontend_url: String
+  circle: CircleObjectType
+  course: CourseObjectType
 }
 
-type LearningSequenceObjectType implements CoursePageInterface {
-  icon: String!
-  id: ID
-  title: String
-  slug: String
-  content_type: String
-  live: Boolean
-  translation_key: String
-  frontend_url: String
-  learning_units: [LearningUnitObjectType]
-}
-
-type LearningUnitObjectType implements CoursePageInterface {
-  id: ID
-  title: String
-  slug: String
-  content_type: String
-  live: Boolean
-  translation_key: String
-  frontend_url: String
-  learning_contents: [LearningContentInterface]
-}
-
-interface LearningContentInterface {
-  id: ID
-  title: String
-  slug: String
-  content_type: String
-  live: Boolean
-  translation_key: String
-  frontend_url: String
-  minutes: Int
-  description: String
-  content: String
+type CourseObjectType {
+  id: ID!
+  title: String!
+  category_name: String!
+  slug: String!
+  learning_path: LearningPathObjectType
 }
 
 type LearningPathObjectType implements CoursePageInterface {
@@ -115,6 +92,8 @@ type LearningPathObjectType implements CoursePageInterface {
   search_description: String!
   latest_revision_created_at: DateTime
   frontend_url: String
+  circle: CircleObjectType
+  course: CourseObjectType
   topics: [TopicObjectType]
 }
 
@@ -165,9 +144,53 @@ type TopicObjectType implements CoursePageInterface {
   live: Boolean
   translation_key: String
   frontend_url: String
+  circle: CircleObjectType
+  course: CourseObjectType
   circles: [CircleObjectType]
 }
 
+type LearningSequenceObjectType implements CoursePageInterface {
+  icon: String!
+  id: ID
+  title: String
+  slug: String
+  content_type: String
+  live: Boolean
+  translation_key: String
+  frontend_url: String
+  circle: CircleObjectType
+  course: CourseObjectType
+  learning_units: [LearningUnitObjectType]
+}
+
+type LearningUnitObjectType implements CoursePageInterface {
+  id: ID
+  title: String
+  slug: String
+  content_type: String
+  live: Boolean
+  translation_key: String
+  frontend_url: String
+  circle: CircleObjectType
+  course: CourseObjectType
+  learning_contents: [LearningContentInterface]
+}
+
+interface LearningContentInterface {
+  id: ID
+  title: String
+  slug: String
+  content_type: String
+  live: Boolean
+  translation_key: String
+  frontend_url: String
+  circle: CircleObjectType
+  course: CourseObjectType
+  minutes: Int
+  description: String
+  content: String
+}
+
 type LearningContentMediaLibraryObjectType implements LearningContentInterface {
   id: ID
   title: String
@@ -176,6 +199,8 @@ type LearningContentMediaLibraryObjectType implements LearningContentInterface {
   live: Boolean
   translation_key: String
   frontend_url: String
+  circle: CircleObjectType
+  course: CourseObjectType
   minutes: Int
   description: String
   content: String
@@ -191,6 +216,8 @@ type LearningContentAssignmentObjectType implements LearningContentInterface {
   live: Boolean
   translation_key: String
   frontend_url: String
+  circle: CircleObjectType
+  course: CourseObjectType
   minutes: Int
   description: String
   content: String
@@ -217,9 +244,13 @@ type AssignmentObjectType implements CoursePageInterface {
   live: Boolean
   translation_key: String
   frontend_url: String
+  circle: CircleObjectType
+  course: CourseObjectType
   tasks: JSONStreamField
   evaluation_tasks: JSONStreamField
   performance_objectives: JSONStreamField
+  max_points: Int
+  learning_content: LearningContentInterface
 }
 
 """An enumeration."""
@@ -232,6 +263,12 @@ enum AssignmentAssignmentAssignmentTypeChoices {
 
   """REFLECTION"""
   REFLECTION
+
+  """CONDITION_ACCEPTANCE"""
+  CONDITION_ACCEPTANCE
+
+  """EDONIQ_TEST"""
+  EDONIQ_TEST
 }
 
 scalar JSONStreamField
@@ -246,6 +283,12 @@ enum LearnpathLearningContentAssignmentAssignmentTypeChoices {
 
   """REFLECTION"""
   REFLECTION
+
+  """CONDITION_ACCEPTANCE"""
+  CONDITION_ACCEPTANCE
+
+  """EDONIQ_TEST"""
+  EDONIQ_TEST
 }
 
 type LearningContentAttendanceCourseObjectType implements LearningContentInterface {
@@ -256,6 +299,8 @@ type LearningContentAttendanceCourseObjectType implements LearningContentInterfa
   live: Boolean
   translation_key: String
   frontend_url: String
+  circle: CircleObjectType
+  course: CourseObjectType
   minutes: Int
   description: String
   content: String
@@ -269,6 +314,8 @@ type LearningContentFeedbackObjectType implements LearningContentInterface {
   live: Boolean
   translation_key: String
   frontend_url: String
+  circle: CircleObjectType
+  course: CourseObjectType
   minutes: Int
   description: String
   content: String
@@ -282,6 +329,8 @@ type LearningContentLearningModuleObjectType implements LearningContentInterface
   live: Boolean
   translation_key: String
   frontend_url: String
+  circle: CircleObjectType
+  course: CourseObjectType
   minutes: Int
   description: String
   content: String
@@ -295,6 +344,8 @@ type LearningContentPlaceholderObjectType implements LearningContentInterface {
   live: Boolean
   translation_key: String
   frontend_url: String
+  circle: CircleObjectType
+  course: CourseObjectType
   minutes: Int
   description: String
   content: String
@@ -308,12 +359,15 @@ type LearningContentRichTextObjectType implements LearningContentInterface {
   live: Boolean
   translation_key: String
   frontend_url: String
+  circle: CircleObjectType
+  course: CourseObjectType
   minutes: Int
   description: String
   content: String
 }
 
 type LearningContentTestObjectType implements LearningContentInterface {
+  content_assignment: AssignmentObjectType
   id: ID
   title: String
   slug: String
@@ -321,6 +375,8 @@ type LearningContentTestObjectType implements LearningContentInterface {
   live: Boolean
   translation_key: String
   frontend_url: String
+  circle: CircleObjectType
+  course: CourseObjectType
   minutes: Int
   description: String
   content: String
@@ -334,6 +390,8 @@ type LearningContentVideoObjectType implements LearningContentInterface {
   live: Boolean
   translation_key: String
   frontend_url: String
+  circle: CircleObjectType
+  course: CourseObjectType
   minutes: Int
   description: String
   content: String
@@ -347,6 +405,8 @@ type LearningContentDocumentListObjectType implements LearningContentInterface {
   live: Boolean
   translation_key: String
   frontend_url: String
+  circle: CircleObjectType
+  course: CourseObjectType
   minutes: Int
   description: String
   content: String
@@ -378,12 +438,17 @@ enum AttendanceUserStatus {
   ABSENT
 }
 
-type CourseObjectType {
-  id: ID!
-  title: String!
-  category_name: String!
-  slug: String!
-  learning_path: LearningPathObjectType
+type CompetenceCertificateObjectType implements CoursePageInterface {
+  id: ID
+  title: String
+  slug: String
+  content_type: String
+  live: Boolean
+  translation_key: String
+  frontend_url: String
+  circle: CircleObjectType
+  course: CourseObjectType
+  assignments: [AssignmentObjectType]
 }
 
 type AssignmentCompletionObjectType {
@@ -492,4 +557,4 @@ enum AssignmentCompletionStatus {
   SUBMITTED
   EVALUATION_IN_PROGRESS
   EVALUATION_SUBMITTED
-}
+}
\ No newline at end of file
diff --git a/client/src/gql/typenames.ts b/client/src/gql/typenames.ts
index fb87f08b..51e70750 100644
--- a/client/src/gql/typenames.ts
+++ b/client/src/gql/typenames.ts
@@ -10,6 +10,7 @@ export const AttendanceUserStatus = "AttendanceUserStatus";
 export const AttendanceUserType = "AttendanceUserType";
 export const Boolean = "Boolean";
 export const CircleObjectType = "CircleObjectType";
+export const CompetenceCertificateObjectType = "CompetenceCertificateObjectType";
 export const CoreUserLanguageChoices = "CoreUserLanguageChoices";
 export const CourseObjectType = "CourseObjectType";
 export const CoursePageInterface = "CoursePageInterface";
diff --git a/scripts/competenceCertificate.graphql b/scripts/competenceCertificate.graphql
new file mode 100644
index 00000000..40e842b2
--- /dev/null
+++ b/scripts/competenceCertificate.graphql
@@ -0,0 +1,15 @@
+{
+  competence_certificate(id:1) {
+    title,
+    assignments {
+      id
+      title
+      max_points
+      learning_content {
+        title
+        frontend_url
+        content_type
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/scripts/learningPath.graphql b/scripts/learningPath.graphql
new file mode 100644
index 00000000..0130bf1f
--- /dev/null
+++ b/scripts/learningPath.graphql
@@ -0,0 +1,30 @@
+{
+  learning_path(slug: "test-lehrgang-lp") {
+    id
+    title
+    content_type
+    topics {
+      id
+      title
+      content_type
+      circles {
+        id
+        title
+        content_type
+        learning_sequences {
+          id
+          title
+          icon
+          learning_units {
+            id
+            title
+            learning_contents {
+              id
+              title
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/server/vbv_lernwelt/assignment/creators/create_assignments.py b/server/vbv_lernwelt/assignment/creators/create_assignments.py
index 861d8dca..8985926b 100644
--- a/server/vbv_lernwelt/assignment/creators/create_assignments.py
+++ b/server/vbv_lernwelt/assignment/creators/create_assignments.py
@@ -25,7 +25,7 @@ from wagtail.blocks.list_block import ListBlock, ListValue
 from wagtail.rich_text import RichText
 
 
-def create_uk_fahrzeug_casework(course_id=COURSE_UK):
+def create_uk_fahrzeug_casework(course_id=COURSE_UK, competence_certificate=None):
     assignment_list_page = (
         CoursePage.objects.get(course_id=course_id)
         .get_children()
@@ -36,6 +36,7 @@ def create_uk_fahrzeug_casework(course_id=COURSE_UK):
     assignment = AssignmentFactory(
         parent=assignment_list_page,
         title="Überprüfen einer Motorfahrzeugs-Versicherungspolice",
+        competence_certificate=competence_certificate,
         effort_required="ca. 5 Stunden",
         intro_text=replace_whitespace(
             """
diff --git a/server/vbv_lernwelt/assignment/graphql/types.py b/server/vbv_lernwelt/assignment/graphql/types.py
index 3ba46191..b998cb27 100644
--- a/server/vbv_lernwelt/assignment/graphql/types.py
+++ b/server/vbv_lernwelt/assignment/graphql/types.py
@@ -5,12 +5,15 @@ from graphene_django import DjangoObjectType
 from vbv_lernwelt.assignment.models import Assignment, AssignmentCompletion
 from vbv_lernwelt.core.graphql.types import JSONStreamField
 from vbv_lernwelt.course.graphql.interfaces import CoursePageInterface
+from vbv_lernwelt.learnpath.graphql.types import LearningContentInterface
 
 
 class AssignmentObjectType(DjangoObjectType):
     tasks = JSONStreamField()
     evaluation_tasks = JSONStreamField()
     performance_objectives = JSONStreamField()
+    max_points = graphene.Int()
+    learning_content = graphene.Field(LearningContentInterface)
 
     class Meta:
         model = Assignment
@@ -21,8 +24,15 @@ class AssignmentObjectType(DjangoObjectType):
             "effort_required",
             "evaluation_description",
             "evaluation_document_url",
+            "learning_content",
         )
 
+    def resolve_max_points(self, info):
+        return self.get_max_points()
+
+    def resolve_learning_content(self, info):
+        return self.find_attached_learning_content()
+
 
 class AssignmentCompletionObjectType(DjangoObjectType):
     completion_data = GenericScalar()
diff --git a/server/vbv_lernwelt/assignment/migrations/0007_auto_20230901_1112.py b/server/vbv_lernwelt/assignment/migrations/0007_auto_20230901_1112.py
new file mode 100644
index 00000000..e32156f7
--- /dev/null
+++ b/server/vbv_lernwelt/assignment/migrations/0007_auto_20230901_1112.py
@@ -0,0 +1,25 @@
+# Generated by Django 3.2.20 on 2023-09-01 09:12
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('competence', '0003_competencecertificate_competencecertificatelist_competencenavipage'),
+        ('assignment', '0006_auto_20230823_1127'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='assignment',
+            name='competence_certificate',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='competence.competencecertificate'),
+        ),
+        migrations.AlterField(
+            model_name='assignment',
+            name='assignment_type',
+            field=models.CharField(choices=[('CASEWORK', 'CASEWORK'), ('PREP_ASSIGNMENT', 'PREP_ASSIGNMENT'), ('REFLECTION', 'REFLECTION'), ('CONDITION_ACCEPTANCE', 'CONDITION_ACCEPTANCE'), ('EDONIQ_TEST', 'EDONIQ_TEST')], default='CASEWORK', max_length=50),
+        ),
+    ]
diff --git a/server/vbv_lernwelt/assignment/models.py b/server/vbv_lernwelt/assignment/models.py
index 74c25df6..059eedc5 100644
--- a/server/vbv_lernwelt/assignment/models.py
+++ b/server/vbv_lernwelt/assignment/models.py
@@ -5,7 +5,7 @@ from django.db import models
 from django.db.models import UniqueConstraint
 from slugify import slugify
 from wagtail import blocks
-from wagtail.admin.panels import FieldPanel
+from wagtail.admin.panels import FieldPanel, PageChooserPanel
 from wagtail.fields import RichTextField, StreamField
 from wagtail.models import Page
 
@@ -113,6 +113,7 @@ class AssignmentType(Enum):
     PREP_ASSIGNMENT = "PREP_ASSIGNMENT"  # Vorbereitungsauftrag
     REFLECTION = "REFLECTION"  # Reflexion
     CONDITION_ACCEPTANCE = "CONDITION_ACCEPTANCE"  # Bedingungsannahme
+    EDONIQ_TEST = "EDONIQ_TEST"  # EdonIQ Test
 
 
 class Assignment(CourseBasePage):
@@ -132,6 +133,13 @@ class Assignment(CourseBasePage):
         default=AssignmentType.CASEWORK.value,
     )
 
+    competence_certificate = models.ForeignKey(
+        "competence.CompetenceCertificate",
+        null=True,
+        blank=True,
+        on_delete=models.SET_NULL,
+    )
+
     intro_text = RichTextField(
         help_text="Erläuterung der Ausgangslage",
         features=DEFAULT_RICH_TEXT_FEATURES_WITH_HEADER,
@@ -180,6 +188,7 @@ class Assignment(CourseBasePage):
 
     content_panels = Page.content_panels + [
         FieldPanel("assignment_type"),
+        PageChooserPanel("competence_certificate", "competence.CompetenceCertificate"),
         FieldPanel("intro_text"),
         FieldPanel("effort_required"),
         FieldPanel("performance_objectives"),
@@ -239,6 +248,23 @@ class Assignment(CourseBasePage):
     def get_input_tasks(self):
         return self.filter_user_subtasks() + self.get_evaluation_tasks()
 
+    def get_max_points(self):
+        return sum(
+            [task["value"].get("max_points", 0) for task in self.get_evaluation_tasks()]
+        )
+
+    def find_attached_learning_content(self):
+        """
+        Returns the first learning content page attached to this assignment
+        """
+        page = self.learningcontentassignment_set.first()
+        if page:
+            return page.specific
+        page = self.learningcontentedoniqtest_set.first()
+        if page:
+            return page.specific
+        return None
+
 
 class AssignmentCompletionStatus(Enum):
     IN_PROGRESS = "IN_PROGRESS"
diff --git a/server/vbv_lernwelt/competence/factories.py b/server/vbv_lernwelt/competence/factories.py
index 9ff245bc..ce9f05f8 100644
--- a/server/vbv_lernwelt/competence/factories.py
+++ b/server/vbv_lernwelt/competence/factories.py
@@ -4,9 +4,33 @@ from vbv_lernwelt.competence.models import (
     CompetencePage,
     CompetenceProfilePage,
     PerformanceCriteria,
+    CompetenceCertificate,
+    CompetenceNaviPage,
+    CompetenceCertificateList,
 )
 
 
+class CompetenceNaviPageFactory(wagtail_factories.PageFactory):
+    title = "KompetenzNavi"
+
+    class Meta:
+        model = CompetenceNaviPage
+
+
+class CompetenceCertificateListFactory(wagtail_factories.PageFactory):
+    title = "Kompetenznachweise"
+
+    class Meta:
+        model = CompetenceCertificateList
+
+
+class CompetenceCertificateFactory(wagtail_factories.PageFactory):
+    title = "Kompetenznachweis"
+
+    class Meta:
+        model = CompetenceCertificate
+
+
 class CompetenceProfilePageFactory(wagtail_factories.PageFactory):
     title = "KompetenzNavi"
 
diff --git a/server/vbv_lernwelt/competence/graphql/__init__.py b/server/vbv_lernwelt/competence/graphql/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/server/vbv_lernwelt/competence/graphql/queries.py b/server/vbv_lernwelt/competence/graphql/queries.py
new file mode 100644
index 00000000..182cf6f1
--- /dev/null
+++ b/server/vbv_lernwelt/competence/graphql/queries.py
@@ -0,0 +1,14 @@
+import graphene
+
+from vbv_lernwelt.competence.graphql.types import CompetenceCertificateObjectType
+from vbv_lernwelt.competence.models import CompetenceCertificate
+
+
+class CompetenceCertificateQuery(object):
+    competence_certificate = graphene.Field(
+        CompetenceCertificateObjectType,
+        id=graphene.ID(),
+    )
+
+    def resolve_competence_certificate(root, info, id):
+        return CompetenceCertificate.objects.get(id=id)
diff --git a/server/vbv_lernwelt/competence/graphql/types.py b/server/vbv_lernwelt/competence/graphql/types.py
new file mode 100644
index 00000000..1b46c9aa
--- /dev/null
+++ b/server/vbv_lernwelt/competence/graphql/types.py
@@ -0,0 +1,19 @@
+from graphene import List
+from graphene_django import DjangoObjectType
+
+from vbv_lernwelt.assignment.graphql.types import AssignmentObjectType
+from vbv_lernwelt.competence.models import CompetenceCertificate
+from vbv_lernwelt.course.graphql.interfaces import CoursePageInterface
+
+
+class CompetenceCertificateObjectType(DjangoObjectType):
+    assignments = List(AssignmentObjectType)
+
+    class Meta:
+        model = CompetenceCertificate
+        interfaces = (CoursePageInterface,)
+        fields = ["assignments"]
+
+    # resolver for the assignments
+    def resolve_assignments(self, info):
+        return self.assignment_set.all()
diff --git a/server/vbv_lernwelt/competence/migrations/0003_competencecertificate_competencecertificatelist_competencenavipage.py b/server/vbv_lernwelt/competence/migrations/0003_competencecertificate_competencecertificatelist_competencenavipage.py
new file mode 100644
index 00000000..ee1a1898
--- /dev/null
+++ b/server/vbv_lernwelt/competence/migrations/0003_competencecertificate_competencecertificatelist_competencenavipage.py
@@ -0,0 +1,45 @@
+# Generated by Django 3.2.20 on 2023-09-01 09:12
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wagtailcore', '0089_log_entry_data_json_null_to_object'),
+        ('competence', '0002_performancecriteria_learning_unit'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='CompetenceCertificate',
+            fields=[
+                ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.page')),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=('wagtailcore.page',),
+        ),
+        migrations.CreateModel(
+            name='CompetenceCertificateList',
+            fields=[
+                ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.page')),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=('wagtailcore.page',),
+        ),
+        migrations.CreateModel(
+            name='CompetenceNaviPage',
+            fields=[
+                ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.page')),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=('wagtailcore.page',),
+        ),
+    ]
diff --git a/server/vbv_lernwelt/competence/models.py b/server/vbv_lernwelt/competence/models.py
index 45b4488b..de2328f0 100644
--- a/server/vbv_lernwelt/competence/models.py
+++ b/server/vbv_lernwelt/competence/models.py
@@ -9,6 +9,38 @@ from vbv_lernwelt.core.model_utils import find_available_slug
 from vbv_lernwelt.course.models import CourseBasePage
 
 
+class CompetenceNaviPage(CourseBasePage):
+    parent_page_types = ["course.CoursePage"]
+    subpage_types = ["competence.CompetenceCertificateList"]
+
+    def get_frontend_url(self):
+        return f"/course/{self.slug.replace('-competencenavi', '')}/competence"
+
+    def save(self, clean=True, user=None, log_action=False, **kwargs):
+        self.slug = find_available_slug(
+            slugify(f"{self.get_parent().slug}-competencenavi", allow_unicode=True),
+            ignore_page_id=self.id,
+        )
+        super(CompetenceNaviPage, self).save(clean, user, log_action, **kwargs)
+
+
+class CompetenceCertificateList(CourseBasePage):
+    """Kompetenznachweise für einen Lehrgang"""
+
+    parent_page_types = ["competence.CompetenceNaviPage"]
+    subpage_types = ["competence.CompetenceCertificate"]
+
+
+class CompetenceCertificate(CourseBasePage):
+    """einzelner Kompetenznachweis"""
+
+    parent_page_types = ["competence.CompetenceCertificateList"]
+
+    def __str__(self):
+        course = self.get_course()
+        return f"{course.title} - {self.title}"
+
+
 class CompetenceProfilePage(CourseBasePage):
     serialize_field_names = [
         "course",
@@ -35,6 +67,8 @@ class CompetenceProfilePage(CourseBasePage):
 
 
 class CompetencePage(CourseBasePage):
+    """Handlungskompetenz"""
+
     serialize_field_names = [
         "competence_id",
         "children",
diff --git a/server/vbv_lernwelt/core/schema.py b/server/vbv_lernwelt/core/schema.py
index d389be78..11d9a045 100644
--- a/server/vbv_lernwelt/core/schema.py
+++ b/server/vbv_lernwelt/core/schema.py
@@ -2,6 +2,7 @@ import graphene
 
 from vbv_lernwelt.assignment.graphql.mutations import AssignmentMutation
 from vbv_lernwelt.assignment.graphql.queries import AssignmentQuery
+from vbv_lernwelt.competence.graphql.queries import CompetenceCertificateQuery
 from vbv_lernwelt.course.graphql.queries import CourseQuery
 from vbv_lernwelt.course_session.graphql.mutations import CourseSessionMutation
 from vbv_lernwelt.course_session.graphql.queries import CourseSessionQuery
@@ -10,7 +11,12 @@ from vbv_lernwelt.learnpath.graphql.queries import CircleQuery
 
 
 class Query(
-    AssignmentQuery, CourseQuery, CourseSessionQuery, CircleQuery, graphene.ObjectType
+    AssignmentQuery,
+    CompetenceCertificateQuery,
+    CourseQuery,
+    CourseSessionQuery,
+    CircleQuery,
+    graphene.ObjectType,
 ):
     pass
 
diff --git a/server/vbv_lernwelt/course/creators/test_course.py b/server/vbv_lernwelt/course/creators/test_course.py
index 264965bf..c25e9fd2 100644
--- a/server/vbv_lernwelt/course/creators/test_course.py
+++ b/server/vbv_lernwelt/course/creators/test_course.py
@@ -11,13 +11,24 @@ from vbv_lernwelt.assignment.creators.create_assignments import (
     create_uk_fahrzeug_prep_assignment,
     create_uk_reflection,
 )
-from vbv_lernwelt.assignment.models import Assignment, AssignmentCompletionStatus
+from vbv_lernwelt.assignment.models import (
+    Assignment,
+    AssignmentCompletionStatus,
+    AssignmentListPage,
+)
 from vbv_lernwelt.assignment.services import update_assignment_completion
-from vbv_lernwelt.assignment.tests.assignment_factories import AssignmentListPageFactory
+from vbv_lernwelt.assignment.tests.assignment_factories import (
+    AssignmentListPageFactory,
+    AssignmentFactory,
+    EvaluationTaskBlockFactory,
+)
 from vbv_lernwelt.competence.factories import (
     CompetencePageFactory,
     CompetenceProfilePageFactory,
     PerformanceCriteriaFactory,
+    CompetenceNaviPageFactory,
+    CompetenceCertificateListFactory,
+    CompetenceCertificateFactory,
 )
 from vbv_lernwelt.competence.models import CompetencePage
 from vbv_lernwelt.core.constants import (
@@ -74,15 +85,21 @@ def create_test_course(include_uk=True, include_vv=True, with_sessions=False):
 
     create_test_competence_profile()
     if include_uk:
+        competence_certificate = create_test_competence_navi()
         # assignments create assignments parent page
         course_page = CoursePage.objects.get(course_id=COURSE_TEST_ID)
         _assignment_list_page = AssignmentListPageFactory(
             parent=course_page,
         )
-        create_uk_fahrzeug_casework(course_id=COURSE_TEST_ID)
+        create_uk_fahrzeug_casework(
+            course_id=COURSE_TEST_ID, competence_certificate=competence_certificate
+        )
         create_uk_fahrzeug_prep_assignment(course_id=COURSE_TEST_ID)
         create_uk_condition_acceptance(course_id=COURSE_TEST_ID)
         create_uk_reflection(course_id=COURSE_TEST_ID)
+        create_test_assignment_edoniq(
+            course_id=COURSE_TEST_ID, competence_certificate=competence_certificate
+        )
 
     create_test_learning_path(include_uk=include_uk, include_vv=include_vv)
     create_test_media_library()
@@ -316,6 +333,9 @@ damit du erfolgreich mit deinem Lernpfad (durch-)starten kannst.
         description=RichText(
             "<p>Folgender Test mit Wissens- und Verständnisfragen ist Teil des Kompetenznachweises. Der Test kann nur einmal durchgeführt werden und ist notenrelevant.</p>"
         ),
+        content_assignment=Assignment.objects.get(
+            slug__startswith="test-lehrgang-assignment-edoniq-wissens-und-verständisfragen-circle-fahrzeug-demo"
+        ),
         checkbox_text="Hiermit bestätige ich, dass ich die Anweisungen verstanden und die Redlichkeitserklärung akzeptiert habe.",
         test_url="https://exam.vbv-afa.ch/e-tutor/v4/user/course/pre_course_object?aid=1689096897473,2147466097",
         extended_time_test_url="https://exam2.vbv-afa.ch/e-tutor/v4/user/course/pre_course_object?aid=1689096897473,2147466097",
@@ -488,6 +508,27 @@ def create_test_competence_profile():
         )
 
 
+def create_test_competence_navi():
+    course_page = CoursePage.objects.get(course_id=COURSE_TEST_ID)
+
+    competence_navi_page = CompetenceNaviPageFactory(
+        title="KompetenzNavi",
+        parent=course_page,
+    )
+
+    competence_certificate_list = CompetenceCertificateListFactory(
+        title="Kompetenznachweise",
+        parent=competence_navi_page,
+    )
+
+    competence_certificate = CompetenceCertificateFactory(
+        title="Kompetenznachweis 1",
+        parent=competence_certificate_list,
+    )
+
+    return competence_certificate
+
+
 def create_test_media_library():
     course = Course.objects.get(id=COURSE_TEST_ID)
     course_page = CoursePage.objects.get(course_id=COURSE_TEST_ID)
@@ -564,3 +605,40 @@ def create_test_media_library():
                 f"<ul><li>Mit Risiken im Strassenverkehr umgehen</li><li>Versicherungsschutz</li><li>Vertragsarten</li><li>Zusammenfassung</li></ul>"
             ),
         )
+
+
+def create_test_assignment_edoniq(
+    course_id=COURSE_TEST_ID, competence_certificate=None
+):
+    assignment_list_page = (
+        CoursePage.objects.get(course_id=course_id)
+        .get_children()
+        .exact_type(AssignmentListPage)
+        .first()
+    )
+
+    assignment = AssignmentFactory(
+        parent=assignment_list_page,
+        title="Edoniq Wissens- und Verständisfragen - Circle Fahrzeug (Demo)",
+        competence_certificate=competence_certificate,
+        effort_required="ca. 5 Stunden",
+        intro_text="Edoniq Test",
+        performance_objectives=[],
+        evaluation_document_url="",
+        evaluation_description="",
+    )
+
+    assignment.evaluation_tasks = []
+    assignment.evaluation_tasks.append(
+        (
+            "task",
+            EvaluationTaskBlockFactory(
+                title="Maximale Punktzahl vom Edoniq Test",
+                max_points=24,
+            ),
+        ),
+    )
+
+    assignment.save()
+
+    return assignment
diff --git a/server/vbv_lernwelt/course/graphql/interfaces.py b/server/vbv_lernwelt/course/graphql/interfaces.py
index 10dfc250..d71a1f12 100644
--- a/server/vbv_lernwelt/course/graphql/interfaces.py
+++ b/server/vbv_lernwelt/course/graphql/interfaces.py
@@ -1,6 +1,7 @@
 import graphene
 
 from vbv_lernwelt.core.utils import get_django_content_type
+from vbv_lernwelt.learnpath.models import Circle
 
 
 class CoursePageInterface(graphene.Interface):
@@ -11,9 +12,20 @@ class CoursePageInterface(graphene.Interface):
     live = graphene.Boolean()
     translation_key = graphene.String()
     frontend_url = graphene.String()
+    circle = graphene.Field("vbv_lernwelt.learnpath.graphql.types.CircleObjectType")
+    course = graphene.Field("vbv_lernwelt.course.graphql.types.CourseObjectType")
 
     def resolve_frontend_url(self, info):
         return self.get_frontend_url()
 
     def resolve_content_type(self, info):
         return get_django_content_type(self)
+
+    def resolve_circle(self, info):
+        circle = self.get_ancestors().exact_type(Circle).first()
+        if circle:
+            return circle.specific
+        return None
+
+    def resolve_course(self, info):
+        return self.get_course()
diff --git a/server/vbv_lernwelt/learnpath/graphql/types.py b/server/vbv_lernwelt/learnpath/graphql/types.py
index 0434efd8..c055b4d9 100644
--- a/server/vbv_lernwelt/learnpath/graphql/types.py
+++ b/server/vbv_lernwelt/learnpath/graphql/types.py
@@ -106,7 +106,9 @@ class LearningContentTestObjectType(DjangoObjectType):
     class Meta:
         model = LearningContentEdoniqTest
         interfaces = (LearningContentInterface,)
-        fields = []
+        fields = [
+            "content_assignment",
+        ]
 
 
 class LearningContentRichTextObjectType(DjangoObjectType):
diff --git a/server/vbv_lernwelt/learnpath/migrations/0004_auto_20230901_1112.py b/server/vbv_lernwelt/learnpath/migrations/0004_auto_20230901_1112.py
new file mode 100644
index 00000000..b5b6782e
--- /dev/null
+++ b/server/vbv_lernwelt/learnpath/migrations/0004_auto_20230901_1112.py
@@ -0,0 +1,25 @@
+# Generated by Django 3.2.20 on 2023-09-01 09:12
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('assignment', '0007_auto_20230901_1112'),
+        ('learnpath', '0003_auto_20230810_0817'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='learningcontentedoniqtest',
+            name='content_assignment',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='assignment.assignment'),
+        ),
+        migrations.AlterField(
+            model_name='learningcontentassignment',
+            name='assignment_type',
+            field=models.CharField(choices=[('CASEWORK', 'CASEWORK'), ('PREP_ASSIGNMENT', 'PREP_ASSIGNMENT'), ('REFLECTION', 'REFLECTION'), ('CONDITION_ACCEPTANCE', 'CONDITION_ACCEPTANCE'), ('EDONIQ_TEST', 'EDONIQ_TEST')], default='CASEWORK', max_length=50),
+        ),
+    ]
diff --git a/server/vbv_lernwelt/learnpath/models.py b/server/vbv_lernwelt/learnpath/models.py
index a7a61585..a9ea847f 100644
--- a/server/vbv_lernwelt/learnpath/models.py
+++ b/server/vbv_lernwelt/learnpath/models.py
@@ -337,8 +337,16 @@ class LearningContentEdoniqTest(LearningContent):
         FieldPanel("checkbox_text", classname="Text"),
         FieldPanel("test_url", classname="Text"),
         FieldPanel("extended_time_test_url", classname="Text"),
+        PageChooserPanel("content_assignment", "assignment.Assignment"),
     ]
 
+    content_assignment = models.ForeignKey(
+        "assignment.Assignment",
+        # `null=True` is only set because of existing data...
+        null=True,
+        on_delete=models.SET_NULL,
+    )
+
     @property
     def has_extended_time_test(self):
         return bool(self.extended_time_test_url)
diff --git a/server/vbv_lernwelt/notify/migrations/0004_alter_notification_notification_trigger.py b/server/vbv_lernwelt/notify/migrations/0004_alter_notification_notification_trigger.py
new file mode 100644
index 00000000..deb22d78
--- /dev/null
+++ b/server/vbv_lernwelt/notify/migrations/0004_alter_notification_notification_trigger.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.20 on 2023-09-01 09:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('notify', '0003_truncate_notifications'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='notification',
+            name='notification_trigger',
+            field=models.CharField(choices=[('ATTENDANCE_COURSE_REMINDER', 'Attendance Course Reminder'), ('CASEWORK_SUBMITTED', 'Casework Submitted'), ('CASEWORK_EVALUATED', 'Casework Evaluated'), ('NEW_FEEDBACK', 'New Feedback')], default='', max_length=255),
+        ),
+    ]

From a95974c54f59cb3b4ca3a1b54913744cb7767f2a Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Fri, 1 Sep 2023 11:51:44 +0200
Subject: [PATCH 09/49] Extend graphql scheme for KompetenzNavi

---
 client/src/gql/graphql.ts                     |  52 ++++-
 client/src/gql/schema.graphql                 | 205 +++++++++++-------
 client/src/gql/typenames.ts                   |   1 +
 scripts/competenceCertificate.graphql         |  36 ++-
 .../competence/graphql/queries.py             |  39 +++-
 .../vbv_lernwelt/competence/graphql/types.py  |  17 +-
 server/vbv_lernwelt/competence/models.py      |  20 ++
 server/vbv_lernwelt/core/schema.py            |   4 +-
 server/vbv_lernwelt/course/graphql/types.py   |  54 +++--
 .../vbv_lernwelt/learnpath/graphql/queries.py |  24 +-
 10 files changed, 330 insertions(+), 122 deletions(-)

diff --git a/client/src/gql/graphql.ts b/client/src/gql/graphql.ts
index a23ed2ab..4f84135c 100644
--- a/client/src/gql/graphql.ts
+++ b/client/src/gql/graphql.ts
@@ -162,6 +162,42 @@ export type CircleObjectType = CoursePageInterface & {
   translation_key?: Maybe<Scalars['String']['output']>;
 };
 
+export type CompetenceCertificateListObjectType = CoursePageInterface & {
+  __typename?: 'CompetenceCertificateListObjectType';
+  circle?: Maybe<CircleObjectType>;
+  competence_certificates?: Maybe<Array<Maybe<CompetenceCertificateObjectType>>>;
+  content_type?: Maybe<Scalars['String']['output']>;
+  course?: Maybe<CourseObjectType>;
+  depth: Scalars['Int']['output'];
+  draft_title: Scalars['String']['output'];
+  expire_at?: Maybe<Scalars['DateTime']['output']>;
+  expired: Scalars['Boolean']['output'];
+  first_published_at?: Maybe<Scalars['DateTime']['output']>;
+  frontend_url?: Maybe<Scalars['String']['output']>;
+  go_live_at?: Maybe<Scalars['DateTime']['output']>;
+  has_unpublished_changes: Scalars['Boolean']['output'];
+  id?: Maybe<Scalars['ID']['output']>;
+  last_published_at?: Maybe<Scalars['DateTime']['output']>;
+  latest_revision_created_at?: Maybe<Scalars['DateTime']['output']>;
+  live?: Maybe<Scalars['Boolean']['output']>;
+  locked: Scalars['Boolean']['output'];
+  locked_at?: Maybe<Scalars['DateTime']['output']>;
+  locked_by?: Maybe<UserType>;
+  numchild: Scalars['Int']['output'];
+  owner?: Maybe<UserType>;
+  path: Scalars['String']['output'];
+  /** Die informative Beschreibung, dargestellt in Suchmaschinen-Ergebnissen unter der Überschrift. */
+  search_description: Scalars['String']['output'];
+  /** Der Titel der Seite, dargestellt in Suchmaschinen-Ergebnissen als die verlinkte Überschrift. */
+  seo_title: Scalars['String']['output'];
+  /** Ob ein Link zu dieser Seite in automatisch generierten Menüs auftaucht. */
+  show_in_menus: Scalars['Boolean']['output'];
+  slug?: Maybe<Scalars['String']['output']>;
+  title?: Maybe<Scalars['String']['output']>;
+  translation_key?: Maybe<Scalars['String']['output']>;
+  url_path: Scalars['String']['output'];
+};
+
 export type CompetenceCertificateObjectType = CoursePageInterface & {
   __typename?: 'CompetenceCertificateObjectType';
   assignments?: Maybe<Array<Maybe<AssignmentObjectType>>>;
@@ -532,6 +568,7 @@ export type Query = {
   assignment_completion?: Maybe<AssignmentCompletionObjectType>;
   circle?: Maybe<CircleObjectType>;
   competence_certificate?: Maybe<CompetenceCertificateObjectType>;
+  competence_certificate_list?: Maybe<CompetenceCertificateListObjectType>;
   course?: Maybe<CourseObjectType>;
   course_session_attendance_course?: Maybe<CourseSessionAttendanceCourseType>;
   learning_content_assignment?: Maybe<LearningContentAssignmentObjectType>;
@@ -563,13 +600,22 @@ export type QueryAssignmentCompletionArgs = {
 
 
 export type QueryCircleArgs = {
-  id?: InputMaybe<Scalars['Int']['input']>;
+  id?: InputMaybe<Scalars['ID']['input']>;
   slug?: InputMaybe<Scalars['String']['input']>;
 };
 
 
 export type QueryCompetenceCertificateArgs = {
   id?: InputMaybe<Scalars['ID']['input']>;
+  slug?: InputMaybe<Scalars['String']['input']>;
+};
+
+
+export type QueryCompetenceCertificateListArgs = {
+  course_id?: InputMaybe<Scalars['ID']['input']>;
+  course_slug?: InputMaybe<Scalars['String']['input']>;
+  id?: InputMaybe<Scalars['ID']['input']>;
+  slug?: InputMaybe<Scalars['String']['input']>;
 };
 
 
@@ -585,7 +631,9 @@ export type QueryCourseSessionAttendanceCourseArgs = {
 
 
 export type QueryLearningPathArgs = {
-  id?: InputMaybe<Scalars['Int']['input']>;
+  course_id?: InputMaybe<Scalars['ID']['input']>;
+  course_slug?: InputMaybe<Scalars['String']['input']>;
+  id?: InputMaybe<Scalars['ID']['input']>;
   slug?: InputMaybe<Scalars['String']['input']>;
 };
 
diff --git a/client/src/gql/schema.graphql b/client/src/gql/schema.graphql
index cc80187a..837a5eab 100644
--- a/client/src/gql/schema.graphql
+++ b/client/src/gql/schema.graphql
@@ -1,6 +1,6 @@
 type Query {
-  circle(id: Int, slug: String): CircleObjectType
-  learning_path(id: Int, slug: String): LearningPathObjectType
+  learning_path(id: ID, slug: String, course_id: ID, course_slug: String): LearningPathObjectType
+  circle(id: ID, slug: String): CircleObjectType
   learning_content_media_library: LearningContentMediaLibraryObjectType
   learning_content_assignment: LearningContentAssignmentObjectType
   learning_content_attendance_course: LearningContentAttendanceCourseObjectType
@@ -13,46 +13,12 @@ type Query {
   learning_content_document_list: LearningContentDocumentListObjectType
   course_session_attendance_course(id: ID!, assignment_user_id: ID): CourseSessionAttendanceCourseType
   course(id: Int): CourseObjectType
-  competence_certificate(id: ID): CompetenceCertificateObjectType
+  competence_certificate(id: ID, slug: String): CompetenceCertificateObjectType
+  competence_certificate_list(id: ID, slug: String, course_id: ID, course_slug: String): CompetenceCertificateListObjectType
   assignment(id: ID, slug: String): AssignmentObjectType
   assignment_completion(assignment_id: ID!, course_session_id: ID!, learning_content_page_id: ID, assignment_user_id: UUID): AssignmentCompletionObjectType
 }
 
-type CircleObjectType implements CoursePageInterface {
-  description: String!
-  goals: String!
-  id: ID
-  title: String
-  slug: String
-  content_type: String
-  live: Boolean
-  translation_key: String
-  frontend_url: String
-  circle: CircleObjectType
-  course: CourseObjectType
-  learning_sequences: [LearningSequenceObjectType]
-}
-
-interface CoursePageInterface {
-  id: ID
-  title: String
-  slug: String
-  content_type: String
-  live: Boolean
-  translation_key: String
-  frontend_url: String
-  circle: CircleObjectType
-  course: CourseObjectType
-}
-
-type CourseObjectType {
-  id: ID!
-  title: String!
-  category_name: String!
-  slug: String!
-  learning_path: LearningPathObjectType
-}
-
 type LearningPathObjectType implements CoursePageInterface {
   id: ID
   path: String!
@@ -97,6 +63,83 @@ type LearningPathObjectType implements CoursePageInterface {
   topics: [TopicObjectType]
 }
 
+interface CoursePageInterface {
+  id: ID
+  title: String
+  slug: String
+  content_type: String
+  live: Boolean
+  translation_key: String
+  frontend_url: String
+  circle: CircleObjectType
+  course: CourseObjectType
+}
+
+type CircleObjectType implements CoursePageInterface {
+  description: String!
+  goals: String!
+  id: ID
+  title: String
+  slug: String
+  content_type: String
+  live: Boolean
+  translation_key: String
+  frontend_url: String
+  circle: CircleObjectType
+  course: CourseObjectType
+  learning_sequences: [LearningSequenceObjectType]
+}
+
+type CourseObjectType {
+  id: ID!
+  title: String!
+  category_name: String!
+  slug: String!
+  learning_path: LearningPathObjectType
+}
+
+type LearningSequenceObjectType implements CoursePageInterface {
+  icon: String!
+  id: ID
+  title: String
+  slug: String
+  content_type: String
+  live: Boolean
+  translation_key: String
+  frontend_url: String
+  circle: CircleObjectType
+  course: CourseObjectType
+  learning_units: [LearningUnitObjectType]
+}
+
+type LearningUnitObjectType implements CoursePageInterface {
+  id: ID
+  title: String
+  slug: String
+  content_type: String
+  live: Boolean
+  translation_key: String
+  frontend_url: String
+  circle: CircleObjectType
+  course: CourseObjectType
+  learning_contents: [LearningContentInterface]
+}
+
+interface LearningContentInterface {
+  id: ID
+  title: String
+  slug: String
+  content_type: String
+  live: Boolean
+  translation_key: String
+  frontend_url: String
+  circle: CircleObjectType
+  course: CourseObjectType
+  minutes: Int
+  description: String
+  content: String
+}
+
 """
 The `DateTime` scalar type represents a DateTime
 value as specified by
@@ -149,48 +192,6 @@ type TopicObjectType implements CoursePageInterface {
   circles: [CircleObjectType]
 }
 
-type LearningSequenceObjectType implements CoursePageInterface {
-  icon: String!
-  id: ID
-  title: String
-  slug: String
-  content_type: String
-  live: Boolean
-  translation_key: String
-  frontend_url: String
-  circle: CircleObjectType
-  course: CourseObjectType
-  learning_units: [LearningUnitObjectType]
-}
-
-type LearningUnitObjectType implements CoursePageInterface {
-  id: ID
-  title: String
-  slug: String
-  content_type: String
-  live: Boolean
-  translation_key: String
-  frontend_url: String
-  circle: CircleObjectType
-  course: CourseObjectType
-  learning_contents: [LearningContentInterface]
-}
-
-interface LearningContentInterface {
-  id: ID
-  title: String
-  slug: String
-  content_type: String
-  live: Boolean
-  translation_key: String
-  frontend_url: String
-  circle: CircleObjectType
-  course: CourseObjectType
-  minutes: Int
-  description: String
-  content: String
-}
-
 type LearningContentMediaLibraryObjectType implements LearningContentInterface {
   id: ID
   title: String
@@ -451,6 +452,50 @@ type CompetenceCertificateObjectType implements CoursePageInterface {
   assignments: [AssignmentObjectType]
 }
 
+type CompetenceCertificateListObjectType implements CoursePageInterface {
+  id: ID
+  path: String!
+  depth: Int!
+  numchild: Int!
+  translation_key: String
+  live: Boolean
+  has_unpublished_changes: Boolean!
+  first_published_at: DateTime
+  last_published_at: DateTime
+  go_live_at: DateTime
+  expire_at: DateTime
+  expired: Boolean!
+  locked: Boolean!
+  locked_at: DateTime
+  locked_by: UserType
+  title: String
+  draft_title: String!
+  slug: String
+  content_type: String
+  url_path: String!
+  owner: UserType
+
+  """
+  Der Titel der Seite, dargestellt in Suchmaschinen-Ergebnissen als die verlinkte Überschrift.
+  """
+  seo_title: String!
+
+  """
+  Ob ein Link zu dieser Seite in automatisch generierten Menüs auftaucht.
+  """
+  show_in_menus: Boolean!
+
+  """
+  Die informative Beschreibung, dargestellt in Suchmaschinen-Ergebnissen unter der Überschrift.
+  """
+  search_description: String!
+  latest_revision_created_at: DateTime
+  frontend_url: String
+  circle: CircleObjectType
+  course: CourseObjectType
+  competence_certificates: [CompetenceCertificateObjectType]
+}
+
 type AssignmentCompletionObjectType {
   id: UUID!
   created_at: DateTime!
diff --git a/client/src/gql/typenames.ts b/client/src/gql/typenames.ts
index 51e70750..b6f895a1 100644
--- a/client/src/gql/typenames.ts
+++ b/client/src/gql/typenames.ts
@@ -10,6 +10,7 @@ export const AttendanceUserStatus = "AttendanceUserStatus";
 export const AttendanceUserType = "AttendanceUserType";
 export const Boolean = "Boolean";
 export const CircleObjectType = "CircleObjectType";
+export const CompetenceCertificateListObjectType = "CompetenceCertificateListObjectType";
 export const CompetenceCertificateObjectType = "CompetenceCertificateObjectType";
 export const CoreUserLanguageChoices = "CoreUserLanguageChoices";
 export const CourseObjectType = "CourseObjectType";
diff --git a/scripts/competenceCertificate.graphql b/scripts/competenceCertificate.graphql
index 40e842b2..dba5d385 100644
--- a/scripts/competenceCertificate.graphql
+++ b/scripts/competenceCertificate.graphql
@@ -1,15 +1,29 @@
+fragment CoursePageFields on CoursePageInterface {
+  title
+  id
+  slug
+  content_type
+}
+
 {
-  competence_certificate(id:1) {
-    title,
-    assignments {
-      id
-      title
-      max_points
-      learning_content {
-        title
-        frontend_url
-        content_type
+  competence_certificate_list(course_slug:"test-lehrgang") {
+    ...CoursePageFields
+    competence_certificates {
+      ...CoursePageFields
+      assignments {
+        ...CoursePageFields
+        assignment_type
+        max_points
+        learning_content {
+          title
+          id
+          slug
+          content_type
+          circle {
+            ...CoursePageFields
+          }
+        }
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/server/vbv_lernwelt/competence/graphql/queries.py b/server/vbv_lernwelt/competence/graphql/queries.py
index 182cf6f1..86c49189 100644
--- a/server/vbv_lernwelt/competence/graphql/queries.py
+++ b/server/vbv_lernwelt/competence/graphql/queries.py
@@ -1,14 +1,41 @@
 import graphene
 
-from vbv_lernwelt.competence.graphql.types import CompetenceCertificateObjectType
-from vbv_lernwelt.competence.models import CompetenceCertificate
+from vbv_lernwelt.competence.graphql.types import (
+    CompetenceCertificateObjectType,
+    CompetenceCertificateListObjectType,
+)
+from vbv_lernwelt.competence.models import (
+    CompetenceCertificate,
+    CompetenceCertificateList,
+)
+from vbv_lernwelt.course.graphql.types import resolve_course_page
 
 
 class CompetenceCertificateQuery(object):
     competence_certificate = graphene.Field(
-        CompetenceCertificateObjectType,
-        id=graphene.ID(),
+        CompetenceCertificateObjectType, id=graphene.ID(), slug=graphene.String()
     )
 
-    def resolve_competence_certificate(root, info, id):
-        return CompetenceCertificate.objects.get(id=id)
+    competence_certificate_list = graphene.Field(
+        CompetenceCertificateListObjectType,
+        id=graphene.ID(),
+        slug=graphene.String(),
+        course_id=graphene.ID(),
+        course_slug=graphene.String(),
+    )
+
+    def resolve_competence_certificate(root, info, id=None, slug=None):
+        return resolve_course_page(CompetenceCertificate, root, info, id=id, slug=slug)
+
+    def resolve_competence_certificate_list(
+        root, info, id=None, slug=None, course_id=None, course_slug=None
+    ):
+        return resolve_course_page(
+            CompetenceCertificateList,
+            root,
+            info,
+            id=id,
+            slug=slug,
+            course_id=course_id,
+            course_slug=course_slug,
+        )
diff --git a/server/vbv_lernwelt/competence/graphql/types.py b/server/vbv_lernwelt/competence/graphql/types.py
index 1b46c9aa..f12a12d2 100644
--- a/server/vbv_lernwelt/competence/graphql/types.py
+++ b/server/vbv_lernwelt/competence/graphql/types.py
@@ -2,7 +2,10 @@ from graphene import List
 from graphene_django import DjangoObjectType
 
 from vbv_lernwelt.assignment.graphql.types import AssignmentObjectType
-from vbv_lernwelt.competence.models import CompetenceCertificate
+from vbv_lernwelt.competence.models import (
+    CompetenceCertificate,
+    CompetenceCertificateList,
+)
 from vbv_lernwelt.course.graphql.interfaces import CoursePageInterface
 
 
@@ -14,6 +17,16 @@ class CompetenceCertificateObjectType(DjangoObjectType):
         interfaces = (CoursePageInterface,)
         fields = ["assignments"]
 
-    # resolver for the assignments
     def resolve_assignments(self, info):
         return self.assignment_set.all()
+
+
+class CompetenceCertificateListObjectType(DjangoObjectType):
+    competence_certificates = List(CompetenceCertificateObjectType)
+
+    class Meta:
+        model = CompetenceCertificateList
+        interfaces = (CoursePageInterface,)
+
+    def resolve_competence_certificates(self, info):
+        return CompetenceCertificate.objects.child_of(self)
diff --git a/server/vbv_lernwelt/competence/models.py b/server/vbv_lernwelt/competence/models.py
index de2328f0..b823ec0b 100644
--- a/server/vbv_lernwelt/competence/models.py
+++ b/server/vbv_lernwelt/competence/models.py
@@ -30,6 +30,16 @@ class CompetenceCertificateList(CourseBasePage):
     parent_page_types = ["competence.CompetenceNaviPage"]
     subpage_types = ["competence.CompetenceCertificate"]
 
+    def get_frontend_url(self):
+        return f"/course/{self.slug.replace('-competencenavi-certificates', '')}/competence/certificates"
+
+    def save(self, clean=True, user=None, log_action=False, **kwargs):
+        self.slug = find_available_slug(
+            slugify(f"{self.get_parent().slug}-certificates", allow_unicode=True),
+            ignore_page_id=self.id,
+        )
+        super(CompetenceCertificateList, self).save(clean, user, log_action, **kwargs)
+
 
 class CompetenceCertificate(CourseBasePage):
     """einzelner Kompetenznachweis"""
@@ -40,6 +50,16 @@ class CompetenceCertificate(CourseBasePage):
         course = self.get_course()
         return f"{course.title} - {self.title}"
 
+    def get_frontend_url(self):
+        return f"/course/{self.slug.replace('-competencenavi-certificates-', '/competence/certificates/')}"
+
+    def save(self, clean=True, user=None, log_action=False, **kwargs):
+        self.slug = find_available_slug(
+            slugify(f"{self.get_parent().slug}-{self.title}", allow_unicode=True),
+            ignore_page_id=self.id,
+        )
+        super(CompetenceCertificate, self).save(clean, user, log_action, **kwargs)
+
 
 class CompetenceProfilePage(CourseBasePage):
     serialize_field_names = [
diff --git a/server/vbv_lernwelt/core/schema.py b/server/vbv_lernwelt/core/schema.py
index 11d9a045..c336e533 100644
--- a/server/vbv_lernwelt/core/schema.py
+++ b/server/vbv_lernwelt/core/schema.py
@@ -7,7 +7,7 @@ from vbv_lernwelt.course.graphql.queries import CourseQuery
 from vbv_lernwelt.course_session.graphql.mutations import CourseSessionMutation
 from vbv_lernwelt.course_session.graphql.queries import CourseSessionQuery
 from vbv_lernwelt.feedback.graphql.mutations import FeedbackMutation
-from vbv_lernwelt.learnpath.graphql.queries import CircleQuery
+from vbv_lernwelt.learnpath.graphql.queries import LearningPathQuery
 
 
 class Query(
@@ -15,7 +15,7 @@ class Query(
     CompetenceCertificateQuery,
     CourseQuery,
     CourseSessionQuery,
-    CircleQuery,
+    LearningPathQuery,
     graphene.ObjectType,
 ):
     pass
diff --git a/server/vbv_lernwelt/course/graphql/types.py b/server/vbv_lernwelt/course/graphql/types.py
index 33f268d9..39985bae 100644
--- a/server/vbv_lernwelt/course/graphql/types.py
+++ b/server/vbv_lernwelt/course/graphql/types.py
@@ -6,7 +6,7 @@ from graphene_django import DjangoObjectType
 from graphql import GraphQLError
 from rest_framework.exceptions import PermissionDenied
 
-from vbv_lernwelt.course.models import Course, CourseBasePage
+from vbv_lernwelt.course.models import Course, CourseBasePage, CoursePage
 from vbv_lernwelt.course.permissions import has_course_access
 from vbv_lernwelt.learnpath.graphql.types import LearningPathObjectType
 
@@ -14,23 +14,49 @@ logger = structlog.get_logger(__name__)
 
 
 def resolve_course_page(
-    page_model_class: Type[CourseBasePage], root, info, id=None, slug=None
+    page_model_class: Type[CourseBasePage],
+    root,
+    info,
+    id=None,
+    slug=None,
+    course_id=None,
+    course_slug=None,
 ):
     try:
-        if id is None and slug is None:
-            raise GraphQLError("Either 'id' or 'slug' must be provided.")
+        if id is None and slug is None and course_id is None and course_slug is None:
+            raise GraphQLError(
+                "Either 'id', 'slug', 'course_id' or 'course_slug' must be provided."
+            )
 
-        page = None
-        if id is not None:
-            page = page_model_class.objects.get(pk=id)
-        elif slug is not None:
-            page = page_model_class.objects.get(slug=slug)
+        if id or slug:
+            # try to fetch page directly
+            page = None
+            if id is not None:
+                page = page_model_class.objects.get(pk=id)
+            elif slug is not None:
+                page = page_model_class.objects.get(slug=slug)
 
-        if page and not has_course_access(
-            info.context.user, page.specific.get_course().id
-        ):
-            raise PermissionDenied("You do not have access to this course.")
-        return page
+            if page and not has_course_access(
+                info.context.user, page.specific.get_course().id
+            ):
+                raise PermissionDenied("You do not have access to this course.")
+            return page
+
+        if course_id or course_slug:
+            # fetch first page of type `page_model_class` via course
+            # makes sense for "Index" pages like "lernpfad" or "kompetenznachweise" etc
+            course_page = None
+            if course_id is not None:
+                course_page = CoursePage.objects.get(pk=course_id)
+            elif course_slug is not None:
+                course_page = CoursePage.objects.get(slug=course_slug)
+
+            page = course_page.get_descendants().type(page_model_class).first()
+            if page and not has_course_access(
+                info.context.user, page.specific.get_course().id
+            ):
+                raise PermissionDenied("You do not have access to this course.")
+            return page.specific
 
     except PermissionDenied as e:
         raise e
diff --git a/server/vbv_lernwelt/learnpath/graphql/queries.py b/server/vbv_lernwelt/learnpath/graphql/queries.py
index 188300de..00e9faf8 100644
--- a/server/vbv_lernwelt/learnpath/graphql/queries.py
+++ b/server/vbv_lernwelt/learnpath/graphql/queries.py
@@ -18,17 +18,31 @@ from vbv_lernwelt.learnpath.graphql.types import (
 from vbv_lernwelt.learnpath.models import Circle, LearningPath
 
 
-class CircleQuery:
-    circle = graphene.Field(CircleObjectType, id=graphene.Int(), slug=graphene.String())
+class LearningPathQuery:
     learning_path = graphene.Field(
-        LearningPathObjectType, id=graphene.Int(), slug=graphene.String()
+        LearningPathObjectType,
+        id=graphene.ID(),
+        slug=graphene.String(),
+        course_id=graphene.ID(),
+        course_slug=graphene.String(),
     )
+    circle = graphene.Field(CircleObjectType, id=graphene.ID(), slug=graphene.String())
 
     def resolve_circle(root, info, id=None, slug=None):
         return resolve_course_page(Circle, root, info, id=id, slug=slug)
 
-    def resolve_learning_path(root, info, id=None, slug=None):
-        return resolve_course_page(LearningPath, root, info, id=id, slug=slug)
+    def resolve_learning_path(
+        root, info, id=None, slug=None, course_id=None, course_slug=None
+    ):
+        return resolve_course_page(
+            LearningPath,
+            root,
+            info,
+            id=id,
+            slug=slug,
+            course_id=course_id,
+            course_slug=course_slug,
+        )
 
     # dummy import, so that graphene recognizes the types
     learning_content_media_library = graphene.Field(

From c59c44f1ddb47317c01c9fa20d76db30e6cf841e Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Fri, 1 Sep 2023 13:58:05 +0200
Subject: [PATCH 10/49] Move old competence frontend code to "competence-old"

---
 client/src/components/header/MainNavigationBar.vue   |  2 +-
 client/src/pages/cockpit/CockpitUserProfilePage.vue  |  2 +-
 .../competence-old}/CompetenceDetail.vue             |  2 +-
 .../CompetenceIndexPage.vue                          | 10 ++++++----
 .../CompetenceListPage.vue                           |  4 ++--
 .../CompetenceParentPage.vue                         |  0
 .../PerformanceCriteriaPage.vue                      |  4 ++--
 .../competence-old}/PerformanceCriteriaRow.vue       |  2 +-
 .../SinglePerformanceCriteriaPage.vue                |  0
 client/src/router/index.ts                           | 12 ++++++------
 10 files changed, 20 insertions(+), 18 deletions(-)
 rename client/src/{components/competences => pages/competence-old}/CompetenceDetail.vue (96%)
 rename client/src/pages/{competence => competence-old}/CompetenceIndexPage.vue (95%)
 rename client/src/pages/{competence => competence-old}/CompetenceListPage.vue (89%)
 rename client/src/pages/{competence => competence-old}/CompetenceParentPage.vue (100%)
 rename client/src/pages/{competence => competence-old}/PerformanceCriteriaPage.vue (96%)
 rename client/src/{components/competences => pages/competence-old}/PerformanceCriteriaRow.vue (95%)
 rename client/src/pages/{competence => competence-old}/SinglePerformanceCriteriaPage.vue (100%)

diff --git a/client/src/components/header/MainNavigationBar.vue b/client/src/components/header/MainNavigationBar.vue
index e04414e5..522e923b 100644
--- a/client/src/components/header/MainNavigationBar.vue
+++ b/client/src/components/header/MainNavigationBar.vue
@@ -126,7 +126,7 @@ onMounted(() => {
 
                 <router-link
                   v-if="inCourse() && courseSessionsStore.currentCourseSession"
-                  :to="courseSessionsStore.currentCourseSession.competence_url"
+                  :to="`${courseSessionsStore.currentCourseSession.competence_url}-old`"
                   class="nav-item"
                   :class="{ 'nav-item--active': inCompetenceProfile() }"
                 >
diff --git a/client/src/pages/cockpit/CockpitUserProfilePage.vue b/client/src/pages/cockpit/CockpitUserProfilePage.vue
index f20ac90e..4e859009 100644
--- a/client/src/pages/cockpit/CockpitUserProfilePage.vue
+++ b/client/src/pages/cockpit/CockpitUserProfilePage.vue
@@ -5,7 +5,7 @@ import { useLearningPathStore } from "@/stores/learningPath";
 import * as log from "loglevel";
 import { computed, onMounted } from "vue";
 
-import CompetenceDetail from "@/components/competences/CompetenceDetail.vue";
+import CompetenceDetail from "@/pages/competence-old/CompetenceDetail.vue";
 import LearningPathPathView from "@/pages/learningPath/learningPathPage/LearningPathPathView.vue";
 
 const props = defineProps<{
diff --git a/client/src/components/competences/CompetenceDetail.vue b/client/src/pages/competence-old/CompetenceDetail.vue
similarity index 96%
rename from client/src/components/competences/CompetenceDetail.vue
rename to client/src/pages/competence-old/CompetenceDetail.vue
index a16dbaf4..ec12fa5e 100644
--- a/client/src/components/competences/CompetenceDetail.vue
+++ b/client/src/pages/competence-old/CompetenceDetail.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import PerformanceCriteriaRow from "@/components/competences/PerformanceCriteriaRow.vue";
+import PerformanceCriteriaRow from "@/pages/competence-old/PerformanceCriteriaRow.vue";
 import ItProgress from "@/components/ui/ItProgress.vue";
 import ItToggleArrow from "@/components/ui/ItToggleArrow.vue";
 import { useCompetenceStore } from "@/stores/competence";
diff --git a/client/src/pages/competence/CompetenceIndexPage.vue b/client/src/pages/competence-old/CompetenceIndexPage.vue
similarity index 95%
rename from client/src/pages/competence/CompetenceIndexPage.vue
rename to client/src/pages/competence-old/CompetenceIndexPage.vue
index 3ac8e99c..480df996 100644
--- a/client/src/pages/competence/CompetenceIndexPage.vue
+++ b/client/src/pages/competence-old/CompetenceIndexPage.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import PerformanceCriteriaRow from "@/components/competences/PerformanceCriteriaRow.vue";
+import PerformanceCriteriaRow from "@/pages/competence-old/PerformanceCriteriaRow.vue";
 import ItDropdownSelect from "@/components/ui/ItDropdownSelect.vue";
 import ItProgress from "@/components/ui/ItProgress.vue";
 import { useCompetenceStore } from "@/stores/competence";
@@ -90,7 +90,9 @@ const countStatus = computed(() => {
           </li>
         </ul>
         <router-link
-          :to="`${competenceStore.competenceProfilePage()?.frontend_url}/competences`"
+          :to="`${
+            competenceStore.competenceProfilePage()?.frontend_url
+          }-old/competences`"
           class="btn-text inline-flex items-center py-2 pl-0"
         >
           <span>{{ $t("general.showAll") }}</span>
@@ -136,7 +138,7 @@ const countStatus = computed(() => {
         </li>
       </ul>
       <router-link
-        :to="`${competenceStore.competenceProfilePage()?.frontend_url}/criteria`"
+        :to="`${competenceStore.competenceProfilePage()?.frontend_url}-old/criteria`"
         class="btn-text inline-flex items-center py-2 pl-0"
       >
         <span>{{ $t("general.showAll") }}</span>
@@ -164,7 +166,7 @@ const countStatus = computed(() => {
         </li>
       </ul>
       <router-link
-        :to="`${competenceStore.competenceProfilePage()?.frontend_url}/criteria`"
+        :to="`${competenceStore.competenceProfilePage()?.frontend_url}-old/criteria`"
         class="btn-text inline-flex items-center py-2 pl-0"
       >
         <span>{{ $t("general.showAll") }}</span>
diff --git a/client/src/pages/competence/CompetenceListPage.vue b/client/src/pages/competence-old/CompetenceListPage.vue
similarity index 89%
rename from client/src/pages/competence/CompetenceListPage.vue
rename to client/src/pages/competence-old/CompetenceListPage.vue
index fcd6512e..64e8dbf2 100644
--- a/client/src/pages/competence/CompetenceListPage.vue
+++ b/client/src/pages/competence-old/CompetenceListPage.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import CompetenceDetail from "@/components/competences/CompetenceDetail.vue";
+import CompetenceDetail from "@/pages/competence-old/CompetenceDetail.vue";
 import ItDropdownSelect from "@/components/ui/ItDropdownSelect.vue";
 import { useCompetenceStore } from "@/stores/competence";
 import * as log from "loglevel";
@@ -19,7 +19,7 @@ const competenceStore = useCompetenceStore();
       <router-link
         v-if="competenceStore.competenceProfilePage()"
         class="btn-text inline-flex items-center pl-0"
-        :to="competenceStore.competenceProfilePage()?.frontend_url as string"
+        :to="`${competenceStore.competenceProfilePage()?.frontend_url}-old` as string"
       >
         <it-icon-arrow-left />
         <span>{{ $t("general.back") }}</span>
diff --git a/client/src/pages/competence/CompetenceParentPage.vue b/client/src/pages/competence-old/CompetenceParentPage.vue
similarity index 100%
rename from client/src/pages/competence/CompetenceParentPage.vue
rename to client/src/pages/competence-old/CompetenceParentPage.vue
diff --git a/client/src/pages/competence/PerformanceCriteriaPage.vue b/client/src/pages/competence-old/PerformanceCriteriaPage.vue
similarity index 96%
rename from client/src/pages/competence/PerformanceCriteriaPage.vue
rename to client/src/pages/competence-old/PerformanceCriteriaPage.vue
index dfd96b54..1117d6c1 100644
--- a/client/src/pages/competence/PerformanceCriteriaPage.vue
+++ b/client/src/pages/competence-old/PerformanceCriteriaPage.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { default as PerformanceCriteriaRow } from "@/components/competences/PerformanceCriteriaRow.vue";
+import { default as PerformanceCriteriaRow } from "@/pages/competence-old/PerformanceCriteriaRow.vue";
 import ItDropdownSelect from "@/components/ui/ItDropdownSelect.vue";
 import { useCompetenceStore } from "@/stores/competence";
 import type { CourseCompletionStatus } from "@/types";
@@ -61,7 +61,7 @@ function updateActiveState(status: CourseCompletionStatus) {
     <nav class="py-4 lg:pb-8">
       <router-link
         class="btn-text inline-flex items-center pl-0"
-        :to="`${competenceStore.competenceProfilePage()?.frontend_url}`"
+        :to="`${competenceStore.competenceProfilePage()?.frontend_url}-old`"
       >
         <it-icon-arrow-left />
         <span>{{ $t("general.back") }}</span>
diff --git a/client/src/components/competences/PerformanceCriteriaRow.vue b/client/src/pages/competence-old/PerformanceCriteriaRow.vue
similarity index 95%
rename from client/src/components/competences/PerformanceCriteriaRow.vue
rename to client/src/pages/competence-old/PerformanceCriteriaRow.vue
index 7bdc099a..e6e1140c 100644
--- a/client/src/components/competences/PerformanceCriteriaRow.vue
+++ b/client/src/pages/competence-old/PerformanceCriteriaRow.vue
@@ -48,7 +48,7 @@ const props = withDefaults(defineProps<Props>(), {
       <router-link
         v-if="props.showAssessAgain"
         class="link"
-        :to="`/course/${props.courseSlug}/competence/criteria/${criteria.slug}`"
+        :to="`/course/${props.courseSlug}/competence-old/criteria/${criteria.slug}`"
       >
         {{ $t("competences.assessAgain") }}
       </router-link>
diff --git a/client/src/pages/competence/SinglePerformanceCriteriaPage.vue b/client/src/pages/competence-old/SinglePerformanceCriteriaPage.vue
similarity index 100%
rename from client/src/pages/competence/SinglePerformanceCriteriaPage.vue
rename to client/src/pages/competence-old/SinglePerformanceCriteriaPage.vue
diff --git a/client/src/router/index.ts b/client/src/router/index.ts
index 47f98553..29b8e88e 100644
--- a/client/src/router/index.ts
+++ b/client/src/router/index.ts
@@ -62,30 +62,30 @@ const router = createRouter({
       ],
     },
     {
-      path: "/course/:courseSlug/competence",
+      path: "/course/:courseSlug/competence-old",
       props: true,
-      component: () => import("@/pages/competence/CompetenceParentPage.vue"),
+      component: () => import("@/pages/competence-old/CompetenceParentPage.vue"),
       children: [
         {
           path: "",
           props: true,
-          component: () => import("@/pages/competence/CompetenceIndexPage.vue"),
+          component: () => import("@/pages/competence-old/CompetenceIndexPage.vue"),
         },
         {
           path: "competences",
           props: true,
-          component: () => import("@/pages/competence/CompetenceListPage.vue"),
+          component: () => import("@/pages/competence-old/CompetenceListPage.vue"),
         },
         {
           path: "criteria",
           props: true,
-          component: () => import("@/pages/competence/PerformanceCriteriaPage.vue"),
+          component: () => import("@/pages/competence-old/PerformanceCriteriaPage.vue"),
         },
         {
           path: "criteria/:criteriaSlug",
           props: true,
           component: () =>
-            import("@/pages/competence/SinglePerformanceCriteriaPage.vue"),
+            import("@/pages/competence-old/SinglePerformanceCriteriaPage.vue"),
         },
       ],
     },

From 2430c02584aabd00f01fc70b4fea3a4096fefc26 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Fri, 1 Sep 2023 15:06:38 +0200
Subject: [PATCH 11/49] Add initial KompetenzNavi Frontend

---
 client/package-lock.json                      | 51 ++++--------
 client/package.json                           |  3 +-
 .../components/header/MainNavigationBar.vue   | 11 ++-
 client/src/gql/gql.ts                         | 10 +++
 client/src/gql/graphql.ts                     | 67 ++++++++++++++-
 client/src/graphql/queries.ts                 | 36 ++++++++
 .../competence/CompetenceCertificatesPage.vue | 51 ++++++++++++
 .../src/pages/competence/CompetenceDetail.vue | 82 +++++++++++++++++++
 .../competence/CompetenceOverviewPage.vue     | 74 +++++++++++++++++
 .../pages/competence/CompetenceParentPage.vue | 48 +++++++++++
 .../mediaLibrary/MediaLibraryParentPage.vue   |  3 +-
 client/src/router/index.ts                    | 13 +++
 client/src/types.ts                           | 16 +++-
 13 files changed, 422 insertions(+), 43 deletions(-)
 create mode 100644 client/src/pages/competence/CompetenceCertificatesPage.vue
 create mode 100644 client/src/pages/competence/CompetenceDetail.vue
 create mode 100644 client/src/pages/competence/CompetenceOverviewPage.vue
 create mode 100644 client/src/pages/competence/CompetenceParentPage.vue

diff --git a/client/package-lock.json b/client/package-lock.json
index 029afee7..77c99e92 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -12,8 +12,7 @@
         "@headlessui/vue": "1.7.7",
         "@sentry/tracing": "^7.56.0",
         "@sentry/vue": "^7.56.0",
-        "@urql/devtools": "^2.0.3",
-        "@urql/exchange-graphcache": "^6.1.4",
+        "@urql/exchange-graphcache": "^6.3.2",
         "@urql/introspection": "^1.0.2",
         "@urql/vue": "^1.1.2",
         "@vueuse/core": "10.1.0",
@@ -7767,33 +7766,21 @@
       }
     },
     "node_modules/@urql/core": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/@urql/core/-/core-4.0.7.tgz",
-      "integrity": "sha512-UtZ9oSbSFODXzFydgLCXpAQz26KGT1d6uEfcylKphiRWNXSWZi8k7vhJXNceNm/Dn0MiZ+kaaJHKcnGY1jvHRQ==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/@urql/core/-/core-4.1.2.tgz",
+      "integrity": "sha512-K+JA5dxEjY7Jkt1hV8G2ShkuOscKS/r+8QnXDDxTkyMzZzviYqz5f/zxgSElObT/QSW17xCC1LFl+kwiyX5opg==",
       "dependencies": {
         "@0no-co/graphql.web": "^1.0.1",
         "wonka": "^6.3.2"
       }
     },
-    "node_modules/@urql/devtools": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@urql/devtools/-/devtools-2.0.3.tgz",
-      "integrity": "sha512-TktPLiBS9LcBPHD6qcnb8wqOVcg3Bx0iCtvQ80uPpfofwwBGJmqnQTjUdEFU6kwaLOFZULQ9+Uo4831G823mQw==",
-      "dependencies": {
-        "wonka": ">= 4.0.9"
-      },
-      "peerDependencies": {
-        "@urql/core": ">= 1.14.0",
-        "graphql": ">= 0.11.0"
-      }
-    },
     "node_modules/@urql/exchange-graphcache": {
-      "version": "6.1.4",
-      "resolved": "https://registry.npmjs.org/@urql/exchange-graphcache/-/exchange-graphcache-6.1.4.tgz",
-      "integrity": "sha512-GQ1scnYjMVoUHrPoYOlw3ZfU2nXuLTEhWhKzPquhZz87GliVpZPuFMf+o64cI1dKy9xDlbU7aQnKiSaGeT248w==",
+      "version": "6.3.2",
+      "resolved": "https://registry.npmjs.org/@urql/exchange-graphcache/-/exchange-graphcache-6.3.2.tgz",
+      "integrity": "sha512-ajBtuOkCkWgYJVk8MYqlhTF2vNojEREitcUE62q8tUxC6zDHZybk8DUPe6RM0HUyUw6IPAnzmDf6djK5JOEvvw==",
       "dependencies": {
         "@0no-co/graphql.web": "^1.0.1",
-        "@urql/core": ">=4.0.0",
+        "@urql/core": ">=4.1.0",
         "wonka": "^6.3.2"
       }
     },
@@ -26352,29 +26339,21 @@
       }
     },
     "@urql/core": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/@urql/core/-/core-4.0.7.tgz",
-      "integrity": "sha512-UtZ9oSbSFODXzFydgLCXpAQz26KGT1d6uEfcylKphiRWNXSWZi8k7vhJXNceNm/Dn0MiZ+kaaJHKcnGY1jvHRQ==",
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/@urql/core/-/core-4.1.2.tgz",
+      "integrity": "sha512-K+JA5dxEjY7Jkt1hV8G2ShkuOscKS/r+8QnXDDxTkyMzZzviYqz5f/zxgSElObT/QSW17xCC1LFl+kwiyX5opg==",
       "requires": {
         "@0no-co/graphql.web": "^1.0.1",
         "wonka": "^6.3.2"
       }
     },
-    "@urql/devtools": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@urql/devtools/-/devtools-2.0.3.tgz",
-      "integrity": "sha512-TktPLiBS9LcBPHD6qcnb8wqOVcg3Bx0iCtvQ80uPpfofwwBGJmqnQTjUdEFU6kwaLOFZULQ9+Uo4831G823mQw==",
-      "requires": {
-        "wonka": ">= 4.0.9"
-      }
-    },
     "@urql/exchange-graphcache": {
-      "version": "6.1.4",
-      "resolved": "https://registry.npmjs.org/@urql/exchange-graphcache/-/exchange-graphcache-6.1.4.tgz",
-      "integrity": "sha512-GQ1scnYjMVoUHrPoYOlw3ZfU2nXuLTEhWhKzPquhZz87GliVpZPuFMf+o64cI1dKy9xDlbU7aQnKiSaGeT248w==",
+      "version": "6.3.2",
+      "resolved": "https://registry.npmjs.org/@urql/exchange-graphcache/-/exchange-graphcache-6.3.2.tgz",
+      "integrity": "sha512-ajBtuOkCkWgYJVk8MYqlhTF2vNojEREitcUE62q8tUxC6zDHZybk8DUPe6RM0HUyUw6IPAnzmDf6djK5JOEvvw==",
       "requires": {
         "@0no-co/graphql.web": "^1.0.1",
-        "@urql/core": ">=4.0.0",
+        "@urql/core": ">=4.1.0",
         "wonka": "^6.3.2"
       }
     },
diff --git a/client/package.json b/client/package.json
index 24cc5919..0bd7f8c5 100644
--- a/client/package.json
+++ b/client/package.json
@@ -24,8 +24,7 @@
     "@headlessui/vue": "1.7.7",
     "@sentry/tracing": "^7.56.0",
     "@sentry/vue": "^7.56.0",
-    "@urql/devtools": "^2.0.3",
-    "@urql/exchange-graphcache": "^6.1.4",
+    "@urql/exchange-graphcache": "^6.3.2",
     "@urql/introspection": "^1.0.2",
     "@urql/vue": "^1.1.2",
     "@vueuse/core": "10.1.0",
diff --git a/client/src/components/header/MainNavigationBar.vue b/client/src/components/header/MainNavigationBar.vue
index 522e923b..92bace30 100644
--- a/client/src/components/header/MainNavigationBar.vue
+++ b/client/src/components/header/MainNavigationBar.vue
@@ -126,12 +126,21 @@ onMounted(() => {
 
                 <router-link
                   v-if="inCourse() && courseSessionsStore.currentCourseSession"
-                  :to="`${courseSessionsStore.currentCourseSession.competence_url}-old`"
+                  :to="`${courseSessionsStore.currentCourseSession.competence_url}`"
                   class="nav-item"
                   :class="{ 'nav-item--active': inCompetenceProfile() }"
                 >
                   {{ t("competences.title") }}
                 </router-link>
+
+                <router-link
+                  v-if="inCourse() && courseSessionsStore.currentCourseSession"
+                  :to="`${courseSessionsStore.currentCourseSession.competence_url}-old`"
+                  class="nav-item"
+                  :class="{ 'nav-item--active': inCompetenceProfile() }"
+                >
+                  {{ t("competences.title") }} (old)
+                </router-link>
               </div>
             </div>
 
diff --git a/client/src/gql/gql.ts b/client/src/gql/gql.ts
index e9e5bc7c..6e1335fa 100644
--- a/client/src/gql/gql.ts
+++ b/client/src/gql/gql.ts
@@ -16,9 +16,11 @@ const documents = {
     "\n  mutation SendFeedbackMutation($input: SendFeedbackInput!) {\n    send_feedback(input: $input) {\n      feedback_response {\n        id\n      }\n      errors {\n        field\n        messages\n      }\n    }\n  }\n": types.SendFeedbackMutationDocument,
     "\n  mutation AttendanceCheckMutation(\n    $attendanceCourseId: ID!\n    $attendanceUserList: [AttendanceUserInputType]!\n  ) {\n    update_course_session_attendance_course_users(\n      id: $attendanceCourseId\n      attendance_user_list: $attendanceUserList\n    ) {\n      course_session_attendance_course {\n        id\n        attendance_user_list {\n          user_id\n          first_name\n          last_name\n          email\n          status\n        }\n      }\n    }\n  }\n": types.AttendanceCheckMutationDocument,
     "\n  mutation UpsertAssignmentCompletion(\n    $assignmentId: ID!\n    $courseSessionId: ID!\n    $learningContentId: ID\n    $assignmentUserId: UUID\n    $completionStatus: AssignmentCompletionStatus!\n    $completionDataString: String!\n    $evaluationGrade: Float\n    $evaluationPoints: Float\n  ) {\n    upsert_assignment_completion(\n      assignment_id: $assignmentId\n      course_session_id: $courseSessionId\n      learning_content_page_id: $learningContentId\n      assignment_user_id: $assignmentUserId\n      completion_status: $completionStatus\n      completion_data_string: $completionDataString\n      evaluation_grade: $evaluationGrade\n      evaluation_points: $evaluationPoints\n    ) {\n      assignment_completion {\n        id\n        completion_status\n        submitted_at\n        evaluation_submitted_at\n        evaluation_grade\n        evaluation_points\n        completion_data\n      }\n    }\n  }\n": types.UpsertAssignmentCompletionDocument,
+    "\n  fragment CoursePageFields on CoursePageInterface {\n    title\n    id\n    slug\n    content_type\n    frontend_url\n  }\n": types.CoursePageFieldsFragmentDoc,
     "\n  query attendanceCheckQuery($courseSessionId: ID!) {\n    course_session_attendance_course(id: $courseSessionId) {\n      id\n      attendance_user_list {\n        user_id\n        status\n      }\n    }\n  }\n": types.AttendanceCheckQueryDocument,
     "\n  query assignmentCompletionQuery(\n    $assignmentId: ID!\n    $courseSessionId: ID!\n    $learningContentId: ID\n    $assignmentUserId: UUID\n  ) {\n    assignment(id: $assignmentId) {\n      assignment_type\n      content_type\n      effort_required\n      evaluation_description\n      evaluation_document_url\n      evaluation_tasks\n      id\n      intro_text\n      performance_objectives\n      slug\n      tasks\n      title\n      translation_key\n    }\n    assignment_completion(\n      assignment_id: $assignmentId\n      course_session_id: $courseSessionId\n      assignment_user_id: $assignmentUserId\n      learning_content_page_id: $learningContentId\n    ) {\n      id\n      completion_status\n      submitted_at\n      evaluation_submitted_at\n      evaluation_user {\n        id\n      }\n      assignment_user {\n        id\n      }\n      evaluation_grade\n      evaluation_points\n      completion_data\n    }\n  }\n": types.AssignmentCompletionQueryDocument,
     "\n  query courseQuery($courseId: Int!) {\n    course(id: $courseId) {\n      id\n      slug\n      title\n      category_name\n      learning_path {\n        id\n      }\n    }\n  }\n": types.CourseQueryDocument,
+    "\n  query competenceCertificateQuery($courseSlug: String!) {\n    competence_certificate_list(course_slug: $courseSlug) {\n      ...CoursePageFields\n      competence_certificates {\n        ...CoursePageFields\n        assignments {\n          ...CoursePageFields\n          assignment_type\n          max_points\n          learning_content {\n            title\n            id\n            slug\n            content_type\n            frontend_url\n            circle {\n              ...CoursePageFields\n            }\n          }\n        }\n      }\n    }\n  }\n": types.CompetenceCertificateQueryDocument,
 };
 
 /**
@@ -47,6 +49,10 @@ export function graphql(source: "\n  mutation AttendanceCheckMutation(\n    $att
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
 export function graphql(source: "\n  mutation UpsertAssignmentCompletion(\n    $assignmentId: ID!\n    $courseSessionId: ID!\n    $learningContentId: ID\n    $assignmentUserId: UUID\n    $completionStatus: AssignmentCompletionStatus!\n    $completionDataString: String!\n    $evaluationGrade: Float\n    $evaluationPoints: Float\n  ) {\n    upsert_assignment_completion(\n      assignment_id: $assignmentId\n      course_session_id: $courseSessionId\n      learning_content_page_id: $learningContentId\n      assignment_user_id: $assignmentUserId\n      completion_status: $completionStatus\n      completion_data_string: $completionDataString\n      evaluation_grade: $evaluationGrade\n      evaluation_points: $evaluationPoints\n    ) {\n      assignment_completion {\n        id\n        completion_status\n        submitted_at\n        evaluation_submitted_at\n        evaluation_grade\n        evaluation_points\n        completion_data\n      }\n    }\n  }\n"): (typeof documents)["\n  mutation UpsertAssignmentCompletion(\n    $assignmentId: ID!\n    $courseSessionId: ID!\n    $learningContentId: ID\n    $assignmentUserId: UUID\n    $completionStatus: AssignmentCompletionStatus!\n    $completionDataString: String!\n    $evaluationGrade: Float\n    $evaluationPoints: Float\n  ) {\n    upsert_assignment_completion(\n      assignment_id: $assignmentId\n      course_session_id: $courseSessionId\n      learning_content_page_id: $learningContentId\n      assignment_user_id: $assignmentUserId\n      completion_status: $completionStatus\n      completion_data_string: $completionDataString\n      evaluation_grade: $evaluationGrade\n      evaluation_points: $evaluationPoints\n    ) {\n      assignment_completion {\n        id\n        completion_status\n        submitted_at\n        evaluation_submitted_at\n        evaluation_grade\n        evaluation_points\n        completion_data\n      }\n    }\n  }\n"];
+/**
+ * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
+ */
+export function graphql(source: "\n  fragment CoursePageFields on CoursePageInterface {\n    title\n    id\n    slug\n    content_type\n    frontend_url\n  }\n"): (typeof documents)["\n  fragment CoursePageFields on CoursePageInterface {\n    title\n    id\n    slug\n    content_type\n    frontend_url\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
@@ -59,6 +65,10 @@ export function graphql(source: "\n  query assignmentCompletionQuery(\n    $assi
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
 export function graphql(source: "\n  query courseQuery($courseId: Int!) {\n    course(id: $courseId) {\n      id\n      slug\n      title\n      category_name\n      learning_path {\n        id\n      }\n    }\n  }\n"): (typeof documents)["\n  query courseQuery($courseId: Int!) {\n    course(id: $courseId) {\n      id\n      slug\n      title\n      category_name\n      learning_path {\n        id\n      }\n    }\n  }\n"];
+/**
+ * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
+ */
+export function graphql(source: "\n  query competenceCertificateQuery($courseSlug: String!) {\n    competence_certificate_list(course_slug: $courseSlug) {\n      ...CoursePageFields\n      competence_certificates {\n        ...CoursePageFields\n        assignments {\n          ...CoursePageFields\n          assignment_type\n          max_points\n          learning_content {\n            title\n            id\n            slug\n            content_type\n            frontend_url\n            circle {\n              ...CoursePageFields\n            }\n          }\n        }\n      }\n    }\n  }\n"): (typeof documents)["\n  query competenceCertificateQuery($courseSlug: String!) {\n    competence_certificate_list(course_slug: $courseSlug) {\n      ...CoursePageFields\n      competence_certificates {\n        ...CoursePageFields\n        assignments {\n          ...CoursePageFields\n          assignment_type\n          max_points\n          learning_content {\n            title\n            id\n            slug\n            content_type\n            frontend_url\n            circle {\n              ...CoursePageFields\n            }\n          }\n        }\n      }\n    }\n  }\n"];
 
 export function graphql(source: string) {
   return (documents as any)[source] ?? {};
diff --git a/client/src/gql/graphql.ts b/client/src/gql/graphql.ts
index 4f84135c..9fa5a2d6 100644
--- a/client/src/gql/graphql.ts
+++ b/client/src/gql/graphql.ts
@@ -708,6 +708,24 @@ export type UpsertAssignmentCompletionMutationVariables = Exact<{
 
 export type UpsertAssignmentCompletionMutation = { __typename?: 'Mutation', upsert_assignment_completion?: { __typename?: 'AssignmentCompletionMutation', assignment_completion?: { __typename?: 'AssignmentCompletionObjectType', id: any, completion_status: AssignmentAssignmentCompletionCompletionStatusChoices, submitted_at?: any | null, evaluation_submitted_at?: any | null, evaluation_grade?: number | null, evaluation_points?: number | null, completion_data?: any | null } | null } | null };
 
+type CoursePageFieldsAssignmentObjectTypeFragment = { __typename?: 'AssignmentObjectType', title?: string | null, id?: string | null, slug?: string | null, content_type?: string | null, frontend_url?: string | null } & { ' $fragmentName'?: 'CoursePageFieldsAssignmentObjectTypeFragment' };
+
+type CoursePageFieldsCircleObjectTypeFragment = { __typename?: 'CircleObjectType', title?: string | null, id?: string | null, slug?: string | null, content_type?: string | null, frontend_url?: string | null } & { ' $fragmentName'?: 'CoursePageFieldsCircleObjectTypeFragment' };
+
+type CoursePageFieldsCompetenceCertificateListObjectTypeFragment = { __typename?: 'CompetenceCertificateListObjectType', title?: string | null, id?: string | null, slug?: string | null, content_type?: string | null, frontend_url?: string | null } & { ' $fragmentName'?: 'CoursePageFieldsCompetenceCertificateListObjectTypeFragment' };
+
+type CoursePageFieldsCompetenceCertificateObjectTypeFragment = { __typename?: 'CompetenceCertificateObjectType', title?: string | null, id?: string | null, slug?: string | null, content_type?: string | null, frontend_url?: string | null } & { ' $fragmentName'?: 'CoursePageFieldsCompetenceCertificateObjectTypeFragment' };
+
+type CoursePageFieldsLearningPathObjectTypeFragment = { __typename?: 'LearningPathObjectType', title?: string | null, id?: string | null, slug?: string | null, content_type?: string | null, frontend_url?: string | null } & { ' $fragmentName'?: 'CoursePageFieldsLearningPathObjectTypeFragment' };
+
+type CoursePageFieldsLearningSequenceObjectTypeFragment = { __typename?: 'LearningSequenceObjectType', title?: string | null, id?: string | null, slug?: string | null, content_type?: string | null, frontend_url?: string | null } & { ' $fragmentName'?: 'CoursePageFieldsLearningSequenceObjectTypeFragment' };
+
+type CoursePageFieldsLearningUnitObjectTypeFragment = { __typename?: 'LearningUnitObjectType', title?: string | null, id?: string | null, slug?: string | null, content_type?: string | null, frontend_url?: string | null } & { ' $fragmentName'?: 'CoursePageFieldsLearningUnitObjectTypeFragment' };
+
+type CoursePageFieldsTopicObjectTypeFragment = { __typename?: 'TopicObjectType', title?: string | null, id?: string | null, slug?: string | null, content_type?: string | null, frontend_url?: string | null } & { ' $fragmentName'?: 'CoursePageFieldsTopicObjectTypeFragment' };
+
+export type CoursePageFieldsFragment = CoursePageFieldsAssignmentObjectTypeFragment | CoursePageFieldsCircleObjectTypeFragment | CoursePageFieldsCompetenceCertificateListObjectTypeFragment | CoursePageFieldsCompetenceCertificateObjectTypeFragment | CoursePageFieldsLearningPathObjectTypeFragment | CoursePageFieldsLearningSequenceObjectTypeFragment | CoursePageFieldsLearningUnitObjectTypeFragment | CoursePageFieldsTopicObjectTypeFragment;
+
 export type AttendanceCheckQueryQueryVariables = Exact<{
   courseSessionId: Scalars['ID']['input'];
 }>;
@@ -732,10 +750,57 @@ export type CourseQueryQueryVariables = Exact<{
 
 export type CourseQueryQuery = { __typename?: 'Query', course?: { __typename?: 'CourseObjectType', id: string, slug: string, title: string, category_name: string, learning_path?: { __typename?: 'LearningPathObjectType', id?: string | null } | null } | null };
 
+export type CompetenceCertificateQueryQueryVariables = Exact<{
+  courseSlug: Scalars['String']['input'];
+}>;
 
+
+export type CompetenceCertificateQueryQuery = { __typename?: 'Query', competence_certificate_list?: (
+    { __typename?: 'CompetenceCertificateListObjectType', competence_certificates?: Array<(
+      { __typename?: 'CompetenceCertificateObjectType', assignments?: Array<(
+        { __typename?: 'AssignmentObjectType', assignment_type: AssignmentAssignmentAssignmentTypeChoices, max_points?: number | null, learning_content?: { __typename?: 'LearningContentAssignmentObjectType', title?: string | null, id?: string | null, slug?: string | null, content_type?: string | null, frontend_url?: string | null, circle?: (
+            { __typename?: 'CircleObjectType' }
+            & { ' $fragmentRefs'?: { 'CoursePageFieldsCircleObjectTypeFragment': CoursePageFieldsCircleObjectTypeFragment } }
+          ) | null } | { __typename?: 'LearningContentAttendanceCourseObjectType', title?: string | null, id?: string | null, slug?: string | null, content_type?: string | null, frontend_url?: string | null, circle?: (
+            { __typename?: 'CircleObjectType' }
+            & { ' $fragmentRefs'?: { 'CoursePageFieldsCircleObjectTypeFragment': CoursePageFieldsCircleObjectTypeFragment } }
+          ) | null } | { __typename?: 'LearningContentDocumentListObjectType', title?: string | null, id?: string | null, slug?: string | null, content_type?: string | null, frontend_url?: string | null, circle?: (
+            { __typename?: 'CircleObjectType' }
+            & { ' $fragmentRefs'?: { 'CoursePageFieldsCircleObjectTypeFragment': CoursePageFieldsCircleObjectTypeFragment } }
+          ) | null } | { __typename?: 'LearningContentFeedbackObjectType', title?: string | null, id?: string | null, slug?: string | null, content_type?: string | null, frontend_url?: string | null, circle?: (
+            { __typename?: 'CircleObjectType' }
+            & { ' $fragmentRefs'?: { 'CoursePageFieldsCircleObjectTypeFragment': CoursePageFieldsCircleObjectTypeFragment } }
+          ) | null } | { __typename?: 'LearningContentLearningModuleObjectType', title?: string | null, id?: string | null, slug?: string | null, content_type?: string | null, frontend_url?: string | null, circle?: (
+            { __typename?: 'CircleObjectType' }
+            & { ' $fragmentRefs'?: { 'CoursePageFieldsCircleObjectTypeFragment': CoursePageFieldsCircleObjectTypeFragment } }
+          ) | null } | { __typename?: 'LearningContentMediaLibraryObjectType', title?: string | null, id?: string | null, slug?: string | null, content_type?: string | null, frontend_url?: string | null, circle?: (
+            { __typename?: 'CircleObjectType' }
+            & { ' $fragmentRefs'?: { 'CoursePageFieldsCircleObjectTypeFragment': CoursePageFieldsCircleObjectTypeFragment } }
+          ) | null } | { __typename?: 'LearningContentPlaceholderObjectType', title?: string | null, id?: string | null, slug?: string | null, content_type?: string | null, frontend_url?: string | null, circle?: (
+            { __typename?: 'CircleObjectType' }
+            & { ' $fragmentRefs'?: { 'CoursePageFieldsCircleObjectTypeFragment': CoursePageFieldsCircleObjectTypeFragment } }
+          ) | null } | { __typename?: 'LearningContentRichTextObjectType', title?: string | null, id?: string | null, slug?: string | null, content_type?: string | null, frontend_url?: string | null, circle?: (
+            { __typename?: 'CircleObjectType' }
+            & { ' $fragmentRefs'?: { 'CoursePageFieldsCircleObjectTypeFragment': CoursePageFieldsCircleObjectTypeFragment } }
+          ) | null } | { __typename?: 'LearningContentTestObjectType', title?: string | null, id?: string | null, slug?: string | null, content_type?: string | null, frontend_url?: string | null, circle?: (
+            { __typename?: 'CircleObjectType' }
+            & { ' $fragmentRefs'?: { 'CoursePageFieldsCircleObjectTypeFragment': CoursePageFieldsCircleObjectTypeFragment } }
+          ) | null } | { __typename?: 'LearningContentVideoObjectType', title?: string | null, id?: string | null, slug?: string | null, content_type?: string | null, frontend_url?: string | null, circle?: (
+            { __typename?: 'CircleObjectType' }
+            & { ' $fragmentRefs'?: { 'CoursePageFieldsCircleObjectTypeFragment': CoursePageFieldsCircleObjectTypeFragment } }
+          ) | null } | null }
+        & { ' $fragmentRefs'?: { 'CoursePageFieldsAssignmentObjectTypeFragment': CoursePageFieldsAssignmentObjectTypeFragment } }
+      ) | null> | null }
+      & { ' $fragmentRefs'?: { 'CoursePageFieldsCompetenceCertificateObjectTypeFragment': CoursePageFieldsCompetenceCertificateObjectTypeFragment } }
+    ) | null> | null }
+    & { ' $fragmentRefs'?: { 'CoursePageFieldsCompetenceCertificateListObjectTypeFragment': CoursePageFieldsCompetenceCertificateListObjectTypeFragment } }
+  ) | null };
+
+export const CoursePageFieldsFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"CoursePageFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"CoursePageInterface"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"content_type"}},{"kind":"Field","name":{"kind":"Name","value":"frontend_url"}}]}}]} as unknown as DocumentNode<CoursePageFieldsFragment, unknown>;
 export const SendFeedbackMutationDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"SendFeedbackMutation"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"SendFeedbackInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"send_feedback"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"feedback_response"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}},{"kind":"Field","name":{"kind":"Name","value":"errors"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"field"}},{"kind":"Field","name":{"kind":"Name","value":"messages"}}]}}]}}]}}]} as unknown as DocumentNode<SendFeedbackMutationMutation, SendFeedbackMutationMutationVariables>;
 export const AttendanceCheckMutationDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"AttendanceCheckMutation"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"attendanceCourseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"attendanceUserList"}},"type":{"kind":"NonNullType","type":{"kind":"ListType","type":{"kind":"NamedType","name":{"kind":"Name","value":"AttendanceUserInputType"}}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"update_course_session_attendance_course_users"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"attendanceCourseId"}}},{"kind":"Argument","name":{"kind":"Name","value":"attendance_user_list"},"value":{"kind":"Variable","name":{"kind":"Name","value":"attendanceUserList"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course_session_attendance_course"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"attendance_user_list"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"user_id"}},{"kind":"Field","name":{"kind":"Name","value":"first_name"}},{"kind":"Field","name":{"kind":"Name","value":"last_name"}},{"kind":"Field","name":{"kind":"Name","value":"email"}},{"kind":"Field","name":{"kind":"Name","value":"status"}}]}}]}}]}}]}}]} as unknown as DocumentNode<AttendanceCheckMutationMutation, AttendanceCheckMutationMutationVariables>;
 export const UpsertAssignmentCompletionDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpsertAssignmentCompletion"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"learningContentId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"assignmentUserId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"completionStatus"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"AssignmentCompletionStatus"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"completionDataString"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"evaluationGrade"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Float"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"evaluationPoints"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Float"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"upsert_assignment_completion"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"assignment_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}}},{"kind":"Argument","name":{"kind":"Name","value":"course_session_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}}},{"kind":"Argument","name":{"kind":"Name","value":"learning_content_page_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"learningContentId"}}},{"kind":"Argument","name":{"kind":"Name","value":"assignment_user_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentUserId"}}},{"kind":"Argument","name":{"kind":"Name","value":"completion_status"},"value":{"kind":"Variable","name":{"kind":"Name","value":"completionStatus"}}},{"kind":"Argument","name":{"kind":"Name","value":"completion_data_string"},"value":{"kind":"Variable","name":{"kind":"Name","value":"completionDataString"}}},{"kind":"Argument","name":{"kind":"Name","value":"evaluation_grade"},"value":{"kind":"Variable","name":{"kind":"Name","value":"evaluationGrade"}}},{"kind":"Argument","name":{"kind":"Name","value":"evaluation_points"},"value":{"kind":"Variable","name":{"kind":"Name","value":"evaluationPoints"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"assignment_completion"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"completion_status"}},{"kind":"Field","name":{"kind":"Name","value":"submitted_at"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_submitted_at"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_grade"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points"}},{"kind":"Field","name":{"kind":"Name","value":"completion_data"}}]}}]}}]}}]} as unknown as DocumentNode<UpsertAssignmentCompletionMutation, UpsertAssignmentCompletionMutationVariables>;
 export const AttendanceCheckQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"attendanceCheckQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course_session_attendance_course"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"attendance_user_list"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"user_id"}},{"kind":"Field","name":{"kind":"Name","value":"status"}}]}}]}}]}}]} as unknown as DocumentNode<AttendanceCheckQueryQuery, AttendanceCheckQueryQueryVariables>;
 export const AssignmentCompletionQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"assignmentCompletionQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"learningContentId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"assignmentUserId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"assignment"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"assignment_type"}},{"kind":"Field","name":{"kind":"Name","value":"content_type"}},{"kind":"Field","name":{"kind":"Name","value":"effort_required"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_description"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_document_url"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_tasks"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"intro_text"}},{"kind":"Field","name":{"kind":"Name","value":"performance_objectives"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"tasks"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"translation_key"}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignment_completion"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"assignment_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}}},{"kind":"Argument","name":{"kind":"Name","value":"course_session_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}}},{"kind":"Argument","name":{"kind":"Name","value":"assignment_user_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentUserId"}}},{"kind":"Argument","name":{"kind":"Name","value":"learning_content_page_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"learningContentId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"completion_status"}},{"kind":"Field","name":{"kind":"Name","value":"submitted_at"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_submitted_at"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignment_user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_grade"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points"}},{"kind":"Field","name":{"kind":"Name","value":"completion_data"}}]}}]}}]} as unknown as DocumentNode<AssignmentCompletionQueryQuery, AssignmentCompletionQueryQueryVariables>;
-export const CourseQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"courseQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"category_name"}},{"kind":"Field","name":{"kind":"Name","value":"learning_path"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]}}]} as unknown as DocumentNode<CourseQueryQuery, CourseQueryQueryVariables>;
\ No newline at end of file
+export const CourseQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"courseQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"category_name"}},{"kind":"Field","name":{"kind":"Name","value":"learning_path"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]}}]} as unknown as DocumentNode<CourseQueryQuery, CourseQueryQueryVariables>;
+export const CompetenceCertificateQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"competenceCertificateQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSlug"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_list"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_slug"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseSlug"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificates"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"assignments"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type"}},{"kind":"Field","name":{"kind":"Name","value":"max_points"}},{"kind":"Field","name":{"kind":"Name","value":"learning_content"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"content_type"}},{"kind":"Field","name":{"kind":"Name","value":"frontend_url"}},{"kind":"Field","name":{"kind":"Name","value":"circle"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}}]}}]}}]}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"CoursePageFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"CoursePageInterface"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"content_type"}},{"kind":"Field","name":{"kind":"Name","value":"frontend_url"}}]}}]} as unknown as DocumentNode<CompetenceCertificateQueryQuery, CompetenceCertificateQueryQueryVariables>;
\ No newline at end of file
diff --git a/client/src/graphql/queries.ts b/client/src/graphql/queries.ts
index 94c2c63a..15a175a5 100644
--- a/client/src/graphql/queries.ts
+++ b/client/src/graphql/queries.ts
@@ -1,5 +1,15 @@
 import { graphql } from "@/gql";
 
+const CoursePageFragment = graphql(`
+  fragment CoursePageFields on CoursePageInterface {
+    title
+    id
+    slug
+    content_type
+    frontend_url
+  }
+`);
+
 export const ATTENDANCE_CHECK_QUERY = graphql(`
   query attendanceCheckQuery($courseSessionId: ID!) {
     course_session_attendance_course(id: $courseSessionId) {
@@ -70,3 +80,29 @@ export const COURSE_QUERY = graphql(`
     }
   }
 `);
+
+export const COMPETENCE_CERTIFICATE_QUERY = graphql(`
+  query competenceCertificateQuery($courseSlug: String!) {
+    competence_certificate_list(course_slug: $courseSlug) {
+      ...CoursePageFields
+      competence_certificates {
+        ...CoursePageFields
+        assignments {
+          ...CoursePageFields
+          assignment_type
+          max_points
+          learning_content {
+            title
+            id
+            slug
+            content_type
+            frontend_url
+            circle {
+              ...CoursePageFields
+            }
+          }
+        }
+      }
+    }
+  }
+`);
diff --git a/client/src/pages/competence/CompetenceCertificatesPage.vue b/client/src/pages/competence/CompetenceCertificatesPage.vue
new file mode 100644
index 00000000..64e8dbf2
--- /dev/null
+++ b/client/src/pages/competence/CompetenceCertificatesPage.vue
@@ -0,0 +1,51 @@
+<script setup lang="ts">
+import CompetenceDetail from "@/pages/competence-old/CompetenceDetail.vue";
+import ItDropdownSelect from "@/components/ui/ItDropdownSelect.vue";
+import { useCompetenceStore } from "@/stores/competence";
+import * as log from "loglevel";
+
+log.debug("CompetenceListPage created");
+
+const props = defineProps<{
+  courseSlug: string;
+}>();
+
+const competenceStore = useCompetenceStore();
+</script>
+
+<template>
+  <div class="container-large">
+    <nav class="py-4 lg:pb-8">
+      <router-link
+        v-if="competenceStore.competenceProfilePage()"
+        class="btn-text inline-flex items-center pl-0"
+        :to="`${competenceStore.competenceProfilePage()?.frontend_url}-old` as string"
+      >
+        <it-icon-arrow-left />
+        <span>{{ $t("general.back") }}</span>
+      </router-link>
+    </nav>
+    <div class="mb-10 flex flex-col items-center justify-between lg:flex-row">
+      <h1>Kompetenzen</h1>
+      <ItDropdownSelect
+        v-model="competenceStore.selectedCircle"
+        class="mt-4 w-full lg:mt-0 lg:w-96"
+        :items="competenceStore.availableCircles"
+      ></ItDropdownSelect>
+    </div>
+    <ul v-if="competenceStore.competenceProfilePage()">
+      <li
+        v-for="competence in competenceStore.competences()"
+        :key="competence.id"
+        class="mb-8 bg-white p-8"
+      >
+        <CompetenceDetail
+          :competence="competence"
+          :course-slug="props.courseSlug"
+        ></CompetenceDetail>
+      </li>
+    </ul>
+  </div>
+</template>
+
+<style scoped></style>
diff --git a/client/src/pages/competence/CompetenceDetail.vue b/client/src/pages/competence/CompetenceDetail.vue
new file mode 100644
index 00000000..ec12fa5e
--- /dev/null
+++ b/client/src/pages/competence/CompetenceDetail.vue
@@ -0,0 +1,82 @@
+<script setup lang="ts">
+import PerformanceCriteriaRow from "@/pages/competence-old/PerformanceCriteriaRow.vue";
+import ItProgress from "@/components/ui/ItProgress.vue";
+import ItToggleArrow from "@/components/ui/ItToggleArrow.vue";
+import { useCompetenceStore } from "@/stores/competence";
+import type { CompetencePage } from "@/types";
+import log from "loglevel";
+import { ref } from "vue";
+
+const competenceStore = useCompetenceStore();
+
+interface Props {
+  competence: CompetencePage;
+  courseSlug: string;
+  showAssessAgain?: boolean;
+  isInline?: boolean;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  showAssessAgain: true,
+  isInline: false,
+});
+
+log.debug("PerformanceCriteriaRow created", props);
+
+const isOpen = ref(false);
+
+const togglePerformanceCriteria = () => {
+  isOpen.value = !isOpen.value;
+};
+</script>
+
+<template>
+  <div>
+    <div :class="{ 'mb-4 border-b pb-8': isOpen }" class="-mx-8 px-8">
+      <div
+        class="flex flex-row items-center justify-between"
+        :class="props.isInline ? '' : 'mb-4'"
+        role="button"
+        aria-pressed="false"
+        @click="togglePerformanceCriteria()"
+      >
+        <h2 :class="props.isInline ? ['text-bold', 'w-2/5'] : 'text-large'">
+          {{ competence.competence_id }} {{ competence.title }}
+        </h2>
+        <ItProgress
+          v-if="isInline"
+          class="w-[330px]"
+          :status-count="
+            competenceStore.calcStatusCount(
+              competenceStore.criteriaByCompetence(competence)
+            )
+          "
+        ></ItProgress>
+        <ItToggleArrow :is-open="isOpen" :small="isInline"></ItToggleArrow>
+      </div>
+      <ItProgress
+        v-if="!isInline"
+        :status-count="
+          competenceStore.calcStatusCount(
+            competenceStore.criteriaByCompetence(competence)
+          )
+        "
+      ></ItProgress>
+    </div>
+    <ul v-if="isOpen">
+      <li
+        v-for="performanceCriteria in competenceStore.criteriaByCompetence(competence)"
+        :key="performanceCriteria.id"
+        class="mb-4 border-b pb-4 last:border-0"
+      >
+        <PerformanceCriteriaRow
+          :criteria="performanceCriteria"
+          :show-state="true"
+          :course-slug="props.courseSlug"
+          :show-assess-again="props.showAssessAgain"
+        ></PerformanceCriteriaRow>
+      </li>
+    </ul>
+  </div>
+</template>
+<style lang="scss" scoped></style>
diff --git a/client/src/pages/competence/CompetenceOverviewPage.vue b/client/src/pages/competence/CompetenceOverviewPage.vue
new file mode 100644
index 00000000..5c24a2df
--- /dev/null
+++ b/client/src/pages/competence/CompetenceOverviewPage.vue
@@ -0,0 +1,74 @@
+<script setup lang="ts">
+import log from "loglevel";
+import { COMPETENCE_CERTIFICATE_QUERY } from "@/graphql/queries";
+import { useQuery } from "@urql/vue";
+import { computed, onMounted } from "vue";
+import type { CompetenceCertificate, CompetenceCertificateAssignment } from "@/types";
+
+const props = defineProps<{
+  courseSlug: string;
+}>();
+
+log.debug("CompetenceOverviewPage created", props);
+
+const queryResult = useQuery({
+  query: COMPETENCE_CERTIFICATE_QUERY,
+  variables: {
+    courseSlug: "test-lehrgang",
+  },
+});
+
+const competenceCertificates = computed(() => {
+  return queryResult.data.value?.competence_certificate_list
+    .competence_certificates as CompetenceCertificate[];
+});
+
+onMounted(async () => {
+  // log.debug("AssignmentView mounted", props.assignmentId, props.userId);
+});
+
+const getIconName = (assignment: CompetenceCertificateAssignment) => {
+  if (assignment.assignment_type === "EDONIQ_TEST") {
+    return "it-icon-test-large";
+  }
+  return "it-icon-assignment-large";
+};
+</script>
+
+<template>
+  <div class="container-large lg:mt-4">
+    <h1>{{ $t("competences.title") }}</h1>
+    <!--    <pre>-->
+    <!--      {{ competenceCertificates }}-->
+    <!--    </pre>-->
+
+    <div
+      v-for="competenceCertificate in competenceCertificates"
+      :key="competenceCertificate.id"
+    >
+      {{ competenceCertificate.title }}
+
+      <div
+        v-for="assignment in competenceCertificate.assignments"
+        class="bg-white px-8"
+      >
+        <div class="flex items-center border-b py-8">
+          <component :is="getIconName(assignment)" class="mr-4 h-9 w-9"></component>
+          <div class="flex max-w-md flex-col">
+            <h3 class="text-bold flex items-center gap-2">{{ assignment.title }}</h3>
+            <p class="text-gray-800">
+              Im Circle «{{ assignment.learning_content.circle.title }}» anschauen
+            </p>
+          </div>
+          <div class="grow px-8"></div>
+          <div class="flex flex-col items-center">
+            <div>Höchstpunktzahl</div>
+            <div>{{ assignment.max_points }} Punkte</div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style scoped></style>
diff --git a/client/src/pages/competence/CompetenceParentPage.vue b/client/src/pages/competence/CompetenceParentPage.vue
new file mode 100644
index 00000000..5a071602
--- /dev/null
+++ b/client/src/pages/competence/CompetenceParentPage.vue
@@ -0,0 +1,48 @@
+<script setup lang="ts">
+import { useCompetenceStore } from "@/stores/competence";
+import * as log from "loglevel";
+import { onMounted } from "vue";
+
+log.debug("CompetenceParentPage created");
+
+const props = defineProps<{
+  courseSlug: string;
+}>();
+
+const competenceStore = useCompetenceStore();
+
+onMounted(async () => {
+  log.debug("CompetenceParentPage mounted", props.courseSlug);
+
+  try {
+    const competencePageSlug = props.courseSlug + "-competence";
+    await competenceStore.loadCompetenceProfilePage(competencePageSlug);
+  } catch (error) {
+    log.error(error);
+  }
+});
+</script>
+
+<template>
+  <div class="bg-gray-200">
+    <nav class="border-b bg-white px-4 lg:px-8">
+      <ul class="scrollbar overflow-auto whitespace-nowrap">
+        <li
+          class="inline-block border-t-2 border-t-transparent py-3"
+          :class="{ 'border-b-2 border-b-blue-900': true }"
+        >
+          <router-link :to="`/`">
+            {{ $t("mediaLibrary.overview") }}
+          </router-link>
+        </li>
+        <!-- Add similar logic for other `li` items as you expand the list -->
+        <li class="ml-6 inline-block lg:ml-12"></li>
+      </ul>
+    </nav>
+    <main>
+      <router-view></router-view>
+    </main>
+  </div>
+</template>
+
+<style scoped></style>
diff --git a/client/src/pages/mediaLibrary/MediaLibraryParentPage.vue b/client/src/pages/mediaLibrary/MediaLibraryParentPage.vue
index 012b5788..2d7d6196 100644
--- a/client/src/pages/mediaLibrary/MediaLibraryParentPage.vue
+++ b/client/src/pages/mediaLibrary/MediaLibraryParentPage.vue
@@ -29,7 +29,7 @@ onMounted(async () => {
         v-if="mediaLibraryStore.mediaLibraryPage"
         class="scrollbar overflow-auto whitespace-nowrap"
       >
-        <li class="inline-block lg:ml-12">
+        <li class="inline-block">
           <router-link :to="mediaLibraryStore.mediaLibraryPage.frontend_url">
             {{ $t("mediaLibrary.overview") }}
           </router-link>
@@ -50,7 +50,6 @@ onMounted(async () => {
             {{ category.title }}
           </a>
         </li>
-        <li class="ml-6 inline-block lg:ml-12"></li>
       </ul>
     </nav>
     <main>
diff --git a/client/src/router/index.ts b/client/src/router/index.ts
index 29b8e88e..473083fc 100644
--- a/client/src/router/index.ts
+++ b/client/src/router/index.ts
@@ -61,6 +61,19 @@ const router = createRouter({
         },
       ],
     },
+    {
+      path: "/course/:courseSlug/competence",
+      props: true,
+      component: () => import("@/pages/competence/CompetenceParentPage.vue"),
+      children: [
+        {
+          path: "",
+          props: true,
+          component: () => import("@/pages/competence/CompetenceOverviewPage.vue"),
+        },
+      ],
+    },
+
     {
       path: "/course/:courseSlug/competence-old",
       props: true,
diff --git a/client/src/types.ts b/client/src/types.ts
index 5b88e7ea..1385065f 100644
--- a/client/src/types.ts
+++ b/client/src/types.ts
@@ -349,7 +349,8 @@ export type AssignmentType =
   | "CASEWORK"
   | "PREP_ASSIGNMENT"
   | "REFLECTION"
-  | "CONDITION_ACCEPTANCE";
+  | "CONDITION_ACCEPTANCE"
+  | "EDONIQ_TEST";
 
 export interface Assignment extends BaseCourseWagtailPage {
   readonly content_type: "assignment.Assignment";
@@ -384,6 +385,19 @@ export interface CompetenceProfilePage extends BaseCourseWagtailPage {
   readonly children: CompetencePage[];
 }
 
+export interface CompetenceCertificateAssignment extends BaseCourseWagtailPage {
+  assignment_type: "CASEWORK" | "EDONIQ_TEST";
+  max_points: number;
+  learning_content: BaseCourseWagtailPage & {
+    circle: CircleLight;
+  };
+}
+
+export interface CompetenceCertificate extends BaseCourseWagtailPage {
+  readonly content_type: "competence.CompetenceCertificate";
+  readonly assignments: CompetenceCertificateAssignment[];
+}
+
 // dropdown
 export interface DropdownListItem {
   title: string;

From 428ac294e0fdd2e9511716e43a82d1021f9d1c65 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Tue, 5 Sep 2023 10:24:21 +0200
Subject: [PATCH 12/49] Add `--create-assignment-evaulation` cli parameter

---
 client/src/graphql/client.ts                  |  2 -
 .../e2e/assignment/assignmentTrainer.cy.js    |  2 +-
 .../core/management/commands/cypress_reset.py | 27 ++++++++++---
 .../course/creators/test_course.py            | 40 +++++++++++++++++++
 4 files changed, 63 insertions(+), 8 deletions(-)

diff --git a/client/src/graphql/client.ts b/client/src/graphql/client.ts
index e7b38c98..27e6aa18 100644
--- a/client/src/graphql/client.ts
+++ b/client/src/graphql/client.ts
@@ -1,6 +1,5 @@
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
-import { devtoolsExchange } from "@urql/devtools";
 import { cacheExchange } from "@urql/exchange-graphcache";
 import { Client, fetchExchange } from "@urql/vue";
 import schema from "../gql/minifiedSchema.json";
@@ -12,7 +11,6 @@ import {
 export const graphqlClient = new Client({
   url: import.meta.env.VITE_GRAPHQL_URL || "/server/graphql/",
   exchanges: [
-    devtoolsExchange,
     cacheExchange({
       schema: schema,
       keys: {
diff --git a/cypress/e2e/assignment/assignmentTrainer.cy.js b/cypress/e2e/assignment/assignmentTrainer.cy.js
index 6377c0a3..339f12f9 100644
--- a/cypress/e2e/assignment/assignmentTrainer.cy.js
+++ b/cypress/e2e/assignment/assignmentTrainer.cy.js
@@ -3,7 +3,7 @@ import { login } from "../helpers";
 
 describe("assignmentTrainer.cy.js", () => {
   beforeEach(() => {
-    cy.manageCommand("cypress_reset --create-completion");
+    cy.manageCommand("cypress_reset --create-assignment-completion");
     login("test-trainer1@example.com", "test");
   });
 
diff --git a/server/vbv_lernwelt/core/management/commands/cypress_reset.py b/server/vbv_lernwelt/core/management/commands/cypress_reset.py
index 9d1ad15d..db462e28 100644
--- a/server/vbv_lernwelt/core/management/commands/cypress_reset.py
+++ b/server/vbv_lernwelt/core/management/commands/cypress_reset.py
@@ -4,10 +4,12 @@ from vbv_lernwelt.assignment.models import Assignment, AssignmentCompletion
 from vbv_lernwelt.core.constants import (
     TEST_COURSE_SESSION_BERN_ID,
     TEST_STUDENT1_USER_ID,
+    TEST_TRAINER1_USER_ID,
 )
 from vbv_lernwelt.core.models import User
 from vbv_lernwelt.course.creators.test_course import (
     create_test_assignment_submitted_data,
+    create_test_assignment_evaulation_data,
 )
 from vbv_lernwelt.course.models import CourseCompletion, CourseSession
 from vbv_lernwelt.notify.models import Notification
@@ -15,11 +17,16 @@ from vbv_lernwelt.notify.models import Notification
 
 @click.command()
 @click.option(
-    "--create-completion/--no-create-completion",
+    "--create-assignment-completion/--no-create-assignment-completion",
     default=False,
-    help="will create completion data for some users",
+    help="will create assignment completion data for test-student1@example.com",
 )
-def command(create_completion):
+@click.option(
+    "--create-assignment-evaluation/--no-create-assignment-evaluation",
+    default=False,
+    help="will create assignment evaluation data for test-student1@example.com",
+)
+def command(create_assignment_completion, create_assignment_evaluation):
     print("cypress reset data")
     CourseCompletion.objects.all().delete()
     Notification.objects.all().delete()
@@ -27,8 +34,8 @@ def command(create_completion):
     User.objects.all().update(language="de")
     User.objects.all().update(additional_json_data={})
 
-    if create_completion:
-        print("create completion data for test course")
+    if create_assignment_completion or create_assignment_evaluation:
+        print("create assignment completion data for test course")
         create_test_assignment_submitted_data(
             assignment=Assignment.objects.get(
                 slug="test-lehrgang-assignment-überprüfen-einer-motorfahrzeugs-versicherungspolice"
@@ -36,3 +43,13 @@ def command(create_completion):
             course_session=CourseSession.objects.get(id=TEST_COURSE_SESSION_BERN_ID),
             user=User.objects.get(id=TEST_STUDENT1_USER_ID),
         )
+    if create_assignment_evaluation:
+        print("create assignment evaulation data for test course")
+        create_test_assignment_evaulation_data(
+            assignment=Assignment.objects.get(
+                slug="test-lehrgang-assignment-überprüfen-einer-motorfahrzeugs-versicherungspolice"
+            ),
+            course_session=CourseSession.objects.get(id=TEST_COURSE_SESSION_BERN_ID),
+            assignment_user=User.objects.get(id=TEST_STUDENT1_USER_ID),
+            evaluation_user=User.objects.get(id=TEST_TRAINER1_USER_ID),
+        )
diff --git a/server/vbv_lernwelt/course/creators/test_course.py b/server/vbv_lernwelt/course/creators/test_course.py
index c25e9fd2..c341a4cd 100644
--- a/server/vbv_lernwelt/course/creators/test_course.py
+++ b/server/vbv_lernwelt/course/creators/test_course.py
@@ -229,6 +229,46 @@ def create_test_assignment_submitted_data(assignment, course_session, user):
         )
 
 
+def create_test_assignment_evaulation_data(
+    assignment, course_session, assignment_user, evaluation_user
+):
+    if assignment and course_session and assignment_user and evaluation_user:
+        subtasks = assignment.get_evaluation_tasks()
+        evaluation_points = 0
+
+        for index, evaluation_task in enumerate(subtasks):
+            evaluation_points += 2
+
+            update_assignment_completion(
+                assignment_user=assignment_user,
+                assignment=assignment,
+                course_session=course_session,
+                learning_content_page=assignment.learningcontentassignment_set.first(),
+                completion_data={
+                    evaluation_task["id"]: {
+                        "expert_data": {
+                            "points": evaluation_task["value"]["max_points"],
+                            "text": "Gut gemacht!",
+                        }
+                    },
+                },
+                completion_status=AssignmentCompletionStatus.EVALUATION_IN_PROGRESS,
+                evaluation_user=evaluation_user,
+            )
+
+        update_assignment_completion(
+            assignment_user=assignment_user,
+            assignment=assignment,
+            course_session=course_session,
+            learning_content_page=assignment.learningcontentassignment_set.first(),
+            completion_data={},
+            completion_status=AssignmentCompletionStatus.EVALUATION_SUBMITTED,
+            evaluation_user=evaluation_user,
+            evaluation_grade=6,
+            evaluation_points=evaluation_points,
+        )
+
+
 def create_test_course_with_categories(apps=None, schema_editor=None):
     if apps is not None:
         Course = apps.get_model("course", "Course")

From 4bc1ca636c3c887cc35cb864eeb7e6f2bad5678e Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Tue, 5 Sep 2023 11:13:21 +0200
Subject: [PATCH 13/49] Add result data for edoniq test

---
 client/src/gql/graphql.ts                     |  8 +++++
 client/src/gql/schema.graphql                 |  1 +
 .../assignment/graphql/queries.py             | 30 +++++++++++++++++++
 .../core/management/commands/cypress_reset.py | 26 ++++++++++++++--
 .../course/creators/test_course.py            | 25 +++++++++++++---
 5 files changed, 83 insertions(+), 7 deletions(-)

diff --git a/client/src/gql/graphql.ts b/client/src/gql/graphql.ts
index 9fa5a2d6..a68766ad 100644
--- a/client/src/gql/graphql.ts
+++ b/client/src/gql/graphql.ts
@@ -566,6 +566,7 @@ export type Query = {
   __typename?: 'Query';
   assignment?: Maybe<AssignmentObjectType>;
   assignment_completion?: Maybe<AssignmentCompletionObjectType>;
+  assignment_completions?: Maybe<Array<Maybe<AssignmentCompletionObjectType>>>;
   circle?: Maybe<CircleObjectType>;
   competence_certificate?: Maybe<CompetenceCertificateObjectType>;
   competence_certificate_list?: Maybe<CompetenceCertificateListObjectType>;
@@ -599,6 +600,13 @@ export type QueryAssignmentCompletionArgs = {
 };
 
 
+export type QueryAssignmentCompletionsArgs = {
+  assignment_ids: Array<InputMaybe<Scalars['ID']['input']>>;
+  assignment_user_id?: InputMaybe<Scalars['UUID']['input']>;
+  course_session_id: Scalars['ID']['input'];
+};
+
+
 export type QueryCircleArgs = {
   id?: InputMaybe<Scalars['ID']['input']>;
   slug?: InputMaybe<Scalars['String']['input']>;
diff --git a/client/src/gql/schema.graphql b/client/src/gql/schema.graphql
index 837a5eab..1cd73b42 100644
--- a/client/src/gql/schema.graphql
+++ b/client/src/gql/schema.graphql
@@ -17,6 +17,7 @@ type Query {
   competence_certificate_list(id: ID, slug: String, course_id: ID, course_slug: String): CompetenceCertificateListObjectType
   assignment(id: ID, slug: String): AssignmentObjectType
   assignment_completion(assignment_id: ID!, course_session_id: ID!, learning_content_page_id: ID, assignment_user_id: UUID): AssignmentCompletionObjectType
+  assignment_completions(assignment_ids: [ID]!, course_session_id: ID!, assignment_user_id: UUID): [AssignmentCompletionObjectType]
 }
 
 type LearningPathObjectType implements CoursePageInterface {
diff --git a/server/vbv_lernwelt/assignment/graphql/queries.py b/server/vbv_lernwelt/assignment/graphql/queries.py
index 035e478f..67e9a315 100644
--- a/server/vbv_lernwelt/assignment/graphql/queries.py
+++ b/server/vbv_lernwelt/assignment/graphql/queries.py
@@ -58,3 +58,33 @@ class AssignmentQuery(object):
                     course_session_id=course_session_id,
                 ).first()
         raise PermissionDenied()
+
+    assignment_completions = graphene.List(
+        AssignmentCompletionObjectType,
+        assignment_ids=graphene.List(graphene.ID, required=True),
+        course_session_id=graphene.ID(required=True),
+        assignment_user_id=graphene.UUID(required=False),
+    )
+
+    def resolve_assignment_completions(
+        root,
+        info,
+        assignment_ids,
+        course_session_id,
+        assignment_user_id=None,
+        **kwargs,
+    ):
+        if assignment_user_id is None:
+            assignment_user_id = info.context.user.id
+
+        if str(assignment_user_id) == str(
+            info.context.user.id
+        ) or is_course_session_expert(info.context.user, course_session_id):
+            course_id = CourseSession.objects.get(id=course_session_id).course_id
+            if has_course_access(info.context.user, course_id):
+                return AssignmentCompletion.objects.filter(
+                    assignment_user_id=assignment_user_id,
+                    assignment_id__in=assignment_ids,
+                    course_session_id=course_session_id,
+                )
+        raise PermissionDenied()
diff --git a/server/vbv_lernwelt/core/management/commands/cypress_reset.py b/server/vbv_lernwelt/core/management/commands/cypress_reset.py
index db462e28..c5be3f35 100644
--- a/server/vbv_lernwelt/core/management/commands/cypress_reset.py
+++ b/server/vbv_lernwelt/core/management/commands/cypress_reset.py
@@ -9,7 +9,8 @@ from vbv_lernwelt.core.constants import (
 from vbv_lernwelt.core.models import User
 from vbv_lernwelt.course.creators.test_course import (
     create_test_assignment_submitted_data,
-    create_test_assignment_evaulation_data,
+    create_test_assignment_evaluation_data,
+    create_edoniq_test_result_data,
 )
 from vbv_lernwelt.course.models import CourseCompletion, CourseSession
 from vbv_lernwelt.notify.models import Notification
@@ -26,7 +27,16 @@ from vbv_lernwelt.notify.models import Notification
     default=False,
     help="will create assignment evaluation data for test-student1@example.com",
 )
-def command(create_assignment_completion, create_assignment_evaluation):
+@click.option(
+    "--create-edoniq-test-results/--no-create-edoniq-test-results",
+    default=False,
+    help="will create edoniq result data for test-student1@example.com",
+)
+def command(
+    create_assignment_completion,
+    create_assignment_evaluation,
+    create_edoniq_test_results,
+):
     print("cypress reset data")
     CourseCompletion.objects.all().delete()
     Notification.objects.all().delete()
@@ -45,7 +55,7 @@ def command(create_assignment_completion, create_assignment_evaluation):
         )
     if create_assignment_evaluation:
         print("create assignment evaulation data for test course")
-        create_test_assignment_evaulation_data(
+        create_test_assignment_evaluation_data(
             assignment=Assignment.objects.get(
                 slug="test-lehrgang-assignment-überprüfen-einer-motorfahrzeugs-versicherungspolice"
             ),
@@ -53,3 +63,13 @@ def command(create_assignment_completion, create_assignment_evaluation):
             assignment_user=User.objects.get(id=TEST_STUDENT1_USER_ID),
             evaluation_user=User.objects.get(id=TEST_TRAINER1_USER_ID),
         )
+
+    if create_edoniq_test_results:
+        print("create edoniq test results")
+        create_edoniq_test_result_data(
+            assignment=Assignment.objects.get(
+                slug="test-lehrgang-assignment-edoniq-wissens-und-verständisfragen-circle-fahrzeug-demo"
+            ),
+            course_session=CourseSession.objects.get(id=TEST_COURSE_SESSION_BERN_ID),
+            assignment_user=User.objects.get(id=TEST_STUDENT1_USER_ID),
+        )
diff --git a/server/vbv_lernwelt/course/creators/test_course.py b/server/vbv_lernwelt/course/creators/test_course.py
index c341a4cd..2d47f298 100644
--- a/server/vbv_lernwelt/course/creators/test_course.py
+++ b/server/vbv_lernwelt/course/creators/test_course.py
@@ -229,7 +229,7 @@ def create_test_assignment_submitted_data(assignment, course_session, user):
         )
 
 
-def create_test_assignment_evaulation_data(
+def create_test_assignment_evaluation_data(
     assignment, course_session, assignment_user, evaluation_user
 ):
     if assignment and course_session and assignment_user and evaluation_user:
@@ -237,13 +237,13 @@ def create_test_assignment_evaulation_data(
         evaluation_points = 0
 
         for index, evaluation_task in enumerate(subtasks):
-            evaluation_points += 2
+            evaluation_points += evaluation_task["value"]["max_points"]
 
             update_assignment_completion(
                 assignment_user=assignment_user,
                 assignment=assignment,
                 course_session=course_session,
-                learning_content_page=assignment.learningcontentassignment_set.first(),
+                learning_content_page=assignment.find_attached_learning_content(),
                 completion_data={
                     evaluation_task["id"]: {
                         "expert_data": {
@@ -260,7 +260,7 @@ def create_test_assignment_evaulation_data(
             assignment_user=assignment_user,
             assignment=assignment,
             course_session=course_session,
-            learning_content_page=assignment.learningcontentassignment_set.first(),
+            learning_content_page=assignment.find_attached_learning_content(),
             completion_data={},
             completion_status=AssignmentCompletionStatus.EVALUATION_SUBMITTED,
             evaluation_user=evaluation_user,
@@ -269,6 +269,23 @@ def create_test_assignment_evaulation_data(
         )
 
 
+def create_edoniq_test_result_data(
+    assignment, course_session, assignment_user, points=24
+):
+    if assignment and course_session and assignment_user:
+        update_assignment_completion(
+            assignment_user=assignment_user,
+            assignment=assignment,
+            course_session=course_session,
+            learning_content_page=assignment.find_attached_learning_content(),
+            completion_data={},
+            completion_status=AssignmentCompletionStatus.EVALUATION_SUBMITTED,
+            evaluation_user=User.objects.get(username="admin"),
+            evaluation_grade=6,
+            evaluation_points=points,
+        )
+
+
 def create_test_course_with_categories(apps=None, schema_editor=None):
     if apps is not None:
         Course = apps.get_model("course", "Course")

From 21174d17db806caa11e0dbfc859e984ddaba9ce0 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Tue, 5 Sep 2023 14:06:07 +0200
Subject: [PATCH 14/49] Attach completion data to `Assignment` in GraphQL
 schema

---
 client/src/gql/graphql.ts                     |  16 +--
 client/src/gql/schema.graphql                 |  96 ++++++++--------
 .../assignment/graphql/queries.py             |  63 +---------
 .../vbv_lernwelt/assignment/graphql/types.py  | 108 +++++++++++++-----
 server/vbv_lernwelt/assignment/models.py      |   6 +
 5 files changed, 150 insertions(+), 139 deletions(-)

diff --git a/client/src/gql/graphql.ts b/client/src/gql/graphql.ts
index a68766ad..beb8b26f 100644
--- a/client/src/gql/graphql.ts
+++ b/client/src/gql/graphql.ts
@@ -99,6 +99,7 @@ export type AssignmentObjectType = CoursePageInterface & {
   __typename?: 'AssignmentObjectType';
   assignment_type: AssignmentAssignmentAssignmentTypeChoices;
   circle?: Maybe<CircleObjectType>;
+  completion?: Maybe<AssignmentCompletionObjectType>;
   content_type?: Maybe<Scalars['String']['output']>;
   course?: Maybe<CourseObjectType>;
   /** Zeitaufwand als Text */
@@ -122,6 +123,13 @@ export type AssignmentObjectType = CoursePageInterface & {
   translation_key?: Maybe<Scalars['String']['output']>;
 };
 
+
+export type AssignmentObjectTypeCompletionArgs = {
+  assignment_user_id?: InputMaybe<Scalars['UUID']['input']>;
+  course_session_id: Scalars['ID']['input'];
+  learning_content_page_id?: InputMaybe<Scalars['ID']['input']>;
+};
+
 export type AttendanceCourseUserMutation = {
   __typename?: 'AttendanceCourseUserMutation';
   course_session_attendance_course?: Maybe<CourseSessionAttendanceCourseType>;
@@ -566,7 +574,6 @@ export type Query = {
   __typename?: 'Query';
   assignment?: Maybe<AssignmentObjectType>;
   assignment_completion?: Maybe<AssignmentCompletionObjectType>;
-  assignment_completions?: Maybe<Array<Maybe<AssignmentCompletionObjectType>>>;
   circle?: Maybe<CircleObjectType>;
   competence_certificate?: Maybe<CompetenceCertificateObjectType>;
   competence_certificate_list?: Maybe<CompetenceCertificateListObjectType>;
@@ -600,13 +607,6 @@ export type QueryAssignmentCompletionArgs = {
 };
 
 
-export type QueryAssignmentCompletionsArgs = {
-  assignment_ids: Array<InputMaybe<Scalars['ID']['input']>>;
-  assignment_user_id?: InputMaybe<Scalars['UUID']['input']>;
-  course_session_id: Scalars['ID']['input'];
-};
-
-
 export type QueryCircleArgs = {
   id?: InputMaybe<Scalars['ID']['input']>;
   slug?: InputMaybe<Scalars['String']['input']>;
diff --git a/client/src/gql/schema.graphql b/client/src/gql/schema.graphql
index 1cd73b42..6e40bffb 100644
--- a/client/src/gql/schema.graphql
+++ b/client/src/gql/schema.graphql
@@ -17,7 +17,6 @@ type Query {
   competence_certificate_list(id: ID, slug: String, course_id: ID, course_slug: String): CompetenceCertificateListObjectType
   assignment(id: ID, slug: String): AssignmentObjectType
   assignment_completion(assignment_id: ID!, course_session_id: ID!, learning_content_page_id: ID, assignment_user_id: UUID): AssignmentCompletionObjectType
-  assignment_completions(assignment_ids: [ID]!, course_session_id: ID!, assignment_user_id: UUID): [AssignmentCompletionObjectType]
 }
 
 type LearningPathObjectType implements CoursePageInterface {
@@ -253,6 +252,7 @@ type AssignmentObjectType implements CoursePageInterface {
   performance_objectives: JSONStreamField
   max_points: Int
   learning_content: LearningContentInterface
+  completion(course_session_id: ID!, learning_content_page_id: ID, assignment_user_id: UUID): AssignmentCompletionObjectType
 }
 
 """An enumeration."""
@@ -275,6 +275,53 @@ enum AssignmentAssignmentAssignmentTypeChoices {
 
 scalar JSONStreamField
 
+type AssignmentCompletionObjectType {
+  id: UUID!
+  created_at: DateTime!
+  updated_at: DateTime!
+  submitted_at: DateTime
+  evaluation_submitted_at: DateTime
+  evaluation_user: UserType
+  evaluation_grade: Float
+  evaluation_points: Float
+  assignment_user: UserType!
+  assignment: AssignmentObjectType!
+  completion_status: AssignmentAssignmentCompletionCompletionStatusChoices!
+  completion_data: GenericScalar
+  additional_json_data: JSONString!
+  learning_content_page_id: ID
+}
+
+"""An enumeration."""
+enum AssignmentAssignmentCompletionCompletionStatusChoices {
+  """IN_PROGRESS"""
+  IN_PROGRESS
+
+  """SUBMITTED"""
+  SUBMITTED
+
+  """EVALUATION_IN_PROGRESS"""
+  EVALUATION_IN_PROGRESS
+
+  """EVALUATION_SUBMITTED"""
+  EVALUATION_SUBMITTED
+}
+
+"""
+The `GenericScalar` scalar type represents a generic
+GraphQL scalar value that could be:
+String, Boolean, Int, Float, List or Object.
+"""
+scalar GenericScalar
+
+"""
+Allows use of a JSON String for input / output from the GraphQL schema.
+
+Use of this type is *not recommended* as you lose the benefits of having a defined, static
+schema (one of the key benefits of GraphQL).
+"""
+scalar JSONString
+
 """An enumeration."""
 enum LearnpathLearningContentAssignmentAssignmentTypeChoices {
   """CASEWORK"""
@@ -497,53 +544,6 @@ type CompetenceCertificateListObjectType implements CoursePageInterface {
   competence_certificates: [CompetenceCertificateObjectType]
 }
 
-type AssignmentCompletionObjectType {
-  id: UUID!
-  created_at: DateTime!
-  updated_at: DateTime!
-  submitted_at: DateTime
-  evaluation_submitted_at: DateTime
-  evaluation_user: UserType
-  evaluation_grade: Float
-  evaluation_points: Float
-  assignment_user: UserType!
-  assignment: AssignmentObjectType!
-  completion_status: AssignmentAssignmentCompletionCompletionStatusChoices!
-  completion_data: GenericScalar
-  additional_json_data: JSONString!
-  learning_content_page_id: ID
-}
-
-"""An enumeration."""
-enum AssignmentAssignmentCompletionCompletionStatusChoices {
-  """IN_PROGRESS"""
-  IN_PROGRESS
-
-  """SUBMITTED"""
-  SUBMITTED
-
-  """EVALUATION_IN_PROGRESS"""
-  EVALUATION_IN_PROGRESS
-
-  """EVALUATION_SUBMITTED"""
-  EVALUATION_SUBMITTED
-}
-
-"""
-The `GenericScalar` scalar type represents a generic
-GraphQL scalar value that could be:
-String, Boolean, Int, Float, List or Object.
-"""
-scalar GenericScalar
-
-"""
-Allows use of a JSON String for input / output from the GraphQL schema.
-
-Use of this type is *not recommended* as you lose the benefits of having a defined, static
-schema (one of the key benefits of GraphQL).
-"""
-scalar JSONString
-
 type Mutation {
   send_feedback(input: SendFeedbackInput!): SendFeedbackPayload
   update_course_session_attendance_course_users(attendance_user_list: [AttendanceUserInputType]!, id: ID!): AttendanceCourseUserMutation
diff --git a/server/vbv_lernwelt/assignment/graphql/queries.py b/server/vbv_lernwelt/assignment/graphql/queries.py
index 67e9a315..7def9d8b 100644
--- a/server/vbv_lernwelt/assignment/graphql/queries.py
+++ b/server/vbv_lernwelt/assignment/graphql/queries.py
@@ -1,14 +1,11 @@
 import graphene
-from rest_framework.exceptions import PermissionDenied
 
 from vbv_lernwelt.assignment.graphql.types import (
     AssignmentCompletionObjectType,
-    AssignmentObjectType,
+    AssignmentObjectType, resolve_assignment_completion,
 )
-from vbv_lernwelt.assignment.models import Assignment, AssignmentCompletion
+from vbv_lernwelt.assignment.models import Assignment
 from vbv_lernwelt.course.graphql.types import resolve_course_page
-from vbv_lernwelt.course.models import CourseSession
-from vbv_lernwelt.course.permissions import has_course_access, is_course_session_expert
 
 
 class AssignmentQuery(object):
@@ -36,55 +33,7 @@ class AssignmentQuery(object):
         assignment_user_id=None,
         **kwargs,
     ):
-        if assignment_user_id is None:
-            assignment_user_id = info.context.user.id
-
-        if str(assignment_user_id) == str(
-            info.context.user.id
-        ) or is_course_session_expert(info.context.user, course_session_id):
-            course_id = CourseSession.objects.get(id=course_session_id).course_id
-            if has_course_access(info.context.user, course_id):
-                if learning_content_page_id is None:
-                    learning_content_page = Assignment.objects.get(
-                        id=assignment_id
-                    ).learningcontentassignment_set.first()
-                    if learning_content_page:
-                        learning_content_page_id = learning_content_page.id
-
-                return AssignmentCompletion.objects.filter(
-                    assignment_user_id=assignment_user_id,
-                    assignment_id=assignment_id,
-                    learning_content_page_id=learning_content_page_id,
-                    course_session_id=course_session_id,
-                ).first()
-        raise PermissionDenied()
-
-    assignment_completions = graphene.List(
-        AssignmentCompletionObjectType,
-        assignment_ids=graphene.List(graphene.ID, required=True),
-        course_session_id=graphene.ID(required=True),
-        assignment_user_id=graphene.UUID(required=False),
-    )
-
-    def resolve_assignment_completions(
-        root,
-        info,
-        assignment_ids,
-        course_session_id,
-        assignment_user_id=None,
-        **kwargs,
-    ):
-        if assignment_user_id is None:
-            assignment_user_id = info.context.user.id
-
-        if str(assignment_user_id) == str(
-            info.context.user.id
-        ) or is_course_session_expert(info.context.user, course_session_id):
-            course_id = CourseSession.objects.get(id=course_session_id).course_id
-            if has_course_access(info.context.user, course_id):
-                return AssignmentCompletion.objects.filter(
-                    assignment_user_id=assignment_user_id,
-                    assignment_id__in=assignment_ids,
-                    course_session_id=course_session_id,
-                )
-        raise PermissionDenied()
+        return resolve_assignment_completion(
+            info, assignment_id, course_session_id, learning_content_page_id,
+            assignment_user_id,
+        )
diff --git a/server/vbv_lernwelt/assignment/graphql/types.py b/server/vbv_lernwelt/assignment/graphql/types.py
index b998cb27..55975bc1 100644
--- a/server/vbv_lernwelt/assignment/graphql/types.py
+++ b/server/vbv_lernwelt/assignment/graphql/types.py
@@ -1,39 +1,16 @@
 import graphene
 from graphene.types.generic import GenericScalar
 from graphene_django import DjangoObjectType
+from rest_framework.exceptions import PermissionDenied
 
 from vbv_lernwelt.assignment.models import Assignment, AssignmentCompletion
 from vbv_lernwelt.core.graphql.types import JSONStreamField
 from vbv_lernwelt.course.graphql.interfaces import CoursePageInterface
+from vbv_lernwelt.course.models import CourseSession
+from vbv_lernwelt.course.permissions import is_course_session_expert, has_course_access
 from vbv_lernwelt.learnpath.graphql.types import LearningContentInterface
 
 
-class AssignmentObjectType(DjangoObjectType):
-    tasks = JSONStreamField()
-    evaluation_tasks = JSONStreamField()
-    performance_objectives = JSONStreamField()
-    max_points = graphene.Int()
-    learning_content = graphene.Field(LearningContentInterface)
-
-    class Meta:
-        model = Assignment
-        interfaces = (CoursePageInterface,)
-        fields = (
-            "assignment_type",
-            "intro_text",
-            "effort_required",
-            "evaluation_description",
-            "evaluation_document_url",
-            "learning_content",
-        )
-
-    def resolve_max_points(self, info):
-        return self.get_max_points()
-
-    def resolve_learning_content(self, info):
-        return self.find_attached_learning_content()
-
-
 class AssignmentCompletionObjectType(DjangoObjectType):
     completion_data = GenericScalar()
     learning_content_page_id = graphene.ID(source="learning_content_page_id")
@@ -57,3 +34,82 @@ class AssignmentCompletionObjectType(DjangoObjectType):
             "evaluation_grade",
             "evaluation_points",
         )
+
+
+class AssignmentObjectType(DjangoObjectType):
+    tasks = JSONStreamField()
+    evaluation_tasks = JSONStreamField()
+    performance_objectives = JSONStreamField()
+    max_points = graphene.Int()
+    learning_content = graphene.Field(LearningContentInterface)
+    completion = graphene.Field(
+        AssignmentCompletionObjectType,
+        course_session_id=graphene.ID(required=True),
+        learning_content_page_id=graphene.ID(required=False),
+        assignment_user_id=graphene.UUID(required=False),
+    )
+
+    class Meta:
+        model = Assignment
+        interfaces = (CoursePageInterface,)
+        fields = (
+            "assignment_type",
+            "intro_text",
+            "effort_required",
+            "evaluation_description",
+            "evaluation_document_url",
+            "learning_content",
+        )
+
+    def resolve_max_points(self, info):
+        return self.get_max_points()
+
+    def resolve_learning_content(self, info):
+        return self.find_attached_learning_content()
+
+    def resolve_completion(
+        self, info, course_session_id, learning_content_page_id=None,
+        assignment_user_id=None,
+    ):
+        if learning_content_page_id is None:
+            lp = self.find_attached_learning_content()
+            if lp:
+                learning_content_page_id = lp.id
+        return resolve_assignment_completion(
+            info=info,
+            course_session_id=course_session_id,
+            learning_content_page_id=learning_content_page_id,
+            assignment_user_id=assignment_user_id,
+            assignment_id=self.id,
+        )
+
+
+def resolve_assignment_completion(
+    info,
+    assignment_id,
+    course_session_id,
+    learning_content_page_id=None,
+    assignment_user_id=None,
+):
+    if assignment_user_id is None:
+        assignment_user_id = info.context.user.id
+
+    if str(assignment_user_id) == str(
+        info.context.user.id
+    ) or is_course_session_expert(info.context.user, course_session_id):
+        course_id = CourseSession.objects.get(id=course_session_id).course_id
+        if has_course_access(info.context.user, course_id):
+            if learning_content_page_id is None:
+                learning_content_page = Assignment.objects.get(
+                    id=assignment_id
+                ).learningcontentassignment_set.first()
+                if learning_content_page:
+                    learning_content_page_id = learning_content_page.id
+
+            return AssignmentCompletion.objects.filter(
+                assignment_user_id=assignment_user_id,
+                assignment_id=assignment_id,
+                learning_content_page_id=learning_content_page_id,
+                course_session_id=course_session_id,
+            ).first()
+    raise PermissionDenied()
diff --git a/server/vbv_lernwelt/assignment/models.py b/server/vbv_lernwelt/assignment/models.py
index 059eedc5..e82e8def 100644
--- a/server/vbv_lernwelt/assignment/models.py
+++ b/server/vbv_lernwelt/assignment/models.py
@@ -265,6 +265,12 @@ class Assignment(CourseBasePage):
             return page.specific
         return None
 
+    def get_frontend_url(self):
+        lp = self.find_attached_learning_content()
+        if lp:
+            return lp.get_frontend_url()
+        return ""
+
 
 class AssignmentCompletionStatus(Enum):
     IN_PROGRESS = "IN_PROGRESS"

From 9f81def5370bb8c97423f70527c6303208aa92ab Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Tue, 5 Sep 2023 14:49:59 +0200
Subject: [PATCH 15/49] Show evaluation points in KompetenzNavi

---
 client/src/gql/gql.ts                         |  4 +-
 client/src/gql/graphql.ts                     |  5 +-
 client/src/graphql/queries.ts                 | 10 ++-
 .../competence/CompetenceOverviewPage.vue     | 62 ++++++++++++++++---
 client/src/types.ts                           |  6 ++
 .../core/management/commands/cypress_reset.py |  1 +
 6 files changed, 74 insertions(+), 14 deletions(-)

diff --git a/client/src/gql/gql.ts b/client/src/gql/gql.ts
index 6e1335fa..5c4de3e8 100644
--- a/client/src/gql/gql.ts
+++ b/client/src/gql/gql.ts
@@ -20,7 +20,7 @@ const documents = {
     "\n  query attendanceCheckQuery($courseSessionId: ID!) {\n    course_session_attendance_course(id: $courseSessionId) {\n      id\n      attendance_user_list {\n        user_id\n        status\n      }\n    }\n  }\n": types.AttendanceCheckQueryDocument,
     "\n  query assignmentCompletionQuery(\n    $assignmentId: ID!\n    $courseSessionId: ID!\n    $learningContentId: ID\n    $assignmentUserId: UUID\n  ) {\n    assignment(id: $assignmentId) {\n      assignment_type\n      content_type\n      effort_required\n      evaluation_description\n      evaluation_document_url\n      evaluation_tasks\n      id\n      intro_text\n      performance_objectives\n      slug\n      tasks\n      title\n      translation_key\n    }\n    assignment_completion(\n      assignment_id: $assignmentId\n      course_session_id: $courseSessionId\n      assignment_user_id: $assignmentUserId\n      learning_content_page_id: $learningContentId\n    ) {\n      id\n      completion_status\n      submitted_at\n      evaluation_submitted_at\n      evaluation_user {\n        id\n      }\n      assignment_user {\n        id\n      }\n      evaluation_grade\n      evaluation_points\n      completion_data\n    }\n  }\n": types.AssignmentCompletionQueryDocument,
     "\n  query courseQuery($courseId: Int!) {\n    course(id: $courseId) {\n      id\n      slug\n      title\n      category_name\n      learning_path {\n        id\n      }\n    }\n  }\n": types.CourseQueryDocument,
-    "\n  query competenceCertificateQuery($courseSlug: String!) {\n    competence_certificate_list(course_slug: $courseSlug) {\n      ...CoursePageFields\n      competence_certificates {\n        ...CoursePageFields\n        assignments {\n          ...CoursePageFields\n          assignment_type\n          max_points\n          learning_content {\n            title\n            id\n            slug\n            content_type\n            frontend_url\n            circle {\n              ...CoursePageFields\n            }\n          }\n        }\n      }\n    }\n  }\n": types.CompetenceCertificateQueryDocument,
+    "\n  query competenceCertificateQuery($courseSlug: String!, $courseSessionId: ID!) {\n    competence_certificate_list(course_slug: $courseSlug) {\n      ...CoursePageFields\n      competence_certificates {\n        ...CoursePageFields\n        assignments {\n          ...CoursePageFields\n          assignment_type\n          max_points\n          completion(course_session_id: $courseSessionId) {\n            id\n            completion_status\n            submitted_at\n            evaluation_points\n          }\n          learning_content {\n            title\n            id\n            slug\n            content_type\n            frontend_url\n            circle {\n              ...CoursePageFields\n            }\n          }\n        }\n      }\n    }\n  }\n": types.CompetenceCertificateQueryDocument,
 };
 
 /**
@@ -68,7 +68,7 @@ export function graphql(source: "\n  query courseQuery($courseId: Int!) {\n    c
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  query competenceCertificateQuery($courseSlug: String!) {\n    competence_certificate_list(course_slug: $courseSlug) {\n      ...CoursePageFields\n      competence_certificates {\n        ...CoursePageFields\n        assignments {\n          ...CoursePageFields\n          assignment_type\n          max_points\n          learning_content {\n            title\n            id\n            slug\n            content_type\n            frontend_url\n            circle {\n              ...CoursePageFields\n            }\n          }\n        }\n      }\n    }\n  }\n"): (typeof documents)["\n  query competenceCertificateQuery($courseSlug: String!) {\n    competence_certificate_list(course_slug: $courseSlug) {\n      ...CoursePageFields\n      competence_certificates {\n        ...CoursePageFields\n        assignments {\n          ...CoursePageFields\n          assignment_type\n          max_points\n          learning_content {\n            title\n            id\n            slug\n            content_type\n            frontend_url\n            circle {\n              ...CoursePageFields\n            }\n          }\n        }\n      }\n    }\n  }\n"];
+export function graphql(source: "\n  query competenceCertificateQuery($courseSlug: String!, $courseSessionId: ID!) {\n    competence_certificate_list(course_slug: $courseSlug) {\n      ...CoursePageFields\n      competence_certificates {\n        ...CoursePageFields\n        assignments {\n          ...CoursePageFields\n          assignment_type\n          max_points\n          completion(course_session_id: $courseSessionId) {\n            id\n            completion_status\n            submitted_at\n            evaluation_points\n          }\n          learning_content {\n            title\n            id\n            slug\n            content_type\n            frontend_url\n            circle {\n              ...CoursePageFields\n            }\n          }\n        }\n      }\n    }\n  }\n"): (typeof documents)["\n  query competenceCertificateQuery($courseSlug: String!, $courseSessionId: ID!) {\n    competence_certificate_list(course_slug: $courseSlug) {\n      ...CoursePageFields\n      competence_certificates {\n        ...CoursePageFields\n        assignments {\n          ...CoursePageFields\n          assignment_type\n          max_points\n          completion(course_session_id: $courseSessionId) {\n            id\n            completion_status\n            submitted_at\n            evaluation_points\n          }\n          learning_content {\n            title\n            id\n            slug\n            content_type\n            frontend_url\n            circle {\n              ...CoursePageFields\n            }\n          }\n        }\n      }\n    }\n  }\n"];
 
 export function graphql(source: string) {
   return (documents as any)[source] ?? {};
diff --git a/client/src/gql/graphql.ts b/client/src/gql/graphql.ts
index beb8b26f..e2b3afb3 100644
--- a/client/src/gql/graphql.ts
+++ b/client/src/gql/graphql.ts
@@ -760,13 +760,14 @@ export type CourseQueryQuery = { __typename?: 'Query', course?: { __typename?: '
 
 export type CompetenceCertificateQueryQueryVariables = Exact<{
   courseSlug: Scalars['String']['input'];
+  courseSessionId: Scalars['ID']['input'];
 }>;
 
 
 export type CompetenceCertificateQueryQuery = { __typename?: 'Query', competence_certificate_list?: (
     { __typename?: 'CompetenceCertificateListObjectType', competence_certificates?: Array<(
       { __typename?: 'CompetenceCertificateObjectType', assignments?: Array<(
-        { __typename?: 'AssignmentObjectType', assignment_type: AssignmentAssignmentAssignmentTypeChoices, max_points?: number | null, learning_content?: { __typename?: 'LearningContentAssignmentObjectType', title?: string | null, id?: string | null, slug?: string | null, content_type?: string | null, frontend_url?: string | null, circle?: (
+        { __typename?: 'AssignmentObjectType', assignment_type: AssignmentAssignmentAssignmentTypeChoices, max_points?: number | null, completion?: { __typename?: 'AssignmentCompletionObjectType', id: any, completion_status: AssignmentAssignmentCompletionCompletionStatusChoices, submitted_at?: any | null, evaluation_points?: number | null } | null, learning_content?: { __typename?: 'LearningContentAssignmentObjectType', title?: string | null, id?: string | null, slug?: string | null, content_type?: string | null, frontend_url?: string | null, circle?: (
             { __typename?: 'CircleObjectType' }
             & { ' $fragmentRefs'?: { 'CoursePageFieldsCircleObjectTypeFragment': CoursePageFieldsCircleObjectTypeFragment } }
           ) | null } | { __typename?: 'LearningContentAttendanceCourseObjectType', title?: string | null, id?: string | null, slug?: string | null, content_type?: string | null, frontend_url?: string | null, circle?: (
@@ -811,4 +812,4 @@ export const UpsertAssignmentCompletionDocument = {"kind":"Document","definition
 export const AttendanceCheckQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"attendanceCheckQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course_session_attendance_course"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"attendance_user_list"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"user_id"}},{"kind":"Field","name":{"kind":"Name","value":"status"}}]}}]}}]}}]} as unknown as DocumentNode<AttendanceCheckQueryQuery, AttendanceCheckQueryQueryVariables>;
 export const AssignmentCompletionQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"assignmentCompletionQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"learningContentId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"assignmentUserId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"assignment"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"assignment_type"}},{"kind":"Field","name":{"kind":"Name","value":"content_type"}},{"kind":"Field","name":{"kind":"Name","value":"effort_required"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_description"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_document_url"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_tasks"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"intro_text"}},{"kind":"Field","name":{"kind":"Name","value":"performance_objectives"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"tasks"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"translation_key"}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignment_completion"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"assignment_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}}},{"kind":"Argument","name":{"kind":"Name","value":"course_session_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}}},{"kind":"Argument","name":{"kind":"Name","value":"assignment_user_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentUserId"}}},{"kind":"Argument","name":{"kind":"Name","value":"learning_content_page_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"learningContentId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"completion_status"}},{"kind":"Field","name":{"kind":"Name","value":"submitted_at"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_submitted_at"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignment_user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_grade"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points"}},{"kind":"Field","name":{"kind":"Name","value":"completion_data"}}]}}]}}]} as unknown as DocumentNode<AssignmentCompletionQueryQuery, AssignmentCompletionQueryQueryVariables>;
 export const CourseQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"courseQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"category_name"}},{"kind":"Field","name":{"kind":"Name","value":"learning_path"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]}}]} as unknown as DocumentNode<CourseQueryQuery, CourseQueryQueryVariables>;
-export const CompetenceCertificateQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"competenceCertificateQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSlug"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_list"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_slug"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseSlug"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificates"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"assignments"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type"}},{"kind":"Field","name":{"kind":"Name","value":"max_points"}},{"kind":"Field","name":{"kind":"Name","value":"learning_content"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"content_type"}},{"kind":"Field","name":{"kind":"Name","value":"frontend_url"}},{"kind":"Field","name":{"kind":"Name","value":"circle"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}}]}}]}}]}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"CoursePageFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"CoursePageInterface"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"content_type"}},{"kind":"Field","name":{"kind":"Name","value":"frontend_url"}}]}}]} as unknown as DocumentNode<CompetenceCertificateQueryQuery, CompetenceCertificateQueryQueryVariables>;
\ No newline at end of file
+export const CompetenceCertificateQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"competenceCertificateQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSlug"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_list"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_slug"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseSlug"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificates"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"assignments"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type"}},{"kind":"Field","name":{"kind":"Name","value":"max_points"}},{"kind":"Field","name":{"kind":"Name","value":"completion"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_session_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"completion_status"}},{"kind":"Field","name":{"kind":"Name","value":"submitted_at"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points"}}]}},{"kind":"Field","name":{"kind":"Name","value":"learning_content"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"content_type"}},{"kind":"Field","name":{"kind":"Name","value":"frontend_url"}},{"kind":"Field","name":{"kind":"Name","value":"circle"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}}]}}]}}]}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"CoursePageFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"CoursePageInterface"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"content_type"}},{"kind":"Field","name":{"kind":"Name","value":"frontend_url"}}]}}]} as unknown as DocumentNode<CompetenceCertificateQueryQuery, CompetenceCertificateQueryQueryVariables>;
\ No newline at end of file
diff --git a/client/src/graphql/queries.ts b/client/src/graphql/queries.ts
index 15a175a5..7a3f86c4 100644
--- a/client/src/graphql/queries.ts
+++ b/client/src/graphql/queries.ts
@@ -81,8 +81,8 @@ export const COURSE_QUERY = graphql(`
   }
 `);
 
-export const COMPETENCE_CERTIFICATE_QUERY = graphql(`
-  query competenceCertificateQuery($courseSlug: String!) {
+export const COMPETENCE_NAVI_CERTIFICATE_QUERY = graphql(`
+  query competenceCertificateQuery($courseSlug: String!, $courseSessionId: ID!) {
     competence_certificate_list(course_slug: $courseSlug) {
       ...CoursePageFields
       competence_certificates {
@@ -91,6 +91,12 @@ export const COMPETENCE_CERTIFICATE_QUERY = graphql(`
           ...CoursePageFields
           assignment_type
           max_points
+          completion(course_session_id: $courseSessionId) {
+            id
+            completion_status
+            submitted_at
+            evaluation_points
+          }
           learning_content {
             title
             id
diff --git a/client/src/pages/competence/CompetenceOverviewPage.vue b/client/src/pages/competence/CompetenceOverviewPage.vue
index 5c24a2df..4b5e8982 100644
--- a/client/src/pages/competence/CompetenceOverviewPage.vue
+++ b/client/src/pages/competence/CompetenceOverviewPage.vue
@@ -1,9 +1,10 @@
 <script setup lang="ts">
 import log from "loglevel";
-import { COMPETENCE_CERTIFICATE_QUERY } from "@/graphql/queries";
+import { COMPETENCE_NAVI_CERTIFICATE_QUERY } from "@/graphql/queries";
 import { useQuery } from "@urql/vue";
 import { computed, onMounted } from "vue";
 import type { CompetenceCertificate, CompetenceCertificateAssignment } from "@/types";
+import { useCurrentCourseSession } from "@/composables";
 
 const props = defineProps<{
   courseSlug: string;
@@ -11,10 +12,13 @@ const props = defineProps<{
 
 log.debug("CompetenceOverviewPage created", props);
 
+const courseSession = useCurrentCourseSession();
+
 const queryResult = useQuery({
-  query: COMPETENCE_CERTIFICATE_QUERY,
+  query: COMPETENCE_NAVI_CERTIFICATE_QUERY,
   variables: {
     courseSlug: "test-lehrgang",
+    courseSessionId: courseSession.value.id,
   },
 });
 
@@ -54,16 +58,58 @@ const getIconName = (assignment: CompetenceCertificateAssignment) => {
       >
         <div class="flex items-center border-b py-8">
           <component :is="getIconName(assignment)" class="mr-4 h-9 w-9"></component>
-          <div class="flex max-w-md flex-col">
+          <div class="flex w-[420px] flex-col">
             <h3 class="text-bold flex items-center gap-2">{{ assignment.title }}</h3>
             <p class="text-gray-800">
-              Im Circle «{{ assignment.learning_content.circle.title }}» anschauen
+              <a :href="assignment.frontend_url" class="link" target="_blank">
+                Im Circle «{{ assignment.learning_content.circle.title }}» anschauen
+              </a>
             </p>
           </div>
-          <div class="grow px-8"></div>
-          <div class="flex flex-col items-center">
-            <div>Höchstpunktzahl</div>
-            <div>{{ assignment.max_points }} Punkte</div>
+          <div class="grow px-8">
+            <div
+              v-if="assignment.completion.completion_status === 'EVALUATION_SUBMITTED'"
+              class="flex items-center"
+            >
+              <div
+                class="relative flex h-7 w-7 items-center justify-center rounded-full border border-green-500 bg-green-500"
+              >
+                <it-icon-check class="h-4/5 w-4/5"></it-icon-check>
+              </div>
+              <div class="ml-2">Bewertung freigegeben</div>
+            </div>
+            <div
+              v-else-if="
+                ['EVALUATION_IN_PROGRESS', 'SUBMITTED'].includes(
+                  assignment.completion.completion_status
+                )
+              "
+              class="flex items-center"
+            >
+              <div
+                class="relative flex h-7 w-7 items-center justify-center rounded-full border border-green-500"
+              >
+                <it-icon-check class="h-6 w-6"></it-icon-check>
+              </div>
+              <div class="ml-2">Ergebnisse abgegeben</div>
+            </div>
+          </div>
+          <div>
+            <div
+              v-if="assignment.completion.completion_status === 'EVALUATION_SUBMITTED'"
+              class="flex flex-col items-center"
+            >
+              <div class="flex flex-col items-center">
+                <div class="heading-2">
+                  {{ assignment.completion.evaluation_points }}
+                </div>
+                <div>von {{ assignment.max_points }} Punkten</div>
+              </div>
+            </div>
+            <div v-else class="flex flex-col items-center">
+              <div>Höchstpunktzahl</div>
+              <div>{{ assignment.max_points }} Punkte</div>
+            </div>
           </div>
         </div>
       </div>
diff --git a/client/src/types.ts b/client/src/types.ts
index 1385065f..4051169b 100644
--- a/client/src/types.ts
+++ b/client/src/types.ts
@@ -391,6 +391,12 @@ export interface CompetenceCertificateAssignment extends BaseCourseWagtailPage {
   learning_content: BaseCourseWagtailPage & {
     circle: CircleLight;
   };
+  completion: {
+    id: string;
+    completion_status: AssignmentCompletionStatus;
+    evaluation_submitted_at: string | null;
+    evaluation_points: number | null;
+  };
 }
 
 export interface CompetenceCertificate extends BaseCourseWagtailPage {
diff --git a/server/vbv_lernwelt/core/management/commands/cypress_reset.py b/server/vbv_lernwelt/core/management/commands/cypress_reset.py
index c5be3f35..39447c9e 100644
--- a/server/vbv_lernwelt/core/management/commands/cypress_reset.py
+++ b/server/vbv_lernwelt/core/management/commands/cypress_reset.py
@@ -72,4 +72,5 @@ def command(
             ),
             course_session=CourseSession.objects.get(id=TEST_COURSE_SESSION_BERN_ID),
             assignment_user=User.objects.get(id=TEST_STUDENT1_USER_ID),
+            points=19,
         )

From 2569411959e46923356944cd3c187dca0daeb299 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Tue, 5 Sep 2023 15:40:18 +0200
Subject: [PATCH 16/49] Fix upsert on initial loading of assignment in circle

---
 client/src/gql/gql.ts                                     | 4 ++--
 client/src/gql/graphql.ts                                 | 4 +++-
 client/src/gql/schema.graphql                             | 2 +-
 client/src/graphql/mutations.ts                           | 2 ++
 client/src/pages/competence/CompetenceOverviewPage.vue    | 8 +++++---
 .../assignment/AssignmentIntroductionView.vue             | 2 --
 .../learningContentPage/assignment/AssignmentView.vue     | 8 ++++----
 server/vbv_lernwelt/assignment/graphql/mutations.py       | 3 +++
 server/vbv_lernwelt/assignment/services.py                | 7 +++++++
 9 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/client/src/gql/gql.ts b/client/src/gql/gql.ts
index 5c4de3e8..40cbed98 100644
--- a/client/src/gql/gql.ts
+++ b/client/src/gql/gql.ts
@@ -15,7 +15,7 @@ import type { TypedDocumentNode as DocumentNode } from '@graphql-typed-document-
 const documents = {
     "\n  mutation SendFeedbackMutation($input: SendFeedbackInput!) {\n    send_feedback(input: $input) {\n      feedback_response {\n        id\n      }\n      errors {\n        field\n        messages\n      }\n    }\n  }\n": types.SendFeedbackMutationDocument,
     "\n  mutation AttendanceCheckMutation(\n    $attendanceCourseId: ID!\n    $attendanceUserList: [AttendanceUserInputType]!\n  ) {\n    update_course_session_attendance_course_users(\n      id: $attendanceCourseId\n      attendance_user_list: $attendanceUserList\n    ) {\n      course_session_attendance_course {\n        id\n        attendance_user_list {\n          user_id\n          first_name\n          last_name\n          email\n          status\n        }\n      }\n    }\n  }\n": types.AttendanceCheckMutationDocument,
-    "\n  mutation UpsertAssignmentCompletion(\n    $assignmentId: ID!\n    $courseSessionId: ID!\n    $learningContentId: ID\n    $assignmentUserId: UUID\n    $completionStatus: AssignmentCompletionStatus!\n    $completionDataString: String!\n    $evaluationGrade: Float\n    $evaluationPoints: Float\n  ) {\n    upsert_assignment_completion(\n      assignment_id: $assignmentId\n      course_session_id: $courseSessionId\n      learning_content_page_id: $learningContentId\n      assignment_user_id: $assignmentUserId\n      completion_status: $completionStatus\n      completion_data_string: $completionDataString\n      evaluation_grade: $evaluationGrade\n      evaluation_points: $evaluationPoints\n    ) {\n      assignment_completion {\n        id\n        completion_status\n        submitted_at\n        evaluation_submitted_at\n        evaluation_grade\n        evaluation_points\n        completion_data\n      }\n    }\n  }\n": types.UpsertAssignmentCompletionDocument,
+    "\n  mutation UpsertAssignmentCompletion(\n    $assignmentId: ID!\n    $courseSessionId: ID!\n    $learningContentId: ID\n    $assignmentUserId: UUID\n    $completionStatus: AssignmentCompletionStatus!\n    $completionDataString: String!\n    $evaluationGrade: Float\n    $evaluationPoints: Float\n    $initializeCompletion: Boolean\n  ) {\n    upsert_assignment_completion(\n      assignment_id: $assignmentId\n      course_session_id: $courseSessionId\n      learning_content_page_id: $learningContentId\n      assignment_user_id: $assignmentUserId\n      completion_status: $completionStatus\n      completion_data_string: $completionDataString\n      evaluation_grade: $evaluationGrade\n      evaluation_points: $evaluationPoints\n      initialize_completion: $initializeCompletion\n    ) {\n      assignment_completion {\n        id\n        completion_status\n        submitted_at\n        evaluation_submitted_at\n        evaluation_grade\n        evaluation_points\n        completion_data\n      }\n    }\n  }\n": types.UpsertAssignmentCompletionDocument,
     "\n  fragment CoursePageFields on CoursePageInterface {\n    title\n    id\n    slug\n    content_type\n    frontend_url\n  }\n": types.CoursePageFieldsFragmentDoc,
     "\n  query attendanceCheckQuery($courseSessionId: ID!) {\n    course_session_attendance_course(id: $courseSessionId) {\n      id\n      attendance_user_list {\n        user_id\n        status\n      }\n    }\n  }\n": types.AttendanceCheckQueryDocument,
     "\n  query assignmentCompletionQuery(\n    $assignmentId: ID!\n    $courseSessionId: ID!\n    $learningContentId: ID\n    $assignmentUserId: UUID\n  ) {\n    assignment(id: $assignmentId) {\n      assignment_type\n      content_type\n      effort_required\n      evaluation_description\n      evaluation_document_url\n      evaluation_tasks\n      id\n      intro_text\n      performance_objectives\n      slug\n      tasks\n      title\n      translation_key\n    }\n    assignment_completion(\n      assignment_id: $assignmentId\n      course_session_id: $courseSessionId\n      assignment_user_id: $assignmentUserId\n      learning_content_page_id: $learningContentId\n    ) {\n      id\n      completion_status\n      submitted_at\n      evaluation_submitted_at\n      evaluation_user {\n        id\n      }\n      assignment_user {\n        id\n      }\n      evaluation_grade\n      evaluation_points\n      completion_data\n    }\n  }\n": types.AssignmentCompletionQueryDocument,
@@ -48,7 +48,7 @@ export function graphql(source: "\n  mutation AttendanceCheckMutation(\n    $att
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  mutation UpsertAssignmentCompletion(\n    $assignmentId: ID!\n    $courseSessionId: ID!\n    $learningContentId: ID\n    $assignmentUserId: UUID\n    $completionStatus: AssignmentCompletionStatus!\n    $completionDataString: String!\n    $evaluationGrade: Float\n    $evaluationPoints: Float\n  ) {\n    upsert_assignment_completion(\n      assignment_id: $assignmentId\n      course_session_id: $courseSessionId\n      learning_content_page_id: $learningContentId\n      assignment_user_id: $assignmentUserId\n      completion_status: $completionStatus\n      completion_data_string: $completionDataString\n      evaluation_grade: $evaluationGrade\n      evaluation_points: $evaluationPoints\n    ) {\n      assignment_completion {\n        id\n        completion_status\n        submitted_at\n        evaluation_submitted_at\n        evaluation_grade\n        evaluation_points\n        completion_data\n      }\n    }\n  }\n"): (typeof documents)["\n  mutation UpsertAssignmentCompletion(\n    $assignmentId: ID!\n    $courseSessionId: ID!\n    $learningContentId: ID\n    $assignmentUserId: UUID\n    $completionStatus: AssignmentCompletionStatus!\n    $completionDataString: String!\n    $evaluationGrade: Float\n    $evaluationPoints: Float\n  ) {\n    upsert_assignment_completion(\n      assignment_id: $assignmentId\n      course_session_id: $courseSessionId\n      learning_content_page_id: $learningContentId\n      assignment_user_id: $assignmentUserId\n      completion_status: $completionStatus\n      completion_data_string: $completionDataString\n      evaluation_grade: $evaluationGrade\n      evaluation_points: $evaluationPoints\n    ) {\n      assignment_completion {\n        id\n        completion_status\n        submitted_at\n        evaluation_submitted_at\n        evaluation_grade\n        evaluation_points\n        completion_data\n      }\n    }\n  }\n"];
+export function graphql(source: "\n  mutation UpsertAssignmentCompletion(\n    $assignmentId: ID!\n    $courseSessionId: ID!\n    $learningContentId: ID\n    $assignmentUserId: UUID\n    $completionStatus: AssignmentCompletionStatus!\n    $completionDataString: String!\n    $evaluationGrade: Float\n    $evaluationPoints: Float\n    $initializeCompletion: Boolean\n  ) {\n    upsert_assignment_completion(\n      assignment_id: $assignmentId\n      course_session_id: $courseSessionId\n      learning_content_page_id: $learningContentId\n      assignment_user_id: $assignmentUserId\n      completion_status: $completionStatus\n      completion_data_string: $completionDataString\n      evaluation_grade: $evaluationGrade\n      evaluation_points: $evaluationPoints\n      initialize_completion: $initializeCompletion\n    ) {\n      assignment_completion {\n        id\n        completion_status\n        submitted_at\n        evaluation_submitted_at\n        evaluation_grade\n        evaluation_points\n        completion_data\n      }\n    }\n  }\n"): (typeof documents)["\n  mutation UpsertAssignmentCompletion(\n    $assignmentId: ID!\n    $courseSessionId: ID!\n    $learningContentId: ID\n    $assignmentUserId: UUID\n    $completionStatus: AssignmentCompletionStatus!\n    $completionDataString: String!\n    $evaluationGrade: Float\n    $evaluationPoints: Float\n    $initializeCompletion: Boolean\n  ) {\n    upsert_assignment_completion(\n      assignment_id: $assignmentId\n      course_session_id: $courseSessionId\n      learning_content_page_id: $learningContentId\n      assignment_user_id: $assignmentUserId\n      completion_status: $completionStatus\n      completion_data_string: $completionDataString\n      evaluation_grade: $evaluationGrade\n      evaluation_points: $evaluationPoints\n      initialize_completion: $initializeCompletion\n    ) {\n      assignment_completion {\n        id\n        completion_status\n        submitted_at\n        evaluation_submitted_at\n        evaluation_grade\n        evaluation_points\n        completion_data\n      }\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
diff --git a/client/src/gql/graphql.ts b/client/src/gql/graphql.ts
index e2b3afb3..34e322e6 100644
--- a/client/src/gql/graphql.ts
+++ b/client/src/gql/graphql.ts
@@ -561,6 +561,7 @@ export type MutationUpsertAssignmentCompletionArgs = {
   course_session_id: Scalars['ID']['input'];
   evaluation_grade?: InputMaybe<Scalars['Float']['input']>;
   evaluation_points?: InputMaybe<Scalars['Float']['input']>;
+  initialize_completion?: InputMaybe<Scalars['Boolean']['input']>;
   learning_content_page_id?: InputMaybe<Scalars['ID']['input']>;
 };
 
@@ -711,6 +712,7 @@ export type UpsertAssignmentCompletionMutationVariables = Exact<{
   completionDataString: Scalars['String']['input'];
   evaluationGrade?: InputMaybe<Scalars['Float']['input']>;
   evaluationPoints?: InputMaybe<Scalars['Float']['input']>;
+  initializeCompletion?: InputMaybe<Scalars['Boolean']['input']>;
 }>;
 
 
@@ -808,7 +810,7 @@ export type CompetenceCertificateQueryQuery = { __typename?: 'Query', competence
 export const CoursePageFieldsFragmentDoc = {"kind":"Document","definitions":[{"kind":"FragmentDefinition","name":{"kind":"Name","value":"CoursePageFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"CoursePageInterface"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"content_type"}},{"kind":"Field","name":{"kind":"Name","value":"frontend_url"}}]}}]} as unknown as DocumentNode<CoursePageFieldsFragment, unknown>;
 export const SendFeedbackMutationDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"SendFeedbackMutation"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"SendFeedbackInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"send_feedback"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"feedback_response"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}},{"kind":"Field","name":{"kind":"Name","value":"errors"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"field"}},{"kind":"Field","name":{"kind":"Name","value":"messages"}}]}}]}}]}}]} as unknown as DocumentNode<SendFeedbackMutationMutation, SendFeedbackMutationMutationVariables>;
 export const AttendanceCheckMutationDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"AttendanceCheckMutation"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"attendanceCourseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"attendanceUserList"}},"type":{"kind":"NonNullType","type":{"kind":"ListType","type":{"kind":"NamedType","name":{"kind":"Name","value":"AttendanceUserInputType"}}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"update_course_session_attendance_course_users"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"attendanceCourseId"}}},{"kind":"Argument","name":{"kind":"Name","value":"attendance_user_list"},"value":{"kind":"Variable","name":{"kind":"Name","value":"attendanceUserList"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course_session_attendance_course"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"attendance_user_list"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"user_id"}},{"kind":"Field","name":{"kind":"Name","value":"first_name"}},{"kind":"Field","name":{"kind":"Name","value":"last_name"}},{"kind":"Field","name":{"kind":"Name","value":"email"}},{"kind":"Field","name":{"kind":"Name","value":"status"}}]}}]}}]}}]}}]} as unknown as DocumentNode<AttendanceCheckMutationMutation, AttendanceCheckMutationMutationVariables>;
-export const UpsertAssignmentCompletionDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpsertAssignmentCompletion"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"learningContentId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"assignmentUserId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"completionStatus"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"AssignmentCompletionStatus"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"completionDataString"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"evaluationGrade"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Float"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"evaluationPoints"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Float"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"upsert_assignment_completion"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"assignment_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}}},{"kind":"Argument","name":{"kind":"Name","value":"course_session_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}}},{"kind":"Argument","name":{"kind":"Name","value":"learning_content_page_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"learningContentId"}}},{"kind":"Argument","name":{"kind":"Name","value":"assignment_user_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentUserId"}}},{"kind":"Argument","name":{"kind":"Name","value":"completion_status"},"value":{"kind":"Variable","name":{"kind":"Name","value":"completionStatus"}}},{"kind":"Argument","name":{"kind":"Name","value":"completion_data_string"},"value":{"kind":"Variable","name":{"kind":"Name","value":"completionDataString"}}},{"kind":"Argument","name":{"kind":"Name","value":"evaluation_grade"},"value":{"kind":"Variable","name":{"kind":"Name","value":"evaluationGrade"}}},{"kind":"Argument","name":{"kind":"Name","value":"evaluation_points"},"value":{"kind":"Variable","name":{"kind":"Name","value":"evaluationPoints"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"assignment_completion"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"completion_status"}},{"kind":"Field","name":{"kind":"Name","value":"submitted_at"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_submitted_at"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_grade"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points"}},{"kind":"Field","name":{"kind":"Name","value":"completion_data"}}]}}]}}]}}]} as unknown as DocumentNode<UpsertAssignmentCompletionMutation, UpsertAssignmentCompletionMutationVariables>;
+export const UpsertAssignmentCompletionDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpsertAssignmentCompletion"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"learningContentId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"assignmentUserId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"completionStatus"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"AssignmentCompletionStatus"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"completionDataString"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"evaluationGrade"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Float"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"evaluationPoints"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Float"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"initializeCompletion"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Boolean"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"upsert_assignment_completion"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"assignment_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}}},{"kind":"Argument","name":{"kind":"Name","value":"course_session_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}}},{"kind":"Argument","name":{"kind":"Name","value":"learning_content_page_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"learningContentId"}}},{"kind":"Argument","name":{"kind":"Name","value":"assignment_user_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentUserId"}}},{"kind":"Argument","name":{"kind":"Name","value":"completion_status"},"value":{"kind":"Variable","name":{"kind":"Name","value":"completionStatus"}}},{"kind":"Argument","name":{"kind":"Name","value":"completion_data_string"},"value":{"kind":"Variable","name":{"kind":"Name","value":"completionDataString"}}},{"kind":"Argument","name":{"kind":"Name","value":"evaluation_grade"},"value":{"kind":"Variable","name":{"kind":"Name","value":"evaluationGrade"}}},{"kind":"Argument","name":{"kind":"Name","value":"evaluation_points"},"value":{"kind":"Variable","name":{"kind":"Name","value":"evaluationPoints"}}},{"kind":"Argument","name":{"kind":"Name","value":"initialize_completion"},"value":{"kind":"Variable","name":{"kind":"Name","value":"initializeCompletion"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"assignment_completion"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"completion_status"}},{"kind":"Field","name":{"kind":"Name","value":"submitted_at"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_submitted_at"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_grade"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points"}},{"kind":"Field","name":{"kind":"Name","value":"completion_data"}}]}}]}}]}}]} as unknown as DocumentNode<UpsertAssignmentCompletionMutation, UpsertAssignmentCompletionMutationVariables>;
 export const AttendanceCheckQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"attendanceCheckQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course_session_attendance_course"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"attendance_user_list"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"user_id"}},{"kind":"Field","name":{"kind":"Name","value":"status"}}]}}]}}]}}]} as unknown as DocumentNode<AttendanceCheckQueryQuery, AttendanceCheckQueryQueryVariables>;
 export const AssignmentCompletionQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"assignmentCompletionQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"learningContentId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"assignmentUserId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"assignment"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"assignment_type"}},{"kind":"Field","name":{"kind":"Name","value":"content_type"}},{"kind":"Field","name":{"kind":"Name","value":"effort_required"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_description"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_document_url"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_tasks"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"intro_text"}},{"kind":"Field","name":{"kind":"Name","value":"performance_objectives"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"tasks"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"translation_key"}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignment_completion"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"assignment_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}}},{"kind":"Argument","name":{"kind":"Name","value":"course_session_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}}},{"kind":"Argument","name":{"kind":"Name","value":"assignment_user_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentUserId"}}},{"kind":"Argument","name":{"kind":"Name","value":"learning_content_page_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"learningContentId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"completion_status"}},{"kind":"Field","name":{"kind":"Name","value":"submitted_at"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_submitted_at"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignment_user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_grade"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points"}},{"kind":"Field","name":{"kind":"Name","value":"completion_data"}}]}}]}}]} as unknown as DocumentNode<AssignmentCompletionQueryQuery, AssignmentCompletionQueryQueryVariables>;
 export const CourseQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"courseQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"category_name"}},{"kind":"Field","name":{"kind":"Name","value":"learning_path"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]}}]} as unknown as DocumentNode<CourseQueryQuery, CourseQueryQueryVariables>;
diff --git a/client/src/gql/schema.graphql b/client/src/gql/schema.graphql
index 6e40bffb..d27f988a 100644
--- a/client/src/gql/schema.graphql
+++ b/client/src/gql/schema.graphql
@@ -547,7 +547,7 @@ type CompetenceCertificateListObjectType implements CoursePageInterface {
 type Mutation {
   send_feedback(input: SendFeedbackInput!): SendFeedbackPayload
   update_course_session_attendance_course_users(attendance_user_list: [AttendanceUserInputType]!, id: ID!): AttendanceCourseUserMutation
-  upsert_assignment_completion(assignment_id: ID!, assignment_user_id: UUID, completion_data_string: String, completion_status: AssignmentCompletionStatus, course_session_id: ID!, evaluation_grade: Float, evaluation_points: Float, learning_content_page_id: ID): AssignmentCompletionMutation
+  upsert_assignment_completion(assignment_id: ID!, assignment_user_id: UUID, completion_data_string: String, completion_status: AssignmentCompletionStatus, course_session_id: ID!, evaluation_grade: Float, evaluation_points: Float, initialize_completion: Boolean, learning_content_page_id: ID): AssignmentCompletionMutation
 }
 
 type SendFeedbackPayload {
diff --git a/client/src/graphql/mutations.ts b/client/src/graphql/mutations.ts
index 8c1a6281..42106cb0 100644
--- a/client/src/graphql/mutations.ts
+++ b/client/src/graphql/mutations.ts
@@ -33,6 +33,7 @@ export const UPSERT_ASSIGNMENT_COMPLETION_MUTATION = graphql(`
     $completionDataString: String!
     $evaluationGrade: Float
     $evaluationPoints: Float
+    $initializeCompletion: Boolean
   ) {
     upsert_assignment_completion(
       assignment_id: $assignmentId
@@ -43,6 +44,7 @@ export const UPSERT_ASSIGNMENT_COMPLETION_MUTATION = graphql(`
       completion_data_string: $completionDataString
       evaluation_grade: $evaluationGrade
       evaluation_points: $evaluationPoints
+      initialize_completion: $initializeCompletion
     ) {
       assignment_completion {
         id
diff --git a/client/src/pages/competence/CompetenceOverviewPage.vue b/client/src/pages/competence/CompetenceOverviewPage.vue
index 4b5e8982..88fa3dfa 100644
--- a/client/src/pages/competence/CompetenceOverviewPage.vue
+++ b/client/src/pages/competence/CompetenceOverviewPage.vue
@@ -18,13 +18,15 @@ const queryResult = useQuery({
   query: COMPETENCE_NAVI_CERTIFICATE_QUERY,
   variables: {
     courseSlug: "test-lehrgang",
-    courseSessionId: courseSession.value.id,
+    courseSessionId: courseSession.value.id.toString(),
   },
 });
 
 const competenceCertificates = computed(() => {
-  return queryResult.data.value?.competence_certificate_list
-    .competence_certificates as CompetenceCertificate[];
+  return (
+    (queryResult.data.value?.competence_certificate_list
+      ?.competence_certificates as unknown as CompetenceCertificate[]) ?? []
+  );
 });
 
 onMounted(async () => {
diff --git a/client/src/pages/learningPath/learningContentPage/assignment/AssignmentIntroductionView.vue b/client/src/pages/learningPath/learningContentPage/assignment/AssignmentIntroductionView.vue
index 06485fba..b61c414f 100644
--- a/client/src/pages/learningPath/learningContentPage/assignment/AssignmentIntroductionView.vue
+++ b/client/src/pages/learningPath/learningContentPage/assignment/AssignmentIntroductionView.vue
@@ -16,8 +16,6 @@ const props = withDefaults(defineProps<Props>(), {
 
 log.debug("AssignmentIntroductionView created", props.assignment, props.dueDate);
 
-// TODO: Test if submission deadline is set correctly, and evaluation_deadline is set.
-
 const step = useRouteQuery("step");
 </script>
 
diff --git a/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue b/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue
index bb3d0d60..2c888d82 100644
--- a/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue
+++ b/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue
@@ -12,7 +12,6 @@ import { useUserStore } from "@/stores/user";
 import type {
   Assignment,
   AssignmentCompletion,
-  AssignmentCompletionStatus,
   AssignmentTask,
   CourseSessionAssignment,
   CourseSessionUser,
@@ -89,7 +88,7 @@ onMounted(async () => {
 
   // create initial `AssignmentCompletion` first, so that it exists and we don't
   // have reactivity problem accessing it.
-  await upsertAssignmentCompletion("IN_PROGRESS");
+  await initUpsertAssignmentCompletion();
   queryResult.resume();
 
   try {
@@ -120,17 +119,18 @@ const currentTask = computed(() => {
   return undefined;
 });
 
-const upsertAssignmentCompletion = async (status: AssignmentCompletionStatus) => {
+const initUpsertAssignmentCompletion = async () => {
   try {
     await upsertAssignmentCompletionMutation.executeMutation({
       assignmentId: props.learningContent.content_assignment_id.toString(),
       courseSessionId: courseSession.value.id.toString(),
       learningContentId: props.learningContent.id.toString(),
       completionDataString: JSON.stringify({}),
-      completionStatus: status,
+      completionStatus: "IN_PROGRESS",
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore
       id: assignmentCompletion.value?.id,
+      initializeCompletion: true,
     });
     bustItGetCache(
       `/api/course/completion/${courseSession.value.id}/${useUserStore().id}/`
diff --git a/server/vbv_lernwelt/assignment/graphql/mutations.py b/server/vbv_lernwelt/assignment/graphql/mutations.py
index 038d355b..2ed169c9 100644
--- a/server/vbv_lernwelt/assignment/graphql/mutations.py
+++ b/server/vbv_lernwelt/assignment/graphql/mutations.py
@@ -31,6 +31,7 @@ class AssignmentCompletionMutation(graphene.Mutation):
 
         evaluation_grade = graphene.Float()
         evaluation_points = graphene.Float()
+        initialize_completion = graphene.Boolean(required=False)
 
     @classmethod
     def mutate(
@@ -45,6 +46,7 @@ class AssignmentCompletionMutation(graphene.Mutation):
         completion_data_string="{}",
         evaluation_grade=None,
         evaluation_points=None,
+        initialize_completion=False,
     ):
         if assignment_user_id is None:
             assignment_user_id = info.context.user.id
@@ -101,6 +103,7 @@ class AssignmentCompletionMutation(graphene.Mutation):
 
         ac = update_assignment_completion(
             copy_task_data=False,
+            initialize_completion=initialize_completion,
             **assignment_data,
             **evaluation_data,
         )
diff --git a/server/vbv_lernwelt/assignment/services.py b/server/vbv_lernwelt/assignment/services.py
index 23e8f6a3..3fe37872 100644
--- a/server/vbv_lernwelt/assignment/services.py
+++ b/server/vbv_lernwelt/assignment/services.py
@@ -32,6 +32,7 @@ def update_assignment_completion(
     evaluation_points: float | None = None,
     validate_completion_status_change: bool = True,
     copy_task_data: bool = False,
+    initialize_completion: bool = False,
 ) -> AssignmentCompletion:
     """
     :param completion_data: should have the following structure:
@@ -50,6 +51,8 @@ def update_assignment_completion(
     :param copy_task_data: if true, the task data will be copied to the completion data
       used for "SUBMITTED" and "EVALUATION_SUBMITTED" status, so that we don't lose the question
       context
+    :param initialize_completion: if true, the completion will be created, but not updated
+      used as a workaround for initial work with the object on the frontend
     :return: AssignmentCompletion
     """
     if completion_data is None:
@@ -64,6 +67,10 @@ def update_assignment_completion(
         else None,
     )
 
+    if initialize_completion:
+        # ignore further updates
+        return ac
+
     if not is_valid_assignment_completion_status(completion_status):
         raise serializers.ValidationError(
             {

From 1196aba79d2fbdeaba7e4561248d48ee9821c0ad Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Tue, 5 Sep 2023 16:27:04 +0200
Subject: [PATCH 17/49] Show result in EdoniqTestBlock

---
 client/src/gql/gql.ts                         |  4 +--
 client/src/gql/graphql.ts                     |  4 +--
 client/src/graphql/queries.ts                 |  1 +
 .../competence/CompetenceOverviewPage.vue     |  8 +++---
 .../blocks/EdoniqTestBlock.vue                | 19 +++++++-------
 client/src/types.ts                           |  5 +++-
 .../course/creators/test_course.py            | 26 +++++++++----------
 server/vbv_lernwelt/learnpath/models.py       |  1 +
 8 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/client/src/gql/gql.ts b/client/src/gql/gql.ts
index 40cbed98..01bbd64e 100644
--- a/client/src/gql/gql.ts
+++ b/client/src/gql/gql.ts
@@ -18,7 +18,7 @@ const documents = {
     "\n  mutation UpsertAssignmentCompletion(\n    $assignmentId: ID!\n    $courseSessionId: ID!\n    $learningContentId: ID\n    $assignmentUserId: UUID\n    $completionStatus: AssignmentCompletionStatus!\n    $completionDataString: String!\n    $evaluationGrade: Float\n    $evaluationPoints: Float\n    $initializeCompletion: Boolean\n  ) {\n    upsert_assignment_completion(\n      assignment_id: $assignmentId\n      course_session_id: $courseSessionId\n      learning_content_page_id: $learningContentId\n      assignment_user_id: $assignmentUserId\n      completion_status: $completionStatus\n      completion_data_string: $completionDataString\n      evaluation_grade: $evaluationGrade\n      evaluation_points: $evaluationPoints\n      initialize_completion: $initializeCompletion\n    ) {\n      assignment_completion {\n        id\n        completion_status\n        submitted_at\n        evaluation_submitted_at\n        evaluation_grade\n        evaluation_points\n        completion_data\n      }\n    }\n  }\n": types.UpsertAssignmentCompletionDocument,
     "\n  fragment CoursePageFields on CoursePageInterface {\n    title\n    id\n    slug\n    content_type\n    frontend_url\n  }\n": types.CoursePageFieldsFragmentDoc,
     "\n  query attendanceCheckQuery($courseSessionId: ID!) {\n    course_session_attendance_course(id: $courseSessionId) {\n      id\n      attendance_user_list {\n        user_id\n        status\n      }\n    }\n  }\n": types.AttendanceCheckQueryDocument,
-    "\n  query assignmentCompletionQuery(\n    $assignmentId: ID!\n    $courseSessionId: ID!\n    $learningContentId: ID\n    $assignmentUserId: UUID\n  ) {\n    assignment(id: $assignmentId) {\n      assignment_type\n      content_type\n      effort_required\n      evaluation_description\n      evaluation_document_url\n      evaluation_tasks\n      id\n      intro_text\n      performance_objectives\n      slug\n      tasks\n      title\n      translation_key\n    }\n    assignment_completion(\n      assignment_id: $assignmentId\n      course_session_id: $courseSessionId\n      assignment_user_id: $assignmentUserId\n      learning_content_page_id: $learningContentId\n    ) {\n      id\n      completion_status\n      submitted_at\n      evaluation_submitted_at\n      evaluation_user {\n        id\n      }\n      assignment_user {\n        id\n      }\n      evaluation_grade\n      evaluation_points\n      completion_data\n    }\n  }\n": types.AssignmentCompletionQueryDocument,
+    "\n  query assignmentCompletionQuery(\n    $assignmentId: ID!\n    $courseSessionId: ID!\n    $learningContentId: ID\n    $assignmentUserId: UUID\n  ) {\n    assignment(id: $assignmentId) {\n      assignment_type\n      max_points\n      content_type\n      effort_required\n      evaluation_description\n      evaluation_document_url\n      evaluation_tasks\n      id\n      intro_text\n      performance_objectives\n      slug\n      tasks\n      title\n      translation_key\n    }\n    assignment_completion(\n      assignment_id: $assignmentId\n      course_session_id: $courseSessionId\n      assignment_user_id: $assignmentUserId\n      learning_content_page_id: $learningContentId\n    ) {\n      id\n      completion_status\n      submitted_at\n      evaluation_submitted_at\n      evaluation_user {\n        id\n      }\n      assignment_user {\n        id\n      }\n      evaluation_grade\n      evaluation_points\n      completion_data\n    }\n  }\n": types.AssignmentCompletionQueryDocument,
     "\n  query courseQuery($courseId: Int!) {\n    course(id: $courseId) {\n      id\n      slug\n      title\n      category_name\n      learning_path {\n        id\n      }\n    }\n  }\n": types.CourseQueryDocument,
     "\n  query competenceCertificateQuery($courseSlug: String!, $courseSessionId: ID!) {\n    competence_certificate_list(course_slug: $courseSlug) {\n      ...CoursePageFields\n      competence_certificates {\n        ...CoursePageFields\n        assignments {\n          ...CoursePageFields\n          assignment_type\n          max_points\n          completion(course_session_id: $courseSessionId) {\n            id\n            completion_status\n            submitted_at\n            evaluation_points\n          }\n          learning_content {\n            title\n            id\n            slug\n            content_type\n            frontend_url\n            circle {\n              ...CoursePageFields\n            }\n          }\n        }\n      }\n    }\n  }\n": types.CompetenceCertificateQueryDocument,
 };
@@ -60,7 +60,7 @@ export function graphql(source: "\n  query attendanceCheckQuery($courseSessionId
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  query assignmentCompletionQuery(\n    $assignmentId: ID!\n    $courseSessionId: ID!\n    $learningContentId: ID\n    $assignmentUserId: UUID\n  ) {\n    assignment(id: $assignmentId) {\n      assignment_type\n      content_type\n      effort_required\n      evaluation_description\n      evaluation_document_url\n      evaluation_tasks\n      id\n      intro_text\n      performance_objectives\n      slug\n      tasks\n      title\n      translation_key\n    }\n    assignment_completion(\n      assignment_id: $assignmentId\n      course_session_id: $courseSessionId\n      assignment_user_id: $assignmentUserId\n      learning_content_page_id: $learningContentId\n    ) {\n      id\n      completion_status\n      submitted_at\n      evaluation_submitted_at\n      evaluation_user {\n        id\n      }\n      assignment_user {\n        id\n      }\n      evaluation_grade\n      evaluation_points\n      completion_data\n    }\n  }\n"): (typeof documents)["\n  query assignmentCompletionQuery(\n    $assignmentId: ID!\n    $courseSessionId: ID!\n    $learningContentId: ID\n    $assignmentUserId: UUID\n  ) {\n    assignment(id: $assignmentId) {\n      assignment_type\n      content_type\n      effort_required\n      evaluation_description\n      evaluation_document_url\n      evaluation_tasks\n      id\n      intro_text\n      performance_objectives\n      slug\n      tasks\n      title\n      translation_key\n    }\n    assignment_completion(\n      assignment_id: $assignmentId\n      course_session_id: $courseSessionId\n      assignment_user_id: $assignmentUserId\n      learning_content_page_id: $learningContentId\n    ) {\n      id\n      completion_status\n      submitted_at\n      evaluation_submitted_at\n      evaluation_user {\n        id\n      }\n      assignment_user {\n        id\n      }\n      evaluation_grade\n      evaluation_points\n      completion_data\n    }\n  }\n"];
+export function graphql(source: "\n  query assignmentCompletionQuery(\n    $assignmentId: ID!\n    $courseSessionId: ID!\n    $learningContentId: ID\n    $assignmentUserId: UUID\n  ) {\n    assignment(id: $assignmentId) {\n      assignment_type\n      max_points\n      content_type\n      effort_required\n      evaluation_description\n      evaluation_document_url\n      evaluation_tasks\n      id\n      intro_text\n      performance_objectives\n      slug\n      tasks\n      title\n      translation_key\n    }\n    assignment_completion(\n      assignment_id: $assignmentId\n      course_session_id: $courseSessionId\n      assignment_user_id: $assignmentUserId\n      learning_content_page_id: $learningContentId\n    ) {\n      id\n      completion_status\n      submitted_at\n      evaluation_submitted_at\n      evaluation_user {\n        id\n      }\n      assignment_user {\n        id\n      }\n      evaluation_grade\n      evaluation_points\n      completion_data\n    }\n  }\n"): (typeof documents)["\n  query assignmentCompletionQuery(\n    $assignmentId: ID!\n    $courseSessionId: ID!\n    $learningContentId: ID\n    $assignmentUserId: UUID\n  ) {\n    assignment(id: $assignmentId) {\n      assignment_type\n      max_points\n      content_type\n      effort_required\n      evaluation_description\n      evaluation_document_url\n      evaluation_tasks\n      id\n      intro_text\n      performance_objectives\n      slug\n      tasks\n      title\n      translation_key\n    }\n    assignment_completion(\n      assignment_id: $assignmentId\n      course_session_id: $courseSessionId\n      assignment_user_id: $assignmentUserId\n      learning_content_page_id: $learningContentId\n    ) {\n      id\n      completion_status\n      submitted_at\n      evaluation_submitted_at\n      evaluation_user {\n        id\n      }\n      assignment_user {\n        id\n      }\n      evaluation_grade\n      evaluation_points\n      completion_data\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
diff --git a/client/src/gql/graphql.ts b/client/src/gql/graphql.ts
index 34e322e6..6dfaa4dd 100644
--- a/client/src/gql/graphql.ts
+++ b/client/src/gql/graphql.ts
@@ -751,7 +751,7 @@ export type AssignmentCompletionQueryQueryVariables = Exact<{
 }>;
 
 
-export type AssignmentCompletionQueryQuery = { __typename?: 'Query', assignment?: { __typename?: 'AssignmentObjectType', assignment_type: AssignmentAssignmentAssignmentTypeChoices, content_type?: string | null, effort_required: string, evaluation_description: string, evaluation_document_url: string, evaluation_tasks?: any | null, id?: string | null, intro_text: string, performance_objectives?: any | null, slug?: string | null, tasks?: any | null, title?: string | null, translation_key?: string | null } | null, assignment_completion?: { __typename?: 'AssignmentCompletionObjectType', id: any, completion_status: AssignmentAssignmentCompletionCompletionStatusChoices, submitted_at?: any | null, evaluation_submitted_at?: any | null, evaluation_grade?: number | null, evaluation_points?: number | null, completion_data?: any | null, evaluation_user?: { __typename?: 'UserType', id: any } | null, assignment_user: { __typename?: 'UserType', id: any } } | null };
+export type AssignmentCompletionQueryQuery = { __typename?: 'Query', assignment?: { __typename?: 'AssignmentObjectType', assignment_type: AssignmentAssignmentAssignmentTypeChoices, max_points?: number | null, content_type?: string | null, effort_required: string, evaluation_description: string, evaluation_document_url: string, evaluation_tasks?: any | null, id?: string | null, intro_text: string, performance_objectives?: any | null, slug?: string | null, tasks?: any | null, title?: string | null, translation_key?: string | null } | null, assignment_completion?: { __typename?: 'AssignmentCompletionObjectType', id: any, completion_status: AssignmentAssignmentCompletionCompletionStatusChoices, submitted_at?: any | null, evaluation_submitted_at?: any | null, evaluation_grade?: number | null, evaluation_points?: number | null, completion_data?: any | null, evaluation_user?: { __typename?: 'UserType', id: any } | null, assignment_user: { __typename?: 'UserType', id: any } } | null };
 
 export type CourseQueryQueryVariables = Exact<{
   courseId: Scalars['Int']['input'];
@@ -812,6 +812,6 @@ export const SendFeedbackMutationDocument = {"kind":"Document","definitions":[{"
 export const AttendanceCheckMutationDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"AttendanceCheckMutation"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"attendanceCourseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"attendanceUserList"}},"type":{"kind":"NonNullType","type":{"kind":"ListType","type":{"kind":"NamedType","name":{"kind":"Name","value":"AttendanceUserInputType"}}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"update_course_session_attendance_course_users"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"attendanceCourseId"}}},{"kind":"Argument","name":{"kind":"Name","value":"attendance_user_list"},"value":{"kind":"Variable","name":{"kind":"Name","value":"attendanceUserList"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course_session_attendance_course"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"attendance_user_list"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"user_id"}},{"kind":"Field","name":{"kind":"Name","value":"first_name"}},{"kind":"Field","name":{"kind":"Name","value":"last_name"}},{"kind":"Field","name":{"kind":"Name","value":"email"}},{"kind":"Field","name":{"kind":"Name","value":"status"}}]}}]}}]}}]}}]} as unknown as DocumentNode<AttendanceCheckMutationMutation, AttendanceCheckMutationMutationVariables>;
 export const UpsertAssignmentCompletionDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpsertAssignmentCompletion"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"learningContentId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"assignmentUserId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"completionStatus"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"AssignmentCompletionStatus"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"completionDataString"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"evaluationGrade"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Float"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"evaluationPoints"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Float"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"initializeCompletion"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Boolean"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"upsert_assignment_completion"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"assignment_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}}},{"kind":"Argument","name":{"kind":"Name","value":"course_session_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}}},{"kind":"Argument","name":{"kind":"Name","value":"learning_content_page_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"learningContentId"}}},{"kind":"Argument","name":{"kind":"Name","value":"assignment_user_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentUserId"}}},{"kind":"Argument","name":{"kind":"Name","value":"completion_status"},"value":{"kind":"Variable","name":{"kind":"Name","value":"completionStatus"}}},{"kind":"Argument","name":{"kind":"Name","value":"completion_data_string"},"value":{"kind":"Variable","name":{"kind":"Name","value":"completionDataString"}}},{"kind":"Argument","name":{"kind":"Name","value":"evaluation_grade"},"value":{"kind":"Variable","name":{"kind":"Name","value":"evaluationGrade"}}},{"kind":"Argument","name":{"kind":"Name","value":"evaluation_points"},"value":{"kind":"Variable","name":{"kind":"Name","value":"evaluationPoints"}}},{"kind":"Argument","name":{"kind":"Name","value":"initialize_completion"},"value":{"kind":"Variable","name":{"kind":"Name","value":"initializeCompletion"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"assignment_completion"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"completion_status"}},{"kind":"Field","name":{"kind":"Name","value":"submitted_at"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_submitted_at"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_grade"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points"}},{"kind":"Field","name":{"kind":"Name","value":"completion_data"}}]}}]}}]}}]} as unknown as DocumentNode<UpsertAssignmentCompletionMutation, UpsertAssignmentCompletionMutationVariables>;
 export const AttendanceCheckQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"attendanceCheckQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course_session_attendance_course"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"attendance_user_list"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"user_id"}},{"kind":"Field","name":{"kind":"Name","value":"status"}}]}}]}}]}}]} as unknown as DocumentNode<AttendanceCheckQueryQuery, AttendanceCheckQueryQueryVariables>;
-export const AssignmentCompletionQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"assignmentCompletionQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"learningContentId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"assignmentUserId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"assignment"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"assignment_type"}},{"kind":"Field","name":{"kind":"Name","value":"content_type"}},{"kind":"Field","name":{"kind":"Name","value":"effort_required"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_description"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_document_url"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_tasks"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"intro_text"}},{"kind":"Field","name":{"kind":"Name","value":"performance_objectives"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"tasks"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"translation_key"}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignment_completion"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"assignment_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}}},{"kind":"Argument","name":{"kind":"Name","value":"course_session_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}}},{"kind":"Argument","name":{"kind":"Name","value":"assignment_user_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentUserId"}}},{"kind":"Argument","name":{"kind":"Name","value":"learning_content_page_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"learningContentId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"completion_status"}},{"kind":"Field","name":{"kind":"Name","value":"submitted_at"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_submitted_at"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignment_user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_grade"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points"}},{"kind":"Field","name":{"kind":"Name","value":"completion_data"}}]}}]}}]} as unknown as DocumentNode<AssignmentCompletionQueryQuery, AssignmentCompletionQueryQueryVariables>;
+export const AssignmentCompletionQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"assignmentCompletionQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"learningContentId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"assignmentUserId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"assignment"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"assignment_type"}},{"kind":"Field","name":{"kind":"Name","value":"max_points"}},{"kind":"Field","name":{"kind":"Name","value":"content_type"}},{"kind":"Field","name":{"kind":"Name","value":"effort_required"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_description"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_document_url"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_tasks"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"intro_text"}},{"kind":"Field","name":{"kind":"Name","value":"performance_objectives"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"tasks"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"translation_key"}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignment_completion"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"assignment_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}}},{"kind":"Argument","name":{"kind":"Name","value":"course_session_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}}},{"kind":"Argument","name":{"kind":"Name","value":"assignment_user_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentUserId"}}},{"kind":"Argument","name":{"kind":"Name","value":"learning_content_page_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"learningContentId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"completion_status"}},{"kind":"Field","name":{"kind":"Name","value":"submitted_at"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_submitted_at"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignment_user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_grade"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points"}},{"kind":"Field","name":{"kind":"Name","value":"completion_data"}}]}}]}}]} as unknown as DocumentNode<AssignmentCompletionQueryQuery, AssignmentCompletionQueryQueryVariables>;
 export const CourseQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"courseQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"category_name"}},{"kind":"Field","name":{"kind":"Name","value":"learning_path"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]}}]} as unknown as DocumentNode<CourseQueryQuery, CourseQueryQueryVariables>;
 export const CompetenceCertificateQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"competenceCertificateQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSlug"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_list"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_slug"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseSlug"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificates"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"assignments"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type"}},{"kind":"Field","name":{"kind":"Name","value":"max_points"}},{"kind":"Field","name":{"kind":"Name","value":"completion"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_session_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"completion_status"}},{"kind":"Field","name":{"kind":"Name","value":"submitted_at"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points"}}]}},{"kind":"Field","name":{"kind":"Name","value":"learning_content"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"content_type"}},{"kind":"Field","name":{"kind":"Name","value":"frontend_url"}},{"kind":"Field","name":{"kind":"Name","value":"circle"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}}]}}]}}]}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"CoursePageFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"CoursePageInterface"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"content_type"}},{"kind":"Field","name":{"kind":"Name","value":"frontend_url"}}]}}]} as unknown as DocumentNode<CompetenceCertificateQueryQuery, CompetenceCertificateQueryQueryVariables>;
\ No newline at end of file
diff --git a/client/src/graphql/queries.ts b/client/src/graphql/queries.ts
index 7a3f86c4..f2c89f30 100644
--- a/client/src/graphql/queries.ts
+++ b/client/src/graphql/queries.ts
@@ -31,6 +31,7 @@ export const ASSIGNMENT_COMPLETION_QUERY = graphql(`
   ) {
     assignment(id: $assignmentId) {
       assignment_type
+      max_points
       content_type
       effort_required
       evaluation_description
diff --git a/client/src/pages/competence/CompetenceOverviewPage.vue b/client/src/pages/competence/CompetenceOverviewPage.vue
index 88fa3dfa..ee9b1e6e 100644
--- a/client/src/pages/competence/CompetenceOverviewPage.vue
+++ b/client/src/pages/competence/CompetenceOverviewPage.vue
@@ -70,7 +70,7 @@ const getIconName = (assignment: CompetenceCertificateAssignment) => {
           </div>
           <div class="grow px-8">
             <div
-              v-if="assignment.completion.completion_status === 'EVALUATION_SUBMITTED'"
+              v-if="assignment.completion?.completion_status === 'EVALUATION_SUBMITTED'"
               class="flex items-center"
             >
               <div
@@ -83,7 +83,7 @@ const getIconName = (assignment: CompetenceCertificateAssignment) => {
             <div
               v-else-if="
                 ['EVALUATION_IN_PROGRESS', 'SUBMITTED'].includes(
-                  assignment.completion.completion_status
+                  assignment.completion?.completion_status || ''
                 )
               "
               class="flex items-center"
@@ -98,12 +98,12 @@ const getIconName = (assignment: CompetenceCertificateAssignment) => {
           </div>
           <div>
             <div
-              v-if="assignment.completion.completion_status === 'EVALUATION_SUBMITTED'"
+              v-if="assignment.completion?.completion_status === 'EVALUATION_SUBMITTED'"
               class="flex flex-col items-center"
             >
               <div class="flex flex-col items-center">
                 <div class="heading-2">
-                  {{ assignment.completion.evaluation_points }}
+                  {{ assignment.completion?.evaluation_points }}
                 </div>
                 <div>von {{ assignment.max_points }} Punkten</div>
               </div>
diff --git a/client/src/pages/learningPath/learningContentPage/blocks/EdoniqTestBlock.vue b/client/src/pages/learningPath/learningContentPage/blocks/EdoniqTestBlock.vue
index 478b75e1..75f7932c 100644
--- a/client/src/pages/learningPath/learningContentPage/blocks/EdoniqTestBlock.vue
+++ b/client/src/pages/learningPath/learningContentPage/blocks/EdoniqTestBlock.vue
@@ -63,15 +63,16 @@ async function startTest() {
         />
       </div>
 
-      <div class="my-8">
-        <button
-          :disabled="!termsAccepted"
-          class="btn-primary inline-flex items-center"
-          @click="startTest()"
-        >
-          {{ $t("edoniqTest.startTest") }}
-          <it-icon-external-link class="it-icon ml-2 h-5 w-5"></it-icon-external-link>
-        </button>
+        <div class="my-8">
+          <button
+            :disabled="!termsAccepted"
+            class="btn-primary inline-flex items-center"
+            @click="startTest()"
+          >
+            {{ $t("edoniqTest.startTest") }}
+            <it-icon-external-link class="it-icon ml-2 h-5 w-5"></it-icon-external-link>
+          </button>
+        </div>
       </div>
     </div>
   </LearningContentSimpleLayout>
diff --git a/client/src/types.ts b/client/src/types.ts
index 4051169b..e1144a8e 100644
--- a/client/src/types.ts
+++ b/client/src/types.ts
@@ -97,6 +97,7 @@ export interface LearningContentEdoniqTest extends LearningContentInterface {
   readonly content_type: "learnpath.LearningContentEdoniqTest";
   readonly checkbox_text: string;
   readonly has_extended_time_test: boolean;
+  readonly content_assignment_id: number;
 }
 
 export interface LearningContentVideo extends LearningContentInterface {
@@ -362,6 +363,7 @@ export interface Assignment extends BaseCourseWagtailPage {
   readonly evaluation_document_url: string;
   readonly tasks: AssignmentTask[];
   readonly evaluation_tasks: AssignmentEvaluationTask[];
+  readonly max_points: number;
 }
 
 export interface PerformanceCriteria extends BaseCourseWagtailPage {
@@ -396,7 +398,7 @@ export interface CompetenceCertificateAssignment extends BaseCourseWagtailPage {
     completion_status: AssignmentCompletionStatus;
     evaluation_submitted_at: string | null;
     evaluation_points: number | null;
-  };
+  } | null;
 }
 
 export interface CompetenceCertificate extends BaseCourseWagtailPage {
@@ -569,6 +571,7 @@ export interface AssignmentCompletion {
   evaluation_user: string | null;
   completion_data: AssignmentCompletionData;
   evaluation_grade: number | null;
+  evaluation_points: number | null;
 }
 
 export type UpsertUserAssignmentCompletion = {
diff --git a/server/vbv_lernwelt/course/creators/test_course.py b/server/vbv_lernwelt/course/creators/test_course.py
index 2d47f298..2a24b78a 100644
--- a/server/vbv_lernwelt/course/creators/test_course.py
+++ b/server/vbv_lernwelt/course/creators/test_course.py
@@ -384,19 +384,6 @@ damit du erfolgreich mit deinem Lernpfad (durch-)starten kannst.
             slug__startswith="test-lehrgang-assignment-fahrzeug-mein-erstes-auto"
         ),
     ),
-    LearningContentEdoniqTestFactory(
-        title="Wissens- und Verständnisfragen",
-        parent=circle,
-        description=RichText(
-            "<p>Folgender Test mit Wissens- und Verständnisfragen ist Teil des Kompetenznachweises. Der Test kann nur einmal durchgeführt werden und ist notenrelevant.</p>"
-        ),
-        content_assignment=Assignment.objects.get(
-            slug__startswith="test-lehrgang-assignment-edoniq-wissens-und-verständisfragen-circle-fahrzeug-demo"
-        ),
-        checkbox_text="Hiermit bestätige ich, dass ich die Anweisungen verstanden und die Redlichkeitserklärung akzeptiert habe.",
-        test_url="https://exam.vbv-afa.ch/e-tutor/v4/user/course/pre_course_object?aid=1689096897473,2147466097",
-        extended_time_test_url="https://exam2.vbv-afa.ch/e-tutor/v4/user/course/pre_course_object?aid=1689096897473,2147466097",
-    )
 
     PerformanceCriteriaFactory(
         parent=CompetencePage.objects.get(competence_id="X1"),
@@ -423,10 +410,20 @@ damit du erfolgreich mit deinem Lernpfad (durch-)starten kannst.
         parent=circle,
     )
     LearningUnitFactory(title="Kompetenznachweis", parent=circle)
-    LearningContentPlaceholderFactory(
+    LearningContentEdoniqTestFactory(
         title="Wissens- und Verständnisfragen",
         parent=circle,
+        description=RichText(
+            "<p>Folgender Test mit Wissens- und Verständnisfragen ist Teil des Kompetenznachweises. Der Test kann nur einmal durchgeführt werden und ist notenrelevant.</p>"
+        ),
+        content_assignment=Assignment.objects.get(
+            slug__startswith="test-lehrgang-assignment-edoniq-wissens-und-verständisfragen-circle-fahrzeug-demo"
+        ),
+        checkbox_text="Hiermit bestätige ich, dass ich die Anweisungen verstanden und die Redlichkeitserklärung akzeptiert habe.",
+        test_url="https://exam.vbv-afa.ch/e-tutor/v4/user/course/pre_course_object?aid=1689096897473,2147466097",
+        extended_time_test_url="https://exam2.vbv-afa.ch/e-tutor/v4/user/course/pre_course_object?aid=1689096897473,2147466097",
     )
+
     LearningSequenceFactory(title="Transfer", parent=circle, icon="it-icon-ls-end")
     LearningUnitFactory(title="Transfer", parent=circle)
     LearningContentAssignmentFactory(
@@ -676,6 +673,7 @@ def create_test_assignment_edoniq(
 
     assignment = AssignmentFactory(
         parent=assignment_list_page,
+        assignment_type="EDONIQ_TEST",
         title="Edoniq Wissens- und Verständisfragen - Circle Fahrzeug (Demo)",
         competence_certificate=competence_certificate,
         effort_required="ca. 5 Stunden",
diff --git a/server/vbv_lernwelt/learnpath/models.py b/server/vbv_lernwelt/learnpath/models.py
index a9ea847f..167a132b 100644
--- a/server/vbv_lernwelt/learnpath/models.py
+++ b/server/vbv_lernwelt/learnpath/models.py
@@ -325,6 +325,7 @@ class LearningContentEdoniqTest(LearningContent):
     serialize_field_names = LearningContent.serialize_field_names + [
         "checkbox_text",
         "has_extended_time_test",
+        "content_assignment_id",
     ]
     parent_page_types = ["learnpath.Circle"]
     subpage_types = []

From b48ab5ec3d495e5365a9fb6ab869ba29283d7e3e Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Tue, 5 Sep 2023 17:12:10 +0200
Subject: [PATCH 18/49] Add flags in admin from for cypress_reset_view

---
 server/vbv_lernwelt/core/views.py             | 23 +++++++++-
 .../vbv_lernwelt/templates/admin/index.html   | 46 ++++++++++++++-----
 2 files changed, 56 insertions(+), 13 deletions(-)

diff --git a/server/vbv_lernwelt/core/views.py b/server/vbv_lernwelt/core/views.py
index 3660cea1..211a3281 100644
--- a/server/vbv_lernwelt/core/views.py
+++ b/server/vbv_lernwelt/core/views.py
@@ -134,7 +134,28 @@ def check_rate_limit(request):
 @permission_classes((IsAdminUser,))
 def cypress_reset_view(request):
     if not settings.APP_ENVIRONMENT.startswith("prod"):
-        call_command("cypress_reset")
+        # Checking for the flags in the POST request
+        create_assignment_completion = request.data.get(
+            'create_assignment_completion') == 'true'
+        create_assignment_evaluation = request.data.get(
+            'create_assignment_evaluation') == 'true'
+        create_edoniq_test_results = request.data.get(
+            'create_edoniq_test_results') == 'true'
+
+        # TODO: Handle the flags as needed. For example:
+        if create_assignment_completion:
+            # Logic for creating assignment completion
+            pass
+        if create_edoniq_test_results:
+            # Logic for creating Edoniq test results
+            pass
+
+        call_command(
+            "cypress_reset",
+            create_assignment_completion=create_assignment_completion,
+            create_assignment_evaluation=create_assignment_evaluation,
+            create_edoniq_test_results=create_edoniq_test_results,
+        )
 
     return HttpResponseRedirect("/server/admin/")
 
diff --git a/server/vbv_lernwelt/templates/admin/index.html b/server/vbv_lernwelt/templates/admin/index.html
index 564c0c92..423e0cf4 100644
--- a/server/vbv_lernwelt/templates/admin/index.html
+++ b/server/vbv_lernwelt/templates/admin/index.html
@@ -1,49 +1,71 @@
 {% extends "admin/index.html" %}
 
 {% block content %}
-<div id="content-main">
-  {% include "admin/app_list.html" with app_list=app_list show_changelinks=True %}
+  <div id="content-main">
+    {% include "admin/app_list.html" with app_list=app_list show_changelinks=True %}
 
-  <div class="content">
+    <div class="content">
       <h1>üK</h1>
       <h1>Excel Import üK</h1>
       <h2>Durchführungen und Trainer</h2>
-      <form method="post" enctype="multipart/form-data" action="/server/importer/coursesession-trainer-import/">
+      <form method="post" enctype="multipart/form-data"
+            action="/server/importer/coursesession-trainer-import/">
         {% csrf_token %}
         <input type="file" name="excel_file" accept=".xlsx, .xls">
         <input type="submit" value="Durchführungen und Trainer importieren">
       </form>
 
       <h2>Teilnehmer</h2>
-      <form method="post" enctype="multipart/form-data" action="/server/importer/coursesession-students-import/">
+      <form method="post" enctype="multipart/form-data"
+            action="/server/importer/coursesession-students-import/">
         {% csrf_token %}
         <input type="file" name="excel_file" accept=".xlsx, .xls">
         <input type="submit" value="Teilnehmer importieren">
       </form>
 
       <h2>Sync mit T2L Daten</h2>
-      <form method="post" enctype="multipart/form-data" action="/server/importer/t2l-sync/">
+      <form method="post" enctype="multipart/form-data"
+            action="/server/importer/t2l-sync/">
         {% csrf_token %}
         <input type="file" name="excel_file" accept=".xlsx, .xls">
         <input type="submit" value="Teilnehmer mit T2L-Daten Synchronisiern">
       </form>
 
       <h2>Export Edoniq Teilnehmer</h2>
-      <a href="{% url 'edoniq_export_students' %}" class="btn btn-primary">Teilnehmer exportieren</a>
+      <a href="{% url 'edoniq_export_students' %}" class="btn btn-primary">Teilnehmer
+        exportieren</a>
 
       <h2>Export Edoniq Trainer</h2>
-      <a href="{% url 'edoniq_export_trainers' %}" class="btn btn-primary">Trainer exportieren</a>
+      <a href="{% url 'edoniq_export_trainers' %}" class="btn btn-primary">Trainer
+        exportieren</a>
 
       <h2>Export Edoniq Teilnehmer und Trainer</h2>
-      <a href="{% url 'edoniq_export_students_and_trainers' %}" class="btn btn-primary">Teilnehmer und Trainer exportieren</a>
+      <a href="{% url 'edoniq_export_students_and_trainers' %}" class="btn btn-primary">Teilnehmer
+        und Trainer exportieren</a>
 
+      <hr style="margin: 24px 0">
 
-     <h1>Reset</h1>
       <form action="/api/core/cypressreset/" method="post">
         {% csrf_token %}
-        <button class="btn" name="">Testdaten zurück setzen</button>
+        <label>
+          <input type="checkbox" name="create_assignment_completion" value="true">
+          create_assignment_completion
+        </label>
+        <div style="margin: 8px"></div>
+        <label>
+          <input type="checkbox" name="create_assignment_evaluation" value="true">
+          create_assignment_evaluation
+        </label>
+        <div style="margin: 8px"></div>
+
+        <label>
+          <input type="checkbox" name="create_edoniq_test_results" value="true">
+          create_edoniq_test_results
+        </label>
+        <div style="margin: 8px"></div>
+        <button class="btn">Testdaten zurück setzen</button>
       </form>
+    </div>
   </div>
-</div>
 
 {% endblock %}

From 08edf98e2a2738ea3496d2af9e3eb7481791a534 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Tue, 5 Sep 2023 17:20:04 +0200
Subject: [PATCH 19/49] More work on frontend

---
 .../competence/CompetenceAssignmentRow.vue    | 78 ++++++++++++++++++
 .../CompetenceCertificateComponent.vue        | 80 +++++++++++++++++++
 .../competence/CompetenceOverviewPage.vue     | 79 ++----------------
 3 files changed, 163 insertions(+), 74 deletions(-)
 create mode 100644 client/src/pages/competence/CompetenceAssignmentRow.vue
 create mode 100644 client/src/pages/competence/CompetenceCertificateComponent.vue

diff --git a/client/src/pages/competence/CompetenceAssignmentRow.vue b/client/src/pages/competence/CompetenceAssignmentRow.vue
new file mode 100644
index 00000000..037e1be9
--- /dev/null
+++ b/client/src/pages/competence/CompetenceAssignmentRow.vue
@@ -0,0 +1,78 @@
+<script setup lang="ts">
+import type { CompetenceCertificateAssignment } from "@/types";
+import * as log from "loglevel";
+
+log.debug("CompetenceAssignmentRow setup");
+
+const props = defineProps<{
+  assignment: CompetenceCertificateAssignment;
+}>();
+
+const getIconName = () => {
+  if (props.assignment.assignment_type === "EDONIQ_TEST") {
+    return "it-icon-test-large";
+  }
+  return "it-icon-assignment-large";
+};
+</script>
+
+<template>
+  <div class="flex items-center border-b py-8">
+    <component :is="getIconName()" class="mr-4 h-9 w-9"></component>
+    <div class="flex w-[420px] flex-col">
+      <h3 class="text-bold flex items-center gap-2">{{ assignment.title }}</h3>
+      <p class="text-gray-800">
+        <a :href="assignment.frontend_url" class="link" target="_blank">
+          Im Circle «{{ assignment.learning_content.circle.title }}» anschauen
+        </a>
+      </p>
+    </div>
+    <div class="grow px-8">
+      <div
+        v-if="assignment.completion?.completion_status === 'EVALUATION_SUBMITTED'"
+        class="flex items-center"
+      >
+        <div
+          class="relative flex h-7 w-7 items-center justify-center rounded-full border border-green-500 bg-green-500"
+        >
+          <it-icon-check class="h-4/5 w-4/5"></it-icon-check>
+        </div>
+        <div class="ml-2">Bewertung freigegeben</div>
+      </div>
+      <div
+        v-else-if="
+          ['EVALUATION_IN_PROGRESS', 'SUBMITTED'].includes(
+            assignment.completion?.completion_status || ''
+          )
+        "
+        class="flex items-center"
+      >
+        <div
+          class="relative flex h-7 w-7 items-center justify-center rounded-full border border-green-500"
+        >
+          <it-icon-check class="h-6 w-6"></it-icon-check>
+        </div>
+        <div class="ml-2">Ergebnisse abgegeben</div>
+      </div>
+    </div>
+    <div>
+      <div
+        v-if="assignment.completion?.completion_status === 'EVALUATION_SUBMITTED'"
+        class="flex flex-col items-center"
+      >
+        <div class="flex flex-col items-center">
+          <div class="heading-2">
+            {{ assignment.completion?.evaluation_points }}
+          </div>
+          <div>von {{ assignment.max_points }} Punkten</div>
+        </div>
+      </div>
+      <div v-else class="flex flex-col items-center">
+        <div>Höchstpunktzahl</div>
+        <div>{{ assignment.max_points }} Punkte</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style scoped></style>
diff --git a/client/src/pages/competence/CompetenceCertificateComponent.vue b/client/src/pages/competence/CompetenceCertificateComponent.vue
new file mode 100644
index 00000000..d0d23624
--- /dev/null
+++ b/client/src/pages/competence/CompetenceCertificateComponent.vue
@@ -0,0 +1,80 @@
+<script setup lang="ts">
+import * as log from "loglevel";
+import type { CompetenceCertificate } from "@/types";
+import CompetenceAssignmentRow from "@/pages/competence/CompetenceAssignmentRow.vue";
+import { computed } from "vue";
+import ItProgress, { StatusCount } from "@/components/ui/ItProgress.vue";
+
+log.debug("CompetenceCertificateComponent setup");
+
+const props = defineProps<{
+  competenceCertificate: CompetenceCertificate;
+}>();
+
+const totalPointsEvaluatedAssignments = computed(() => {
+  return props.competenceCertificate.assignments.reduce((acc, assignment) => {
+    if (assignment.completion?.completion_status === "EVALUATION_SUBMITTED") {
+      return acc + assignment.max_points;
+    }
+    return acc;
+  }, 0);
+});
+
+const userPointsEvaluatedAssignments = computed(() => {
+  return props.competenceCertificate.assignments.reduce((acc, assignment) => {
+    if (assignment.completion?.completion_status === "EVALUATION_SUBMITTED") {
+      return acc + assignment.completion.evaluation_points;
+    }
+    return acc;
+  }, 0);
+});
+
+const numAssignmentsEvaluated = computed(() => {
+  return props.competenceCertificate.assignments.filter((a) => {
+    return a.completion?.completion_status === "EVALUATION_SUBMITTED";
+  }).length;
+});
+
+const numAssignmentsTotal = computed(() => {
+  return props.competenceCertificate.assignments.length;
+});
+
+const progressStatusCount = computed(() => {
+  return {
+    SUCCESS: numAssignmentsEvaluated.value,
+    UNKNOWN: numAssignmentsTotal.value - numAssignmentsEvaluated.value,
+    FAIL: 0,
+  } as StatusCount;
+});
+</script>
+
+<template>
+  <div>
+    <div class="mb-4 bg-white p-8">
+      <h2>
+        {{ props.competenceCertificate.title }}
+      </h2>
+
+      <div class="flex items-center">
+        <div class="heading-1 py-4">
+          {{ userPointsEvaluatedAssignments }}
+        </div>
+        <div class="pl-2">von {{ totalPointsEvaluatedAssignments }} Punkten</div>
+      </div>
+      <ItProgress :status-count="progressStatusCount" />
+      <div>
+        {{ numAssignmentsEvaluated }} von {{ numAssignmentsTotal }} Arbeiten
+        abgeschlossen
+      </div>
+    </div>
+
+    <div
+      v-for="assignment in props.competenceCertificate.assignments"
+      class="bg-white px-8"
+    >
+      <CompetenceAssignmentRow :assignment="assignment"></CompetenceAssignmentRow>
+    </div>
+  </div>
+</template>
+
+<style scoped></style>
diff --git a/client/src/pages/competence/CompetenceOverviewPage.vue b/client/src/pages/competence/CompetenceOverviewPage.vue
index ee9b1e6e..f40b786b 100644
--- a/client/src/pages/competence/CompetenceOverviewPage.vue
+++ b/client/src/pages/competence/CompetenceOverviewPage.vue
@@ -3,8 +3,9 @@ import log from "loglevel";
 import { COMPETENCE_NAVI_CERTIFICATE_QUERY } from "@/graphql/queries";
 import { useQuery } from "@urql/vue";
 import { computed, onMounted } from "vue";
-import type { CompetenceCertificate, CompetenceCertificateAssignment } from "@/types";
+import type { CompetenceCertificate } from "@/types";
 import { useCurrentCourseSession } from "@/composables";
+import CompetenceCertificateComponent from "@/pages/competence/CompetenceCertificateComponent.vue";
 
 const props = defineProps<{
   courseSlug: string;
@@ -32,89 +33,19 @@ const competenceCertificates = computed(() => {
 onMounted(async () => {
   // log.debug("AssignmentView mounted", props.assignmentId, props.userId);
 });
-
-const getIconName = (assignment: CompetenceCertificateAssignment) => {
-  if (assignment.assignment_type === "EDONIQ_TEST") {
-    return "it-icon-test-large";
-  }
-  return "it-icon-assignment-large";
-};
 </script>
 
 <template>
   <div class="container-large lg:mt-4">
     <h1>{{ $t("competences.title") }}</h1>
-    <!--    <pre>-->
-    <!--      {{ competenceCertificates }}-->
-    <!--    </pre>-->
 
     <div
       v-for="competenceCertificate in competenceCertificates"
       :key="competenceCertificate.id"
     >
-      {{ competenceCertificate.title }}
-
-      <div
-        v-for="assignment in competenceCertificate.assignments"
-        class="bg-white px-8"
-      >
-        <div class="flex items-center border-b py-8">
-          <component :is="getIconName(assignment)" class="mr-4 h-9 w-9"></component>
-          <div class="flex w-[420px] flex-col">
-            <h3 class="text-bold flex items-center gap-2">{{ assignment.title }}</h3>
-            <p class="text-gray-800">
-              <a :href="assignment.frontend_url" class="link" target="_blank">
-                Im Circle «{{ assignment.learning_content.circle.title }}» anschauen
-              </a>
-            </p>
-          </div>
-          <div class="grow px-8">
-            <div
-              v-if="assignment.completion?.completion_status === 'EVALUATION_SUBMITTED'"
-              class="flex items-center"
-            >
-              <div
-                class="relative flex h-7 w-7 items-center justify-center rounded-full border border-green-500 bg-green-500"
-              >
-                <it-icon-check class="h-4/5 w-4/5"></it-icon-check>
-              </div>
-              <div class="ml-2">Bewertung freigegeben</div>
-            </div>
-            <div
-              v-else-if="
-                ['EVALUATION_IN_PROGRESS', 'SUBMITTED'].includes(
-                  assignment.completion?.completion_status || ''
-                )
-              "
-              class="flex items-center"
-            >
-              <div
-                class="relative flex h-7 w-7 items-center justify-center rounded-full border border-green-500"
-              >
-                <it-icon-check class="h-6 w-6"></it-icon-check>
-              </div>
-              <div class="ml-2">Ergebnisse abgegeben</div>
-            </div>
-          </div>
-          <div>
-            <div
-              v-if="assignment.completion?.completion_status === 'EVALUATION_SUBMITTED'"
-              class="flex flex-col items-center"
-            >
-              <div class="flex flex-col items-center">
-                <div class="heading-2">
-                  {{ assignment.completion?.evaluation_points }}
-                </div>
-                <div>von {{ assignment.max_points }} Punkten</div>
-              </div>
-            </div>
-            <div v-else class="flex flex-col items-center">
-              <div>Höchstpunktzahl</div>
-              <div>{{ assignment.max_points }} Punkte</div>
-            </div>
-          </div>
-        </div>
-      </div>
+      <CompetenceCertificateComponent
+        :competence-certificate="competenceCertificate"
+      ></CompetenceCertificateComponent>
     </div>
   </div>
 </template>

From cce82b72ad1d01964083e73a5b12b35d2942f71d Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Tue, 5 Sep 2023 17:49:51 +0200
Subject: [PATCH 20/49] Format code

---
 client/src/graphql/queries.ts                 |  1 +
 .../CompetenceCertificateComponent.vue        |  6 +-
 .../assignment/graphql/queries.py             |  8 ++-
 .../vbv_lernwelt/assignment/graphql/types.py  | 13 ++--
 .../migrations/0007_auto_20230901_1112.py     | 37 ++++++++---
 server/vbv_lernwelt/competence/factories.py   |  6 +-
 .../competence/graphql/queries.py             |  2 +-
 ...tencecertificatelist_competencenavipage.py | 61 ++++++++++++++-----
 .../core/management/commands/cypress_reset.py |  4 +-
 server/vbv_lernwelt/core/views.py             | 15 +++--
 .../course/creators/test_course.py            |  8 +--
 .../migrations/0004_auto_20230901_1112.py     | 33 +++++++---
 ...alter_notification_notification_trigger.py | 18 ++++--
 13 files changed, 146 insertions(+), 66 deletions(-)

diff --git a/client/src/graphql/queries.ts b/client/src/graphql/queries.ts
index f2c89f30..a1d2d1e1 100644
--- a/client/src/graphql/queries.ts
+++ b/client/src/graphql/queries.ts
@@ -1,5 +1,6 @@
 import { graphql } from "@/gql";
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 const CoursePageFragment = graphql(`
   fragment CoursePageFields on CoursePageInterface {
     title
diff --git a/client/src/pages/competence/CompetenceCertificateComponent.vue b/client/src/pages/competence/CompetenceCertificateComponent.vue
index d0d23624..a309167c 100644
--- a/client/src/pages/competence/CompetenceCertificateComponent.vue
+++ b/client/src/pages/competence/CompetenceCertificateComponent.vue
@@ -3,7 +3,8 @@ import * as log from "loglevel";
 import type { CompetenceCertificate } from "@/types";
 import CompetenceAssignmentRow from "@/pages/competence/CompetenceAssignmentRow.vue";
 import { computed } from "vue";
-import ItProgress, { StatusCount } from "@/components/ui/ItProgress.vue";
+import type { StatusCount } from "@/components/ui/ItProgress.vue";
+import ItProgress from "@/components/ui/ItProgress.vue";
 
 log.debug("CompetenceCertificateComponent setup");
 
@@ -23,7 +24,7 @@ const totalPointsEvaluatedAssignments = computed(() => {
 const userPointsEvaluatedAssignments = computed(() => {
   return props.competenceCertificate.assignments.reduce((acc, assignment) => {
     if (assignment.completion?.completion_status === "EVALUATION_SUBMITTED") {
-      return acc + assignment.completion.evaluation_points;
+      return acc + (assignment.completion?.evaluation_points ?? 0);
     }
     return acc;
   }, 0);
@@ -70,6 +71,7 @@ const progressStatusCount = computed(() => {
 
     <div
       v-for="assignment in props.competenceCertificate.assignments"
+      :key="assignment.id"
       class="bg-white px-8"
     >
       <CompetenceAssignmentRow :assignment="assignment"></CompetenceAssignmentRow>
diff --git a/server/vbv_lernwelt/assignment/graphql/queries.py b/server/vbv_lernwelt/assignment/graphql/queries.py
index 7def9d8b..7ff57fe2 100644
--- a/server/vbv_lernwelt/assignment/graphql/queries.py
+++ b/server/vbv_lernwelt/assignment/graphql/queries.py
@@ -2,7 +2,8 @@ import graphene
 
 from vbv_lernwelt.assignment.graphql.types import (
     AssignmentCompletionObjectType,
-    AssignmentObjectType, resolve_assignment_completion,
+    AssignmentObjectType,
+    resolve_assignment_completion,
 )
 from vbv_lernwelt.assignment.models import Assignment
 from vbv_lernwelt.course.graphql.types import resolve_course_page
@@ -34,6 +35,9 @@ class AssignmentQuery(object):
         **kwargs,
     ):
         return resolve_assignment_completion(
-            info, assignment_id, course_session_id, learning_content_page_id,
+            info,
+            assignment_id,
+            course_session_id,
+            learning_content_page_id,
             assignment_user_id,
         )
diff --git a/server/vbv_lernwelt/assignment/graphql/types.py b/server/vbv_lernwelt/assignment/graphql/types.py
index 55975bc1..bf50a1f7 100644
--- a/server/vbv_lernwelt/assignment/graphql/types.py
+++ b/server/vbv_lernwelt/assignment/graphql/types.py
@@ -7,7 +7,7 @@ from vbv_lernwelt.assignment.models import Assignment, AssignmentCompletion
 from vbv_lernwelt.core.graphql.types import JSONStreamField
 from vbv_lernwelt.course.graphql.interfaces import CoursePageInterface
 from vbv_lernwelt.course.models import CourseSession
-from vbv_lernwelt.course.permissions import is_course_session_expert, has_course_access
+from vbv_lernwelt.course.permissions import has_course_access, is_course_session_expert
 from vbv_lernwelt.learnpath.graphql.types import LearningContentInterface
 
 
@@ -68,7 +68,10 @@ class AssignmentObjectType(DjangoObjectType):
         return self.find_attached_learning_content()
 
     def resolve_completion(
-        self, info, course_session_id, learning_content_page_id=None,
+        self,
+        info,
+        course_session_id,
+        learning_content_page_id=None,
         assignment_user_id=None,
     ):
         if learning_content_page_id is None:
@@ -94,9 +97,9 @@ def resolve_assignment_completion(
     if assignment_user_id is None:
         assignment_user_id = info.context.user.id
 
-    if str(assignment_user_id) == str(
-        info.context.user.id
-    ) or is_course_session_expert(info.context.user, course_session_id):
+    if str(assignment_user_id) == str(info.context.user.id) or is_course_session_expert(
+        info.context.user, course_session_id
+    ):
         course_id = CourseSession.objects.get(id=course_session_id).course_id
         if has_course_access(info.context.user, course_id):
             if learning_content_page_id is None:
diff --git a/server/vbv_lernwelt/assignment/migrations/0007_auto_20230901_1112.py b/server/vbv_lernwelt/assignment/migrations/0007_auto_20230901_1112.py
index e32156f7..4deee74d 100644
--- a/server/vbv_lernwelt/assignment/migrations/0007_auto_20230901_1112.py
+++ b/server/vbv_lernwelt/assignment/migrations/0007_auto_20230901_1112.py
@@ -1,25 +1,42 @@
 # Generated by Django 3.2.20 on 2023-09-01 09:12
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('competence', '0003_competencecertificate_competencecertificatelist_competencenavipage'),
-        ('assignment', '0006_auto_20230823_1127'),
+        (
+            "competence",
+            "0003_competencecertificate_competencecertificatelist_competencenavipage",
+        ),
+        ("assignment", "0006_auto_20230823_1127"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='assignment',
-            name='competence_certificate',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='competence.competencecertificate'),
+            model_name="assignment",
+            name="competence_certificate",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                to="competence.competencecertificate",
+            ),
         ),
         migrations.AlterField(
-            model_name='assignment',
-            name='assignment_type',
-            field=models.CharField(choices=[('CASEWORK', 'CASEWORK'), ('PREP_ASSIGNMENT', 'PREP_ASSIGNMENT'), ('REFLECTION', 'REFLECTION'), ('CONDITION_ACCEPTANCE', 'CONDITION_ACCEPTANCE'), ('EDONIQ_TEST', 'EDONIQ_TEST')], default='CASEWORK', max_length=50),
+            model_name="assignment",
+            name="assignment_type",
+            field=models.CharField(
+                choices=[
+                    ("CASEWORK", "CASEWORK"),
+                    ("PREP_ASSIGNMENT", "PREP_ASSIGNMENT"),
+                    ("REFLECTION", "REFLECTION"),
+                    ("CONDITION_ACCEPTANCE", "CONDITION_ACCEPTANCE"),
+                    ("EDONIQ_TEST", "EDONIQ_TEST"),
+                ],
+                default="CASEWORK",
+                max_length=50,
+            ),
         ),
     ]
diff --git a/server/vbv_lernwelt/competence/factories.py b/server/vbv_lernwelt/competence/factories.py
index ce9f05f8..a4bc8176 100644
--- a/server/vbv_lernwelt/competence/factories.py
+++ b/server/vbv_lernwelt/competence/factories.py
@@ -1,12 +1,12 @@
 import wagtail_factories
 
 from vbv_lernwelt.competence.models import (
+    CompetenceCertificate,
+    CompetenceCertificateList,
+    CompetenceNaviPage,
     CompetencePage,
     CompetenceProfilePage,
     PerformanceCriteria,
-    CompetenceCertificate,
-    CompetenceNaviPage,
-    CompetenceCertificateList,
 )
 
 
diff --git a/server/vbv_lernwelt/competence/graphql/queries.py b/server/vbv_lernwelt/competence/graphql/queries.py
index 86c49189..815316b8 100644
--- a/server/vbv_lernwelt/competence/graphql/queries.py
+++ b/server/vbv_lernwelt/competence/graphql/queries.py
@@ -1,8 +1,8 @@
 import graphene
 
 from vbv_lernwelt.competence.graphql.types import (
-    CompetenceCertificateObjectType,
     CompetenceCertificateListObjectType,
+    CompetenceCertificateObjectType,
 )
 from vbv_lernwelt.competence.models import (
     CompetenceCertificate,
diff --git a/server/vbv_lernwelt/competence/migrations/0003_competencecertificate_competencecertificatelist_competencenavipage.py b/server/vbv_lernwelt/competence/migrations/0003_competencecertificate_competencecertificatelist_competencenavipage.py
index ee1a1898..dfca9aab 100644
--- a/server/vbv_lernwelt/competence/migrations/0003_competencecertificate_competencecertificatelist_competencenavipage.py
+++ b/server/vbv_lernwelt/competence/migrations/0003_competencecertificate_competencecertificatelist_competencenavipage.py
@@ -1,45 +1,74 @@
 # Generated by Django 3.2.20 on 2023-09-01 09:12
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('wagtailcore', '0089_log_entry_data_json_null_to_object'),
-        ('competence', '0002_performancecriteria_learning_unit'),
+        ("wagtailcore", "0089_log_entry_data_json_null_to_object"),
+        ("competence", "0002_performancecriteria_learning_unit"),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='CompetenceCertificate',
+            name="CompetenceCertificate",
             fields=[
-                ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.page')),
+                (
+                    "page_ptr",
+                    models.OneToOneField(
+                        auto_created=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        parent_link=True,
+                        primary_key=True,
+                        serialize=False,
+                        to="wagtailcore.page",
+                    ),
+                ),
             ],
             options={
-                'abstract': False,
+                "abstract": False,
             },
-            bases=('wagtailcore.page',),
+            bases=("wagtailcore.page",),
         ),
         migrations.CreateModel(
-            name='CompetenceCertificateList',
+            name="CompetenceCertificateList",
             fields=[
-                ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.page')),
+                (
+                    "page_ptr",
+                    models.OneToOneField(
+                        auto_created=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        parent_link=True,
+                        primary_key=True,
+                        serialize=False,
+                        to="wagtailcore.page",
+                    ),
+                ),
             ],
             options={
-                'abstract': False,
+                "abstract": False,
             },
-            bases=('wagtailcore.page',),
+            bases=("wagtailcore.page",),
         ),
         migrations.CreateModel(
-            name='CompetenceNaviPage',
+            name="CompetenceNaviPage",
             fields=[
-                ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.page')),
+                (
+                    "page_ptr",
+                    models.OneToOneField(
+                        auto_created=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        parent_link=True,
+                        primary_key=True,
+                        serialize=False,
+                        to="wagtailcore.page",
+                    ),
+                ),
             ],
             options={
-                'abstract': False,
+                "abstract": False,
             },
-            bases=('wagtailcore.page',),
+            bases=("wagtailcore.page",),
         ),
     ]
diff --git a/server/vbv_lernwelt/core/management/commands/cypress_reset.py b/server/vbv_lernwelt/core/management/commands/cypress_reset.py
index 39447c9e..0d498e8b 100644
--- a/server/vbv_lernwelt/core/management/commands/cypress_reset.py
+++ b/server/vbv_lernwelt/core/management/commands/cypress_reset.py
@@ -8,9 +8,9 @@ from vbv_lernwelt.core.constants import (
 )
 from vbv_lernwelt.core.models import User
 from vbv_lernwelt.course.creators.test_course import (
-    create_test_assignment_submitted_data,
-    create_test_assignment_evaluation_data,
     create_edoniq_test_result_data,
+    create_test_assignment_evaluation_data,
+    create_test_assignment_submitted_data,
 )
 from vbv_lernwelt.course.models import CourseCompletion, CourseSession
 from vbv_lernwelt.notify.models import Notification
diff --git a/server/vbv_lernwelt/core/views.py b/server/vbv_lernwelt/core/views.py
index 211a3281..65722d46 100644
--- a/server/vbv_lernwelt/core/views.py
+++ b/server/vbv_lernwelt/core/views.py
@@ -135,12 +135,15 @@ def check_rate_limit(request):
 def cypress_reset_view(request):
     if not settings.APP_ENVIRONMENT.startswith("prod"):
         # Checking for the flags in the POST request
-        create_assignment_completion = request.data.get(
-            'create_assignment_completion') == 'true'
-        create_assignment_evaluation = request.data.get(
-            'create_assignment_evaluation') == 'true'
-        create_edoniq_test_results = request.data.get(
-            'create_edoniq_test_results') == 'true'
+        create_assignment_completion = (
+            request.data.get("create_assignment_completion") == "true"
+        )
+        create_assignment_evaluation = (
+            request.data.get("create_assignment_evaluation") == "true"
+        )
+        create_edoniq_test_results = (
+            request.data.get("create_edoniq_test_results") == "true"
+        )
 
         # TODO: Handle the flags as needed. For example:
         if create_assignment_completion:
diff --git a/server/vbv_lernwelt/course/creators/test_course.py b/server/vbv_lernwelt/course/creators/test_course.py
index 2a24b78a..863f5cbd 100644
--- a/server/vbv_lernwelt/course/creators/test_course.py
+++ b/server/vbv_lernwelt/course/creators/test_course.py
@@ -18,17 +18,17 @@ from vbv_lernwelt.assignment.models import (
 )
 from vbv_lernwelt.assignment.services import update_assignment_completion
 from vbv_lernwelt.assignment.tests.assignment_factories import (
-    AssignmentListPageFactory,
     AssignmentFactory,
+    AssignmentListPageFactory,
     EvaluationTaskBlockFactory,
 )
 from vbv_lernwelt.competence.factories import (
+    CompetenceCertificateFactory,
+    CompetenceCertificateListFactory,
+    CompetenceNaviPageFactory,
     CompetencePageFactory,
     CompetenceProfilePageFactory,
     PerformanceCriteriaFactory,
-    CompetenceNaviPageFactory,
-    CompetenceCertificateListFactory,
-    CompetenceCertificateFactory,
 )
 from vbv_lernwelt.competence.models import CompetencePage
 from vbv_lernwelt.core.constants import (
diff --git a/server/vbv_lernwelt/learnpath/migrations/0004_auto_20230901_1112.py b/server/vbv_lernwelt/learnpath/migrations/0004_auto_20230901_1112.py
index b5b6782e..1a79cbfb 100644
--- a/server/vbv_lernwelt/learnpath/migrations/0004_auto_20230901_1112.py
+++ b/server/vbv_lernwelt/learnpath/migrations/0004_auto_20230901_1112.py
@@ -1,25 +1,38 @@
 # Generated by Django 3.2.20 on 2023-09-01 09:12
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('assignment', '0007_auto_20230901_1112'),
-        ('learnpath', '0003_auto_20230810_0817'),
+        ("assignment", "0007_auto_20230901_1112"),
+        ("learnpath", "0003_auto_20230810_0817"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='learningcontentedoniqtest',
-            name='content_assignment',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='assignment.assignment'),
+            model_name="learningcontentedoniqtest",
+            name="content_assignment",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                to="assignment.assignment",
+            ),
         ),
         migrations.AlterField(
-            model_name='learningcontentassignment',
-            name='assignment_type',
-            field=models.CharField(choices=[('CASEWORK', 'CASEWORK'), ('PREP_ASSIGNMENT', 'PREP_ASSIGNMENT'), ('REFLECTION', 'REFLECTION'), ('CONDITION_ACCEPTANCE', 'CONDITION_ACCEPTANCE'), ('EDONIQ_TEST', 'EDONIQ_TEST')], default='CASEWORK', max_length=50),
+            model_name="learningcontentassignment",
+            name="assignment_type",
+            field=models.CharField(
+                choices=[
+                    ("CASEWORK", "CASEWORK"),
+                    ("PREP_ASSIGNMENT", "PREP_ASSIGNMENT"),
+                    ("REFLECTION", "REFLECTION"),
+                    ("CONDITION_ACCEPTANCE", "CONDITION_ACCEPTANCE"),
+                    ("EDONIQ_TEST", "EDONIQ_TEST"),
+                ],
+                default="CASEWORK",
+                max_length=50,
+            ),
         ),
     ]
diff --git a/server/vbv_lernwelt/notify/migrations/0004_alter_notification_notification_trigger.py b/server/vbv_lernwelt/notify/migrations/0004_alter_notification_notification_trigger.py
index deb22d78..3fe65fa7 100644
--- a/server/vbv_lernwelt/notify/migrations/0004_alter_notification_notification_trigger.py
+++ b/server/vbv_lernwelt/notify/migrations/0004_alter_notification_notification_trigger.py
@@ -4,15 +4,23 @@ from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('notify', '0003_truncate_notifications'),
+        ("notify", "0003_truncate_notifications"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='notification',
-            name='notification_trigger',
-            field=models.CharField(choices=[('ATTENDANCE_COURSE_REMINDER', 'Attendance Course Reminder'), ('CASEWORK_SUBMITTED', 'Casework Submitted'), ('CASEWORK_EVALUATED', 'Casework Evaluated'), ('NEW_FEEDBACK', 'New Feedback')], default='', max_length=255),
+            model_name="notification",
+            name="notification_trigger",
+            field=models.CharField(
+                choices=[
+                    ("ATTENDANCE_COURSE_REMINDER", "Attendance Course Reminder"),
+                    ("CASEWORK_SUBMITTED", "Casework Submitted"),
+                    ("CASEWORK_EVALUATED", "Casework Evaluated"),
+                    ("NEW_FEEDBACK", "New Feedback"),
+                ],
+                default="",
+                max_length=255,
+            ),
         ),
     ]

From aabaced83641779e66944edb518a186d6969b5a5 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Wed, 6 Sep 2023 14:04:46 +0200
Subject: [PATCH 21/49] Fix creation scripts

---
 .../competence/CompetenceAssignmentRow.vue    |  8 ++++-
 .../competence/CompetenceOverviewPage.vue     |  2 +-
 client/src/types.ts                           |  8 +++--
 .../course/creators/test_course.py            | 14 ++++----
 .../vbv_lernwelt/course/creators/uk_course.py | 28 ++++++++++++++++
 .../commands/create_default_courses.py        | 32 +++++++++++++------
 .../learnpath/create_vv_new_learning_path.py  | 18 +++++------
 ...ingcontentedoniqtest_content_assignment.py | 24 ++++++++++++++
 server/vbv_lernwelt/learnpath/models.py       |  1 +
 9 files changed, 106 insertions(+), 29 deletions(-)
 create mode 100644 server/vbv_lernwelt/learnpath/migrations/0005_alter_learningcontentedoniqtest_content_assignment.py

diff --git a/client/src/pages/competence/CompetenceAssignmentRow.vue b/client/src/pages/competence/CompetenceAssignmentRow.vue
index 037e1be9..fb2fb48a 100644
--- a/client/src/pages/competence/CompetenceAssignmentRow.vue
+++ b/client/src/pages/competence/CompetenceAssignmentRow.vue
@@ -22,9 +22,15 @@ const getIconName = () => {
     <div class="flex w-[420px] flex-col">
       <h3 class="text-bold flex items-center gap-2">{{ assignment.title }}</h3>
       <p class="text-gray-800">
-        <a :href="assignment.frontend_url" class="link" target="_blank">
+        <a
+          v-if="assignment.learning_content"
+          :href="assignment.frontend_url"
+          class="link"
+          target="_blank"
+        >
           Im Circle «{{ assignment.learning_content.circle.title }}» anschauen
         </a>
+        <span v-else>Fehler, Lerninhalt nicht korrekt verknüpft</span>
       </p>
     </div>
     <div class="grow px-8">
diff --git a/client/src/pages/competence/CompetenceOverviewPage.vue b/client/src/pages/competence/CompetenceOverviewPage.vue
index f40b786b..e7ecbf9e 100644
--- a/client/src/pages/competence/CompetenceOverviewPage.vue
+++ b/client/src/pages/competence/CompetenceOverviewPage.vue
@@ -18,7 +18,7 @@ const courseSession = useCurrentCourseSession();
 const queryResult = useQuery({
   query: COMPETENCE_NAVI_CERTIFICATE_QUERY,
   variables: {
-    courseSlug: "test-lehrgang",
+    courseSlug: props.courseSlug,
     courseSessionId: courseSession.value.id.toString(),
   },
 });
diff --git a/client/src/types.ts b/client/src/types.ts
index e1144a8e..e3ee2bb7 100644
--- a/client/src/types.ts
+++ b/client/src/types.ts
@@ -390,9 +390,11 @@ export interface CompetenceProfilePage extends BaseCourseWagtailPage {
 export interface CompetenceCertificateAssignment extends BaseCourseWagtailPage {
   assignment_type: "CASEWORK" | "EDONIQ_TEST";
   max_points: number;
-  learning_content: BaseCourseWagtailPage & {
-    circle: CircleLight;
-  };
+  learning_content:
+    | (BaseCourseWagtailPage & {
+        circle: CircleLight;
+      })
+    | null;
   completion: {
     id: string;
     completion_status: AssignmentCompletionStatus;
diff --git a/server/vbv_lernwelt/course/creators/test_course.py b/server/vbv_lernwelt/course/creators/test_course.py
index 863f5cbd..005b6f99 100644
--- a/server/vbv_lernwelt/course/creators/test_course.py
+++ b/server/vbv_lernwelt/course/creators/test_course.py
@@ -97,8 +97,10 @@ def create_test_course(include_uk=True, include_vv=True, with_sessions=False):
         create_uk_fahrzeug_prep_assignment(course_id=COURSE_TEST_ID)
         create_uk_condition_acceptance(course_id=COURSE_TEST_ID)
         create_uk_reflection(course_id=COURSE_TEST_ID)
-        create_test_assignment_edoniq(
-            course_id=COURSE_TEST_ID, competence_certificate=competence_certificate
+        create_edoniq_test_assignment(
+            course_id=COURSE_TEST_ID,
+            title="Edoniq Wissens- und Verständisfragen - Circle Fahrzeug (Demo)",
+            competence_certificate=competence_certificate,
         )
 
     create_test_learning_path(include_uk=include_uk, include_vv=include_vv)
@@ -661,8 +663,8 @@ def create_test_media_library():
         )
 
 
-def create_test_assignment_edoniq(
-    course_id=COURSE_TEST_ID, competence_certificate=None
+def create_edoniq_test_assignment(
+    course_id=COURSE_TEST_ID, title="", competence_certificate=None
 ):
     assignment_list_page = (
         CoursePage.objects.get(course_id=course_id)
@@ -674,9 +676,9 @@ def create_test_assignment_edoniq(
     assignment = AssignmentFactory(
         parent=assignment_list_page,
         assignment_type="EDONIQ_TEST",
-        title="Edoniq Wissens- und Verständisfragen - Circle Fahrzeug (Demo)",
+        title=title,
         competence_certificate=competence_certificate,
-        effort_required="ca. 5 Stunden",
+        effort_required="ca. 2 Stunden",
         intro_text="Edoniq Test",
         performance_objectives=[],
         evaluation_document_url="",
diff --git a/server/vbv_lernwelt/course/creators/uk_course.py b/server/vbv_lernwelt/course/creators/uk_course.py
index cffc82d4..4ab3fdd6 100644
--- a/server/vbv_lernwelt/course/creators/uk_course.py
+++ b/server/vbv_lernwelt/course/creators/uk_course.py
@@ -5,6 +5,11 @@ from wagtail.rich_text import RichText
 from wagtail_localize.models import LocaleSynchronization
 
 from vbv_lernwelt.assignment.models import Assignment
+from vbv_lernwelt.competence.factories import (
+    CompetenceCertificateFactory,
+    CompetenceCertificateListFactory,
+    CompetenceNaviPageFactory,
+)
 from vbv_lernwelt.core.admin import User
 from vbv_lernwelt.course.consts import COURSE_UK, COURSE_UK_FR, COURSE_UK_IT
 from vbv_lernwelt.course.creators.uk_circle_goals_de import UK_DE_CIRCLE_GOALS
@@ -172,6 +177,26 @@ def create_uk_it_learning_path(course_id=COURSE_UK_IT, user=None, skip_locales=T
     Page.objects.update(owner=user)
 
 
+def create_competence_navi(course_id):
+    course_page = CoursePage.objects.get(course_id=course_id)
+
+    competence_navi_page = CompetenceNaviPageFactory(
+        title="KompetenzNavi",
+        parent=course_page,
+    )
+
+    competence_certificate_list = CompetenceCertificateListFactory(
+        title="Kompetenznachweise",
+        parent=competence_navi_page,
+    )
+    competence_certificate = CompetenceCertificateFactory(
+        title="Kompetenznachweis 1",
+        parent=competence_certificate_list,
+    )
+
+    return competence_certificate
+
+
 def create_uk_circle(lp, title="Kickoff", show_test=True):
     circle = CircleFactory(
         title=title,
@@ -688,6 +713,9 @@ In diesem Circle lernst du die wichtigsten Grundlagen bezüglich Versicherungswi
         checkbox_text="Hiermit bestätige ich, dass ich die Anweisungen verstanden und die Redlichkeitserklärung akzeptiert habe.",
         test_url="https://exam.vbv-afa.ch/e-tutor/v4/user/course/pre_course_object?aid=1689096523730,2147466125",
         extended_time_test_url="https://exam.vbv-afa.ch/e-tutor/v4/user/course/pre_course_object?aid=1691157696911,2147478636",
+        content_assignment=Assignment.objects.get(
+            title="Edoniq Wissens- und Verständisfragen - Circle Basis"
+        ),
     )
     LearningUnitFactory(title="Reflexion", title_hidden=True, parent=circle)
     LearningContentAssignmentFactory(
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 8bca3c78..8ea8ddc7 100644
--- a/server/vbv_lernwelt/course/management/commands/create_default_courses.py
+++ b/server/vbv_lernwelt/course/management/commands/create_default_courses.py
@@ -59,8 +59,12 @@ from vbv_lernwelt.course.consts import (
     COURSE_VERSICHERUNGSVERMITTLERIN_ID,
     COURSE_VERSICHERUNGSVERMITTLERIN_IT_ID,
 )
-from vbv_lernwelt.course.creators.test_course import create_test_course
+from vbv_lernwelt.course.creators.test_course import (
+    create_edoniq_test_assignment,
+    create_test_course,
+)
 from vbv_lernwelt.course.creators.uk_course import (
+    create_competence_navi,
     create_uk_fr_learning_path,
     create_uk_it_learning_path,
     create_uk_learning_path,
@@ -113,13 +117,13 @@ ADMIN_EMAILS = ["info@iterativ.ch", "admin"]
         COURSE_TEST_ID,
         COURSE_UK,
         COURSE_VERSICHERUNGSVERMITTLERIN_ID,
-        COURSE_VERSICHERUNGSVERMITTLERIN_FR_ID,
-        COURSE_VERSICHERUNGSVERMITTLERIN_IT_ID,
-        COURSE_UK_FR,
-        COURSE_UK_IT,
-        COURSE_UK_TRAINING,
-        COURSE_UK_TRAINING_FR,
-        COURSE_UK_TRAINING_IT,
+        # COURSE_VERSICHERUNGSVERMITTLERIN_FR_ID,
+        # COURSE_VERSICHERUNGSVERMITTLERIN_IT_ID,
+        # COURSE_UK_FR,
+        # COURSE_UK_IT,
+        # COURSE_UK_TRAINING,
+        # COURSE_UK_TRAINING_FR,
+        # COURSE_UK_TRAINING_IT,
     ],
 )
 def command(course):
@@ -259,12 +263,22 @@ def create_course_uk_de(course_id=COURSE_UK, lang="de"):
     _assignment_list_page = AssignmentListPageFactory(
         parent=course.coursepage,
     )
+
+    competence_certificate = create_competence_navi(course_id=COURSE_UK)
+
     create_uk_kickoff_prep_assignment(course_id=course_id)
     create_uk_condition_acceptance(course_id=course_id)
     create_uk_basis_prep_assignment(course_id=course_id)
-    create_uk_fahrzeug_casework(course_id=course_id)
+    create_uk_fahrzeug_casework(
+        course_id=course_id, competence_certificate=competence_certificate
+    )
     create_uk_fahrzeug_prep_assignment(course_id=course_id)
     create_uk_reflection(course_id=course_id)
+    create_edoniq_test_assignment(
+        course_id=course_id,
+        title="Edoniq Wissens- und Verständisfragen - Circle Basis",
+        competence_certificate=competence_certificate,
+    )
 
     # learning path
     create_uk_learning_path(course_id=course_id)
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 1d012fd3..0b8bf6c9 100644
--- a/server/vbv_lernwelt/learnpath/create_vv_new_learning_path.py
+++ b/server/vbv_lernwelt/learnpath/create_vv_new_learning_path.py
@@ -353,15 +353,15 @@ def create_circle_fahrzeug(lp, title="Fahrzeug"):
         title="Praxisauftrag",
         parent=circle,
     )
-    LearningContentEdoniqTestFactory(
-        title="Fachcheck Fahrzeug",
-        parent=circle,
-        description=RichText(
-            "<p>Teste dein Wissen mit dem Fachcheck. Der Test kann nur einmal durchgeführt werden.</p>"
-        ),
-        checkbox_text="Hiermit bestätige ich, dass ich die Anweisungen verstanden und die Redlichkeitserklärung akzeptiert habe.",
-        content_url="https://s3.eu-central-1.amazonaws.com/myvbv-wbt.iterativ.ch/fachcheck-fahrzeug-xapi-LFv8YiyM/index.html#/",
-    )
+    # LearningContentEdoniqTestFactory(
+    #     title="Fachcheck Fahrzeug",
+    #     parent=circle,
+    #     description=RichText(
+    #         "<p>Teste dein Wissen mit dem Fachcheck. Der Test kann nur einmal durchgeführt werden.</p>"
+    #     ),
+    #     checkbox_text="Hiermit bestätige ich, dass ich die Anweisungen verstanden und die Redlichkeitserklärung akzeptiert habe.",
+    #     content_url="https://s3.eu-central-1.amazonaws.com/myvbv-wbt.iterativ.ch/fachcheck-fahrzeug-xapi-LFv8YiyM/index.html#/",
+    # )
     LearningContentAssignmentFactory(
         title="Reflexion",
         assignment_type="REFLECTION",
diff --git a/server/vbv_lernwelt/learnpath/migrations/0005_alter_learningcontentedoniqtest_content_assignment.py b/server/vbv_lernwelt/learnpath/migrations/0005_alter_learningcontentedoniqtest_content_assignment.py
new file mode 100644
index 00000000..7457932f
--- /dev/null
+++ b/server/vbv_lernwelt/learnpath/migrations/0005_alter_learningcontentedoniqtest_content_assignment.py
@@ -0,0 +1,24 @@
+# Generated by Django 3.2.20 on 2023-09-06 12:01
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("assignment", "0007_auto_20230901_1112"),
+        ("learnpath", "0004_auto_20230901_1112"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="learningcontentedoniqtest",
+            name="content_assignment",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                to="assignment.assignment",
+            ),
+        ),
+    ]
diff --git a/server/vbv_lernwelt/learnpath/models.py b/server/vbv_lernwelt/learnpath/models.py
index 167a132b..d6a77c50 100644
--- a/server/vbv_lernwelt/learnpath/models.py
+++ b/server/vbv_lernwelt/learnpath/models.py
@@ -345,6 +345,7 @@ class LearningContentEdoniqTest(LearningContent):
         "assignment.Assignment",
         # `null=True` is only set because of existing data...
         null=True,
+        blank=True,
         on_delete=models.SET_NULL,
     )
 

From 759731122001e6df9e8981de3492b0f47f498cda Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Wed, 6 Sep 2023 15:16:51 +0200
Subject: [PATCH 22/49] Add circle title to assignment in wagtail cms view

---
 server/vbv_lernwelt/assignment/models.py | 16 ++++++++++++++++
 server/vbv_lernwelt/learnpath/models.py  |  8 ++++++++
 2 files changed, 24 insertions(+)

diff --git a/server/vbv_lernwelt/assignment/models.py b/server/vbv_lernwelt/assignment/models.py
index e82e8def..c485aab7 100644
--- a/server/vbv_lernwelt/assignment/models.py
+++ b/server/vbv_lernwelt/assignment/models.py
@@ -127,6 +127,12 @@ class Assignment(CourseBasePage):
         "evaluation_tasks",
     ]
 
+    def get_admin_display_title(self):
+        circle_title = self.get_attached_circle_title()
+        if circle_title:
+            return f"{circle_title}: {self.title}"
+        return self.title
+
     assignment_type = models.CharField(
         max_length=50,
         choices=[(tag.value, tag.value) for tag in AssignmentType],
@@ -271,6 +277,16 @@ class Assignment(CourseBasePage):
             return lp.get_frontend_url()
         return ""
 
+    def get_attached_circle_title(self):
+        if self.learningcontentassignment_set.count() > 1:
+            # probably "Reflexion" which is attached to multiple circles
+            return ""
+
+        lp = self.find_attached_learning_content()
+        if lp and lp.get_parent_circle():
+            return lp.get_parent_circle().title
+        return ""
+
 
 class AssignmentCompletionStatus(Enum):
     IN_PROGRESS = "IN_PROGRESS"
diff --git a/server/vbv_lernwelt/learnpath/models.py b/server/vbv_lernwelt/learnpath/models.py
index d6a77c50..b0a60b7c 100644
--- a/server/vbv_lernwelt/learnpath/models.py
+++ b/server/vbv_lernwelt/learnpath/models.py
@@ -277,6 +277,14 @@ class LearningContent(CourseBasePage):
             return "ERROR: could not parse slug"
         return f"/course/{m.group('coursePart')}/learn/{m.group('circlePart')}/{m.group('lcPart')}"
 
+    def get_parent_circle(self):
+        try:
+            return self.get_ancestors().exact_type(Circle).first()
+        except Exception:
+            # noop
+            pass
+        return None
+
     def save(self, clean=True, user=None, log_action=False, **kwargs):
         self.slug = find_slug_with_parent_prefix(self, "lc")
         super().save(**kwargs)

From 93bec05abc81c0000a482713b6de8c5ade126f5d Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Thu, 7 Sep 2023 09:55:48 +0200
Subject: [PATCH 23/49] Add competence detail page

---
 .../competence/CompetenceAssignmentRow.vue    |   8 +-
 .../CompetenceCertificateComponent.vue        |  67 ++++++++----
 ...ue => CompetenceCertificateDetailPage.vue} |  30 +++---
 .../CompetenceCertificateListPage.vue         | 100 ++++++++++++++++++
 .../competence/CompetenceCertificatesPage.vue |  51 ---------
 .../pages/competence/CompetenceParentPage.vue |  11 +-
 client/src/router/index.ts                    |  11 +-
 .../wagtailadmin/pages/listing/_list.html     |  96 -----------------
 .../pages/listing/_list_explore.html          |   8 --
 9 files changed, 186 insertions(+), 196 deletions(-)
 rename client/src/pages/competence/{CompetenceOverviewPage.vue => CompetenceCertificateDetailPage.vue} (61%)
 create mode 100644 client/src/pages/competence/CompetenceCertificateListPage.vue
 delete mode 100644 client/src/pages/competence/CompetenceCertificatesPage.vue
 delete mode 100644 server/vbv_lernwelt/templates/wagtailadmin/pages/listing/_list.html
 delete mode 100644 server/vbv_lernwelt/templates/wagtailadmin/pages/listing/_list_explore.html

diff --git a/client/src/pages/competence/CompetenceAssignmentRow.vue b/client/src/pages/competence/CompetenceAssignmentRow.vue
index fb2fb48a..0f9b8983 100644
--- a/client/src/pages/competence/CompetenceAssignmentRow.vue
+++ b/client/src/pages/competence/CompetenceAssignmentRow.vue
@@ -43,7 +43,7 @@ const getIconName = () => {
         >
           <it-icon-check class="h-4/5 w-4/5"></it-icon-check>
         </div>
-        <div class="ml-2">Bewertung freigegeben</div>
+        <div class="ml-2">{{ $t("a.Bewertung freigegeben") }}</div>
       </div>
       <div
         v-else-if="
@@ -58,7 +58,7 @@ const getIconName = () => {
         >
           <it-icon-check class="h-6 w-6"></it-icon-check>
         </div>
-        <div class="ml-2">Ergebnisse abgegeben</div>
+        <div class="ml-2">{{ $t("a.Ergebnisse abgegeben") }}</div>
       </div>
     </div>
     <div>
@@ -74,8 +74,8 @@ const getIconName = () => {
         </div>
       </div>
       <div v-else class="flex flex-col items-center">
-        <div>Höchstpunktzahl</div>
-        <div>{{ assignment.max_points }} Punkte</div>
+        <div>{{ $t("a.Höchstpunktzahl") }}</div>
+        <div>{{ assignment.max_points }} {{ $t("a.Punkte") }}</div>
       </div>
     </div>
   </div>
diff --git a/client/src/pages/competence/CompetenceCertificateComponent.vue b/client/src/pages/competence/CompetenceCertificateComponent.vue
index a309167c..7ff49703 100644
--- a/client/src/pages/competence/CompetenceCertificateComponent.vue
+++ b/client/src/pages/competence/CompetenceCertificateComponent.vue
@@ -5,29 +5,29 @@ import CompetenceAssignmentRow from "@/pages/competence/CompetenceAssignmentRow.
 import { computed } from "vue";
 import type { StatusCount } from "@/components/ui/ItProgress.vue";
 import ItProgress from "@/components/ui/ItProgress.vue";
+import _ from "lodash";
 
 log.debug("CompetenceCertificateComponent setup");
 
 const props = defineProps<{
   competenceCertificate: CompetenceCertificate;
+  detailView: boolean;
 }>();
 
 const totalPointsEvaluatedAssignments = computed(() => {
-  return props.competenceCertificate.assignments.reduce((acc, assignment) => {
-    if (assignment.completion?.completion_status === "EVALUATION_SUBMITTED") {
-      return acc + assignment.max_points;
-    }
-    return acc;
-  }, 0);
+  return _.sum(
+    props.competenceCertificate.assignments
+      .filter((a) => a.completion?.completion_status === "EVALUATION_SUBMITTED")
+      .map((a) => a.max_points)
+  );
 });
 
 const userPointsEvaluatedAssignments = computed(() => {
-  return props.competenceCertificate.assignments.reduce((acc, assignment) => {
-    if (assignment.completion?.completion_status === "EVALUATION_SUBMITTED") {
-      return acc + (assignment.completion?.evaluation_points ?? 0);
-    }
-    return acc;
-  }, 0);
+  return _.sum(
+    props.competenceCertificate.assignments
+      .filter((a) => a.completion?.completion_status === "EVALUATION_SUBMITTED")
+      .map((a) => a.completion?.evaluation_points ?? 0)
+  );
 });
 
 const numAssignmentsEvaluated = computed(() => {
@@ -52,12 +52,23 @@ const progressStatusCount = computed(() => {
 <template>
   <div>
     <div class="mb-4 bg-white p-8">
-      <h2>
-        {{ props.competenceCertificate.title }}
-      </h2>
+      <div class="flex items-center">
+        <h3 :class="{ 'heading-2': props.detailView }">
+          {{ props.competenceCertificate.title }}
+        </h3>
+        <div
+          v-if="numAssignmentsEvaluated < numAssignmentsTotal"
+          class="ml-2 rounded-full bg-gray-200 px-2.5 py-0.5 text-sm"
+        >
+          {{ $t("a.Zwischenstand") }}
+        </div>
+      </div>
 
       <div class="flex items-center">
-        <div class="heading-1 py-4">
+        <div
+          class="py-4"
+          :class="{ 'heading-1': props.detailView, 'heading-2': !props.detailView }"
+        >
           {{ userPointsEvaluatedAssignments }}
         </div>
         <div class="pl-2">von {{ totalPointsEvaluatedAssignments }} Punkten</div>
@@ -67,14 +78,26 @@ const progressStatusCount = computed(() => {
         {{ numAssignmentsEvaluated }} von {{ numAssignmentsTotal }} Arbeiten
         abgeschlossen
       </div>
+
+      <div v-if="!props.detailView">
+        <router-link
+          :to="competenceCertificate.frontend_url"
+          class="btn-text mt-4 inline-flex items-center py-2 pl-0"
+        >
+          <span>{{ $t("a.Details anschauen") }}</span>
+          <it-icon-arrow-right></it-icon-arrow-right>
+        </router-link>
+      </div>
     </div>
 
-    <div
-      v-for="assignment in props.competenceCertificate.assignments"
-      :key="assignment.id"
-      class="bg-white px-8"
-    >
-      <CompetenceAssignmentRow :assignment="assignment"></CompetenceAssignmentRow>
+    <div v-if="props.detailView">
+      <div
+        v-for="assignment in props.competenceCertificate.assignments"
+        :key="assignment.id"
+        class="bg-white px-8"
+      >
+        <CompetenceAssignmentRow :assignment="assignment"></CompetenceAssignmentRow>
+      </div>
     </div>
   </div>
 </template>
diff --git a/client/src/pages/competence/CompetenceOverviewPage.vue b/client/src/pages/competence/CompetenceCertificateDetailPage.vue
similarity index 61%
rename from client/src/pages/competence/CompetenceOverviewPage.vue
rename to client/src/pages/competence/CompetenceCertificateDetailPage.vue
index e7ecbf9e..b275d617 100644
--- a/client/src/pages/competence/CompetenceOverviewPage.vue
+++ b/client/src/pages/competence/CompetenceCertificateDetailPage.vue
@@ -9,13 +9,14 @@ import CompetenceCertificateComponent from "@/pages/competence/CompetenceCertifi
 
 const props = defineProps<{
   courseSlug: string;
+  certificateSlug: string;
 }>();
 
-log.debug("CompetenceOverviewPage created", props);
+log.debug("CompetenceCertificateDetailPage created", props);
 
 const courseSession = useCurrentCourseSession();
 
-const queryResult = useQuery({
+const certificatesQuery = useQuery({
   query: COMPETENCE_NAVI_CERTIFICATE_QUERY,
   variables: {
     courseSlug: props.courseSlug,
@@ -23,11 +24,11 @@ const queryResult = useQuery({
   },
 });
 
-const competenceCertificates = computed(() => {
+const certificate = computed(() => {
   return (
-    (queryResult.data.value?.competence_certificate_list
+    (certificatesQuery.data.value?.competence_certificate_list
       ?.competence_certificates as unknown as CompetenceCertificate[]) ?? []
-  );
+  ).find((cc) => cc.slug.endsWith(props.certificateSlug));
 });
 
 onMounted(async () => {
@@ -37,14 +38,19 @@ onMounted(async () => {
 
 <template>
   <div class="container-large lg:mt-4">
-    <h1>{{ $t("competences.title") }}</h1>
-
-    <div
-      v-for="competenceCertificate in competenceCertificates"
-      :key="competenceCertificate.id"
-    >
+    <nav class="lg:pb-4">
+      <router-link
+        class="btn-text inline-flex items-center pl-0"
+        :to="`/course/${props.courseSlug}/competence/certificates`"
+      >
+        <it-icon-arrow-left />
+        <span>{{ $t("general.back") }}</span>
+      </router-link>
+    </nav>
+    <div v-if="certificate">
       <CompetenceCertificateComponent
-        :competence-certificate="competenceCertificate"
+        :competence-certificate="certificate"
+        :detail-view="true"
       ></CompetenceCertificateComponent>
     </div>
   </div>
diff --git a/client/src/pages/competence/CompetenceCertificateListPage.vue b/client/src/pages/competence/CompetenceCertificateListPage.vue
new file mode 100644
index 00000000..d4b1b3c8
--- /dev/null
+++ b/client/src/pages/competence/CompetenceCertificateListPage.vue
@@ -0,0 +1,100 @@
+<script setup lang="ts">
+import log from "loglevel";
+import { COMPETENCE_NAVI_CERTIFICATE_QUERY } from "@/graphql/queries";
+import { useQuery } from "@urql/vue";
+import { computed, onMounted } from "vue";
+import type { CompetenceCertificate } from "@/types";
+import { useCurrentCourseSession } from "@/composables";
+import CompetenceCertificateComponent from "@/pages/competence/CompetenceCertificateComponent.vue";
+import _ from "lodash";
+
+const props = defineProps<{
+  courseSlug: string;
+}>();
+
+log.debug("CompetenceOverviewPage created", props);
+
+const courseSession = useCurrentCourseSession();
+
+const certificatesQuery = useQuery({
+  query: COMPETENCE_NAVI_CERTIFICATE_QUERY,
+  variables: {
+    courseSlug: props.courseSlug,
+    courseSessionId: courseSession.value.id.toString(),
+  },
+});
+
+const competenceCertificates = computed(() => {
+  return (
+    (certificatesQuery.data.value?.competence_certificate_list
+      ?.competence_certificates as unknown as CompetenceCertificate[]) ?? []
+  );
+});
+
+const assignments = computed(() => {
+  return competenceCertificates.value.flatMap((cc) => cc.assignments);
+});
+
+const totalPointsEvaluatedAssignments = computed(() => {
+  return _.sum(
+    assignments.value
+      .filter((a) => a.completion?.completion_status === "EVALUATION_SUBMITTED")
+      .map((a) => a.max_points)
+  );
+});
+
+const userPointsEvaluatedAssignments = computed(() => {
+  return _.sum(
+    assignments.value
+      .filter((a) => a.completion?.completion_status === "EVALUATION_SUBMITTED")
+      .map((a) => a.completion?.evaluation_points ?? 0)
+  );
+});
+
+const numAssignmentsEvaluated = computed(() => {
+  return assignments.value.filter((a) => {
+    return a.completion?.completion_status === "EVALUATION_SUBMITTED";
+  }).length;
+});
+
+onMounted(async () => {
+  // log.debug("AssignmentView mounted", props.assignmentId, props.userId);
+});
+</script>
+
+<template>
+  <div class="container-large lg:mt-4">
+    <h2 class="mb-4">{{ $t("a.Kompetenznachweise") }}</h2>
+
+    <div class="mb-4 bg-white p-8">
+      <div class="flex items-center">
+        <h3>{{ $t("a.Gesamtpunktzahl") }}</h3>
+        <div
+          v-if="numAssignmentsEvaluated < assignments.length"
+          class="ml-2 rounded-full bg-gray-200 px-2.5 py-0.5 text-sm"
+        >
+          {{ $t("a.Zwischenstand") }}
+        </div>
+      </div>
+
+      <div class="flex items-center">
+        <div class="heading-1 py-4">
+          {{ userPointsEvaluatedAssignments }}
+        </div>
+        <div class="pl-2">von {{ totalPointsEvaluatedAssignments }} Punkten</div>
+      </div>
+    </div>
+
+    <div
+      v-for="competenceCertificate in competenceCertificates"
+      :key="competenceCertificate.id"
+    >
+      <CompetenceCertificateComponent
+        :competence-certificate="competenceCertificate"
+        :detail-view="false"
+      ></CompetenceCertificateComponent>
+    </div>
+  </div>
+</template>
+
+<style scoped></style>
diff --git a/client/src/pages/competence/CompetenceCertificatesPage.vue b/client/src/pages/competence/CompetenceCertificatesPage.vue
deleted file mode 100644
index 64e8dbf2..00000000
--- a/client/src/pages/competence/CompetenceCertificatesPage.vue
+++ /dev/null
@@ -1,51 +0,0 @@
-<script setup lang="ts">
-import CompetenceDetail from "@/pages/competence-old/CompetenceDetail.vue";
-import ItDropdownSelect from "@/components/ui/ItDropdownSelect.vue";
-import { useCompetenceStore } from "@/stores/competence";
-import * as log from "loglevel";
-
-log.debug("CompetenceListPage created");
-
-const props = defineProps<{
-  courseSlug: string;
-}>();
-
-const competenceStore = useCompetenceStore();
-</script>
-
-<template>
-  <div class="container-large">
-    <nav class="py-4 lg:pb-8">
-      <router-link
-        v-if="competenceStore.competenceProfilePage()"
-        class="btn-text inline-flex items-center pl-0"
-        :to="`${competenceStore.competenceProfilePage()?.frontend_url}-old` as string"
-      >
-        <it-icon-arrow-left />
-        <span>{{ $t("general.back") }}</span>
-      </router-link>
-    </nav>
-    <div class="mb-10 flex flex-col items-center justify-between lg:flex-row">
-      <h1>Kompetenzen</h1>
-      <ItDropdownSelect
-        v-model="competenceStore.selectedCircle"
-        class="mt-4 w-full lg:mt-0 lg:w-96"
-        :items="competenceStore.availableCircles"
-      ></ItDropdownSelect>
-    </div>
-    <ul v-if="competenceStore.competenceProfilePage()">
-      <li
-        v-for="competence in competenceStore.competences()"
-        :key="competence.id"
-        class="mb-8 bg-white p-8"
-      >
-        <CompetenceDetail
-          :competence="competence"
-          :course-slug="props.courseSlug"
-        ></CompetenceDetail>
-      </li>
-    </ul>
-  </div>
-</template>
-
-<style scoped></style>
diff --git a/client/src/pages/competence/CompetenceParentPage.vue b/client/src/pages/competence/CompetenceParentPage.vue
index 5a071602..93f3e09f 100644
--- a/client/src/pages/competence/CompetenceParentPage.vue
+++ b/client/src/pages/competence/CompetenceParentPage.vue
@@ -31,10 +31,19 @@ onMounted(async () => {
           class="inline-block border-t-2 border-t-transparent py-3"
           :class="{ 'border-b-2 border-b-blue-900': true }"
         >
-          <router-link :to="`/`">
+          <router-link :to="`/course/${courseSlug}/competence`">
             {{ $t("mediaLibrary.overview") }}
           </router-link>
         </li>
+        <li
+          class="ml-6 inline-block border-t-2 border-t-transparent py-3 lg:ml-12"
+          :class="{ 'border-b-2 border-b-blue-900': true }"
+        >
+          <router-link :to="`/course/${courseSlug}/competence/certificates`">
+            {{ $t("a.Kompetenznachweise") }}
+          </router-link>
+        </li>
+
         <!-- Add similar logic for other `li` items as you expand the list -->
         <li class="ml-6 inline-block lg:ml-12"></li>
       </ul>
diff --git a/client/src/router/index.ts b/client/src/router/index.ts
index 473083fc..3a3ac3bf 100644
--- a/client/src/router/index.ts
+++ b/client/src/router/index.ts
@@ -67,9 +67,16 @@ const router = createRouter({
       component: () => import("@/pages/competence/CompetenceParentPage.vue"),
       children: [
         {
-          path: "",
+          path: "certificates",
           props: true,
-          component: () => import("@/pages/competence/CompetenceOverviewPage.vue"),
+          component: () =>
+            import("@/pages/competence/CompetenceCertificateListPage.vue"),
+        },
+        {
+          path: "certificates/:certificateSlug",
+          props: true,
+          component: () =>
+            import("@/pages/competence/CompetenceCertificateDetailPage.vue"),
         },
       ],
     },
diff --git a/server/vbv_lernwelt/templates/wagtailadmin/pages/listing/_list.html b/server/vbv_lernwelt/templates/wagtailadmin/pages/listing/_list.html
deleted file mode 100644
index 54b82326..00000000
--- a/server/vbv_lernwelt/templates/wagtailadmin/pages/listing/_list.html
+++ /dev/null
@@ -1,96 +0,0 @@
-{% load i18n %}
-{% load l10n %}
-{% load wagtailadmin_tags %}
-<table class="listing {% if full_width %}full-width{% endif %} {% block table_classname %}{% endblock %}">
-  {% if show_ordering_column or show_bulk_actions %}
-    <col width="10px"/>
-  {% endif %}
-  <col/>
-  {% if show_parent %}
-    <col/>
-  {% endif %}
-  <col width="12%"/>
-  <col width="12%"/>
-  <col width="12%"/>
-  <col width="10%"/>
-  <thead>
-  {% block pre_parent_page_headers %}
-  {% endblock %}
-
-  {% if parent_page %}
-    {% page_permissions parent_page as parent_page_perms %}
-    <tr class="index {% if not parent_page.live %} unpublished{% endif %}
-      {% block parent_page_row_classname %}{% endblock %}">
-      <td class="title"{% if show_ordering_column or show_bulk_actions %} colspan="2"{% endif %}>
-        {% block parent_page_title %}
-        {% endblock %}
-      </td>
-      <td class="updated" valign="bottom">{% if parent_page.latest_revision_created_at %}
-        <div class="human-readable-date" title="{{ parent_page.latest_revision_created_at|date:"DATETIME_FORMAT" }}">
-          {% blocktrans trimmed with time_period=parent_page.latest_revision_created_at|timesince %}{{ time_period }}
-            ago{% endblocktrans %}</div>{% endif %}</td>
-      <td class="type" valign="bottom">
-        {% if not parent_page.is_root %}
-          {{ parent_page.content_type.model_class.get_verbose_name }}
-        {% endif %}
-      </td>
-      <td class="status" valign="bottom">
-        {% if not parent_page.is_root %}
-          {% include "wagtailadmin/shared/page_status_tag.html" with page=parent_page %}
-        {% endif %}
-      </td>
-      <td></td>
-    </tr>
-  {% endif %}
-
-  {% block post_parent_page_headers %}
-  {% endblock %}
-  </thead>
-  <tbody>
-  {% if pages %}
-    {% trans "Select page" as checkbox_aria_label %}
-    {% for page in pages %}
-      {% page_permissions page as page_perms %}
-      <tr {% if ordering == "ord" %}id="page_{{ page.id|unlocalize }}"
-          data-page-title="{{ page.get_admin_display_title }}"{% endif %}
-          class="{% if not page.live %}unpublished{% endif %} {% block page_row_classname %}{% endblock %}">
-        {% if show_ordering_column %}
-          <td class="ord">{% if orderable and ordering == "ord" %}
-            <div class="handle icon icon-grip text-replace">{% trans 'Drag' %}</div>{% endif %}</td>
-        {% elif show_bulk_actions %}
-          {% include "wagtailadmin/bulk_actions/listing_checkbox_cell.html" with obj_type="page" obj=page aria_labelledby_prefix="page_" aria_labelledby=page.pk|unlocalize aria_labelledby_suffix="_title" %}
-        {% endif %}
-        <td id="page_{{ page.pk|unlocalize }}_title" class="title title_type_{{ page.content_type.model }}" valign="top" data-listing-page-title>
-          {{ page.type }}
-          {% block page_title %}
-          {% endblock %}
-        </td>
-        {% if show_parent %}
-          <td class="parent" valign="top">
-            {% block page_parent_page_title %}
-              {% with page.get_parent as parent %}
-                {% if parent %}
-                  <a
-                    href="{% url 'wagtailadmin_explore' parent.id %}">{{ parent.specific_deferred.get_admin_display_title }}</a>
-                {% endif %}
-              {% endwith %}
-            {% endblock %}
-          </td>
-        {% endif %}
-        <td class="updated" valign="top">{% if page.latest_revision_created_at %}
-          <div class="human-readable-date" title="{{ page.latest_revision_created_at|date:"DATETIME_FORMAT" }}">
-            {% blocktrans trimmed with time_period=page.latest_revision_created_at|timesince %}{{ time_period }}
-              ago{% endblocktrans %}</div>{% endif %}</td>
-        <td class="type" valign="top">{{ page.content_type.model_class.get_verbose_name }}</td>
-        <td class="status" valign="top">
-          {% include "wagtailadmin/shared/page_status_tag.html" with page=page %}
-        </td>
-        {% block page_navigation %}
-        {% endblock %}
-      </tr>
-    {% endfor %}
-  {% else %}
-    {% block no_results %}{% endblock %}
-  {% endif %}
-  </tbody>
-</table>
diff --git a/server/vbv_lernwelt/templates/wagtailadmin/pages/listing/_list_explore.html b/server/vbv_lernwelt/templates/wagtailadmin/pages/listing/_list_explore.html
deleted file mode 100644
index fd4de9f5..00000000
--- a/server/vbv_lernwelt/templates/wagtailadmin/pages/listing/_list_explore.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% extends "wagtailadmin/pages/listing/_list_explore.html" %}
-
-{% load i18n wagtailadmin_tags %}
-
-
-{% block page_title %}
-  {% include "wagtailadmin/pages/listing/_page_title_explore.html" %}
-{% endblock %}

From 24511df01ecaacc3c4cda75dcc9c775938d5860f Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Thu, 7 Sep 2023 14:40:36 +0200
Subject: [PATCH 24/49] Add competence detail page

---
 .../competence/CompetenceAssignmentRow.vue    |  11 +-
 .../CompetenceCertificateComponent.vue        |  33 +++--
 .../CompetenceCertificateDetailPage.vue       |   2 +-
 .../CompetenceCertificateListPage.vue         |  19 +--
 .../src/pages/competence/CompetenceDetail.vue |  82 ------------
 .../pages/competence/CompetenceIndexPage.vue  | 120 ++++++++++++++++++
 .../pages/competence/CompetenceParentPage.vue |  15 ++-
 client/src/pages/competence/utils.ts          |  34 +++++
 client/src/router/index.ts                    |   6 +
 9 files changed, 204 insertions(+), 118 deletions(-)
 delete mode 100644 client/src/pages/competence/CompetenceDetail.vue
 create mode 100644 client/src/pages/competence/CompetenceIndexPage.vue
 create mode 100644 client/src/pages/competence/utils.ts

diff --git a/client/src/pages/competence/CompetenceAssignmentRow.vue b/client/src/pages/competence/CompetenceAssignmentRow.vue
index 0f9b8983..9278f97b 100644
--- a/client/src/pages/competence/CompetenceAssignmentRow.vue
+++ b/client/src/pages/competence/CompetenceAssignmentRow.vue
@@ -4,9 +4,14 @@ import * as log from "loglevel";
 
 log.debug("CompetenceAssignmentRow setup");
 
-const props = defineProps<{
+export interface Props {
   assignment: CompetenceCertificateAssignment;
-}>();
+  addBorderBottom?: boolean;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  addBorderBottom: false,
+});
 
 const getIconName = () => {
   if (props.assignment.assignment_type === "EDONIQ_TEST") {
@@ -17,7 +22,7 @@ const getIconName = () => {
 </script>
 
 <template>
-  <div class="flex items-center border-b py-8">
+  <div class="flex items-center py-8" :class="{ 'border-b': props.addBorderBottom }">
     <component :is="getIconName()" class="mr-4 h-9 w-9"></component>
     <div class="flex w-[420px] flex-col">
       <h3 class="text-bold flex items-center gap-2">{{ assignment.title }}</h3>
diff --git a/client/src/pages/competence/CompetenceCertificateComponent.vue b/client/src/pages/competence/CompetenceCertificateComponent.vue
index 7ff49703..423c8938 100644
--- a/client/src/pages/competence/CompetenceCertificateComponent.vue
+++ b/client/src/pages/competence/CompetenceCertificateComponent.vue
@@ -5,7 +5,11 @@ import CompetenceAssignmentRow from "@/pages/competence/CompetenceAssignmentRow.
 import { computed } from "vue";
 import type { StatusCount } from "@/components/ui/ItProgress.vue";
 import ItProgress from "@/components/ui/ItProgress.vue";
-import _ from "lodash";
+import {
+  assignmentsMaxEvaluationPoints,
+  assignmentsUserPoints,
+  competenceCertificateProgressStatusCount,
+} from "@/pages/competence/utils";
 
 log.debug("CompetenceCertificateComponent setup");
 
@@ -15,19 +19,11 @@ const props = defineProps<{
 }>();
 
 const totalPointsEvaluatedAssignments = computed(() => {
-  return _.sum(
-    props.competenceCertificate.assignments
-      .filter((a) => a.completion?.completion_status === "EVALUATION_SUBMITTED")
-      .map((a) => a.max_points)
-  );
+  return assignmentsMaxEvaluationPoints(props.competenceCertificate.assignments);
 });
 
 const userPointsEvaluatedAssignments = computed(() => {
-  return _.sum(
-    props.competenceCertificate.assignments
-      .filter((a) => a.completion?.completion_status === "EVALUATION_SUBMITTED")
-      .map((a) => a.completion?.evaluation_points ?? 0)
-  );
+  return assignmentsUserPoints(props.competenceCertificate.assignments);
 });
 
 const numAssignmentsEvaluated = computed(() => {
@@ -41,11 +37,9 @@ const numAssignmentsTotal = computed(() => {
 });
 
 const progressStatusCount = computed(() => {
-  return {
-    SUCCESS: numAssignmentsEvaluated.value,
-    UNKNOWN: numAssignmentsTotal.value - numAssignmentsEvaluated.value,
-    FAIL: 0,
-  } as StatusCount;
+  return competenceCertificateProgressStatusCount(
+    props.competenceCertificate.assignments
+  );
 });
 </script>
 
@@ -92,11 +86,14 @@ const progressStatusCount = computed(() => {
 
     <div v-if="props.detailView">
       <div
-        v-for="assignment in props.competenceCertificate.assignments"
+        v-for="(assignment, index) in competenceCertificate.assignments"
         :key="assignment.id"
         class="bg-white px-8"
       >
-        <CompetenceAssignmentRow :assignment="assignment"></CompetenceAssignmentRow>
+        <CompetenceAssignmentRow
+          :assignment="assignment"
+          :add-border-bottom="index < competenceCertificate.assignments.length - 1"
+        ></CompetenceAssignmentRow>
       </div>
     </div>
   </div>
diff --git a/client/src/pages/competence/CompetenceCertificateDetailPage.vue b/client/src/pages/competence/CompetenceCertificateDetailPage.vue
index b275d617..c50bf1bb 100644
--- a/client/src/pages/competence/CompetenceCertificateDetailPage.vue
+++ b/client/src/pages/competence/CompetenceCertificateDetailPage.vue
@@ -12,7 +12,7 @@ const props = defineProps<{
   certificateSlug: string;
 }>();
 
-log.debug("CompetenceCertificateDetailPage created", props);
+log.debug("CompetenceCertificateDetailPage setup", props);
 
 const courseSession = useCurrentCourseSession();
 
diff --git a/client/src/pages/competence/CompetenceCertificateListPage.vue b/client/src/pages/competence/CompetenceCertificateListPage.vue
index d4b1b3c8..4aeb7bd7 100644
--- a/client/src/pages/competence/CompetenceCertificateListPage.vue
+++ b/client/src/pages/competence/CompetenceCertificateListPage.vue
@@ -6,13 +6,16 @@ import { computed, onMounted } from "vue";
 import type { CompetenceCertificate } from "@/types";
 import { useCurrentCourseSession } from "@/composables";
 import CompetenceCertificateComponent from "@/pages/competence/CompetenceCertificateComponent.vue";
-import _ from "lodash";
+import {
+  assignmentsMaxEvaluationPoints,
+  assignmentsUserPoints,
+} from "@/pages/competence/utils";
 
 const props = defineProps<{
   courseSlug: string;
 }>();
 
-log.debug("CompetenceOverviewPage created", props);
+log.debug("CompetenceCertificateListPage setup", props);
 
 const courseSession = useCurrentCourseSession();
 
@@ -36,19 +39,11 @@ const assignments = computed(() => {
 });
 
 const totalPointsEvaluatedAssignments = computed(() => {
-  return _.sum(
-    assignments.value
-      .filter((a) => a.completion?.completion_status === "EVALUATION_SUBMITTED")
-      .map((a) => a.max_points)
-  );
+  return assignmentsMaxEvaluationPoints(assignments.value);
 });
 
 const userPointsEvaluatedAssignments = computed(() => {
-  return _.sum(
-    assignments.value
-      .filter((a) => a.completion?.completion_status === "EVALUATION_SUBMITTED")
-      .map((a) => a.completion?.evaluation_points ?? 0)
-  );
+  return assignmentsUserPoints(assignments.value);
 });
 
 const numAssignmentsEvaluated = computed(() => {
diff --git a/client/src/pages/competence/CompetenceDetail.vue b/client/src/pages/competence/CompetenceDetail.vue
deleted file mode 100644
index ec12fa5e..00000000
--- a/client/src/pages/competence/CompetenceDetail.vue
+++ /dev/null
@@ -1,82 +0,0 @@
-<script setup lang="ts">
-import PerformanceCriteriaRow from "@/pages/competence-old/PerformanceCriteriaRow.vue";
-import ItProgress from "@/components/ui/ItProgress.vue";
-import ItToggleArrow from "@/components/ui/ItToggleArrow.vue";
-import { useCompetenceStore } from "@/stores/competence";
-import type { CompetencePage } from "@/types";
-import log from "loglevel";
-import { ref } from "vue";
-
-const competenceStore = useCompetenceStore();
-
-interface Props {
-  competence: CompetencePage;
-  courseSlug: string;
-  showAssessAgain?: boolean;
-  isInline?: boolean;
-}
-
-const props = withDefaults(defineProps<Props>(), {
-  showAssessAgain: true,
-  isInline: false,
-});
-
-log.debug("PerformanceCriteriaRow created", props);
-
-const isOpen = ref(false);
-
-const togglePerformanceCriteria = () => {
-  isOpen.value = !isOpen.value;
-};
-</script>
-
-<template>
-  <div>
-    <div :class="{ 'mb-4 border-b pb-8': isOpen }" class="-mx-8 px-8">
-      <div
-        class="flex flex-row items-center justify-between"
-        :class="props.isInline ? '' : 'mb-4'"
-        role="button"
-        aria-pressed="false"
-        @click="togglePerformanceCriteria()"
-      >
-        <h2 :class="props.isInline ? ['text-bold', 'w-2/5'] : 'text-large'">
-          {{ competence.competence_id }} {{ competence.title }}
-        </h2>
-        <ItProgress
-          v-if="isInline"
-          class="w-[330px]"
-          :status-count="
-            competenceStore.calcStatusCount(
-              competenceStore.criteriaByCompetence(competence)
-            )
-          "
-        ></ItProgress>
-        <ItToggleArrow :is-open="isOpen" :small="isInline"></ItToggleArrow>
-      </div>
-      <ItProgress
-        v-if="!isInline"
-        :status-count="
-          competenceStore.calcStatusCount(
-            competenceStore.criteriaByCompetence(competence)
-          )
-        "
-      ></ItProgress>
-    </div>
-    <ul v-if="isOpen">
-      <li
-        v-for="performanceCriteria in competenceStore.criteriaByCompetence(competence)"
-        :key="performanceCriteria.id"
-        class="mb-4 border-b pb-4 last:border-0"
-      >
-        <PerformanceCriteriaRow
-          :criteria="performanceCriteria"
-          :show-state="true"
-          :course-slug="props.courseSlug"
-          :show-assess-again="props.showAssessAgain"
-        ></PerformanceCriteriaRow>
-      </li>
-    </ul>
-  </div>
-</template>
-<style lang="scss" scoped></style>
diff --git a/client/src/pages/competence/CompetenceIndexPage.vue b/client/src/pages/competence/CompetenceIndexPage.vue
new file mode 100644
index 00000000..b7d95cb0
--- /dev/null
+++ b/client/src/pages/competence/CompetenceIndexPage.vue
@@ -0,0 +1,120 @@
+<script setup lang="ts">
+import log from "loglevel";
+import { COMPETENCE_NAVI_CERTIFICATE_QUERY } from "@/graphql/queries";
+import { useQuery } from "@urql/vue";
+import { computed } from "vue";
+import type { CompetenceCertificate } from "@/types";
+import { useCurrentCourseSession } from "@/composables";
+import {
+  assignmentsMaxEvaluationPoints,
+  assignmentsUserPoints,
+  competenceCertificateProgressStatusCount,
+} from "@/pages/competence/utils";
+import ItProgress from "@/components/ui/ItProgress.vue";
+
+const props = defineProps<{
+  courseSlug: string;
+}>();
+
+log.debug("CompetenceIndexPage setup", props);
+
+const courseSession = useCurrentCourseSession();
+
+const certificatesQuery = useQuery({
+  query: COMPETENCE_NAVI_CERTIFICATE_QUERY,
+  variables: {
+    courseSlug: props.courseSlug,
+    courseSessionId: courseSession.value.id.toString(),
+  },
+});
+
+const competenceCertificates = computed(() => {
+  return (
+    (certificatesQuery.data.value?.competence_certificate_list
+      ?.competence_certificates as unknown as CompetenceCertificate[]) ?? []
+  );
+});
+
+const allAssignments = computed(() => {
+  return competenceCertificates.value.flatMap((cc) => cc.assignments);
+});
+
+const totalPointsEvaluatedAssignments = computed(() => {
+  return assignmentsMaxEvaluationPoints(allAssignments.value);
+});
+
+const userPointsEvaluatedAssignments = computed(() => {
+  return assignmentsUserPoints(allAssignments.value);
+});
+</script>
+
+<template>
+  <div class="container-large lg:mt-4">
+    <h1 class="mb-8">{{ $t("a.KompetenzNavi") }}</h1>
+
+    <div class="mb-4 bg-white p-8">
+      <div class="flex items-center">
+        <h3>{{ $t("a.Kompetenznachweise") }}</h3>
+      </div>
+      <div class="mt-4">
+        {{ $t("a.Zwischenstand") }} {{ $t("a.Gesamtpunktzahl") }}:
+        <span class="font-bold">
+          {{ userPointsEvaluatedAssignments }}
+        </span>
+        von {{ totalPointsEvaluatedAssignments }} Punkten
+      </div>
+
+      <div>
+        <div class="mt-4">
+          <div
+            v-for="certificate in competenceCertificates"
+            :key="certificate.id"
+            class="flex items-center justify-between border-b py-4 first:border-t"
+          >
+            <div class="text-bold text-xl">
+              {{ certificate.title }}
+            </div>
+            <div>
+              <span class="text-bold">
+                {{ assignmentsMaxEvaluationPoints(certificate.assignments) }}
+              </span>
+              von
+              {{ assignmentsUserPoints(certificate.assignments) }}
+              Punkten
+            </div>
+            <div class="flex">
+              <div>
+                {{
+                  certificate.assignments.filter(
+                    (a) => a.completion?.completion_status === "EVALUATION_SUBMITTED"
+                  ).length
+                }}
+                von
+                {{ certificate.assignments.length }}
+                Arbeiten abgeschlossen
+              </div>
+              <div class="ml-2 w-40">
+                <ItProgress
+                  :status-count="
+                    competenceCertificateProgressStatusCount(certificate.assignments)
+                  "
+                />
+              </div>
+            </div>
+          </div>
+          <div>
+            <router-link
+              :to="`/course/${props.courseSlug}/competence/certificates`"
+              class="btn-text mt-4 inline-flex items-center py-2 pl-0"
+            >
+              <span>{{ $t("a.Details anschauen") }}</span>
+              <it-icon-arrow-right></it-icon-arrow-right>
+            </router-link>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style scoped></style>
diff --git a/client/src/pages/competence/CompetenceParentPage.vue b/client/src/pages/competence/CompetenceParentPage.vue
index 93f3e09f..92fc0b76 100644
--- a/client/src/pages/competence/CompetenceParentPage.vue
+++ b/client/src/pages/competence/CompetenceParentPage.vue
@@ -2,6 +2,7 @@
 import { useCompetenceStore } from "@/stores/competence";
 import * as log from "loglevel";
 import { onMounted } from "vue";
+import { useRoute } from "vue-router";
 
 log.debug("CompetenceParentPage created");
 
@@ -11,6 +12,16 @@ const props = defineProps<{
 
 const competenceStore = useCompetenceStore();
 
+const route = useRoute();
+
+function routeInOverview() {
+  return route.path.endsWith("/competence");
+}
+
+function routeInCompetenceCertificate() {
+  return route.path.includes("/certificate");
+}
+
 onMounted(async () => {
   log.debug("CompetenceParentPage mounted", props.courseSlug);
 
@@ -29,7 +40,7 @@ onMounted(async () => {
       <ul class="scrollbar overflow-auto whitespace-nowrap">
         <li
           class="inline-block border-t-2 border-t-transparent py-3"
-          :class="{ 'border-b-2 border-b-blue-900': true }"
+          :class="{ 'border-b-2 border-b-blue-900': routeInOverview() }"
         >
           <router-link :to="`/course/${courseSlug}/competence`">
             {{ $t("mediaLibrary.overview") }}
@@ -37,7 +48,7 @@ onMounted(async () => {
         </li>
         <li
           class="ml-6 inline-block border-t-2 border-t-transparent py-3 lg:ml-12"
-          :class="{ 'border-b-2 border-b-blue-900': true }"
+          :class="{ 'border-b-2 border-b-blue-900': routeInCompetenceCertificate() }"
         >
           <router-link :to="`/course/${courseSlug}/competence/certificates`">
             {{ $t("a.Kompetenznachweise") }}
diff --git a/client/src/pages/competence/utils.ts b/client/src/pages/competence/utils.ts
new file mode 100644
index 00000000..5ebc671f
--- /dev/null
+++ b/client/src/pages/competence/utils.ts
@@ -0,0 +1,34 @@
+import type { StatusCount } from "@/components/ui/ItProgress.vue";
+import type { CompetenceCertificateAssignment } from "@/types";
+import _ from "lodash";
+
+export function assignmentsMaxEvaluationPoints(
+  assignments: CompetenceCertificateAssignment[]
+): number {
+  return _.sum(
+    assignments
+      .filter((a) => a.completion?.completion_status === "EVALUATION_SUBMITTED")
+      .map((a) => a.max_points)
+  );
+}
+
+export function assignmentsUserPoints(assignments: CompetenceCertificateAssignment[]) {
+  return _.sum(
+    assignments
+      .filter((a) => a.completion?.completion_status === "EVALUATION_SUBMITTED")
+      .map((a) => a.completion?.evaluation_points ?? 0)
+  );
+}
+
+export function competenceCertificateProgressStatusCount(
+  assignments: CompetenceCertificateAssignment[]
+) {
+  const numAssignmentsEvaluated = assignments.filter(
+    (a) => a.completion?.completion_status === "EVALUATION_SUBMITTED"
+  ).length;
+  return {
+    SUCCESS: numAssignmentsEvaluated,
+    UNKNOWN: assignments.length - numAssignmentsEvaluated,
+    FAIL: 0,
+  } as StatusCount;
+}
diff --git a/client/src/router/index.ts b/client/src/router/index.ts
index 3a3ac3bf..ccbf05d6 100644
--- a/client/src/router/index.ts
+++ b/client/src/router/index.ts
@@ -66,6 +66,12 @@ const router = createRouter({
       props: true,
       component: () => import("@/pages/competence/CompetenceParentPage.vue"),
       children: [
+        {
+          path: "",
+          props: true,
+          component: () => import("@/pages/competence/CompetenceIndexPage.vue"),
+        },
+
         {
           path: "certificates",
           props: true,

From fde7e2edef3483695803bee171b6bda66e6be0b1 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Thu, 7 Sep 2023 15:09:05 +0200
Subject: [PATCH 25/49] Add performanceCriteriaStatusCount to index page

---
 .../components/header/MainNavigationBar.vue   |  9 ---
 .../pages/competence/CompetenceIndexPage.vue  | 59 ++++++++++++++++++-
 2 files changed, 57 insertions(+), 11 deletions(-)

diff --git a/client/src/components/header/MainNavigationBar.vue b/client/src/components/header/MainNavigationBar.vue
index 92bace30..bbaa5c82 100644
--- a/client/src/components/header/MainNavigationBar.vue
+++ b/client/src/components/header/MainNavigationBar.vue
@@ -132,15 +132,6 @@ onMounted(() => {
                 >
                   {{ t("competences.title") }}
                 </router-link>
-
-                <router-link
-                  v-if="inCourse() && courseSessionsStore.currentCourseSession"
-                  :to="`${courseSessionsStore.currentCourseSession.competence_url}-old`"
-                  class="nav-item"
-                  :class="{ 'nav-item--active': inCompetenceProfile() }"
-                >
-                  {{ t("competences.title") }} (old)
-                </router-link>
               </div>
             </div>
 
diff --git a/client/src/pages/competence/CompetenceIndexPage.vue b/client/src/pages/competence/CompetenceIndexPage.vue
index b7d95cb0..df215a7b 100644
--- a/client/src/pages/competence/CompetenceIndexPage.vue
+++ b/client/src/pages/competence/CompetenceIndexPage.vue
@@ -11,6 +11,7 @@ import {
   competenceCertificateProgressStatusCount,
 } from "@/pages/competence/utils";
 import ItProgress from "@/components/ui/ItProgress.vue";
+import { useCompetenceStore } from "@/stores/competence";
 
 const props = defineProps<{
   courseSlug: string;
@@ -20,6 +21,8 @@ log.debug("CompetenceIndexPage setup", props);
 
 const courseSession = useCurrentCourseSession();
 
+const competenceStore = useCompetenceStore();
+
 const certificatesQuery = useQuery({
   query: COMPETENCE_NAVI_CERTIFICATE_QUERY,
   variables: {
@@ -46,13 +49,17 @@ const totalPointsEvaluatedAssignments = computed(() => {
 const userPointsEvaluatedAssignments = computed(() => {
   return assignmentsUserPoints(allAssignments.value);
 });
+
+const performanceCriteriaStatusCount = computed(() => {
+  return competenceStore.calcStatusCount(competenceStore.flatPerformanceCriteria());
+});
 </script>
 
 <template>
   <div class="container-large lg:mt-4">
     <h1 class="mb-8">{{ $t("a.KompetenzNavi") }}</h1>
 
-    <div class="mb-4 bg-white p-8">
+    <section class="mb-4 bg-white p-8">
       <div class="flex items-center">
         <h3>{{ $t("a.Kompetenznachweise") }}</h3>
       </div>
@@ -113,7 +120,55 @@ const userPointsEvaluatedAssignments = computed(() => {
           </div>
         </div>
       </div>
-    </div>
+    </section>
+
+    <section class="mb-4 bg-white px-8 py-4 lg:mb-8 lg:py-8">
+      <h3 class="mb-4 border-b pb-4 lg:border-0 lg:pb-0">
+        {{ $t("a.Selbsteinschätzungen") }}
+      </h3>
+      <ul
+        class="mb-6 flex flex-col lg:flex-row lg:items-center lg:justify-between lg:gap-8"
+      >
+        <li
+          class="mb-4 inline-block w-1/3 flex-1 border-b pb-4 lg:mb-0 lg:border-b-0 lg:border-r lg:pb-0"
+        >
+          <h5 class="mb-4 text-gray-700">«{{ $t("selfEvaluation.no") }}»</h5>
+          <div class="flex flex-row items-center">
+            <it-icon-smiley-thinking class="h-16 w-16"></it-icon-smiley-thinking>
+            <p class="ml-4 inline-block text-7xl font-bold">
+              {{ performanceCriteriaStatusCount.FAIL }}
+            </p>
+          </div>
+        </li>
+        <li
+          class="mb-4 inline-block w-1/3 flex-1 border-b pb-4 lg:mb-0 lg:border-b-0 lg:border-r lg:pb-0"
+        >
+          <h5 class="mb-4 text-gray-700">«{{ $t("selfEvaluation.yes") }}»</h5>
+          <div class="flex flex-row items-center">
+            <it-icon-smiley-happy class="h-16 w-16"></it-icon-smiley-happy>
+            <p class="ml-4 inline-block text-7xl font-bold">
+              {{ performanceCriteriaStatusCount.SUCCESS }}
+            </p>
+          </div>
+        </li>
+        <li class="w-1/3 flex-1 border-b pb-4 lg:mb-0 lg:border-b-0 lg:pb-0">
+          <h5 class="mb-4 text-gray-700">{{ $t("competences.notAssessed") }}</h5>
+          <div class="flex flex-row items-center">
+            <it-icon-smiley-neutral class="h-16 w-16"></it-icon-smiley-neutral>
+            <p class="ml-4 inline-block text-7xl font-bold">
+              {{ performanceCriteriaStatusCount.UNKNOWN }}
+            </p>
+          </div>
+        </li>
+      </ul>
+      <!--      <router-link-->
+      <!--        :to="`${competenceStore.competenceProfilePage()?.frontend_url}-old/criteria`"-->
+      <!--        class="btn-text inline-flex items-center py-2 pl-0"-->
+      <!--      >-->
+      <!--        <span>{{ $t("general.showAll") }}</span>-->
+      <!--        <it-icon-arrow-right></it-icon-arrow-right>-->
+      <!--      </router-link>-->
+    </section>
   </div>
 </template>
 

From 9b654975c04a5e8f3e8b272d69ce5a83f28a5219 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Thu, 7 Sep 2023 15:22:32 +0200
Subject: [PATCH 26/49] Mark translation keys

---
 client/src/locales/de/translation.json        | 46 +++++++++++++++++--
 client/src/locales/fr/translation.json        | 17 ++++++-
 client/src/locales/it/translation.json        | 17 ++++++-
 .../competence/CompetenceAssignmentRow.vue    | 10 +++-
 .../CompetenceCertificateComponent.vue        | 14 ++++--
 .../CompetenceCertificateListPage.vue         |  4 +-
 .../pages/competence/CompetenceIndexPage.vue  | 24 +++++-----
 .../pages/competence/CompetenceParentPage.vue |  2 +-
 .../mediaLibrary/MediaLibraryParentPage.vue   |  2 +-
 9 files changed, 108 insertions(+), 28 deletions(-)

diff --git a/client/src/locales/de/translation.json b/client/src/locales/de/translation.json
index e46a5474..3eb99131 100644
--- a/client/src/locales/de/translation.json
+++ b/client/src/locales/de/translation.json
@@ -1,22 +1,50 @@
 {
+  "100%": "100%",
+  "20%": "20%",
+  "40%": "40%",
+  "60%": "60%",
+  "80%": "80%",
+  "Abgabetermin Ergebnisse:": "Abgabetermin Ergebnisse:",
   "Alle": "Alle",
   "Anwesenheit Präsenzkurse": "Anwesenheit Präsenzkurse",
   "Anwesenheit bestätigen": "Anwesenheit bestätigen",
   "Anwesenheit prüfen": "Anwesenheit prüfen",
   "Anwesenheitskontrolle Präsenzkurse": "Anwesenheitskontrolle Präsenzkurse",
   "Benutzername": "Benutzername",
+  "Die Anwesenheit wurde definitiv bestätigt": [],
   "Ergebnisse anschauen": "Ergebnisse anschauen",
+  "Ergebnisse anzeigen": "Ergebnisse anzeigen",
   "Feedback": "Feedback",
   "Feedback anschauen": "Feedback anschauen",
   "Feedback: Feedback zum Lehrgang": "Feedback: Feedback zum Lehrgang",
+  "Freigabetermin Bewertungen:": "Freigabetermin Bewertungen:",
+  "Hier überprüfst und bestätigst du die Anwesenheit deiner Teilnehmenden": [],
+  "Ich will die Anwesenheit der untenstehenden Personen definitiv bestätigen": [],
+  "Keine Auftragsdetails verfügbar": [],
   "MS Teams öffnen": "MS Teams öffnen",
   "Nächste Termine": "Nächste Termine",
   "Passwort": "Passwort",
+  "Präsenzkurs": "Präsenzkurs",
+  "Sehr unzufrieden": "Sehr unzufrieden",
+  "Sehr zufrieden": "Sehr zufrieden",
   "Status anschauen": "Status anschauen",
   "TODO: Nächste Termine": "TODO: Nächste Termine",
   "Trainerunterlagen": "Trainerunterlagen",
   "Wissens - und Verständnisfragen": "Wissens - und Verständnisfragen",
   "Zur Zeit sind keine Termine vorhanden": "Zur Zeit sind keine Termine vorhanden",
+  "a": {
+    "Bewertung freigegeben": "Bewertung freigegeben",
+    "Details anzeigen": "Details anzeigen",
+    "Ergebnisse abgegeben": "Ergebnisse abgegeben",
+    "Gesamtpunktzahl": "Gesamtpunktzahl",
+    "Höchstpunktzahl": "Höchstpunktzahl",
+    "KompetenzNavi": "KompetenzNavi",
+    "Kompetenznachweise": "Kompetenznachweise",
+    "Punkte": "Punkte",
+    "Selbsteinschätzungen": "Selbsteinschätzungen",
+    "Zwischenstand": "Zwischenstand",
+    "Übersicht": "Übersicht"
+  },
   "assignment": {
     "acceptConditionsDisclaimer": "Bedingungen akzeptieren und Ergebnisse abgeben",
     "assessmentDocumentDisclaimer": "Diese geleitete Fallarbeit wird auf Grund des folgenden Beurteilungsinstrument bewertet:",
@@ -37,7 +65,9 @@
     "submissionNotificationDisclaimer": "{{name}} wird deine Ergebnisse bewerten. Du wirst per Benachrichtigung informiert, sobald die Bewertung für dich freigegeben wurde.",
     "submitAssignment": "Ergebnisse abgeben",
     "taskDefinition": "Bearbeite die Teilaufgaben und dokumentiere deine Ergebnisse.",
-    "taskDefinitionTitle": "Aufgabenstellung"
+    "taskDefinitionTitle": "Aufgabenstellung",
+    "von x Punkten": "von {{x}} Punkten",
+    "x von y Arbeiten abgeschlossen": "{{x}} von {{y}} Arbeiten abgeschlossen"
   },
   "circlePage": {
     "circleContentBoxTitle": "Das lernst du in diesem Circle",
@@ -81,6 +111,12 @@
     "title": "Cockpit",
     "trainerFilesText": "Hier findest du die Trainerunterlagen (Lösungsblätter, Präsentationen etc.) für deinen Circle."
   },
+  "competenceCertificate": {
+    "mainTitle": "competenceCertificate.mainTitle"
+  },
+  "competenceCertificates": {
+    "mainTitle": "competenceCertificates.mainTitle"
+  },
   "competences": {
     "assessAgain": "Sich nochmals einschätzen",
     "assessment": "Einschätzungen",
@@ -171,6 +207,7 @@
     "exam_other": "Prüfungen",
     "feedback_one": "Feedback",
     "feedback_other": "Feedbacks",
+    "im circle x anschauen": "Im Circle «{{x}}» anzeigen",
     "introduction": "Einleitung",
     "learningPath": "Lernpfad",
     "learningSequence": "Lernsequenz",
@@ -252,7 +289,6 @@
       "description": "Finde eine vollständige Liste der Bücher und anderen Medien, auf die im Kurs verwiesen wird.",
       "titel": "Lernmedien"
     },
-    "overview": "Übersicht",
     "title": "Mediathek"
   },
   "messages": {
@@ -293,8 +329,10 @@
       "welcome": "Es hat alles geklappt, du bist nun auf der digitalen Lernumgebung des Berufsbildungsverbands derVersicherungswirtschaft (VBV) registriert!"
     }
   },
+  "unzufrieden": "unzufrieden",
   "x von y Bewertungen freigegeben": "{{x}} von {{y}} Bewertungen freigegeben",
   "x von y Ergebnisse abgegeben": "{{x}} von {{y}} Ergebnisse abgegeben",
   "x von y Feedbacks abgegeben": "{{x}} von {{y}} Feedbacks abgegeben",
-  "x von y abgeschlossen": "{{x}} von {{y}} abgeschlossen"
-}
+  "x von y abgeschlossen": "{{x}} von {{y}} abgeschlossen",
+  "zufrieden": "zufrieden"
+}
\ No newline at end of file
diff --git a/client/src/locales/fr/translation.json b/client/src/locales/fr/translation.json
index e45552fc..e8f9e92d 100644
--- a/client/src/locales/fr/translation.json
+++ b/client/src/locales/fr/translation.json
@@ -15,6 +15,16 @@
   "Trainerunterlagen": "Documents du formateur / de la formatrice",
   "Wissens - und Verständnisfragen": "Questions de connaissance et de compréhension ",
   "Zur Zeit sind keine Termine vorhanden": "Aucune réunion n’est prévue pour le moment",
+  "a": {
+    "Bewertung freigegeben": "Évaluations validée/s",
+    "Details anzeigen": "Afficher les détails",
+    "Ergebnisse abgegeben": "Résultats remis",
+    "Gesamtpunktzahl": "Score total",
+    "Höchstpunktzahl": "Score maximum",
+    "Punkte": "points",
+    "Zwischenstand": "Point intermédiaire",
+    "Übersicht": "Aperçu"
+  },
   "assignment": {
     "acceptConditionsDisclaimer": "Accepter les conditions et remettre les résultats",
     "assessmentDocumentDisclaimer": "Cette étude de cas dirigée est évaluée par l’outil suivant :",
@@ -34,7 +44,9 @@
     "submissionNotificationDisclaimer": "{{name}} va procéder à l’évaluation de tes résultats. Tu recevras une notification dès que l’évaluation aura été validée et que tu pourras la consulter.",
     "submitAssignment": "Remettre les résultats",
     "taskDefinition": "Résous les exercices et documente tes résultats.",
-    "taskDefinitionTitle": "Énoncé du problème"
+    "taskDefinitionTitle": "Énoncé du problème",
+    "von x Punkten": "sur {{x}} points",
+    "x von y Arbeiten abgeschlossen": "{{x}} sur {{y}} épreuves terminées"
   },
   "circlePage": {
     "circleContentBoxTitle": "Ce que tu vas apprendre dans ce cercle",
@@ -169,6 +181,7 @@
     "feedback_many": "Feed-backs",
     "feedback_one": "Feed-back",
     "feedback_other": "Feed-backs",
+    "im circle x anschauen": "Regarder dans le cercle «{{x}}»",
     "introduction": "Introduction",
     "learningPath": "Parcours de formation",
     "learningSequence": "Séquence",
@@ -297,4 +310,4 @@
   "x von y Ergebnisse abgegeben": "{{x}} de {{y}} résultats remis",
   "x von y Feedbacks abgegeben": "{{x}} de {{y}} feedbacks remis",
   "x von y abgeschlossen": "{{x}} de {{y}} achevée/s"
-}
+}
\ No newline at end of file
diff --git a/client/src/locales/it/translation.json b/client/src/locales/it/translation.json
index cae917bf..4a995aea 100644
--- a/client/src/locales/it/translation.json
+++ b/client/src/locales/it/translation.json
@@ -15,6 +15,16 @@
   "Trainerunterlagen": "Documenti del/della trainer",
   "Wissens - und Verständnisfragen": "Domande di conoscenza e di comprensione",
   "Zur Zeit sind keine Termine vorhanden": "Al momento non ci sono scadenze",
+  "a": {
+    "Bewertung freigegeben": "Valutazioni approvate/a",
+    "Details anzeigen": "Mostrare i dettagli",
+    "Ergebnisse abgegeben": "Risultati consegnati",
+    "Gesamtpunktzahl": "Punteggio totale",
+    "Höchstpunktzahl": "Punteggio massimo",
+    "Punkte": "punti",
+    "Zwischenstand": "Punto intermedio",
+    "Übersicht": "Panoramica"
+  },
   "assignment": {
     "acceptConditionsDisclaimer": "Accettare le condizioni e consegnare i risultati",
     "assessmentDocumentDisclaimer": "Questa analisi guidata del caso viene valutata sulla base del seguente strumento di valutazione:",
@@ -34,7 +44,9 @@
     "submissionNotificationDisclaimer": "I tuoi risultati saranno valutati da {{name}}. Riceverai una notifica non appena la tua valutazione sarà disponibile.",
     "submitAssignment": "Consegnare i risultati",
     "taskDefinition": "Svolgi le attività parziali e documenta i tuoi risultati.",
-    "taskDefinitionTitle": "Compito"
+    "taskDefinitionTitle": "Compito",
+    "von x Punkten": "di {{x}} punti",
+    "x von y Arbeiten abgeschlossen": "{{x}} di {{y}} compiti completati"
   },
   "circlePage": {
     "circleContentBoxTitle": "Cosa apprenderai in questo Circle",
@@ -169,6 +181,7 @@
     "feedback_many": "Feedback",
     "feedback_one": "Feedback",
     "feedback_other": "Feedback",
+    "im circle x anschauen": "Guarda nel cerchio «{{x}}»",
     "introduction": "Introduzione",
     "learningPath": "Percorso di formazione",
     "learningSequence": "Sequenza di apprendimento",
@@ -297,4 +310,4 @@
   "x von y Ergebnisse abgegeben": "{{x}} di {{y}} risultati consegnati/o",
   "x von y Feedbacks abgegeben": "{{x}} di {{y}} feedback consegnati/o",
   "x von y abgeschlossen": "{{x}} di {{y}} completate/a"
-}
+}
\ No newline at end of file
diff --git a/client/src/pages/competence/CompetenceAssignmentRow.vue b/client/src/pages/competence/CompetenceAssignmentRow.vue
index 9278f97b..704b110a 100644
--- a/client/src/pages/competence/CompetenceAssignmentRow.vue
+++ b/client/src/pages/competence/CompetenceAssignmentRow.vue
@@ -33,7 +33,11 @@ const getIconName = () => {
           class="link"
           target="_blank"
         >
-          Im Circle «{{ assignment.learning_content.circle.title }}» anschauen
+          {{
+            $t("general.im circle x anschauen", {
+              x: assignment.learning_content.circle.title,
+            })
+          }}
         </a>
         <span v-else>Fehler, Lerninhalt nicht korrekt verknüpft</span>
       </p>
@@ -75,7 +79,9 @@ const getIconName = () => {
           <div class="heading-2">
             {{ assignment.completion?.evaluation_points }}
           </div>
-          <div>von {{ assignment.max_points }} Punkten</div>
+          <div>
+            {{ $t("assignment.von x Punkten", { x: assignment.max_points }) }}
+          </div>
         </div>
       </div>
       <div v-else class="flex flex-col items-center">
diff --git a/client/src/pages/competence/CompetenceCertificateComponent.vue b/client/src/pages/competence/CompetenceCertificateComponent.vue
index 423c8938..54f3caed 100644
--- a/client/src/pages/competence/CompetenceCertificateComponent.vue
+++ b/client/src/pages/competence/CompetenceCertificateComponent.vue
@@ -65,12 +65,18 @@ const progressStatusCount = computed(() => {
         >
           {{ userPointsEvaluatedAssignments }}
         </div>
-        <div class="pl-2">von {{ totalPointsEvaluatedAssignments }} Punkten</div>
+        <div>
+          {{ $t("assignment.von x Punkten", { x: totalPointsEvaluatedAssignments }) }}
+        </div>
       </div>
       <ItProgress :status-count="progressStatusCount" />
       <div>
-        {{ numAssignmentsEvaluated }} von {{ numAssignmentsTotal }} Arbeiten
-        abgeschlossen
+        {{
+          $t("assignment.x von y Arbeiten abgeschlossen", {
+            x: numAssignmentsEvaluated,
+            y: numAssignmentsTotal,
+          })
+        }}
       </div>
 
       <div v-if="!props.detailView">
@@ -78,7 +84,7 @@ const progressStatusCount = computed(() => {
           :to="competenceCertificate.frontend_url"
           class="btn-text mt-4 inline-flex items-center py-2 pl-0"
         >
-          <span>{{ $t("a.Details anschauen") }}</span>
+          <span>{{ $t("a.Details anzeigen") }}</span>
           <it-icon-arrow-right></it-icon-arrow-right>
         </router-link>
       </div>
diff --git a/client/src/pages/competence/CompetenceCertificateListPage.vue b/client/src/pages/competence/CompetenceCertificateListPage.vue
index 4aeb7bd7..5610bb2a 100644
--- a/client/src/pages/competence/CompetenceCertificateListPage.vue
+++ b/client/src/pages/competence/CompetenceCertificateListPage.vue
@@ -76,7 +76,9 @@ onMounted(async () => {
         <div class="heading-1 py-4">
           {{ userPointsEvaluatedAssignments }}
         </div>
-        <div class="pl-2">von {{ totalPointsEvaluatedAssignments }} Punkten</div>
+        <div class="pl-2">
+          {{ $t("assignment.von x Punkten", { x: totalPointsEvaluatedAssignments }) }}
+        </div>
       </div>
     </div>
 
diff --git a/client/src/pages/competence/CompetenceIndexPage.vue b/client/src/pages/competence/CompetenceIndexPage.vue
index df215a7b..2e376872 100644
--- a/client/src/pages/competence/CompetenceIndexPage.vue
+++ b/client/src/pages/competence/CompetenceIndexPage.vue
@@ -68,7 +68,7 @@ const performanceCriteriaStatusCount = computed(() => {
         <span class="font-bold">
           {{ userPointsEvaluatedAssignments }}
         </span>
-        von {{ totalPointsEvaluatedAssignments }} Punkten
+        {{ $t("assignment.von x Punkten", { x: totalPointsEvaluatedAssignments }) }}
       </div>
 
       <div>
@@ -85,20 +85,22 @@ const performanceCriteriaStatusCount = computed(() => {
               <span class="text-bold">
                 {{ assignmentsMaxEvaluationPoints(certificate.assignments) }}
               </span>
-              von
-              {{ assignmentsUserPoints(certificate.assignments) }}
-              Punkten
+              {{
+                $t("assignment.von x Punkten", {
+                  x: assignmentsUserPoints(certificate.assignments),
+                })
+              }}
             </div>
             <div class="flex">
               <div>
                 {{
-                  certificate.assignments.filter(
-                    (a) => a.completion?.completion_status === "EVALUATION_SUBMITTED"
-                  ).length
+                  $t("assignment.x von y Arbeiten abgeschlossen", {
+                    x: certificate.assignments.filter(
+                      (a) => a.completion?.completion_status === "EVALUATION_SUBMITTED"
+                    ).length,
+                    y: certificate.assignments.length,
+                  })
                 }}
-                von
-                {{ certificate.assignments.length }}
-                Arbeiten abgeschlossen
               </div>
               <div class="ml-2 w-40">
                 <ItProgress
@@ -114,7 +116,7 @@ const performanceCriteriaStatusCount = computed(() => {
               :to="`/course/${props.courseSlug}/competence/certificates`"
               class="btn-text mt-4 inline-flex items-center py-2 pl-0"
             >
-              <span>{{ $t("a.Details anschauen") }}</span>
+              <span>{{ $t("a.Details anzeigen") }}</span>
               <it-icon-arrow-right></it-icon-arrow-right>
             </router-link>
           </div>
diff --git a/client/src/pages/competence/CompetenceParentPage.vue b/client/src/pages/competence/CompetenceParentPage.vue
index 92fc0b76..2e72b69b 100644
--- a/client/src/pages/competence/CompetenceParentPage.vue
+++ b/client/src/pages/competence/CompetenceParentPage.vue
@@ -43,7 +43,7 @@ onMounted(async () => {
           :class="{ 'border-b-2 border-b-blue-900': routeInOverview() }"
         >
           <router-link :to="`/course/${courseSlug}/competence`">
-            {{ $t("mediaLibrary.overview") }}
+            {{ $t("a.Übersicht") }}
           </router-link>
         </li>
         <li
diff --git a/client/src/pages/mediaLibrary/MediaLibraryParentPage.vue b/client/src/pages/mediaLibrary/MediaLibraryParentPage.vue
index 2d7d6196..eece4fb7 100644
--- a/client/src/pages/mediaLibrary/MediaLibraryParentPage.vue
+++ b/client/src/pages/mediaLibrary/MediaLibraryParentPage.vue
@@ -31,7 +31,7 @@ onMounted(async () => {
       >
         <li class="inline-block">
           <router-link :to="mediaLibraryStore.mediaLibraryPage.frontend_url">
-            {{ $t("mediaLibrary.overview") }}
+            {{ $t("a.Übersicht") }}
           </router-link>
         </li>
         <li

From 853c8746ea5cdd5b34e11fffdf456e0ca63842c3 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Thu, 7 Sep 2023 16:54:21 +0200
Subject: [PATCH 27/49] VBV-329: Add link to competence certificate in circle
 view

---
 client/src/components/ui/ItCheckbox.vue       | 20 ++++-
 .../circlePage/LearningSequence.vue           | 87 ++++++++++++++++---
 client/src/types.ts                           | 16 ++++
 .../assignment/graphql/mutations.py           |  2 +-
 .../vbv_lernwelt/assignment/graphql/types.py  |  2 +-
 server/vbv_lernwelt/assignment/services.py    | 20 +++--
 .../assignment/tests/test_graphql.py          |  4 +-
 server/vbv_lernwelt/learnpath/models.py       | 16 ++++
 server/vbv_lernwelt/learnpath/serializers.py  | 57 +++++++++++-
 ...icon-lc-competence-certificate-checked.svg | 12 +++
 .../icons/icon-lc-competence-certificate.svg  | 11 +++
 11 files changed, 221 insertions(+), 26 deletions(-)
 create mode 100644 server/vbv_lernwelt/static/icons/icon-lc-competence-certificate-checked.svg
 create mode 100644 server/vbv_lernwelt/static/icons/icon-lc-competence-certificate.svg

diff --git a/client/src/components/ui/ItCheckbox.vue b/client/src/components/ui/ItCheckbox.vue
index 3cf3c57f..89fbcb59 100644
--- a/client/src/components/ui/ItCheckbox.vue
+++ b/client/src/components/ui/ItCheckbox.vue
@@ -2,10 +2,22 @@
 import type { CheckboxItem } from "@/components/ui/checkbox.types";
 import log from "loglevel";
 
-const props = defineProps<{
+interface Props {
   checkboxItem: CheckboxItem<any>;
   disabled?: boolean;
-}>();
+  iconCheckedPath?: string;
+  iconCheckedHoverPath?: string;
+  iconUncheckedPath?: string;
+  iconUncheckedHoverPath?: string;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  disabled: false,
+  iconCheckedPath: "/static/icons/icon-checkbox-checked.svg",
+  iconCheckedHoverPath: "/static/icons/icon-checkbox-checked-hover.svg",
+  iconUncheckedPath: "/static/icons/icon-checkbox-unchecked.svg",
+  iconUncheckedHoverPath: "/static/icons/icon-checkbox-unchecked-hover.svg",
+});
 
 const emit = defineEmits(["toggle"]);
 const toggle = () => {
@@ -39,8 +51,8 @@ const input = () => {
       class="flex h-8 items-center bg-contain bg-no-repeat pl-8 disabled:opacity-50"
       :class="
         checkboxItem.checked
-          ? 'bg-[url(/static/icons/icon-checkbox-checked.svg)] hover:bg-[url(/static/icons/icon-checkbox-checked-hover.svg)]'
-          : 'bg-[url(/static/icons/icon-checkbox-unchecked.svg)] hover:bg-[url(/static/icons/icon-checkbox-unchecked-hover.svg)]'
+          ? `bg-[url(${props.iconCheckedPath})] hover:bg-[url(${props.iconCheckedHoverPath})]`
+          : `bg-[url(${props.iconUncheckedPath})] hover:bg-[url(${props.iconUncheckedHoverPath})]`
       "
       tabindex="0"
       @keydown.stop="keydown"
diff --git a/client/src/pages/learningPath/circlePage/LearningSequence.vue b/client/src/pages/learningPath/circlePage/LearningSequence.vue
index 0eaaba36..17ec7657 100644
--- a/client/src/pages/learningPath/circlePage/LearningSequence.vue
+++ b/client/src/pages/learningPath/circlePage/LearningSequence.vue
@@ -5,6 +5,7 @@ import { showIcon } from "@/pages/learningPath/circlePage/learningSequenceUtils"
 import { useCircleStore } from "@/stores/circle";
 import type {
   CourseCompletionStatus,
+  LearningContent,
   LearningContentInterface,
   LearningSequence,
 } from "@/types";
@@ -87,6 +88,45 @@ const learningSequenceBorderClass = computed(() => {
 
   return result;
 });
+
+function belongsToCompetenceCertificate(lc: LearningContent) {
+  return (
+    (lc.content_type === "learnpath.LearningContentAssignment" ||
+      lc.content_type === "learnpath.LearningContentEdoniqTest") &&
+    lc.competence_certificate?.frontend_url
+  );
+}
+
+function checkboxIconCheckedPath(lc: LearningContent) {
+  if (belongsToCompetenceCertificate(lc)) {
+    return "/static/icons/icon-lc-competence-certificate-checked.svg";
+  }
+  return "/static/icons/icon-checkbox-checked.svg";
+}
+
+function checkboxIconCheckedHoverPath(lc: LearningContent) {
+  if (belongsToCompetenceCertificate(lc)) {
+    return "/static/icons/icon-lc-competence-certificate-checked.svg";
+  }
+
+  return "/static/icons/icon-checkbox-checked-hover.svg";
+}
+
+function checkboxIconUncheckedPath(lc: LearningContent) {
+  if (belongsToCompetenceCertificate(lc)) {
+    return "/static/icons/icon-lc-competence-certificate.svg";
+  }
+
+  return "/static/icons/icon-checkbox-unchecked.svg";
+}
+
+function checkboxIconUncheckedHoverPath(lc: LearningContent) {
+  if (belongsToCompetenceCertificate(lc)) {
+    return "/static/icons/icon-lc-competence-certificate.svg";
+  }
+
+  return "/static/icons/icon-checkbox-unchecked-hover.svg";
+}
 </script>
 
 <template>
@@ -140,21 +180,44 @@ const learningSequenceBorderClass = computed(() => {
               }"
               :disabled="!learningContent.can_user_self_toggle_course_completion"
               :data-cy="`${learningContent.slug}-checkbox`"
+              :icon-checked-path="checkboxIconCheckedPath(learningContent)"
+              :icon-checked-hover-path="checkboxIconCheckedHoverPath(learningContent)"
+              :icon-unchecked-path="checkboxIconUncheckedPath(learningContent)"
+              :icon-unchecked-hover-path="
+                checkboxIconUncheckedHoverPath(learningContent)
+              "
               @toggle="toggleCompleted(learningContent)"
             />
             <div class="flex-auto pt-1 sm:pt-0">
-              <span class="flex items-center gap-4 xl:h-10">
-                <div v-if="props.readonly" class="w-full text-left sm:w-auto">
-                  {{ learningContent.title }}
+              <div class="flex items-center gap-4">
+                <div>
+                  <div v-if="props.readonly" class="w-full text-left sm:w-auto">
+                    {{ learningContent.title }}
+                  </div>
+                  <button
+                    v-else
+                    class="w-full cursor-pointer text-left sm:w-auto"
+                    :data-cy="`${learningContent.slug}`"
+                    @click.stop="circleStore.openLearningContent(learningContent)"
+                  >
+                    {{ learningContent.title }}
+                  </button>
+                  <div
+                    v-if="belongsToCompetenceCertificate(learningContent)"
+                    class="text-sm text-gray-800"
+                  >
+                    {{ $t("circlePage.Dieser Inhalt gehört zu x") }}
+                    <br />
+                    <router-link
+                      v-if="learningContent.competence_certificate?.frontend_url"
+                      :to="learningContent.competence_certificate.frontend_url"
+                      class="link"
+                      data-cy="show-results"
+                    >
+                      {{ $t("circlePage.Im KompetenzNavi anschauen") }}
+                    </router-link>
+                  </div>
                 </div>
-                <button
-                  v-else
-                  class="w-full cursor-pointer text-left sm:w-auto"
-                  :data-cy="`${learningContent.slug}`"
-                  @click.stop="circleStore.openLearningContent(learningContent)"
-                >
-                  {{ learningContent.title }}
-                </button>
 
                 <div
                   class="flex flex-col items-center justify-between gap-4 sm:grow md:flex-row lg:flex-col xl:flex-row"
@@ -183,7 +246,7 @@ const learningSequenceBorderClass = computed(() => {
                     <LearningContentBadge :learning-content="learningContent" />
                   </div>
                 </div>
-              </span>
+              </div>
             </div>
           </li>
         </ol>
diff --git a/client/src/types.ts b/client/src/types.ts
index e3ee2bb7..356c5b97 100644
--- a/client/src/types.ts
+++ b/client/src/types.ts
@@ -55,6 +55,14 @@ export interface LearningContentAssignment extends LearningContentInterface {
   readonly content_type: "learnpath.LearningContentAssignment";
   readonly content_assignment_id: number;
   readonly assignment_type: AssignmentType;
+  readonly competence_certificate?: {
+    id: number;
+    title: string;
+    slug: string;
+    content_type: string;
+    translation_key: string;
+    frontend_url: string;
+  } | null;
 }
 
 export interface LearningContentAttendanceCourse extends LearningContentInterface {
@@ -98,6 +106,14 @@ export interface LearningContentEdoniqTest extends LearningContentInterface {
   readonly checkbox_text: string;
   readonly has_extended_time_test: boolean;
   readonly content_assignment_id: number;
+  readonly competence_certificate?: {
+    id: number;
+    title: string;
+    slug: string;
+    content_type: string;
+    translation_key: string;
+    frontend_url: string;
+  } | null;
 }
 
 export interface LearningContentVideo extends LearningContentInterface {
diff --git a/server/vbv_lernwelt/assignment/graphql/mutations.py b/server/vbv_lernwelt/assignment/graphql/mutations.py
index 2ed169c9..4c3df31c 100644
--- a/server/vbv_lernwelt/assignment/graphql/mutations.py
+++ b/server/vbv_lernwelt/assignment/graphql/mutations.py
@@ -66,7 +66,7 @@ class AssignmentCompletionMutation(graphene.Mutation):
         if learning_content_page_id:
             learning_content_page = Page.objects.get(id=learning_content_page_id)
         if learning_content_page is None:
-            learning_content_page = assignment.learningcontentassignment_set.first()
+            learning_content_page = assignment.find_attached_learning_content()
 
         assignment_data = {
             "assignment_user": assignment_user,
diff --git a/server/vbv_lernwelt/assignment/graphql/types.py b/server/vbv_lernwelt/assignment/graphql/types.py
index bf50a1f7..989121a8 100644
--- a/server/vbv_lernwelt/assignment/graphql/types.py
+++ b/server/vbv_lernwelt/assignment/graphql/types.py
@@ -105,7 +105,7 @@ def resolve_assignment_completion(
             if learning_content_page_id is None:
                 learning_content_page = Assignment.objects.get(
                     id=assignment_id
-                ).learningcontentassignment_set.first()
+                ).find_attached_learning_content()
                 if learning_content_page:
                     learning_content_page_id = learning_content_page.id
 
diff --git a/server/vbv_lernwelt/assignment/services.py b/server/vbv_lernwelt/assignment/services.py
index 3fe37872..d98c6958 100644
--- a/server/vbv_lernwelt/assignment/services.py
+++ b/server/vbv_lernwelt/assignment/services.py
@@ -1,5 +1,4 @@
 from copy import deepcopy
-from gettext import gettext
 
 from django.utils import timezone
 from rest_framework import serializers
@@ -16,7 +15,6 @@ from vbv_lernwelt.core.models import User
 from vbv_lernwelt.core.utils import find_first
 from vbv_lernwelt.course.models import CourseCompletionStatus, CourseSession
 from vbv_lernwelt.course.services import mark_course_completion
-from vbv_lernwelt.notify.email.email_services import EmailTemplate
 from vbv_lernwelt.notify.services import NotificationService
 
 
@@ -147,7 +145,11 @@ def update_assignment_completion(
             )
     elif completion_status == AssignmentCompletionStatus.EVALUATION_SUBMITTED:
         ac.evaluation_submitted_at = timezone.now()
-        learning_content_assignment = assignment.learningcontentassignment_set.first()
+        learning_content_assignment = (
+            learning_content_page
+            if learning_content_page
+            else assignment.find_attached_learning_content()
+        )
         if learning_content_assignment:
             assignment_frontend_url = learning_content_assignment.get_frontend_url()
             NotificationService.send_assignment_evaluated_notification(
@@ -202,8 +204,16 @@ def update_assignment_completion(
                 acl.completion_data[key].update(task_data)
         acl.save()
 
-        if completion_status == AssignmentCompletionStatus.SUBMITTED:
-            learning_content = assignment.learningcontentassignment_set.first()
+        if completion_status in [
+            AssignmentCompletionStatus.EVALUATION_SUBMITTED,
+            AssignmentCompletionStatus.EVALUATION_IN_PROGRESS,
+            AssignmentCompletionStatus.SUBMITTED,
+        ]:
+            learning_content = (
+                learning_content_page
+                if learning_content_page
+                else assignment.find_attached_learning_content()
+            )
             if learning_content:
                 mark_course_completion(
                     user=assignment_user,
diff --git a/server/vbv_lernwelt/assignment/tests/test_graphql.py b/server/vbv_lernwelt/assignment/tests/test_graphql.py
index dc268ad6..9f5d0174 100644
--- a/server/vbv_lernwelt/assignment/tests/test_graphql.py
+++ b/server/vbv_lernwelt/assignment/tests/test_graphql.py
@@ -235,7 +235,7 @@ class AttendanceCourseUserMutationTestCase(GraphQLTestCase):
         ac = AssignmentCompletion.objects.create(
             assignment_user=self.student,
             assignment=self.assignment,
-            learning_content_page=self.assignment.learningcontentassignment_set.first(),
+            learning_content_page=self.assignment.find_attached_learning_content(),
             course_session=self.course_session,
             completion_status="SUBMITTED",
             submitted_at=timezone.now(),
@@ -447,7 +447,7 @@ class AttendanceCourseUserMutationTestCase(GraphQLTestCase):
         """
         reflection = Assignment.objects.get(slug="test-lehrgang-assignment-reflexion")
         reflection_subtasks = reflection.filter_user_subtasks()
-        reflection_learning_content = reflection.learningcontentassignment_set.first()
+        reflection_learning_content = reflection.find_attached_learning_content()
 
         self.client.force_login(self.student)
         user_text_input = find_first(
diff --git a/server/vbv_lernwelt/learnpath/models.py b/server/vbv_lernwelt/learnpath/models.py
index b0a60b7c..a6be6401 100644
--- a/server/vbv_lernwelt/learnpath/models.py
+++ b/server/vbv_lernwelt/learnpath/models.py
@@ -361,6 +361,14 @@ class LearningContentEdoniqTest(LearningContent):
     def has_extended_time_test(self):
         return bool(self.extended_time_test_url)
 
+    @classmethod
+    def get_serializer_class(cls):
+        from vbv_lernwelt.learnpath.serializers import (
+            LearningContentEdoniqTestSerializer,
+        )
+
+        return LearningContentEdoniqTestSerializer
+
 
 class LearningContentRichText(LearningContent):
     text = RichTextField(blank=True, features=DEFAULT_RICH_TEXT_FEATURES_WITH_HEADER)
@@ -407,6 +415,14 @@ class LearningContentAssignment(LearningContent):
         self.assignment_type = self.content_assignment.assignment_type
         super().save(**kwargs)
 
+    @classmethod
+    def get_serializer_class(cls):
+        from vbv_lernwelt.learnpath.serializers import (
+            LearningContentAssignmentSerializer,
+        )
+
+        return LearningContentAssignmentSerializer
+
 
 class LearningContentDocumentList(LearningContent):
     can_user_self_toggle_course_completion = models.BooleanField(default=True)
diff --git a/server/vbv_lernwelt/learnpath/serializers.py b/server/vbv_lernwelt/learnpath/serializers.py
index 42c576c3..b242c5a4 100644
--- a/server/vbv_lernwelt/learnpath/serializers.py
+++ b/server/vbv_lernwelt/learnpath/serializers.py
@@ -3,8 +3,13 @@ from rest_framework.fields import SerializerMethodField
 from vbv_lernwelt.competence.serializers import (
     PerformanceCriteriaLearningPathSerializer,
 )
+from vbv_lernwelt.core.utils import get_django_content_type
 from vbv_lernwelt.course.serializer_helpers import get_course_serializer_class
-from vbv_lernwelt.learnpath.models import LearningUnit
+from vbv_lernwelt.learnpath.models import (
+    LearningUnit,
+    LearningContentEdoniqTest,
+    LearningContentAssignment,
+)
 
 
 class LearningUnitSerializer(
@@ -43,3 +48,53 @@ class LearningUnitPerformanceCriteriaSerializer(
 
     def get_evaluate_url(self, obj):
         return obj.get_evaluate_url()
+
+
+class LearningContentEdoniqTestSerializer(
+    get_course_serializer_class(
+        LearningContentEdoniqTest,
+        field_names=LearningContentEdoniqTest.serialize_field_names
+        + ["competence_certificate"],
+    )
+):
+    # TODO: quickfix before GraphQL learning path
+    competence_certificate = SerializerMethodField()
+
+    def get_competence_certificate(self, obj):
+        try:
+            cert = obj.content_assignment.competence_certificate
+            return {
+                "id": cert.id,
+                "title": cert.title,
+                "slug": cert.slug,
+                "content_type": get_django_content_type(cert),
+                "translation_key": cert.translation_key,
+                "frontend_url": cert.get_frontend_url(),
+            }
+        except Exception:
+            return None
+
+
+class LearningContentAssignmentSerializer(
+    get_course_serializer_class(
+        LearningContentAssignment,
+        field_names=LearningContentAssignment.serialize_field_names
+        + ["competence_certificate"],
+    )
+):
+    # TODO: quickfix before GraphQL learning path
+    competence_certificate = SerializerMethodField()
+
+    def get_competence_certificate(self, obj):
+        try:
+            cert = obj.content_assignment.competence_certificate
+            return {
+                "id": cert.id,
+                "title": cert.title,
+                "slug": cert.slug,
+                "content_type": get_django_content_type(cert),
+                "translation_key": cert.translation_key,
+                "frontend_url": cert.get_frontend_url(),
+            }
+        except Exception:
+            return None
diff --git a/server/vbv_lernwelt/static/icons/icon-lc-competence-certificate-checked.svg b/server/vbv_lernwelt/static/icons/icon-lc-competence-certificate-checked.svg
new file mode 100644
index 00000000..9686627d
--- /dev/null
+++ b/server/vbv_lernwelt/static/icons/icon-lc-competence-certificate-checked.svg
@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32" fill="none">
+  <g clip-path="url(#clip0_2_2021)">
+    <circle cx="25.5" cy="18.5" r="5.5" fill="#54CE8B"/>
+    <path d="M7.5 11.7762L11.5938 15.87L20.4638 7" stroke="#54CE8B" stroke-width="2"/>
+    <path d="M29 32C28.7614 32.0004 28.5305 31.9153 28.3493 31.76L25.5 29.3173L22.6507 31.7587C22.5055 31.8831 22.3277 31.9632 22.1384 31.9897C21.949 32.0161 21.7561 31.9878 21.5824 31.9079C21.4087 31.8281 21.2615 31.7001 21.1583 31.5392C21.0551 31.3783 21.0001 31.1912 21 31V27.8C20.4707 27.9147 19.804 28 19 28H7C6.73478 28 6.48043 27.8946 6.29289 27.7071C6.10536 27.5196 6 27.2652 6 27C6 26.7348 6.10536 26.4804 6.29289 26.2929C6.48043 26.1054 6.73478 26 7 26C8.10267 26 9 25.1027 9 24C9 23.6493 9.06 23.312 9.172 23H3C1.34667 23 0 21.6533 0 20V3C0 1.34667 1.34667 0 3 0H25C26.6533 0 28 1.34667 28 3V10H26V3C25.9996 2.73489 25.8942 2.48074 25.7067 2.29328C25.5193 2.10582 25.2651 2.00035 25 2H3C2.73489 2.00035 2.48074 2.10582 2.29328 2.29328C2.10582 2.48074 2.00035 2.73489 2 3V20C2 20.5507 2.44933 21 3 21H17C17.2652 21 17.5196 21.1054 17.7071 21.2929C17.8946 21.4804 18 21.7348 18 22C18 22.2652 17.8946 22.5196 17.7071 22.7071C17.5196 22.8946 17.2652 23 17 23H12C11.7349 23.0004 11.4807 23.1058 11.2933 23.2933C11.1058 23.4807 11.0004 23.7349 11 24C11 24.728 10.8053 25.412 10.464 26H19C20.6547 26 21.4973 25.548 21.5067 25.5427C21.6595 25.458 21.8318 25.4148 22.0064 25.4171C22.1811 25.4194 22.3522 25.4673 22.5027 25.556C22.6529 25.6434 22.7778 25.7684 22.865 25.9187C22.9522 26.0691 22.9988 26.2395 23 26.4133V28.8267L24.8493 27.24C25.0308 27.0852 25.2615 27.0002 25.5 27.0002C25.7385 27.0002 25.9692 27.0852 26.1507 27.24L28 28.8267L27.9987 25.1893C27.9413 25.096 27.8747 25.052 27.7667 25.0933C26.8053 25.4533 25.788 25.5733 24.7427 25.4573C21.8933 25.132 19.512 22.8467 19.0787 20.0213C18.9155 19.0074 18.9959 17.9691 19.3133 16.9923C19.6307 16.0156 20.176 15.1284 20.904 14.404C21.6281 13.6754 22.5152 13.1298 23.492 12.8121C24.4688 12.4945 25.5072 12.414 26.5213 12.5773C27.6114 12.7501 28.6395 13.1977 29.5087 13.8779C30.3779 14.5581 31.0595 15.4484 31.4894 16.4649C31.9192 17.4815 32.083 18.5907 31.9655 19.6881C31.8479 20.7855 31.4528 21.8349 30.8173 22.7373L29.1827 21.588C29.8454 20.6417 30.1212 19.4777 29.9533 18.3347C29.6827 16.4333 28.112 14.8453 26.2187 14.5547C25.5148 14.4421 24.7942 14.4979 24.116 14.7177C23.4379 14.9374 22.8215 15.3147 22.3173 15.8187C21.8128 16.3221 21.4352 16.9383 21.2157 17.6164C20.9961 18.2945 20.9409 19.0151 21.0547 19.7187C21.3547 21.668 22.9987 23.2453 24.968 23.4707C25.6785 23.5563 26.3992 23.4698 27.0693 23.2187C27.4025 23.0929 27.7612 23.0495 28.1148 23.0922C28.4683 23.1349 28.8064 23.2625 29.1 23.464C29.672 23.8613 29.9987 24.4907 29.9987 25.1893V31C29.998 31.265 29.8924 31.5189 29.705 31.7063C29.5176 31.8937 29.265 31.9993 29 32Z" fill="black"/>
+  </g>
+  <defs>
+    <clipPath id="clip0_2_2021">
+      <rect width="32" height="32" fill="white"/>
+    </clipPath>
+  </defs>
+</svg>
\ No newline at end of file
diff --git a/server/vbv_lernwelt/static/icons/icon-lc-competence-certificate.svg b/server/vbv_lernwelt/static/icons/icon-lc-competence-certificate.svg
new file mode 100644
index 00000000..ab369c8c
--- /dev/null
+++ b/server/vbv_lernwelt/static/icons/icon-lc-competence-certificate.svg
@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32" fill="none">
+  <g clip-path="url(#clip0_1_1145)">
+    <circle cx="25.5" cy="18.5" r="5.5" fill="#FAC852"/>
+    <path d="M29 32C28.7614 32.0004 28.5305 31.9153 28.3493 31.76L25.5 29.3173L22.6507 31.7587C22.5055 31.8831 22.3277 31.9632 22.1384 31.9897C21.949 32.0161 21.7561 31.9878 21.5824 31.9079C21.4087 31.8281 21.2615 31.7001 21.1583 31.5392C21.0551 31.3783 21.0001 31.1912 21 31V27.8C20.4707 27.9147 19.804 28 19 28H7C6.73478 28 6.48043 27.8946 6.29289 27.7071C6.10536 27.5196 6 27.2652 6 27C6 26.7348 6.10536 26.4804 6.29289 26.2929C6.48043 26.1054 6.73478 26 7 26C8.10267 26 9 25.1027 9 24C9 23.6493 9.06 23.312 9.172 23H3C1.34667 23 0 21.6533 0 20V3C0 1.34667 1.34667 0 3 0H25C26.6533 0 28 1.34667 28 3V10H26V3C25.9996 2.73489 25.8942 2.48074 25.7067 2.29328C25.5193 2.10582 25.2651 2.00035 25 2H3C2.73489 2.00035 2.48074 2.10582 2.29328 2.29328C2.10582 2.48074 2.00035 2.73489 2 3V20C2 20.5507 2.44933 21 3 21H17C17.2652 21 17.5196 21.1054 17.7071 21.2929C17.8946 21.4804 18 21.7348 18 22C18 22.2652 17.8946 22.5196 17.7071 22.7071C17.5196 22.8946 17.2652 23 17 23H12C11.7349 23.0004 11.4807 23.1058 11.2933 23.2933C11.1058 23.4807 11.0004 23.7349 11 24C11 24.728 10.8053 25.412 10.464 26H19C20.6547 26 21.4973 25.548 21.5067 25.5427C21.6595 25.458 21.8318 25.4148 22.0064 25.4171C22.1811 25.4194 22.3522 25.4673 22.5027 25.556C22.6529 25.6434 22.7778 25.7684 22.865 25.9187C22.9522 26.0691 22.9988 26.2395 23 26.4133V28.8267L24.8493 27.24C25.0308 27.0852 25.2615 27.0002 25.5 27.0002C25.7385 27.0002 25.9692 27.0852 26.1507 27.24L28 28.8267L27.9987 25.1893C27.9413 25.096 27.8747 25.052 27.7667 25.0933C26.8053 25.4533 25.788 25.5733 24.7427 25.4573C21.8933 25.132 19.512 22.8467 19.0787 20.0213C18.9155 19.0074 18.9959 17.9691 19.3133 16.9923C19.6307 16.0156 20.176 15.1284 20.904 14.404C21.6281 13.6754 22.5152 13.1298 23.492 12.8121C24.4688 12.4945 25.5072 12.414 26.5213 12.5773C27.6114 12.7501 28.6395 13.1977 29.5087 13.8779C30.3779 14.5581 31.0595 15.4484 31.4894 16.4649C31.9192 17.4815 32.083 18.5907 31.9655 19.6881C31.8479 20.7855 31.4528 21.8349 30.8173 22.7373L29.1827 21.588C29.8454 20.6417 30.1212 19.4777 29.9533 18.3347C29.6827 16.4333 28.112 14.8453 26.2187 14.5547C25.5148 14.4421 24.7942 14.4979 24.116 14.7177C23.4379 14.9374 22.8215 15.3147 22.3173 15.8187C21.8128 16.3221 21.4352 16.9383 21.2157 17.6164C20.9961 18.2945 20.9409 19.0151 21.0547 19.7187C21.3547 21.668 22.9987 23.2453 24.968 23.4707C25.6785 23.5563 26.3992 23.4698 27.0693 23.2187C27.4025 23.0929 27.7612 23.0495 28.1148 23.0922C28.4683 23.1349 28.8064 23.2625 29.1 23.464C29.672 23.8613 29.9987 24.4907 29.9987 25.1893V31C29.998 31.265 29.8924 31.5189 29.705 31.7063C29.5176 31.8937 29.265 31.9993 29 32Z" fill="black"/>
+  </g>
+  <defs>
+    <clipPath id="clip0_1_1145">
+      <rect width="32" height="32" fill="white"/>
+    </clipPath>
+  </defs>
+</svg>
\ No newline at end of file

From e43e351e9dd05c9bc0a9eb6544980fc7763e56a7 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Thu, 7 Sep 2023 18:24:49 +0200
Subject: [PATCH 28/49] Refactor design of learning contents in circle page

---
 client/src/components/ui/ItCheckbox.vue       |  20 +-
 client/src/constants.ts                       |   6 +
 client/src/locales/de/translation.json        |   6 +-
 client/src/locales/fr/translation.json        |   3 +-
 client/src/locales/it/translation.json        |   3 +-
 .../circlePage/LearningSequence.vue           | 198 +++++++++---------
 server/vbv_lernwelt/learnpath/serializers.py  |   4 +-
 7 files changed, 118 insertions(+), 122 deletions(-)

diff --git a/client/src/components/ui/ItCheckbox.vue b/client/src/components/ui/ItCheckbox.vue
index 89fbcb59..db9f9525 100644
--- a/client/src/components/ui/ItCheckbox.vue
+++ b/client/src/components/ui/ItCheckbox.vue
@@ -1,22 +1,22 @@
 <script setup lang="ts">
 import type { CheckboxItem } from "@/components/ui/checkbox.types";
 import log from "loglevel";
+import {
+  itCheckboxDefaultIconCheckedTailwindClass,
+  itCheckboxDefaultIconUncheckedTailwindClass,
+} from "@/constants";
 
 interface Props {
   checkboxItem: CheckboxItem<any>;
   disabled?: boolean;
-  iconCheckedPath?: string;
-  iconCheckedHoverPath?: string;
-  iconUncheckedPath?: string;
-  iconUncheckedHoverPath?: string;
+  iconCheckedTailwindClass?: string;
+  iconUncheckedTailwindClass?: string;
 }
 
 const props = withDefaults(defineProps<Props>(), {
   disabled: false,
-  iconCheckedPath: "/static/icons/icon-checkbox-checked.svg",
-  iconCheckedHoverPath: "/static/icons/icon-checkbox-checked-hover.svg",
-  iconUncheckedPath: "/static/icons/icon-checkbox-unchecked.svg",
-  iconUncheckedHoverPath: "/static/icons/icon-checkbox-unchecked-hover.svg",
+  iconCheckedTailwindClass: itCheckboxDefaultIconCheckedTailwindClass,
+  iconUncheckedTailwindClass: itCheckboxDefaultIconUncheckedTailwindClass,
 });
 
 const emit = defineEmits(["toggle"]);
@@ -51,8 +51,8 @@ const input = () => {
       class="flex h-8 items-center bg-contain bg-no-repeat pl-8 disabled:opacity-50"
       :class="
         checkboxItem.checked
-          ? `bg-[url(${props.iconCheckedPath})] hover:bg-[url(${props.iconCheckedHoverPath})]`
-          : `bg-[url(${props.iconUncheckedPath})] hover:bg-[url(${props.iconUncheckedHoverPath})]`
+          ? props.iconCheckedTailwindClass
+          : props.iconUncheckedTailwindClass
       "
       tabindex="0"
       @keydown.stop="keydown"
diff --git a/client/src/constants.ts b/client/src/constants.ts
index 0b981057..65dee1e9 100644
--- a/client/src/constants.ts
+++ b/client/src/constants.ts
@@ -3,3 +3,9 @@ import type { CourseCompletionStatus } from "@/types";
 export const COMPLETION_SUCCESS: CourseCompletionStatus = "SUCCESS";
 export const COMPLETION_FAILURE: CourseCompletionStatus = "FAIL";
 export const COMPLETION_UNKNOWN: CourseCompletionStatus = "UNKNOWN";
+
+export const itCheckboxDefaultIconCheckedTailwindClass =
+  "bg-[url(/static/icons/icon-checkbox-checked.svg)] hover:bg-[url(/static/icons/icon-checkbox-checked-hover.svg)]";
+
+export const itCheckboxDefaultIconUncheckedTailwindClass =
+  "bg-[url(/static/icons/icon-checkbox-unchecked.svg)] hover:bg-[url(/static/icons/icon-checkbox-unchecked-hover.svg)]";
diff --git a/client/src/locales/de/translation.json b/client/src/locales/de/translation.json
index 3eb99131..87ec621d 100644
--- a/client/src/locales/de/translation.json
+++ b/client/src/locales/de/translation.json
@@ -11,16 +11,12 @@
   "Anwesenheit prüfen": "Anwesenheit prüfen",
   "Anwesenheitskontrolle Präsenzkurse": "Anwesenheitskontrolle Präsenzkurse",
   "Benutzername": "Benutzername",
-  "Die Anwesenheit wurde definitiv bestätigt": [],
   "Ergebnisse anschauen": "Ergebnisse anschauen",
   "Ergebnisse anzeigen": "Ergebnisse anzeigen",
   "Feedback": "Feedback",
   "Feedback anschauen": "Feedback anschauen",
   "Feedback: Feedback zum Lehrgang": "Feedback: Feedback zum Lehrgang",
   "Freigabetermin Bewertungen:": "Freigabetermin Bewertungen:",
-  "Hier überprüfst und bestätigst du die Anwesenheit deiner Teilnehmenden": [],
-  "Ich will die Anwesenheit der untenstehenden Personen definitiv bestätigen": [],
-  "Keine Auftragsdetails verfügbar": [],
   "MS Teams öffnen": "MS Teams öffnen",
   "Nächste Termine": "Nächste Termine",
   "Passwort": "Passwort",
@@ -335,4 +331,4 @@
   "x von y Feedbacks abgegeben": "{{x}} von {{y}} Feedbacks abgegeben",
   "x von y abgeschlossen": "{{x}} von {{y}} abgeschlossen",
   "zufrieden": "zufrieden"
-}
\ No newline at end of file
+}
diff --git a/client/src/locales/fr/translation.json b/client/src/locales/fr/translation.json
index e8f9e92d..41c756b3 100644
--- a/client/src/locales/fr/translation.json
+++ b/client/src/locales/fr/translation.json
@@ -21,6 +21,7 @@
     "Ergebnisse abgegeben": "Résultats remis",
     "Gesamtpunktzahl": "Score total",
     "Höchstpunktzahl": "Score maximum",
+    "KompetenzNavi": "NaviCompétence",
     "Punkte": "points",
     "Zwischenstand": "Point intermédiaire",
     "Übersicht": "Aperçu"
@@ -310,4 +311,4 @@
   "x von y Ergebnisse abgegeben": "{{x}} de {{y}} résultats remis",
   "x von y Feedbacks abgegeben": "{{x}} de {{y}} feedbacks remis",
   "x von y abgeschlossen": "{{x}} de {{y}} achevée/s"
-}
\ No newline at end of file
+}
diff --git a/client/src/locales/it/translation.json b/client/src/locales/it/translation.json
index 4a995aea..29b83441 100644
--- a/client/src/locales/it/translation.json
+++ b/client/src/locales/it/translation.json
@@ -21,6 +21,7 @@
     "Ergebnisse abgegeben": "Risultati consegnati",
     "Gesamtpunktzahl": "Punteggio totale",
     "Höchstpunktzahl": "Punteggio massimo",
+    "KompetenzNavi": "NaviCompetenze",
     "Punkte": "punti",
     "Zwischenstand": "Punto intermedio",
     "Übersicht": "Panoramica"
@@ -310,4 +311,4 @@
   "x von y Ergebnisse abgegeben": "{{x}} di {{y}} risultati consegnati/o",
   "x von y Feedbacks abgegeben": "{{x}} di {{y}} feedback consegnati/o",
   "x von y abgeschlossen": "{{x}} di {{y}} completate/a"
-}
\ No newline at end of file
+}
diff --git a/client/src/pages/learningPath/circlePage/LearningSequence.vue b/client/src/pages/learningPath/circlePage/LearningSequence.vue
index 17ec7657..3c10808a 100644
--- a/client/src/pages/learningPath/circlePage/LearningSequence.vue
+++ b/client/src/pages/learningPath/circlePage/LearningSequence.vue
@@ -6,12 +6,18 @@ import { useCircleStore } from "@/stores/circle";
 import type {
   CourseCompletionStatus,
   LearningContent,
+  LearningContentAssignment,
+  LearningContentEdoniqTest,
   LearningContentInterface,
   LearningSequence,
 } from "@/types";
-import { humanizeDuration } from "@/utils/humanizeDuration";
 import findLast from "lodash/findLast";
 import { computed } from "vue";
+import { humanizeDuration } from "../../../utils/humanizeDuration";
+import {
+  itCheckboxDefaultIconCheckedTailwindClass,
+  itCheckboxDefaultIconUncheckedTailwindClass,
+} from "@/constants";
 
 type Props = {
   learningSequence: LearningSequence;
@@ -97,35 +103,22 @@ function belongsToCompetenceCertificate(lc: LearningContent) {
   );
 }
 
-function checkboxIconCheckedPath(lc: LearningContent) {
+type LearninContentWithCompetenceCertificate =
+  | LearningContentAssignment
+  | LearningContentEdoniqTest;
+
+function checkboxIconCheckedTailwindClass(lc: LearningContent) {
   if (belongsToCompetenceCertificate(lc)) {
-    return "/static/icons/icon-lc-competence-certificate-checked.svg";
+    return "bg-[url(/static/icons/icon-lc-competence-certificate-checked.svg)]";
   }
-  return "/static/icons/icon-checkbox-checked.svg";
+  return itCheckboxDefaultIconCheckedTailwindClass;
 }
 
-function checkboxIconCheckedHoverPath(lc: LearningContent) {
+function checkboxIconUncheckedTailwindClass(lc: LearningContent) {
   if (belongsToCompetenceCertificate(lc)) {
-    return "/static/icons/icon-lc-competence-certificate-checked.svg";
+    return "bg-[url(/static/icons/icon-lc-competence-certificate.svg)]";
   }
-
-  return "/static/icons/icon-checkbox-checked-hover.svg";
-}
-
-function checkboxIconUncheckedPath(lc: LearningContent) {
-  if (belongsToCompetenceCertificate(lc)) {
-    return "/static/icons/icon-lc-competence-certificate.svg";
-  }
-
-  return "/static/icons/icon-checkbox-unchecked.svg";
-}
-
-function checkboxIconUncheckedHoverPath(lc: LearningContent) {
-  if (belongsToCompetenceCertificate(lc)) {
-    return "/static/icons/icon-lc-competence-certificate.svg";
-  }
-
-  return "/static/icons/icon-checkbox-unchecked-hover.svg";
+  return itCheckboxDefaultIconUncheckedTailwindClass;
 }
 </script>
 
@@ -163,33 +156,36 @@ function checkboxIconUncheckedHoverPath(lc: LearningContent) {
           <li
             v-for="learningContent in learningUnit.learningContents"
             :key="learningContent.id"
-            class="flex items-center gap-4 pb-3 lg:pb-6"
           >
-            <div v-if="props.readonly">
-              <it-icon-check
-                v-if="learningContent.completion_status === 'SUCCESS'"
-                class="block h-8 w-8"
-              ></it-icon-check>
-              <div v-else class="h-8 w-8"></div>
-            </div>
-            <ItCheckbox
-              v-else
-              :checkbox-item="{
-                value: learningContent.completion_status,
-                checked: learningContent.completion_status === 'SUCCESS',
-              }"
-              :disabled="!learningContent.can_user_self_toggle_course_completion"
-              :data-cy="`${learningContent.slug}-checkbox`"
-              :icon-checked-path="checkboxIconCheckedPath(learningContent)"
-              :icon-checked-hover-path="checkboxIconCheckedHoverPath(learningContent)"
-              :icon-unchecked-path="checkboxIconUncheckedPath(learningContent)"
-              :icon-unchecked-hover-path="
-                checkboxIconUncheckedHoverPath(learningContent)
-              "
-              @toggle="toggleCompleted(learningContent)"
-            />
-            <div class="flex-auto pt-1 sm:pt-0">
-              <div class="flex items-center gap-4">
+            <div class="flex items-center gap-4 pb-6">
+              <div v-if="props.readonly">
+                <it-icon-check
+                  v-if="learningContent.completion_status === 'SUCCESS'"
+                  class="block h-8 w-8"
+                ></it-icon-check>
+                <div v-else class="h-8 w-8"></div>
+              </div>
+              <ItCheckbox
+                v-else
+                :checkbox-item="{
+                  value: learningContent.completion_status,
+                  checked: learningContent.completion_status === 'SUCCESS',
+                }"
+                :disabled="!learningContent.can_user_self_toggle_course_completion"
+                :data-cy="`${learningContent.slug}-checkbox`"
+                :icon-checked-tailwind-class="
+                  checkboxIconCheckedTailwindClass(learningContent)
+                "
+                :icon-unchecked-tailwind-class="
+                  checkboxIconUncheckedTailwindClass(learningContent)
+                "
+                @toggle="toggleCompleted(learningContent)"
+              />
+              <div class="flex flex-auto flex-col gap-4 xl:flex-row xl:justify-between">
+                <div class="xl:order-last">
+                  <LearningContentBadge :learning-content="learningContent" />
+                </div>
+
                 <div>
                   <div v-if="props.readonly" class="w-full text-left sm:w-auto">
                     {{ learningContent.title }}
@@ -202,52 +198,51 @@ function checkboxIconUncheckedHoverPath(lc: LearningContent) {
                   >
                     {{ learningContent.title }}
                   </button>
-                  <div
-                    v-if="belongsToCompetenceCertificate(learningContent)"
-                    class="text-sm text-gray-800"
-                  >
-                    {{ $t("circlePage.Dieser Inhalt gehört zu x") }}
-                    <br />
-                    <router-link
-                      v-if="learningContent.competence_certificate?.frontend_url"
-                      :to="learningContent.competence_certificate.frontend_url"
-                      class="link"
-                      data-cy="show-results"
-                    >
-                      {{ $t("circlePage.Im KompetenzNavi anschauen") }}
-                    </router-link>
-                  </div>
-                </div>
-
-                <div
-                  class="flex flex-col items-center justify-between gap-4 sm:grow md:flex-row lg:flex-col xl:flex-row"
-                >
-                  <button
-                    v-if="
-                      learningContent.translation_key ===
-                        continueTranslationKeyTuple[0] && !props.readonly
-                    "
-                    class="btn-blue order-1 sm:order-none"
-                    data-cy="ls-continue-button"
-                    @click.stop="circleStore.openLearningContent(learningContent)"
-                  >
-                    <span
-                      v-if="continueTranslationKeyTuple[1]"
-                      class="whitespace-nowrap"
-                    >
-                      {{ $t("general.start") }}
-                    </span>
-                    <span v-else class="whitespace-nowrap">
-                      {{ $t("general.nextStep") }}
-                    </span>
-                  </button>
-                  <div class="hidden sm:block"></div>
-                  <div class="w-full sm:w-auto">
-                    <LearningContentBadge :learning-content="learningContent" />
-                  </div>
                 </div>
               </div>
             </div>
+
+            <div
+              v-if="belongsToCompetenceCertificate(learningContent)"
+              class="mb-8 ml-16 text-sm text-gray-800"
+            >
+              {{
+                $t("circlePage.Dieser Inhalt gehört zu x", {
+                  x: (learningContent as LearninContentWithCompetenceCertificate)
+                    ?.competence_certificate?.title,
+                })
+              }}
+              <br />
+              <router-link
+                v-if="(learningContent as LearninContentWithCompetenceCertificate).competence_certificate?.frontend_url"
+                :to="(learningContent as LearninContentWithCompetenceCertificate).competence_certificate?.frontend_url ?? ''"
+                class="link"
+                data-cy="show-results"
+              >
+                {{ $t("circlePage.Im KompetenzNavi anschauen") }}
+              </router-link>
+            </div>
+
+            <div
+              v-if="
+                learningContent.translation_key === continueTranslationKeyTuple[0] &&
+                !props.readonly
+              "
+              class="mb-6"
+            >
+              <button
+                class="btn-blue order-1 sm:order-none"
+                data-cy="ls-continue-button"
+                @click.stop="circleStore.openLearningContent(learningContent)"
+              >
+                <span v-if="continueTranslationKeyTuple[1]" class="whitespace-nowrap">
+                  {{ $t("general.start") }}
+                </span>
+                <span v-else class="whitespace-nowrap">
+                  {{ $t("general.nextStep") }}
+                </span>
+              </button>
+            </div>
           </li>
         </ol>
 
@@ -259,24 +254,21 @@ function checkboxIconUncheckedHoverPath(lc: LearningContent) {
         >
           <div
             v-if="circleStore.calcSelfEvaluationStatus(learningUnit) === 'SUCCESS'"
-            class="self-evaluation-success flex items-center gap-4 pb-3 lg:pb-6"
+            class="self-evaluation-success flex items-center gap-4 pb-6"
           >
-            <it-icon-smiley-happy class="h-8 w-8 flex-none" data-cy="success" />
+            <it-icon-smiley-happy class="mr-4 h-8 w-8 flex-none" data-cy="success" />
             <div>{{ $t("selfEvaluation.selfEvaluationYes") }}</div>
           </div>
           <div
             v-else-if="circleStore.calcSelfEvaluationStatus(learningUnit) === 'FAIL'"
-            class="self-evaluation-fail flex items-center gap-4 pb-3 lg:pb-6"
+            class="self-evaluation-fail flex items-center gap-4 pb-6"
           >
-            <it-icon-smiley-thinking class="h-8 w-8 flex-none" data-cy="fail" />
+            <it-icon-smiley-thinking class="mr-4 h-8 w-8 flex-none" data-cy="fail" />
             <div>{{ $t("selfEvaluation.selfEvaluationNo") }}</div>
           </div>
-          <div
-            v-else
-            class="self-evaluation-unknown flex items-center gap-4 pb-3 lg:pb-6"
-          >
-            <it-icon-smiley-neutral class="h-8 w-8 flex-none" data-cy="unknown" />
-            <div>{{ $t("selfEvaluation.selfEvaluation") }}</div>
+          <div v-else class="self-evaluation-unknown flex items-center gap-4 pb-6">
+            <it-icon-smiley-neutral class="mr-4 h-8 w-8 flex-none" data-cy="unknown" />
+            <div>{{ $t("a.Selbsteinschätzung") }}</div>
           </div>
         </div>
 
diff --git a/server/vbv_lernwelt/learnpath/serializers.py b/server/vbv_lernwelt/learnpath/serializers.py
index b242c5a4..510d697a 100644
--- a/server/vbv_lernwelt/learnpath/serializers.py
+++ b/server/vbv_lernwelt/learnpath/serializers.py
@@ -6,9 +6,9 @@ from vbv_lernwelt.competence.serializers import (
 from vbv_lernwelt.core.utils import get_django_content_type
 from vbv_lernwelt.course.serializer_helpers import get_course_serializer_class
 from vbv_lernwelt.learnpath.models import (
-    LearningUnit,
-    LearningContentEdoniqTest,
     LearningContentAssignment,
+    LearningContentEdoniqTest,
+    LearningUnit,
 )
 
 

From 2e4ba6ad53831a434689066eda2406649a125852 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Fri, 8 Sep 2023 16:42:49 +0200
Subject: [PATCH 29/49] VBV-515: Kompetenznachweis mit 0 Punkten

---
 .../CompetenceCertificateComponent.vue        | 10 +++++++---
 .../CompetenceCertificateListPage.vue         |  7 +++++--
 .../pages/competence/CompetenceIndexPage.vue  | 15 ++++++++++-----
 .../blocks/EdoniqTestBlock.vue                | 19 +++++++++----------
 4 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/client/src/pages/competence/CompetenceCertificateComponent.vue b/client/src/pages/competence/CompetenceCertificateComponent.vue
index 54f3caed..097acafc 100644
--- a/client/src/pages/competence/CompetenceCertificateComponent.vue
+++ b/client/src/pages/competence/CompetenceCertificateComponent.vue
@@ -58,17 +58,21 @@ const progressStatusCount = computed(() => {
         </div>
       </div>
 
-      <div class="flex items-center">
+      <section v-if="userPointsEvaluatedAssignments > 0" class="flex items-center">
         <div
           class="py-4"
           :class="{ 'heading-1': props.detailView, 'heading-2': !props.detailView }"
         >
           {{ userPointsEvaluatedAssignments }}
         </div>
-        <div>
+        <div class="ml-1">
           {{ $t("assignment.von x Punkten", { x: totalPointsEvaluatedAssignments }) }}
         </div>
-      </div>
+      </section>
+      <section v-else class="py-2">
+        {{ $t("a.competenceCertificateNoUserPoints") }}
+      </section>
+
       <ItProgress :status-count="progressStatusCount" />
       <div>
         {{
diff --git a/client/src/pages/competence/CompetenceCertificateListPage.vue b/client/src/pages/competence/CompetenceCertificateListPage.vue
index 5610bb2a..7def993d 100644
--- a/client/src/pages/competence/CompetenceCertificateListPage.vue
+++ b/client/src/pages/competence/CompetenceCertificateListPage.vue
@@ -72,14 +72,17 @@ onMounted(async () => {
         </div>
       </div>
 
-      <div class="flex items-center">
+      <section v-if="userPointsEvaluatedAssignments > 0" class="flex items-center">
         <div class="heading-1 py-4">
           {{ userPointsEvaluatedAssignments }}
         </div>
         <div class="pl-2">
           {{ $t("assignment.von x Punkten", { x: totalPointsEvaluatedAssignments }) }}
         </div>
-      </div>
+      </section>
+      <section v-else class="my-4">
+        {{ $t("a.competenceCertificateNoUserPoints") }}
+      </section>
     </div>
 
     <div
diff --git a/client/src/pages/competence/CompetenceIndexPage.vue b/client/src/pages/competence/CompetenceIndexPage.vue
index 2e376872..034d6865 100644
--- a/client/src/pages/competence/CompetenceIndexPage.vue
+++ b/client/src/pages/competence/CompetenceIndexPage.vue
@@ -64,11 +64,16 @@ const performanceCriteriaStatusCount = computed(() => {
         <h3>{{ $t("a.Kompetenznachweise") }}</h3>
       </div>
       <div class="mt-4">
-        {{ $t("a.Zwischenstand") }} {{ $t("a.Gesamtpunktzahl") }}:
-        <span class="font-bold">
-          {{ userPointsEvaluatedAssignments }}
-        </span>
-        {{ $t("assignment.von x Punkten", { x: totalPointsEvaluatedAssignments }) }}
+        <div v-if="userPointsEvaluatedAssignments > 0">
+          {{ $t("a.Zwischenstand") }} {{ $t("a.Gesamtpunktzahl") }}:
+          <span class="font-bold">
+            {{ userPointsEvaluatedAssignments }}
+          </span>
+          {{ $t("assignment.von x Punkten", { x: totalPointsEvaluatedAssignments }) }}
+        </div>
+        <div v-else>
+          {{ $t("a.competenceCertificateNoUserPoints") }}
+        </div>
       </div>
 
       <div>
diff --git a/client/src/pages/learningPath/learningContentPage/blocks/EdoniqTestBlock.vue b/client/src/pages/learningPath/learningContentPage/blocks/EdoniqTestBlock.vue
index 75f7932c..478b75e1 100644
--- a/client/src/pages/learningPath/learningContentPage/blocks/EdoniqTestBlock.vue
+++ b/client/src/pages/learningPath/learningContentPage/blocks/EdoniqTestBlock.vue
@@ -63,16 +63,15 @@ async function startTest() {
         />
       </div>
 
-        <div class="my-8">
-          <button
-            :disabled="!termsAccepted"
-            class="btn-primary inline-flex items-center"
-            @click="startTest()"
-          >
-            {{ $t("edoniqTest.startTest") }}
-            <it-icon-external-link class="it-icon ml-2 h-5 w-5"></it-icon-external-link>
-          </button>
-        </div>
+      <div class="my-8">
+        <button
+          :disabled="!termsAccepted"
+          class="btn-primary inline-flex items-center"
+          @click="startTest()"
+        >
+          {{ $t("edoniqTest.startTest") }}
+          <it-icon-external-link class="it-icon ml-2 h-5 w-5"></it-icon-external-link>
+        </button>
       </div>
     </div>
   </LearningContentSimpleLayout>

From dbab03228b221d48f098beec7a16203eb885c66c Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Fri, 8 Sep 2023 16:54:59 +0200
Subject: [PATCH 30/49] Show result in EdoniqTestBlock

---
 .../CompetenceCertificateComponent.vue        |   1 -
 .../blocks/EdoniqTestBlock.vue                | 118 ++++++++++++------
 2 files changed, 79 insertions(+), 40 deletions(-)

diff --git a/client/src/pages/competence/CompetenceCertificateComponent.vue b/client/src/pages/competence/CompetenceCertificateComponent.vue
index 097acafc..201637a7 100644
--- a/client/src/pages/competence/CompetenceCertificateComponent.vue
+++ b/client/src/pages/competence/CompetenceCertificateComponent.vue
@@ -3,7 +3,6 @@ import * as log from "loglevel";
 import type { CompetenceCertificate } from "@/types";
 import CompetenceAssignmentRow from "@/pages/competence/CompetenceAssignmentRow.vue";
 import { computed } from "vue";
-import type { StatusCount } from "@/components/ui/ItProgress.vue";
 import ItProgress from "@/components/ui/ItProgress.vue";
 import {
   assignmentsMaxEvaluationPoints,
diff --git a/client/src/pages/learningPath/learningContentPage/blocks/EdoniqTestBlock.vue b/client/src/pages/learningPath/learningContentPage/blocks/EdoniqTestBlock.vue
index 478b75e1..40c95cbe 100644
--- a/client/src/pages/learningPath/learningContentPage/blocks/EdoniqTestBlock.vue
+++ b/client/src/pages/learningPath/learningContentPage/blocks/EdoniqTestBlock.vue
@@ -2,10 +2,17 @@
 import { useTranslation } from "i18next-vue";
 import ItCheckbox from "@/components/ui/ItCheckbox.vue";
 import LearningContentSimpleLayout from "@/pages/learningPath/learningContentPage/layouts/LearningContentSimpleLayout.vue";
-import type { LearningContentEdoniqTest } from "@/types";
-import { ref } from "vue";
+import type {
+  Assignment,
+  AssignmentCompletion,
+  LearningContentEdoniqTest,
+} from "@/types";
+import { computed, ref } from "vue";
 import * as log from "loglevel";
 import { itPost } from "@/fetchHelpers";
+import { useQuery } from "@urql/vue";
+import { ASSIGNMENT_COMPLETION_QUERY } from "@/graphql/queries";
+import { useCurrentCourseSession } from "@/composables";
 
 const { t } = useTranslation();
 
@@ -13,6 +20,29 @@ const props = defineProps<{
   content: LearningContentEdoniqTest;
 }>();
 
+const courseSession = useCurrentCourseSession();
+
+const queryResult = useQuery({
+  query: ASSIGNMENT_COMPLETION_QUERY,
+  variables: {
+    courseSessionId: courseSession.value.id.toString(),
+    assignmentId: props.content.content_assignment_id.toString(),
+    learningContentId: props.content.id.toString(),
+  },
+});
+
+const assignment = computed(
+  () => queryResult.data.value?.assignment as Assignment | undefined
+);
+const assignmentCompletion = computed(
+  () =>
+    queryResult.data.value?.assignment_completion as AssignmentCompletion | undefined
+);
+
+const completionStatus = computed(() => {
+  return assignmentCompletion.value?.completion_status ?? "IN_PROGRESS";
+});
+
 const termsAccepted = ref(false);
 const extendedTimeTest = ref(false);
 
@@ -33,45 +63,55 @@ async function startTest() {
     :learning-content="props.content"
   >
     <!-- eslint-disable vue/no-v-html -->
-    <div class="container-medium">
-      <p
-        v-if="props.content.description"
-        class="default-wagtail-rich-text text-large my-4"
-        v-html="props.content.description"
-      ></p>
-
-      <div class="my-8">
-        <ItCheckbox
-          v-if="props.content.checkbox_text"
-          :checkbox-item="{
-            label: props.content.checkbox_text,
-            value: termsAccepted,
-            checked: termsAccepted,
-          }"
-          @toggle="termsAccepted = !termsAccepted"
-        />
-      </div>
-      <div class="my-8">
-        <ItCheckbox
-          v-if="props.content.has_extended_time_test"
-          :checkbox-item="{
-            label: t('edoniqTest.qualifiesForExtendedTime'),
-            value: extendedTimeTest,
-            checked: extendedTimeTest,
-          }"
-          @toggle="extendedTimeTest = !extendedTimeTest"
-        />
+    <div v-if="queryResult.data" class="container-medium">
+      <div v-if="completionStatus !== 'IN_PROGRESS'">
+        <div v-if="completionStatus === 'EVALUATION_SUBMITTED'">
+          {{ $t("a.Bewertung") }}:
+          {{ assignmentCompletion?.evaluation_points }}
+          {{ $t("assignment.von x Punkten", { x: assignment?.max_points }) }}
+        </div>
+        <div v-else>Ergebnisse abgeben, Bewertung ausstehend</div>
       </div>
+      <div v-else>
+        <p
+          v-if="props.content.description"
+          class="default-wagtail-rich-text text-large my-4"
+          v-html="props.content.description"
+        ></p>
 
-      <div class="my-8">
-        <button
-          :disabled="!termsAccepted"
-          class="btn-primary inline-flex items-center"
-          @click="startTest()"
-        >
-          {{ $t("edoniqTest.startTest") }}
-          <it-icon-external-link class="it-icon ml-2 h-5 w-5"></it-icon-external-link>
-        </button>
+        <div class="my-8">
+          <ItCheckbox
+            v-if="props.content.checkbox_text"
+            :checkbox-item="{
+              label: props.content.checkbox_text,
+              value: termsAccepted,
+              checked: termsAccepted,
+            }"
+            @toggle="termsAccepted = !termsAccepted"
+          />
+        </div>
+        <div class="my-8">
+          <ItCheckbox
+            v-if="props.content.has_extended_time_test"
+            :checkbox-item="{
+              label: t('edoniqTest.qualifiesForExtendedTime'),
+              value: extendedTimeTest,
+              checked: extendedTimeTest,
+            }"
+            @toggle="extendedTimeTest = !extendedTimeTest"
+          />
+        </div>
+
+        <div class="my-8">
+          <button
+            :disabled="!termsAccepted"
+            class="btn-primary inline-flex items-center"
+            @click="startTest()"
+          >
+            {{ $t("edoniqTest.startTest") }}
+            <it-icon-external-link class="it-icon ml-2 h-5 w-5"></it-icon-external-link>
+          </button>
+        </div>
       </div>
     </div>
   </LearningContentSimpleLayout>

From 73694d983e3d7ad651dca8d7266b9dec780a9f74 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Mon, 11 Sep 2023 17:15:24 +0200
Subject: [PATCH 31/49] Setup "KompetenzNavi for existing courses

---
 .../create_uk_competence_profile.py           |  74 ++++++-------
 .../create_uk_training_competence_profile.py  |  62 +++++------
 .../create_vv_competence_profile.py           |  92 ++++++++--------
 server/vbv_lernwelt/competence/factories.py   |   8 +-
 .../migrations/0004_rename_models.py          |  29 +++++
 .../migrations/0005_move_action_competence.py | 103 ++++++++++++++++++
 server/vbv_lernwelt/competence/models.py      |  31 +++---
 .../vbv_lernwelt/competence/tests/test_api.py |   4 +-
 .../course/creators/test_course.py            |  10 +-
 server/vbv_lernwelt/course/models.py          |  16 +--
 .../learnpath/create_vv_new_learning_path.py  |   4 +-
 11 files changed, 285 insertions(+), 148 deletions(-)
 create mode 100644 server/vbv_lernwelt/competence/migrations/0004_rename_models.py
 create mode 100644 server/vbv_lernwelt/competence/migrations/0005_move_action_competence.py

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

From e5d6dd60f6924c8e58e3e8891cc2436224dfc796 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Wed, 13 Sep 2023 15:42:32 +0200
Subject: [PATCH 32/49] Add ActionCompetences page

---
 .../pages/cockpit/CockpitUserProfilePage.vue  |  2 +-
 .../competence-old/CompetenceListPage.vue     | 51 -------------------
 .../ActionCompetenceDetail.vue}               |  0
 .../competence/ActionCompetenceListPage.vue   | 34 +++++++++++++
 .../competence/CompetenceAssignmentRow.vue    |  1 -
 .../pages/competence/CompetenceParentPage.vue | 12 +++++
 client/src/router/index.ts                    |  7 ++-
 7 files changed, 53 insertions(+), 54 deletions(-)
 delete mode 100644 client/src/pages/competence-old/CompetenceListPage.vue
 rename client/src/pages/{competence-old/CompetenceDetail.vue => competence/ActionCompetenceDetail.vue} (100%)
 create mode 100644 client/src/pages/competence/ActionCompetenceListPage.vue

diff --git a/client/src/pages/cockpit/CockpitUserProfilePage.vue b/client/src/pages/cockpit/CockpitUserProfilePage.vue
index 4e859009..360350cf 100644
--- a/client/src/pages/cockpit/CockpitUserProfilePage.vue
+++ b/client/src/pages/cockpit/CockpitUserProfilePage.vue
@@ -5,7 +5,7 @@ import { useLearningPathStore } from "@/stores/learningPath";
 import * as log from "loglevel";
 import { computed, onMounted } from "vue";
 
-import CompetenceDetail from "@/pages/competence-old/CompetenceDetail.vue";
+import CompetenceDetail from "@/pages/competence/ActionCompetenceDetail.vue";
 import LearningPathPathView from "@/pages/learningPath/learningPathPage/LearningPathPathView.vue";
 
 const props = defineProps<{
diff --git a/client/src/pages/competence-old/CompetenceListPage.vue b/client/src/pages/competence-old/CompetenceListPage.vue
deleted file mode 100644
index 64e8dbf2..00000000
--- a/client/src/pages/competence-old/CompetenceListPage.vue
+++ /dev/null
@@ -1,51 +0,0 @@
-<script setup lang="ts">
-import CompetenceDetail from "@/pages/competence-old/CompetenceDetail.vue";
-import ItDropdownSelect from "@/components/ui/ItDropdownSelect.vue";
-import { useCompetenceStore } from "@/stores/competence";
-import * as log from "loglevel";
-
-log.debug("CompetenceListPage created");
-
-const props = defineProps<{
-  courseSlug: string;
-}>();
-
-const competenceStore = useCompetenceStore();
-</script>
-
-<template>
-  <div class="container-large">
-    <nav class="py-4 lg:pb-8">
-      <router-link
-        v-if="competenceStore.competenceProfilePage()"
-        class="btn-text inline-flex items-center pl-0"
-        :to="`${competenceStore.competenceProfilePage()?.frontend_url}-old` as string"
-      >
-        <it-icon-arrow-left />
-        <span>{{ $t("general.back") }}</span>
-      </router-link>
-    </nav>
-    <div class="mb-10 flex flex-col items-center justify-between lg:flex-row">
-      <h1>Kompetenzen</h1>
-      <ItDropdownSelect
-        v-model="competenceStore.selectedCircle"
-        class="mt-4 w-full lg:mt-0 lg:w-96"
-        :items="competenceStore.availableCircles"
-      ></ItDropdownSelect>
-    </div>
-    <ul v-if="competenceStore.competenceProfilePage()">
-      <li
-        v-for="competence in competenceStore.competences()"
-        :key="competence.id"
-        class="mb-8 bg-white p-8"
-      >
-        <CompetenceDetail
-          :competence="competence"
-          :course-slug="props.courseSlug"
-        ></CompetenceDetail>
-      </li>
-    </ul>
-  </div>
-</template>
-
-<style scoped></style>
diff --git a/client/src/pages/competence-old/CompetenceDetail.vue b/client/src/pages/competence/ActionCompetenceDetail.vue
similarity index 100%
rename from client/src/pages/competence-old/CompetenceDetail.vue
rename to client/src/pages/competence/ActionCompetenceDetail.vue
diff --git a/client/src/pages/competence/ActionCompetenceListPage.vue b/client/src/pages/competence/ActionCompetenceListPage.vue
new file mode 100644
index 00000000..9f15586a
--- /dev/null
+++ b/client/src/pages/competence/ActionCompetenceListPage.vue
@@ -0,0 +1,34 @@
+<script setup lang="ts">
+import CompetenceDetail from "@/pages/competence/ActionCompetenceDetail.vue";
+import { useCompetenceStore } from "@/stores/competence";
+import * as log from "loglevel";
+
+log.debug("CompetenceListPage created");
+
+const props = defineProps<{
+  courseSlug: string;
+}>();
+
+const competenceStore = useCompetenceStore();
+</script>
+
+<template>
+  <div class="container-large">
+    <h2 class="mb-4 lg:py-4">{{ $t("a.Handlungskompetenzen") }}</h2>
+
+    <ul v-if="competenceStore.competenceProfilePage()">
+      <li
+        v-for="competence in competenceStore.competences()"
+        :key="competence.id"
+        class="mb-8 bg-white p-8"
+      >
+        <CompetenceDetail
+          :competence="competence"
+          :course-slug="props.courseSlug"
+        ></CompetenceDetail>
+      </li>
+    </ul>
+  </div>
+</template>
+
+<style scoped></style>
diff --git a/client/src/pages/competence/CompetenceAssignmentRow.vue b/client/src/pages/competence/CompetenceAssignmentRow.vue
index 704b110a..099f225c 100644
--- a/client/src/pages/competence/CompetenceAssignmentRow.vue
+++ b/client/src/pages/competence/CompetenceAssignmentRow.vue
@@ -31,7 +31,6 @@ const getIconName = () => {
           v-if="assignment.learning_content"
           :href="assignment.frontend_url"
           class="link"
-          target="_blank"
         >
           {{
             $t("general.im circle x anschauen", {
diff --git a/client/src/pages/competence/CompetenceParentPage.vue b/client/src/pages/competence/CompetenceParentPage.vue
index 2e72b69b..a4b26000 100644
--- a/client/src/pages/competence/CompetenceParentPage.vue
+++ b/client/src/pages/competence/CompetenceParentPage.vue
@@ -22,6 +22,10 @@ function routeInCompetenceCertificate() {
   return route.path.includes("/certificate");
 }
 
+function routeInActionCompetences() {
+  return route.path.endsWith("/competences");
+}
+
 onMounted(async () => {
   log.debug("CompetenceParentPage mounted", props.courseSlug);
 
@@ -54,6 +58,14 @@ onMounted(async () => {
             {{ $t("a.Kompetenznachweise") }}
           </router-link>
         </li>
+        <li
+          class="ml-6 inline-block border-t-2 border-t-transparent py-3 lg:ml-12"
+          :class="{ 'border-b-2 border-b-blue-900': routeInActionCompetences() }"
+        >
+          <router-link :to="`/course/${courseSlug}/competence/competences`">
+            {{ $t("a.Handlungskompetenzen") }}
+          </router-link>
+        </li>
 
         <!-- Add similar logic for other `li` items as you expand the list -->
         <li class="ml-6 inline-block lg:ml-12"></li>
diff --git a/client/src/router/index.ts b/client/src/router/index.ts
index ccbf05d6..43baf170 100644
--- a/client/src/router/index.ts
+++ b/client/src/router/index.ts
@@ -84,6 +84,11 @@ const router = createRouter({
           component: () =>
             import("@/pages/competence/CompetenceCertificateDetailPage.vue"),
         },
+        {
+          path: "competences",
+          props: true,
+          component: () => import("@/pages/competence/ActionCompetenceListPage.vue"),
+        },
       ],
     },
 
@@ -100,7 +105,7 @@ const router = createRouter({
         {
           path: "competences",
           props: true,
-          component: () => import("@/pages/competence-old/CompetenceListPage.vue"),
+          component: () => import("@/pages/competence/ActionCompetenceListPage.vue"),
         },
         {
           path: "criteria",

From 5dfdd470aed4d7db2996fee3b68da79832e92aed Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Wed, 13 Sep 2023 16:00:06 +0200
Subject: [PATCH 33/49] Add PerformanceCriteria page

---
 client/src/components/ui/ItRow.vue            |   2 +-
 .../pages/cockpit/cockpitPage/CockpitPage.vue |   6 +-
 .../CompetenceCertificateDetailPage.vue       |   4 +-
 .../CompetenceCertificateListPage.vue         |   4 +-
 .../pages/competence/CompetenceIndexPage.vue  |  17 +--
 .../pages/competence/CompetenceParentPage.vue |  13 +++
 .../competence/PerformanceCriteriaPage.vue    | 108 ++++++++++++++++++
 client/src/router/history.ts                  |  34 ++++++
 client/src/router/index.ts                    |   8 ++
 client/src/stores/circle.ts                   |   8 +-
 client/src/stores/competence.ts               |   3 +
 11 files changed, 188 insertions(+), 19 deletions(-)
 create mode 100644 client/src/pages/competence/PerformanceCriteriaPage.vue
 create mode 100644 client/src/router/history.ts

diff --git a/client/src/components/ui/ItRow.vue b/client/src/components/ui/ItRow.vue
index 5995b9f2..03353590 100644
--- a/client/src/components/ui/ItRow.vue
+++ b/client/src/components/ui/ItRow.vue
@@ -2,7 +2,7 @@
   <li
     class="flex flex-col justify-between border-t border-gray-500 py-4 leading-[45px] lg:flex-row"
   >
-    <div class="flex flex-row items-center md:w-1/4">
+    <div class="flex flex-row items-center lg:w-1/3">
       <slot name="firstRow"></slot>
     </div>
     <div class="flex flex-1 items-center">
diff --git a/client/src/pages/cockpit/cockpitPage/CockpitPage.vue b/client/src/pages/cockpit/cockpitPage/CockpitPage.vue
index c81c2811..da95521b 100644
--- a/client/src/pages/cockpit/cockpitPage/CockpitPage.vue
+++ b/client/src/pages/cockpit/cockpitPage/CockpitPage.vue
@@ -194,7 +194,7 @@ function setActiveClasses(translationKey: string) {
                           <it-icon-smiley-thinking
                             class="mr-2 inline-block h-8 w-8"
                           ></it-icon-smiley-thinking>
-                          <p class="text-bold inline-block">
+                          <p class="text-bold inline-block w-6">
                             {{ userCountStatusForCircle(csu.user_id, circle).FAIL }}
                           </p>
                         </div>
@@ -202,7 +202,7 @@ function setActiveClasses(translationKey: string) {
                           <it-icon-smiley-happy
                             class="mr-2 inline-block h-8 w-8"
                           ></it-icon-smiley-happy>
-                          <p class="text-bold inline-block">
+                          <p class="text-bold inline-block w-6">
                             {{ userCountStatusForCircle(csu.user_id, circle).SUCCESS }}
                           </p>
                         </li>
@@ -210,7 +210,7 @@ function setActiveClasses(translationKey: string) {
                           <it-icon-smiley-neutral
                             class="mr-2 inline-block h-8 w-8"
                           ></it-icon-smiley-neutral>
-                          <p class="text-bold inline-block">
+                          <p class="text-bold inline-block w-6">
                             {{ userCountStatusForCircle(csu.user_id, circle).UNKNOWN }}
                           </p>
                         </li>
diff --git a/client/src/pages/competence/CompetenceCertificateDetailPage.vue b/client/src/pages/competence/CompetenceCertificateDetailPage.vue
index c50bf1bb..54e2a2b3 100644
--- a/client/src/pages/competence/CompetenceCertificateDetailPage.vue
+++ b/client/src/pages/competence/CompetenceCertificateDetailPage.vue
@@ -37,8 +37,8 @@ onMounted(async () => {
 </script>
 
 <template>
-  <div class="container-large lg:mt-4">
-    <nav class="lg:pb-4">
+  <div class="container-large">
+    <nav class="py-4">
       <router-link
         class="btn-text inline-flex items-center pl-0"
         :to="`/course/${props.courseSlug}/competence/certificates`"
diff --git a/client/src/pages/competence/CompetenceCertificateListPage.vue b/client/src/pages/competence/CompetenceCertificateListPage.vue
index 7def993d..4acc9733 100644
--- a/client/src/pages/competence/CompetenceCertificateListPage.vue
+++ b/client/src/pages/competence/CompetenceCertificateListPage.vue
@@ -58,8 +58,8 @@ onMounted(async () => {
 </script>
 
 <template>
-  <div class="container-large lg:mt-4">
-    <h2 class="mb-4">{{ $t("a.Kompetenznachweise") }}</h2>
+  <div class="container-large">
+    <h2 class="mb-4 lg:py-4">{{ $t("a.Kompetenznachweise") }}</h2>
 
     <div class="mb-4 bg-white p-8">
       <div class="flex items-center">
diff --git a/client/src/pages/competence/CompetenceIndexPage.vue b/client/src/pages/competence/CompetenceIndexPage.vue
index 034d6865..e9f966b7 100644
--- a/client/src/pages/competence/CompetenceIndexPage.vue
+++ b/client/src/pages/competence/CompetenceIndexPage.vue
@@ -168,13 +168,16 @@ const performanceCriteriaStatusCount = computed(() => {
           </div>
         </li>
       </ul>
-      <!--      <router-link-->
-      <!--        :to="`${competenceStore.competenceProfilePage()?.frontend_url}-old/criteria`"-->
-      <!--        class="btn-text inline-flex items-center py-2 pl-0"-->
-      <!--      >-->
-      <!--        <span>{{ $t("general.showAll") }}</span>-->
-      <!--        <it-icon-arrow-right></it-icon-arrow-right>-->
-      <!--      </router-link>-->
+
+      <div>
+        <router-link
+          :to="`/course/${props.courseSlug}/competence/criteria`"
+          class="btn-text mt-4 inline-flex items-center py-2 pl-0"
+        >
+          <span>{{ $t("general.showAll") }}</span>
+          <it-icon-arrow-right></it-icon-arrow-right>
+        </router-link>
+      </div>
     </section>
   </div>
 </template>
diff --git a/client/src/pages/competence/CompetenceParentPage.vue b/client/src/pages/competence/CompetenceParentPage.vue
index a4b26000..a69f90ad 100644
--- a/client/src/pages/competence/CompetenceParentPage.vue
+++ b/client/src/pages/competence/CompetenceParentPage.vue
@@ -22,6 +22,10 @@ function routeInCompetenceCertificate() {
   return route.path.includes("/certificate");
 }
 
+function routeInPerformanceCriteria() {
+  return route.path.endsWith("/criteria");
+}
+
 function routeInActionCompetences() {
   return route.path.endsWith("/competences");
 }
@@ -58,6 +62,15 @@ onMounted(async () => {
             {{ $t("a.Kompetenznachweise") }}
           </router-link>
         </li>
+        <li
+          class="ml-6 inline-block border-t-2 border-t-transparent py-3 lg:ml-12"
+          :class="{ 'border-b-2 border-b-blue-900': routeInPerformanceCriteria() }"
+        >
+          <router-link :to="`/course/${courseSlug}/competence/criteria`">
+            {{ $t("a.Selbsteinschätzungen") }}
+          </router-link>
+        </li>
+
         <li
           class="ml-6 inline-block border-t-2 border-t-transparent py-3 lg:ml-12"
           :class="{ 'border-b-2 border-b-blue-900': routeInActionCompetences() }"
diff --git a/client/src/pages/competence/PerformanceCriteriaPage.vue b/client/src/pages/competence/PerformanceCriteriaPage.vue
new file mode 100644
index 00000000..231f3cee
--- /dev/null
+++ b/client/src/pages/competence/PerformanceCriteriaPage.vue
@@ -0,0 +1,108 @@
+<script setup lang="ts">
+import { useCompetenceStore } from "@/stores/competence";
+import * as log from "loglevel";
+import { computed } from "vue";
+import _ from "lodash";
+
+const props = defineProps<{
+  courseSlug: string;
+}>();
+
+log.debug("PerformanceCriteriaPage created", props);
+
+const competenceStore = useCompetenceStore();
+
+const uniqueLearningUnits = computed(() => {
+  // FIXME: this complex calculation can go away,
+  // once the criteria are in its own learning content
+  // get the learningUnits sorted by circle order in the course
+  const circles = competenceStore.circles.map((c, index) => {
+    return { ...c, sortKey: index };
+  });
+  return _.orderBy(
+    _.uniqBy(
+      competenceStore.flatPerformanceCriteria().map((pc) => {
+        return {
+          luId: pc.learning_unit.id,
+          luTitle: pc.learning_unit.title,
+          circleId: pc.circle.id,
+          circleTitle: pc.circle.title,
+          url: pc.learning_unit.evaluate_url,
+          sortKey: circles.find((c) => c.id === pc.circle.id)?.sortKey,
+        };
+      }),
+      "luId"
+    ),
+    "sortKey"
+  );
+});
+
+const criteriaByLearningUnit = computed(() => {
+  return uniqueLearningUnits.value.map((lu) => {
+    const criteria = competenceStore
+      .flatPerformanceCriteria()
+      .filter((pc) => pc.learning_unit.id === lu.luId);
+    return {
+      ...lu,
+      countSuccess: criteria.filter((c) => c.completion_status === "SUCCESS").length,
+      countFail: criteria.filter((c) => c.completion_status === "FAIL").length,
+      countUnknown: criteria.filter((c) => c.completion_status === "UNKNOWN").length,
+      criteria: criteria,
+    };
+  });
+});
+</script>
+
+<template>
+  <div class="container-large">
+    <h2 class="mb-4 lg:py-4">{{ $t("a.Selbsteinschätzungen") }}</h2>
+    <section class="mb-4 bg-white px-4 py-2">
+      <div
+        v-for="selfEvaluation in criteriaByLearningUnit"
+        :key="selfEvaluation.luId"
+        class="flex items-center justify-between border-b py-4 last:border-b-0"
+      >
+        <div class="w-1/3">
+          {{ $t("a.Circle") }}
+          {{ selfEvaluation.circleTitle }}:
+          {{ selfEvaluation.luTitle }}
+        </div>
+
+        <div class="ml-4 flex w-1/3 flex-row items-center">
+          <div class="mr-6 flex flex-row items-center">
+            <it-icon-smiley-thinking
+              class="mr-2 inline-block h-8 w-8"
+            ></it-icon-smiley-thinking>
+            <div class="w-6">
+              {{ selfEvaluation.countFail }}
+            </div>
+          </div>
+          <li class="mr-6 flex flex-row items-center">
+            <it-icon-smiley-happy
+              class="mr-2 inline-block h-8 w-8"
+            ></it-icon-smiley-happy>
+            <div class="w-6">
+              {{ selfEvaluation.countSuccess }}
+            </div>
+          </li>
+          <li class="flex flex-row items-center">
+            <it-icon-smiley-neutral
+              class="mr-2 inline-block h-8 w-8"
+            ></it-icon-smiley-neutral>
+            <div class="w-6">
+              {{ selfEvaluation.countUnknown }}
+            </div>
+          </li>
+        </div>
+
+        <div>
+          <router-link :to="selfEvaluation.url" class="link">
+            {{ $t("a.Selbsteinschätzung anschauen") }}
+          </router-link>
+        </div>
+      </div>
+    </section>
+  </div>
+</template>
+
+<style scoped></style>
diff --git a/client/src/router/history.ts b/client/src/router/history.ts
new file mode 100644
index 00000000..c7aa92c6
--- /dev/null
+++ b/client/src/router/history.ts
@@ -0,0 +1,34 @@
+// handle route history
+import type {
+  NavigationGuard,
+  RouteLocationNormalized,
+  RouteLocationRaw,
+  Router,
+} from "vue-router";
+
+const routeHistory: RouteLocationNormalized[] = [];
+const MAX_HISTORY = 10; // for example, store the last 10 visited routes
+let isFirstNavigation = true;
+
+export const addToHistory: NavigationGuard = (to, from, next) => {
+  // Add the current route to the history, and ensure it doesn't exceed the maximum length
+  if (isFirstNavigation) {
+    isFirstNavigation = false;
+  } else {
+    routeHistory.push(from);
+  }
+  if (routeHistory.length > MAX_HISTORY) {
+    routeHistory.shift();
+  }
+  next();
+};
+
+export function routerBackOrFallback(router: Router, fallbackRoute: RouteLocationRaw) {
+  // Check the latest route in history
+  const previousRoute = routeHistory[routeHistory.length - 1];
+  if (previousRoute) {
+    router.back();
+  } else {
+    router.push(fallbackRoute);
+  }
+}
diff --git a/client/src/router/index.ts b/client/src/router/index.ts
index 43baf170..d076fa5a 100644
--- a/client/src/router/index.ts
+++ b/client/src/router/index.ts
@@ -5,6 +5,7 @@ import {
   redirectToLoginIfRequired,
   updateLoggedIn,
 } from "@/router/guards";
+import { addToHistory } from "@/router/history";
 import { createRouter, createWebHistory } from "vue-router";
 
 const router = createRouter({
@@ -84,6 +85,11 @@ const router = createRouter({
           component: () =>
             import("@/pages/competence/CompetenceCertificateDetailPage.vue"),
         },
+        {
+          path: "criteria",
+          props: true,
+          component: () => import("@/pages/competence/PerformanceCriteriaPage.vue"),
+        },
         {
           path: "competences",
           props: true,
@@ -226,4 +232,6 @@ router.beforeEach(redirectToLoginIfRequired);
 // register after login hooks
 router.beforeEach(handleCourseSessions);
 
+router.beforeEach(addToHistory);
+
 export default router;
diff --git a/client/src/stores/circle.ts b/client/src/stores/circle.ts
index 8a0e6c41..71406bbd 100644
--- a/client/src/stores/circle.ts
+++ b/client/src/stores/circle.ts
@@ -1,5 +1,4 @@
-import * as log from "loglevel";
-
+import { routerBackOrFallback } from "@/router/history";
 import type { Circle } from "@/services/circle";
 import { useCompletionStore } from "@/stores/completion";
 import { useLearningPathStore } from "@/stores/learningPath";
@@ -11,6 +10,7 @@ import type {
   LearningUnitPerformanceCriteria,
   PerformanceCriteria,
 } from "@/types";
+import * as log from "loglevel";
 import { defineStore } from "pinia";
 
 export type CircleStoreState = {
@@ -128,7 +128,7 @@ export const useCircleStore = defineStore({
       });
     },
     closeLearningContent(learningContent: LearningContentInterface) {
-      this.router.push({
+      routerBackOrFallback(this.router, {
         path: `${this.circle?.frontend_url}`,
         hash: createLearningUnitHash(learningContent.parentLearningUnit),
       });
@@ -139,7 +139,7 @@ export const useCircleStore = defineStore({
       });
     },
     closeSelfEvaluation(learningUnit: LearningUnit) {
-      this.router.push({
+      routerBackOrFallback(this.router, {
         path: `${this.circle?.frontend_url}`,
         hash: createLearningUnitHash(learningUnit),
       });
diff --git a/client/src/stores/competence.ts b/client/src/stores/competence.ts
index fee4f482..e20c128d 100644
--- a/client/src/stores/competence.ts
+++ b/client/src/stores/competence.ts
@@ -19,6 +19,7 @@ export type CompetenceStoreState = {
 
   selectedCircle: { id: string; name: string };
   availableCircles: { id: string; name: string }[];
+  circles: CircleLight[];
 };
 
 export const useCompetenceStore = defineStore({
@@ -28,6 +29,7 @@ export const useCompetenceStore = defineStore({
       competenceProfilePages: new Map<string, CompetenceProfilePage>(),
       selectedCircle: { id: "all", name: `Circle: ${i18next.t("Alle")}` },
       availableCircles: [],
+      circles: [],
     } as CompetenceStoreState;
   },
   getters: {},
@@ -153,6 +155,7 @@ export const useCompetenceStore = defineStore({
 
       this.competenceProfilePages.set(userId, cloneDeep(competenceProfilePage));
 
+      this.circles = competenceProfilePage.circles;
       const circles = competenceProfilePage.circles.map((c: CircleLight) => {
         return { id: c.translation_key, name: `Circle: ${c.title}` };
       });

From dfa03baa252ee875da113c865622af147476a193 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Thu, 14 Sep 2023 10:37:13 +0200
Subject: [PATCH 34/49] Handle closing of self evaluation in KompetenzNavi

---
 .../competence-old/CompetenceIndexPage.vue    | 179 ------------------
 .../competence-old/CompetenceParentPage.vue   |  34 ----
 .../PerformanceCriteriaPage.vue               | 122 ------------
 .../SinglePerformanceCriteriaPage.vue         |  70 -------
 .../competence/ActionCompetenceDetail.vue     |  47 ++---
 .../competence/ActionCompetenceListPage.vue   |  29 ++-
 .../SinglePerformanceCriteriaRow.vue}         |  22 +--
 .../LearningContentParent.vue                 |   7 +-
 .../selfEvaluationPage/SelfEvaluation.vue     |   7 +-
 client/src/router/history.ts                  |   9 +-
 client/src/router/index.ts                    |  29 ---
 client/src/stores/circle.ts                   |  43 +++--
 12 files changed, 100 insertions(+), 498 deletions(-)
 delete mode 100644 client/src/pages/competence-old/CompetenceIndexPage.vue
 delete mode 100644 client/src/pages/competence-old/CompetenceParentPage.vue
 delete mode 100644 client/src/pages/competence-old/PerformanceCriteriaPage.vue
 delete mode 100644 client/src/pages/competence-old/SinglePerformanceCriteriaPage.vue
 rename client/src/pages/{competence-old/PerformanceCriteriaRow.vue => competence/SinglePerformanceCriteriaRow.vue} (58%)

diff --git a/client/src/pages/competence-old/CompetenceIndexPage.vue b/client/src/pages/competence-old/CompetenceIndexPage.vue
deleted file mode 100644
index 480df996..00000000
--- a/client/src/pages/competence-old/CompetenceIndexPage.vue
+++ /dev/null
@@ -1,179 +0,0 @@
-<script setup lang="ts">
-import PerformanceCriteriaRow from "@/pages/competence-old/PerformanceCriteriaRow.vue";
-import ItDropdownSelect from "@/components/ui/ItDropdownSelect.vue";
-import ItProgress from "@/components/ui/ItProgress.vue";
-import { useCompetenceStore } from "@/stores/competence";
-import maxBy from "lodash/maxBy";
-import orderBy from "lodash/orderBy";
-import * as log from "loglevel";
-import { computed } from "vue";
-
-log.debug("CompetenceIndexPage created");
-
-const props = defineProps<{
-  courseSlug: string;
-}>();
-
-log.debug("CompetenceIndexPage created", props);
-
-const competenceStore = useCompetenceStore();
-
-const failedCriteria = computed(() => {
-  return competenceStore
-    .flatPerformanceCriteria()
-    .filter((criteria) => {
-      return criteria.completion_status === "FAIL";
-    })
-    .slice(0, 3);
-});
-
-const lastUpdatedCompetences = computed(() => {
-  return orderBy(
-    competenceStore.competences(),
-    [
-      (competence) => {
-        let criteria = competence.children;
-        if (competenceStore.selectedCircle.id != "all") {
-          criteria = criteria.filter((criteria) => {
-            return (
-              criteria.circle.translation_key === competenceStore.selectedCircle.id
-            );
-          });
-        }
-        return (
-          maxBy(criteria, "completion_status_updated_at")
-            ?.completion_status_updated_at || ""
-        );
-      },
-    ],
-    ["desc"]
-  ).slice(0, 3);
-});
-
-const countStatus = computed(() => {
-  return competenceStore.calcStatusCount(competenceStore.flatPerformanceCriteria());
-});
-</script>
-
-<template>
-  <div class="container-large lg:mt-4">
-    <div
-      v-if="competenceStore.competenceProfilePage()"
-      class="mb-10 flex flex-col justify-between lg:flex-row lg:items-center"
-    >
-      <h1>{{ $t("competences.title") }}</h1>
-      <ItDropdownSelect
-        v-model="competenceStore.selectedCircle"
-        class="mt-4 w-full lg:mt-0 lg:w-96"
-        :items="competenceStore.availableCircles"
-      ></ItDropdownSelect>
-    </div>
-    <div class="l mb-4 bg-white px-8 py-4 lg:mb-8 lg:py-8">
-      <div>
-        <h3 class="border-b pb-4">{{ $t("competences.lastImprovements") }}</h3>
-        <ul>
-          <li
-            v-for="competence in lastUpdatedCompetences"
-            :key="competence.id"
-            class="flex flex-col border-b py-4 last:mb-8 lg:flex-row lg:items-center"
-          >
-            <p class="mb-4 inline-block lg:mb-0 lg:mr-5 lg:w-1/4">
-              {{ competence.competence_id }} {{ competence.title }}
-            </p>
-            <ItProgress
-              :status-count="
-                competenceStore.calcStatusCount(
-                  competenceStore.criteriaByCompetence(competence)
-                )
-              "
-            ></ItProgress>
-          </li>
-        </ul>
-        <router-link
-          :to="`${
-            competenceStore.competenceProfilePage()?.frontend_url
-          }-old/competences`"
-          class="btn-text inline-flex items-center py-2 pl-0"
-        >
-          <span>{{ $t("general.showAll") }}</span>
-          <it-icon-arrow-right></it-icon-arrow-right>
-        </router-link>
-      </div>
-    </div>
-    <div class="l mb-4 bg-white px-8 py-4 lg:mb-8 lg:py-8">
-      <h3 class="mb-4 border-b pb-4 lg:border-0 lg:pb-0">
-        {{ $t("competences.assessment") }}
-      </h3>
-      <ul
-        class="mb-6 flex flex-col lg:flex-row lg:items-center lg:justify-between lg:gap-8"
-      >
-        <li
-          class="mb-4 inline-block flex-1 border-b pb-4 lg:mb-0 lg:border-b-0 lg:border-r lg:pb-0"
-        >
-          <h5 class="mb-4 text-gray-700">«{{ $t("selfEvaluation.no") }}»</h5>
-          <div class="flex flex-row items-center">
-            <it-icon-smiley-thinking class="h-16 w-16"></it-icon-smiley-thinking>
-            <p class="ml-4 inline-block text-7xl font-bold">{{ countStatus.FAIL }}</p>
-          </div>
-        </li>
-        <li
-          class="mb-4 inline-block flex-1 border-b pb-4 lg:mb-0 lg:border-b-0 lg:border-r lg:pb-0"
-        >
-          <h5 class="mb-4 text-gray-700">«{{ $t("selfEvaluation.yes") }}»</h5>
-          <div class="flex flex-row items-center">
-            <it-icon-smiley-happy class="h-16 w-16"></it-icon-smiley-happy>
-            <p class="ml-4 inline-block text-7xl font-bold">
-              {{ countStatus.SUCCESS }}
-            </p>
-          </div>
-        </li>
-        <li class="lg:mb-0flex-1 border-b pb-4 lg:border-b-0 lg:pb-0">
-          <h5 class="mb-4 text-gray-700">{{ $t("competences.notAssessed") }}</h5>
-          <div class="flex flex-row items-center">
-            <it-icon-smiley-neutral class="h-16 w-16"></it-icon-smiley-neutral>
-            <p class="ml-4 inline-block text-7xl font-bold">
-              {{ countStatus.UNKNOWN }}
-            </p>
-          </div>
-        </li>
-      </ul>
-      <router-link
-        :to="`${competenceStore.competenceProfilePage()?.frontend_url}-old/criteria`"
-        class="btn-text inline-flex items-center py-2 pl-0"
-      >
-        <span>{{ $t("general.showAll") }}</span>
-        <it-icon-arrow-right></it-icon-arrow-right>
-      </router-link>
-    </div>
-    <div
-      v-if="failedCriteria.length > 0"
-      class="l mb-4 bg-white px-8 py-4 lg:mb-8 lg:py-8"
-    >
-      <div class="mb-4 flex flex-row items-center border-b pb-4">
-        <it-icon-smiley-thinking class="mr-5 h-11 w-11"></it-icon-smiley-thinking>
-        <h3>«{{ $t("selfEvaluation.no") }}»</h3>
-      </div>
-      <ul class="mb-6">
-        <li
-          v-for="criteria in failedCriteria"
-          :key="criteria.id"
-          class="mb-4 border-b pb-4"
-        >
-          <PerformanceCriteriaRow
-            :criteria="criteria"
-            :course-slug="props.courseSlug"
-          ></PerformanceCriteriaRow>
-        </li>
-      </ul>
-      <router-link
-        :to="`${competenceStore.competenceProfilePage()?.frontend_url}-old/criteria`"
-        class="btn-text inline-flex items-center py-2 pl-0"
-      >
-        <span>{{ $t("general.showAll") }}</span>
-        <it-icon-arrow-right></it-icon-arrow-right>
-      </router-link>
-    </div>
-  </div>
-</template>
-
-<style scoped></style>
diff --git a/client/src/pages/competence-old/CompetenceParentPage.vue b/client/src/pages/competence-old/CompetenceParentPage.vue
deleted file mode 100644
index ff4dab2c..00000000
--- a/client/src/pages/competence-old/CompetenceParentPage.vue
+++ /dev/null
@@ -1,34 +0,0 @@
-<script setup lang="ts">
-import { useCompetenceStore } from "@/stores/competence";
-import * as log from "loglevel";
-import { onMounted } from "vue";
-
-log.debug("CompetenceParentPage created");
-
-const props = defineProps<{
-  courseSlug: string;
-}>();
-
-const competenceStore = useCompetenceStore();
-
-onMounted(async () => {
-  log.debug("CompetenceParentPage mounted", props.courseSlug);
-
-  try {
-    const competencePageSlug = props.courseSlug + "-competence";
-    await competenceStore.loadCompetenceProfilePage(competencePageSlug);
-  } catch (error) {
-    log.error(error);
-  }
-});
-</script>
-
-<template>
-  <div class="bg-gray-200">
-    <main>
-      <router-view></router-view>
-    </main>
-  </div>
-</template>
-
-<style scoped></style>
diff --git a/client/src/pages/competence-old/PerformanceCriteriaPage.vue b/client/src/pages/competence-old/PerformanceCriteriaPage.vue
deleted file mode 100644
index 1117d6c1..00000000
--- a/client/src/pages/competence-old/PerformanceCriteriaPage.vue
+++ /dev/null
@@ -1,122 +0,0 @@
-<script setup lang="ts">
-import { default as PerformanceCriteriaRow } from "@/pages/competence-old/PerformanceCriteriaRow.vue";
-import ItDropdownSelect from "@/components/ui/ItDropdownSelect.vue";
-import { useCompetenceStore } from "@/stores/competence";
-import type { CourseCompletionStatus } from "@/types";
-import * as log from "loglevel";
-import type { Ref } from "vue";
-import { computed, ref } from "vue";
-import { useTranslation } from "i18next-vue";
-
-const props = defineProps<{
-  courseSlug: string;
-}>();
-
-interface MenuItem {
-  id: CourseCompletionStatus;
-  name: string;
-  iconName: string;
-}
-
-log.debug("PerformanceCriteriaPage created", props);
-
-const competenceStore = useCompetenceStore();
-
-const shownCriteria = computed(() => {
-  return competenceStore.flatPerformanceCriteria().filter((criteria) => {
-    return criteria.completion_status === activeMenuItem.value.id;
-  });
-});
-
-const { t } = useTranslation();
-
-const mobileMenuItems: MenuItem[] = [
-  {
-    id: "FAIL",
-    name: `«${t("selfEvaluation.no")}»`,
-    iconName: "it-icon-smiley-thinking",
-  },
-  {
-    id: "SUCCESS",
-    name: `«${t("selfEvaluation.yes")}»`,
-    iconName: "it-icon-smiley-happy",
-  },
-  {
-    id: "UNKNOWN",
-    name: t("competences.notAssessed"),
-    iconName: "it-icon-smiley-neutral",
-  },
-];
-
-const activeMenuItem: Ref<MenuItem> = ref(mobileMenuItems[0]);
-
-function updateActiveState(status: CourseCompletionStatus) {
-  activeMenuItem.value =
-    mobileMenuItems.find((item) => status === item.id) || mobileMenuItems[0];
-}
-</script>
-
-<template>
-  <div class="container-large">
-    <nav class="py-4 lg:pb-8">
-      <router-link
-        class="btn-text inline-flex items-center pl-0"
-        :to="`${competenceStore.competenceProfilePage()?.frontend_url}-old`"
-      >
-        <it-icon-arrow-left />
-        <span>{{ $t("general.back") }}</span>
-      </router-link>
-    </nav>
-    <div class="mb-4 flex flex-col items-center justify-between lg:mb-10 lg:flex-row">
-      <h1>Einschätzungen</h1>
-      <ItDropdownSelect
-        v-model="competenceStore.selectedCircle"
-        class="mt-4 w-full lg:mt-0 lg:w-96"
-        :items="competenceStore.availableCircles"
-      ></ItDropdownSelect>
-      <div class="w-full lg:hidden">
-        <ItDropdownSelect
-          v-model="activeMenuItem"
-          class="mt-4 w-full lg:mt-0 lg:w-96"
-          :items="mobileMenuItems"
-        ></ItDropdownSelect>
-      </div>
-    </div>
-    <div class="bg-white p-8">
-      <div
-        class="mb-4 flex hidden flex-col justify-between border-b pb-4 lg:block lg:flex-row lg:items-center"
-      >
-        <button
-          v-for="item in mobileMenuItems"
-          :key="item.id"
-          :class="{
-            'bg-gray-200': activeMenuItem.id === item.id,
-            'mr-6': item.id !== 'UNKNOWN',
-          }"
-          class="mr-6 inline-block px-2 py-4"
-          @click="updateActiveState(item.id)"
-        >
-          <div class="flex flex-row items-center">
-            <span class="mr-2 inline-block">{{ item.name }}</span>
-            <component :is="item.iconName"></component>
-          </div>
-        </button>
-      </div>
-      <ul class="mb-6">
-        <li
-          v-for="criteria in shownCriteria"
-          :key="criteria.id"
-          class="mb-4 border-b pb-4"
-        >
-          <PerformanceCriteriaRow
-            :criteria="criteria"
-            :show-state="true"
-            :course-slug="props.courseSlug"
-          ></PerformanceCriteriaRow>
-        </li>
-      </ul>
-    </div>
-  </div>
-</template>
-
-<style scoped></style>
diff --git a/client/src/pages/competence-old/SinglePerformanceCriteriaPage.vue b/client/src/pages/competence-old/SinglePerformanceCriteriaPage.vue
deleted file mode 100644
index 4e3a9f5d..00000000
--- a/client/src/pages/competence-old/SinglePerformanceCriteriaPage.vue
+++ /dev/null
@@ -1,70 +0,0 @@
-<script setup lang="ts">
-import { useCircleStore } from "@/stores/circle";
-import { useCompetenceStore } from "@/stores/competence";
-import * as log from "loglevel";
-
-import LearningContentContainer from "@/pages/learningPath/learningContentPage/LearningContentContainer.vue";
-import { computed } from "vue";
-import { useRouter } from "vue-router";
-
-const props = defineProps<{
-  courseSlug: string;
-  criteriaSlug: string;
-}>();
-
-log.debug("SinglePerformanceCriteriaPage.vue setup");
-
-const competenceStore = useCompetenceStore();
-const circleStore = useCircleStore();
-
-const router = useRouter();
-
-const singleCriteria = computed(() => {
-  return competenceStore.flatPerformanceCriteria().find((criteria) => {
-    return criteria.slug === props.criteriaSlug;
-  });
-});
-</script>
-
-<template>
-  <div v-if="singleCriteria" class="absolute bottom-0 top-0 w-full bg-white">
-    <LearningContentContainer @exit="router.back()">
-      <div v-if="singleCriteria" class="container-medium">
-        <div class="mt-4 border p-6 lg:mt-8 lg:p-12">
-          <h2 class="heading-2">
-            {{ singleCriteria.competence_id }} {{ singleCriteria.title }}
-          </h2>
-
-          <div class="mt-4 flex flex-col justify-between gap-6 lg:mt-8 lg:flex-row">
-            <button
-              class="inline-flex flex-1 items-center border p-4 text-left"
-              :class="{
-                'border-green-500': singleCriteria.completion_status === 'SUCCESS',
-                'border-2': singleCriteria.completion_status === 'SUCCESS',
-              }"
-              data-cy="success"
-              @click="circleStore.markCompletion(singleCriteria, 'SUCCESS')"
-            >
-              <it-icon-smiley-happy class="mr-4 h-16 w-16"></it-icon-smiley-happy>
-              <span class="text-large font-bold">{{ $t("selfEvaluation.yes") }}</span>
-            </button>
-            <button
-              class="inline-flex flex-1 items-center border p-4 text-left"
-              :class="{
-                'border-orange-500': singleCriteria.completion_status === 'FAIL',
-                'border-2': singleCriteria.completion_status === 'FAIL',
-              }"
-              data-cy="fail"
-              @click="circleStore.markCompletion(singleCriteria, 'FAIL')"
-            >
-              <it-icon-smiley-thinking class="mr-4 h-16 w-16"></it-icon-smiley-thinking>
-              <span class="text-xl font-bold">{{ $t("selfEvaluation.no") }}</span>
-            </button>
-          </div>
-        </div>
-      </div>
-    </LearningContentContainer>
-  </div>
-</template>
-
-<style scoped></style>
diff --git a/client/src/pages/competence/ActionCompetenceDetail.vue b/client/src/pages/competence/ActionCompetenceDetail.vue
index ec12fa5e..39540e92 100644
--- a/client/src/pages/competence/ActionCompetenceDetail.vue
+++ b/client/src/pages/competence/ActionCompetenceDetail.vue
@@ -1,11 +1,10 @@
 <script setup lang="ts">
-import PerformanceCriteriaRow from "@/pages/competence-old/PerformanceCriteriaRow.vue";
-import ItProgress from "@/components/ui/ItProgress.vue";
 import ItToggleArrow from "@/components/ui/ItToggleArrow.vue";
 import { useCompetenceStore } from "@/stores/competence";
 import type { CompetencePage } from "@/types";
 import log from "loglevel";
-import { ref } from "vue";
+import { ref, watch } from "vue";
+import SinglePerformanceCriteriaRow from "@/pages/competence/SinglePerformanceCriteriaRow.vue";
 
 const competenceStore = useCompetenceStore();
 
@@ -14,17 +13,26 @@ interface Props {
   courseSlug: string;
   showAssessAgain?: boolean;
   isInline?: boolean;
+  allOpen?: boolean;
 }
 
 const props = withDefaults(defineProps<Props>(), {
   showAssessAgain: true,
   isInline: false,
+  allOpen: false,
 });
 
 log.debug("PerformanceCriteriaRow created", props);
 
 const isOpen = ref(false);
 
+watch(
+  () => props.allOpen,
+  (newValue) => {
+    isOpen.value = newValue;
+  }
+);
+
 const togglePerformanceCriteria = () => {
   isOpen.value = !isOpen.value;
 };
@@ -32,7 +40,7 @@ const togglePerformanceCriteria = () => {
 
 <template>
   <div>
-    <div :class="{ 'mb-4 border-b pb-8': isOpen }" class="-mx-8 px-8">
+    <div class="-mx-8 border-b px-8">
       <div
         class="flex flex-row items-center justify-between"
         :class="props.isInline ? '' : 'mb-4'"
@@ -41,40 +49,27 @@ const togglePerformanceCriteria = () => {
         @click="togglePerformanceCriteria()"
       >
         <h2 :class="props.isInline ? ['text-bold', 'w-2/5'] : 'text-large'">
-          {{ competence.competence_id }} {{ competence.title }}
+          {{ competence.title }} ({{ competence.competence_id }})
         </h2>
-        <ItProgress
-          v-if="isInline"
-          class="w-[330px]"
-          :status-count="
-            competenceStore.calcStatusCount(
-              competenceStore.criteriaByCompetence(competence)
-            )
-          "
-        ></ItProgress>
         <ItToggleArrow :is-open="isOpen" :small="isInline"></ItToggleArrow>
       </div>
-      <ItProgress
-        v-if="!isInline"
-        :status-count="
-          competenceStore.calcStatusCount(
-            competenceStore.criteriaByCompetence(competence)
-          )
-        "
-      ></ItProgress>
     </div>
     <ul v-if="isOpen">
+      <li class="my-4 border-b pb-4 font-bold">
+        {{ $t("a.Leistungsziele") }}
+      </li>
+
       <li
         v-for="performanceCriteria in competenceStore.criteriaByCompetence(competence)"
         :key="performanceCriteria.id"
-        class="mb-4 border-b pb-4 last:border-0"
+        class="my-4 border-b pb-4 last:border-0"
       >
-        <PerformanceCriteriaRow
+        <SinglePerformanceCriteriaRow
           :criteria="performanceCriteria"
-          :show-state="true"
+          :show-state="false"
           :course-slug="props.courseSlug"
           :show-assess-again="props.showAssessAgain"
-        ></PerformanceCriteriaRow>
+        ></SinglePerformanceCriteriaRow>
       </li>
     </ul>
   </div>
diff --git a/client/src/pages/competence/ActionCompetenceListPage.vue b/client/src/pages/competence/ActionCompetenceListPage.vue
index 9f15586a..0e5d4167 100644
--- a/client/src/pages/competence/ActionCompetenceListPage.vue
+++ b/client/src/pages/competence/ActionCompetenceListPage.vue
@@ -2,6 +2,7 @@
 import CompetenceDetail from "@/pages/competence/ActionCompetenceDetail.vue";
 import { useCompetenceStore } from "@/stores/competence";
 import * as log from "loglevel";
+import { ref } from "vue";
 
 log.debug("CompetenceListPage created");
 
@@ -10,21 +11,45 @@ const props = defineProps<{
 }>();
 
 const competenceStore = useCompetenceStore();
+
+const isOpenAll = ref(false);
+
+function toggleOpen() {
+  log.debug("toggleOpen");
+  isOpenAll.value = !isOpenAll.value;
+}
 </script>
 
 <template>
   <div class="container-large">
-    <h2 class="mb-4 lg:py-4">{{ $t("a.Handlungskompetenzen") }}</h2>
+    <h2 class="py-4">{{ $t("a.Handlungskompetenzen") }}</h2>
+
+    <div class="flex justify-between py-8">
+      <div class="w-3/4 text-xl">
+        {{ $t("competence.listPageDescription") }}
+      </div>
+      <div class="whitespace-nowrap">
+        <button class="link" @click="toggleOpen()">
+          <span v-if="isOpenAll">
+            {{ $t("a.Alle zuklappen") }}
+          </span>
+          <span v-else>
+            {{ $t("a.Alle aufklappen") }}
+          </span>
+        </button>
+      </div>
+    </div>
 
     <ul v-if="competenceStore.competenceProfilePage()">
       <li
         v-for="competence in competenceStore.competences()"
         :key="competence.id"
-        class="mb-8 bg-white p-8"
+        class="mb-8 bg-white px-8 pt-6"
       >
         <CompetenceDetail
           :competence="competence"
           :course-slug="props.courseSlug"
+          :all-open="isOpenAll"
         ></CompetenceDetail>
       </li>
     </ul>
diff --git a/client/src/pages/competence-old/PerformanceCriteriaRow.vue b/client/src/pages/competence/SinglePerformanceCriteriaRow.vue
similarity index 58%
rename from client/src/pages/competence-old/PerformanceCriteriaRow.vue
rename to client/src/pages/competence/SinglePerformanceCriteriaRow.vue
index e6e1140c..03922783 100644
--- a/client/src/pages/competence-old/PerformanceCriteriaRow.vue
+++ b/client/src/pages/competence/SinglePerformanceCriteriaRow.vue
@@ -26,31 +26,17 @@ const props = withDefaults(defineProps<Props>(), {
         ></it-icon-smiley-thinking>
         <it-icon-smiley-neutral v-else></it-icon-smiley-neutral>
       </div>
-      <div class="mb-4 pr-5 lg:mb-0 lg:mr-10">
-        <h4 class="text-bold mb-2">
-          {{ criteria.competence_id }} {{ criteria.title }}
-        </h4>
-        <p class="hidden lg:block">
-          {{ $t("general.learningUnit") }}:
-          <router-link class="link" :to="criteria.learning_unit.frontend_url">
-            {{ criteria.learning_unit.title }}
-          </router-link>
-        </p>
+      <div class="mb-4 pr-4 lg:mb-0 lg:mr-8">
+        {{ criteria.title }}
       </div>
     </div>
-    <p class="mb-2 lg:hidden">
-      {{ $t("general.learningUnit") }}:
-      <router-link class="link" :to="criteria.learning_unit.frontend_url">
-        {{ criteria.learning_unit.title }}
-      </router-link>
-    </p>
     <span class="whitespace-nowrap">
       <router-link
         v-if="props.showAssessAgain"
         class="link"
-        :to="`/course/${props.courseSlug}/competence-old/criteria/${criteria.slug}`"
+        :to="criteria.learning_unit.evaluate_url"
       >
-        {{ $t("competences.assessAgain") }}
+        {{ $t("competences.assessAgain", { x: criteria.circle.title }) }}
       </router-link>
     </span>
   </div>
diff --git a/client/src/pages/learningPath/learningContentPage/LearningContentParent.vue b/client/src/pages/learningPath/learningContentPage/LearningContentParent.vue
index bd749369..ebaf9f9a 100644
--- a/client/src/pages/learningPath/learningContentPage/LearningContentParent.vue
+++ b/client/src/pages/learningPath/learningContentPage/LearningContentParent.vue
@@ -16,6 +16,7 @@ import MediaLibraryBlock from "./blocks/MediaLibraryBlock.vue";
 import PlaceholderBlock from "./blocks/PlaceholderBlock.vue";
 import RichTextBlock from "./blocks/RichTextBlock.vue";
 import VideoBlock from "./blocks/VideoBlock.vue";
+import { getPreviousRoute } from "@/router/history";
 
 const circleStore = useCircleStore();
 
@@ -25,6 +26,8 @@ const props = defineProps<{
 
 log.debug("LearningContentParent setup", props.learningContent);
 
+const previousRoute = getPreviousRoute();
+
 // can't use the type as component name, as some are reserved HTML components, e.g. video
 const COMPONENTS: Record<LearningContentType, Component> = {
   "learnpath.LearningContentAssignment": AssignmentBlock,
@@ -45,7 +48,7 @@ const component = computed(() => {
 });
 
 function handleFinishedLearningContent() {
-  circleStore.continueFromLearningContent(props.learningContent);
+  circleStore.continueFromLearningContent(props.learningContent, previousRoute);
 }
 
 eventBus.on("finishedLearningContent", handleFinishedLearningContent);
@@ -57,7 +60,7 @@ onUnmounted(() => {
 
 <template>
   <LearningContentContainer
-    @exit="circleStore.closeLearningContent(props.learningContent)"
+    @exit="circleStore.closeLearningContent(props.learningContent, previousRoute)"
   >
     <div>
       <component :is="component" :content="learningContent"></component>
diff --git a/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluation.vue b/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluation.vue
index b244271a..6bbc5dd4 100644
--- a/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluation.vue
+++ b/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluation.vue
@@ -10,6 +10,7 @@ import LearningContentMultiLayout from "@/pages/learningPath/learningContentPage
 import eventBus from "@/utils/eventBus";
 import { useRouteQuery } from "@vueuse/router";
 import { computed, onUnmounted } from "vue";
+import { getPreviousRoute } from "@/router/history";
 
 log.debug("LearningContent.vue setup");
 
@@ -18,6 +19,8 @@ const courseSession = useCurrentCourseSession();
 
 const questionIndex = useRouteQuery("step", "0", { transform: Number, mode: "push" });
 
+const previousRoute = getPreviousRoute();
+
 const props = defineProps<{
   learningUnit: LearningUnit;
 }>();
@@ -52,7 +55,7 @@ function handleBack() {
 }
 
 function handleFinishedLearningContent() {
-  circleStore.closeSelfEvaluation(props.learningUnit);
+  circleStore.closeSelfEvaluation(props.learningUnit, previousRoute);
 }
 
 eventBus.on("finishedLearningContent", handleFinishedLearningContent);
@@ -65,7 +68,7 @@ onUnmounted(() => {
 <template>
   <div v-if="learningUnit">
     <LearningContentContainer
-      @exit="circleStore.closeSelfEvaluation(props.learningUnit)"
+      @exit="circleStore.closeSelfEvaluation(props.learningUnit, previousRoute)"
     >
       <LearningContentMultiLayout
         :current-step="questionIndex"
diff --git a/client/src/router/history.ts b/client/src/router/history.ts
index c7aa92c6..7c0880d5 100644
--- a/client/src/router/history.ts
+++ b/client/src/router/history.ts
@@ -23,9 +23,16 @@ export const addToHistory: NavigationGuard = (to, from, next) => {
   next();
 };
 
+export function getPreviousRoute() {
+  if (routeHistory.length > 0) {
+    return routeHistory[routeHistory.length - 1];
+  }
+  return undefined;
+}
+
 export function routerBackOrFallback(router: Router, fallbackRoute: RouteLocationRaw) {
   // Check the latest route in history
-  const previousRoute = routeHistory[routeHistory.length - 1];
+  const previousRoute = getPreviousRoute();
   if (previousRoute) {
     router.back();
   } else {
diff --git a/client/src/router/index.ts b/client/src/router/index.ts
index d076fa5a..dac7036f 100644
--- a/client/src/router/index.ts
+++ b/client/src/router/index.ts
@@ -97,35 +97,6 @@ const router = createRouter({
         },
       ],
     },
-
-    {
-      path: "/course/:courseSlug/competence-old",
-      props: true,
-      component: () => import("@/pages/competence-old/CompetenceParentPage.vue"),
-      children: [
-        {
-          path: "",
-          props: true,
-          component: () => import("@/pages/competence-old/CompetenceIndexPage.vue"),
-        },
-        {
-          path: "competences",
-          props: true,
-          component: () => import("@/pages/competence/ActionCompetenceListPage.vue"),
-        },
-        {
-          path: "criteria",
-          props: true,
-          component: () => import("@/pages/competence-old/PerformanceCriteriaPage.vue"),
-        },
-        {
-          path: "criteria/:criteriaSlug",
-          props: true,
-          component: () =>
-            import("@/pages/competence-old/SinglePerformanceCriteriaPage.vue"),
-        },
-      ],
-    },
     {
       path: "/course/:courseSlug/learn",
       component: () =>
diff --git a/client/src/stores/circle.ts b/client/src/stores/circle.ts
index 71406bbd..8cbf7b0a 100644
--- a/client/src/stores/circle.ts
+++ b/client/src/stores/circle.ts
@@ -1,4 +1,3 @@
-import { routerBackOrFallback } from "@/router/history";
 import type { Circle } from "@/services/circle";
 import { useCompletionStore } from "@/stores/completion";
 import { useLearningPathStore } from "@/stores/learningPath";
@@ -12,6 +11,7 @@ import type {
 } from "@/types";
 import * as log from "loglevel";
 import { defineStore } from "pinia";
+import type { RouteLocationNormalized } from "vue-router";
 
 export type CircleStoreState = {
   circle: Circle | undefined;
@@ -127,22 +127,36 @@ export const useCircleStore = defineStore({
         path: learningContent.frontend_url,
       });
     },
-    closeLearningContent(learningContent: LearningContentInterface) {
-      routerBackOrFallback(this.router, {
-        path: `${this.circle?.frontend_url}`,
-        hash: createLearningUnitHash(learningContent.parentLearningUnit),
-      });
+    closeLearningContent(
+      learningContent: LearningContentInterface,
+      returnRoute?: RouteLocationNormalized
+    ) {
+      if (returnRoute) {
+        this.router.push(returnRoute);
+      } else {
+        this.router.push({
+          path: `${this.circle?.frontend_url}`,
+          hash: createLearningUnitHash(learningContent.parentLearningUnit),
+        });
+      }
     },
     openSelfEvaluation(learningUnit: LearningUnit) {
       this.router.push({
         path: learningUnit.evaluate_url,
       });
     },
-    closeSelfEvaluation(learningUnit: LearningUnit) {
-      routerBackOrFallback(this.router, {
-        path: `${this.circle?.frontend_url}`,
-        hash: createLearningUnitHash(learningUnit),
-      });
+    closeSelfEvaluation(
+      learningUnit: LearningUnit,
+      returnRoute?: RouteLocationNormalized
+    ) {
+      if (returnRoute) {
+        this.router.push(returnRoute);
+      } else {
+        this.router.push({
+          path: `${this.circle?.frontend_url}`,
+          hash: createLearningUnitHash(learningUnit),
+        });
+      }
     },
     calcSelfEvaluationStatus(learningUnit: LearningUnit): CourseCompletionStatus {
       if (learningUnit.children.length > 0) {
@@ -159,7 +173,10 @@ export const useCircleStore = defineStore({
       }
       return "UNKNOWN";
     },
-    continueFromLearningContent(currentLearningContent: LearningContentInterface) {
+    continueFromLearningContent(
+      currentLearningContent: LearningContentInterface,
+      returnRoute?: RouteLocationNormalized
+    ) {
       if (currentLearningContent) {
         if (currentLearningContent.can_user_self_toggle_course_completion) {
           this.markCompletion(currentLearningContent, "SUCCESS");
@@ -167,7 +184,7 @@ export const useCircleStore = defineStore({
           // reload completion data anyway
           currentLearningContent.parentCircle?.parentLearningPath?.reloadCompletionData();
         }
-        this.closeLearningContent(currentLearningContent);
+        this.closeLearningContent(currentLearningContent, returnRoute);
       } else {
         log.error("currentLearningContent is undefined");
       }

From 2c26a336ac568078f53a53d39fec9339e95b40a5 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Thu, 14 Sep 2023 13:25:48 +0200
Subject: [PATCH 35/49] Mobile Anpassungen Kompetenzprofil

---
 .../pages/competence/ActionCompetenceListPage.vue |  4 ++--
 .../pages/competence/CompetenceAssignmentRow.vue  | 15 +++++++++------
 .../competence/CompetenceCertificateComponent.vue | 13 ++++++++-----
 .../competence/CompetenceCertificateListPage.vue  |  6 +++---
 .../src/pages/competence/CompetenceIndexPage.vue  |  6 +++---
 .../src/pages/competence/CompetenceParentPage.vue |  8 ++++----
 .../pages/competence/PerformanceCriteriaPage.vue  |  6 +++---
 7 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/client/src/pages/competence/ActionCompetenceListPage.vue b/client/src/pages/competence/ActionCompetenceListPage.vue
index 0e5d4167..b4f782cd 100644
--- a/client/src/pages/competence/ActionCompetenceListPage.vue
+++ b/client/src/pages/competence/ActionCompetenceListPage.vue
@@ -24,8 +24,8 @@ function toggleOpen() {
   <div class="container-large">
     <h2 class="py-4">{{ $t("a.Handlungskompetenzen") }}</h2>
 
-    <div class="flex justify-between py-8">
-      <div class="w-3/4 text-xl">
+    <div class="flex flex-col justify-between gap-4 py-8 lg:flex-row">
+      <div class="text-xl lg:w-3/4">
         {{ $t("competence.listPageDescription") }}
       </div>
       <div class="whitespace-nowrap">
diff --git a/client/src/pages/competence/CompetenceAssignmentRow.vue b/client/src/pages/competence/CompetenceAssignmentRow.vue
index 099f225c..c471b9a1 100644
--- a/client/src/pages/competence/CompetenceAssignmentRow.vue
+++ b/client/src/pages/competence/CompetenceAssignmentRow.vue
@@ -22,8 +22,11 @@ const getIconName = () => {
 </script>
 
 <template>
-  <div class="flex items-center py-8" :class="{ 'border-b': props.addBorderBottom }">
-    <component :is="getIconName()" class="mr-4 h-9 w-9"></component>
+  <div
+    class="flex flex-col gap-4 py-8 lg:flex-row lg:items-center lg:gap-0"
+    :class="{ 'border-b': props.addBorderBottom }"
+  >
+    <component :is="getIconName()" class="mr-4 hidden h-9 w-9 lg:block"></component>
     <div class="flex w-[420px] flex-col">
       <h3 class="text-bold flex items-center gap-2">{{ assignment.title }}</h3>
       <p class="text-gray-800">
@@ -41,7 +44,7 @@ const getIconName = () => {
         <span v-else>Fehler, Lerninhalt nicht korrekt verknüpft</span>
       </p>
     </div>
-    <div class="grow px-8">
+    <div class="grow lg:px-8">
       <div
         v-if="assignment.completion?.completion_status === 'EVALUATION_SUBMITTED'"
         class="flex items-center"
@@ -72,9 +75,9 @@ const getIconName = () => {
     <div>
       <div
         v-if="assignment.completion?.completion_status === 'EVALUATION_SUBMITTED'"
-        class="flex flex-col items-center"
+        class="flex flex-col lg:items-center"
       >
-        <div class="flex flex-col items-center">
+        <div class="flex flex-col lg:items-center">
           <div class="heading-2">
             {{ assignment.completion?.evaluation_points }}
           </div>
@@ -83,7 +86,7 @@ const getIconName = () => {
           </div>
         </div>
       </div>
-      <div v-else class="flex flex-col items-center">
+      <div v-else class="flex flex-col lg:items-center">
         <div>{{ $t("a.Höchstpunktzahl") }}</div>
         <div>{{ assignment.max_points }} {{ $t("a.Punkte") }}</div>
       </div>
diff --git a/client/src/pages/competence/CompetenceCertificateComponent.vue b/client/src/pages/competence/CompetenceCertificateComponent.vue
index 201637a7..6dac954a 100644
--- a/client/src/pages/competence/CompetenceCertificateComponent.vue
+++ b/client/src/pages/competence/CompetenceCertificateComponent.vue
@@ -45,16 +45,19 @@ const progressStatusCount = computed(() => {
 <template>
   <div>
     <div class="mb-4 bg-white p-8">
-      <div class="flex items-center">
-        <h3 :class="{ 'heading-2': props.detailView }">
-          {{ props.competenceCertificate.title }}
-        </h3>
+      <div class="flex flex-col lg:flex-row lg:items-center">
         <div
           v-if="numAssignmentsEvaluated < numAssignmentsTotal"
-          class="ml-2 rounded-full bg-gray-200 px-2.5 py-0.5 text-sm"
+          class="rounded-full bg-gray-200 px-2.5 py-0.5 text-sm lg:ml-2"
         >
           {{ $t("a.Zwischenstand") }}
         </div>
+        <h3
+          class="mt-2 lg:order-first lg:mt-0"
+          :class="{ 'heading-2': props.detailView }"
+        >
+          {{ props.competenceCertificate.title }}
+        </h3>
       </div>
 
       <section v-if="userPointsEvaluatedAssignments > 0" class="flex items-center">
diff --git a/client/src/pages/competence/CompetenceCertificateListPage.vue b/client/src/pages/competence/CompetenceCertificateListPage.vue
index 4acc9733..69d4d1b9 100644
--- a/client/src/pages/competence/CompetenceCertificateListPage.vue
+++ b/client/src/pages/competence/CompetenceCertificateListPage.vue
@@ -62,14 +62,14 @@ onMounted(async () => {
     <h2 class="mb-4 lg:py-4">{{ $t("a.Kompetenznachweise") }}</h2>
 
     <div class="mb-4 bg-white p-8">
-      <div class="flex items-center">
-        <h3>{{ $t("a.Gesamtpunktzahl") }}</h3>
+      <div class="flex flex-col lg:flex-row lg:items-center">
         <div
           v-if="numAssignmentsEvaluated < assignments.length"
-          class="ml-2 rounded-full bg-gray-200 px-2.5 py-0.5 text-sm"
+          class="rounded-full bg-gray-200 px-2.5 py-0.5 text-sm lg:ml-2"
         >
           {{ $t("a.Zwischenstand") }}
         </div>
+        <h3 class="mt-2 lg:order-first lg:mt-0">{{ $t("a.Gesamtpunktzahl") }}</h3>
       </div>
 
       <section v-if="userPointsEvaluatedAssignments > 0" class="flex items-center">
diff --git a/client/src/pages/competence/CompetenceIndexPage.vue b/client/src/pages/competence/CompetenceIndexPage.vue
index e9f966b7..7a4fe486 100644
--- a/client/src/pages/competence/CompetenceIndexPage.vue
+++ b/client/src/pages/competence/CompetenceIndexPage.vue
@@ -81,12 +81,12 @@ const performanceCriteriaStatusCount = computed(() => {
           <div
             v-for="certificate in competenceCertificates"
             :key="certificate.id"
-            class="flex items-center justify-between border-b py-4 first:border-t"
+            class="flex flex-col justify-between border-b py-4 first:border-t lg:flex-row lg:items-center"
           >
             <div class="text-bold text-xl">
               {{ certificate.title }}
             </div>
-            <div>
+            <div class="mt-4 lg:mt-0">
               <span class="text-bold">
                 {{ assignmentsMaxEvaluationPoints(certificate.assignments) }}
               </span>
@@ -107,7 +107,7 @@ const performanceCriteriaStatusCount = computed(() => {
                   })
                 }}
               </div>
-              <div class="ml-2 w-40">
+              <div class="ml-2 hidden w-40 lg:block">
                 <ItProgress
                   :status-count="
                     competenceCertificateProgressStatusCount(certificate.assignments)
diff --git a/client/src/pages/competence/CompetenceParentPage.vue b/client/src/pages/competence/CompetenceParentPage.vue
index a69f90ad..1cdd8ca9 100644
--- a/client/src/pages/competence/CompetenceParentPage.vue
+++ b/client/src/pages/competence/CompetenceParentPage.vue
@@ -45,7 +45,7 @@ onMounted(async () => {
 <template>
   <div class="bg-gray-200">
     <nav class="border-b bg-white px-4 lg:px-8">
-      <ul class="scrollbar overflow-auto whitespace-nowrap">
+      <ul class="flex flex-col lg:flex-row">
         <li
           class="inline-block border-t-2 border-t-transparent py-3"
           :class="{ 'border-b-2 border-b-blue-900': routeInOverview() }"
@@ -55,7 +55,7 @@ onMounted(async () => {
           </router-link>
         </li>
         <li
-          class="ml-6 inline-block border-t-2 border-t-transparent py-3 lg:ml-12"
+          class="inline-block border-t-2 border-t-transparent py-3 lg:ml-12"
           :class="{ 'border-b-2 border-b-blue-900': routeInCompetenceCertificate() }"
         >
           <router-link :to="`/course/${courseSlug}/competence/certificates`">
@@ -63,7 +63,7 @@ onMounted(async () => {
           </router-link>
         </li>
         <li
-          class="ml-6 inline-block border-t-2 border-t-transparent py-3 lg:ml-12"
+          class="inline-block border-t-2 border-t-transparent py-3 lg:ml-12"
           :class="{ 'border-b-2 border-b-blue-900': routeInPerformanceCriteria() }"
         >
           <router-link :to="`/course/${courseSlug}/competence/criteria`">
@@ -72,7 +72,7 @@ onMounted(async () => {
         </li>
 
         <li
-          class="ml-6 inline-block border-t-2 border-t-transparent py-3 lg:ml-12"
+          class="inline-block border-t-2 border-t-transparent py-3 lg:ml-12"
           :class="{ 'border-b-2 border-b-blue-900': routeInActionCompetences() }"
         >
           <router-link :to="`/course/${courseSlug}/competence/competences`">
diff --git a/client/src/pages/competence/PerformanceCriteriaPage.vue b/client/src/pages/competence/PerformanceCriteriaPage.vue
index 231f3cee..46172047 100644
--- a/client/src/pages/competence/PerformanceCriteriaPage.vue
+++ b/client/src/pages/competence/PerformanceCriteriaPage.vue
@@ -60,15 +60,15 @@ const criteriaByLearningUnit = computed(() => {
       <div
         v-for="selfEvaluation in criteriaByLearningUnit"
         :key="selfEvaluation.luId"
-        class="flex items-center justify-between border-b py-4 last:border-b-0"
+        class="flex flex-col justify-between gap-4 border-b py-4 last:border-b-0 lg:flex-row lg:items-center"
       >
-        <div class="w-1/3">
+        <div class="lg:w-1/3">
           {{ $t("a.Circle") }}
           {{ selfEvaluation.circleTitle }}:
           {{ selfEvaluation.luTitle }}
         </div>
 
-        <div class="ml-4 flex w-1/3 flex-row items-center">
+        <div class="flex flex-row items-center lg:w-1/3">
           <div class="mr-6 flex flex-row items-center">
             <it-icon-smiley-thinking
               class="mr-2 inline-block h-8 w-8"

From e7bbf961d5aa1d518c450d8390729ca184939443 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Thu, 14 Sep 2023 14:05:03 +0200
Subject: [PATCH 36/49] Cockpit Mobile Anpassungen

---
 client/src/components/AppFooter.vue           |  4 +--
 client/src/components/ui/ItPersonRow.vue      |  2 +-
 client/src/components/ui/ItRow.vue            |  4 +--
 .../AssignmentEvaluationPage.vue              | 21 ++++++++++-----
 .../assignmentsPage/AssignmentDetails.vue     |  8 +++---
 .../pages/cockpit/cockpitPage/CockpitPage.vue | 12 ++++-----
 .../cockpitPage/SubmissionsOverview.vue       | 13 +++++++---
 .../assignment/AssignmentView.vue             | 26 +++++++++----------
 .../learningPathPage/LearningPathPage.vue     |  2 +-
 9 files changed, 53 insertions(+), 39 deletions(-)

diff --git a/client/src/components/AppFooter.vue b/client/src/components/AppFooter.vue
index 97c20f89..0ebb2178 100644
--- a/client/src/components/AppFooter.vue
+++ b/client/src/components/AppFooter.vue
@@ -33,13 +33,13 @@ async function changeLocale(language: AvailableLanguages) {
     <div class="flex-grow"></div>
     <div :class="{ hidden: hideVersion }">VBV_VERSION_BUILD_NUMBER_VBV</div>
     <Menu>
-      <MenuButton class="lg:ml-8" data-cy="language-switch-button">
+      <MenuButton class="text-left lg:ml-8" data-cy="language-switch-button">
         <it-icon-globe class="relative top-[2px] h-4 w-4" />
         <span class="ml-2 inline">{{ $t(`language.${userStore.language}`) }}</span>
       </MenuButton>
       <div class="relative">
         <MenuItems
-          class="lg:right- absolute -right-2/3 -top-24 w-40 bg-white px-4 py-4 shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none"
+          class="absolute bottom-0 w-40 bg-white px-4 py-4 shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none lg:right-0"
         >
           <MenuItem v-for="locale in SUPPORT_LOCALES" :key="locale" class="py-1">
             <button
diff --git a/client/src/components/ui/ItPersonRow.vue b/client/src/components/ui/ItPersonRow.vue
index 0f53595b..98f2792b 100644
--- a/client/src/components/ui/ItPersonRow.vue
+++ b/client/src/components/ui/ItPersonRow.vue
@@ -11,7 +11,7 @@ defineProps<{
   <ItRow>
     <template #firstRow>
       <slot name="leading"></slot>
-      <img class="mr-2 h-[45px] rounded-full" :src="avatarUrl" />
+      <img class="mr-2 h-11 w-11 rounded-full" :src="avatarUrl" />
       <p class="text-bold lg:leading-[45px]">{{ name }}</p>
     </template>
     <template #center>
diff --git a/client/src/components/ui/ItRow.vue b/client/src/components/ui/ItRow.vue
index 03353590..d3b9b8e1 100644
--- a/client/src/components/ui/ItRow.vue
+++ b/client/src/components/ui/ItRow.vue
@@ -1,11 +1,11 @@
 <template>
   <li
-    class="flex flex-col justify-between border-t border-gray-500 py-4 leading-[45px] lg:flex-row"
+    class="flex flex-col justify-between gap-2 border-t border-gray-500 py-4 leading-[45px] lg:flex-row lg:gap-4"
   >
     <div class="flex flex-row items-center lg:w-1/3">
       <slot name="firstRow"></slot>
     </div>
-    <div class="flex flex-1 items-center">
+    <div class="flex flex-1 lg:items-center">
       <slot name="center"></slot>
     </div>
     <div class="flex items-center lg:w-1/4">
diff --git a/client/src/pages/cockpit/assignmentEvaluationPage/AssignmentEvaluationPage.vue b/client/src/pages/cockpit/assignmentEvaluationPage/AssignmentEvaluationPage.vue
index 1b1f40ed..02c0820c 100644
--- a/client/src/pages/cockpit/assignmentEvaluationPage/AssignmentEvaluationPage.vue
+++ b/client/src/pages/cockpit/assignmentEvaluationPage/AssignmentEvaluationPage.vue
@@ -13,6 +13,7 @@ import { useQuery } from "@urql/vue";
 import log from "loglevel";
 import { computed, onMounted, reactive } from "vue";
 import { useRouter } from "vue-router";
+import { getPreviousRoute } from "@/router/history";
 
 const props = defineProps<{
   courseSlug: string;
@@ -53,10 +54,16 @@ onMounted(async () => {
   );
 });
 
+const previousRoute = getPreviousRoute();
+
 function close() {
-  router.push({
-    path: `/course/${props.courseSlug}/cockpit/assignment`,
-  });
+  if (previousRoute) {
+    router.push(previousRoute);
+  } else {
+    router.push({
+      path: `/course/${props.courseSlug}/cockpit`,
+    });
+  }
 }
 
 const assignmentCompletion = computed(
@@ -96,8 +103,8 @@ const assignment = computed(
         v-if="assignment && assignmentCompletion && state.assignmentUser"
         class="relative"
       >
-        <div class="h-content flex flex-col sm:flex-row">
-          <div class="h-full overflow-y-auto bg-white sm:w-1/2">
+        <div class="md:h-content flex flex-col md:flex-row">
+          <div class="bg-white md:h-full md:w-1/2 md:overflow-y-auto">
             <!-- Left part content goes here -->
             <div class="p-10" data-cy="student-submission">
               <h3>{{ $t("a.Ergebnisse") }}</h3>
@@ -119,7 +126,9 @@ const assignment = computed(
               ></AssignmentSubmissionResponses>
             </div>
           </div>
-          <div class="overflow-y-auto bg-gray-200 sm:w-1/2">
+          <div
+            class="order-first bg-gray-200 md:order-last md:w-1/2 md:overflow-y-auto"
+          >
             <EvaluationContainer
               :assignment-completion="assignmentCompletion"
               :assignment-user="state.assignmentUser"
diff --git a/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue b/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue
index b579a3f1..734d7e9f 100644
--- a/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue
+++ b/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue
@@ -95,7 +95,7 @@ const assignmentDetail = computed(() =>
           :data-cy="csu.last_name"
         >
           <template #center>
-            <section class="flex w-full justify-between px-8">
+            <section class="flex w-full justify-between">
               <div
                 v-if="
                   state.gradedUsers.map((gradedUser) => gradedUser.user).includes(csu)
@@ -107,7 +107,7 @@ const assignmentDetail = computed(() =>
                 >
                   <it-icon-check class="h-4/5 w-4/5"></it-icon-check>
                 </div>
-                <div class="ml-2">Bewertung freigegeben</div>
+                <div class="ml-2">{{ $t("a.Bewertung freigegeben") }}</div>
               </div>
               <div
                 v-else-if="state.assignmentSubmittedUsers.includes(csu)"
@@ -118,7 +118,7 @@ const assignmentDetail = computed(() =>
                 >
                   <it-icon-check class="h-6 w-6"></it-icon-check>
                 </div>
-                <div class="ml-2">Ergebnisse abgegeben</div>
+                <div class="ml-2">{{ $t("a.Ergebnisse abgegeben") }}</div>
               </div>
 
               <div
@@ -137,7 +137,7 @@ const assignmentDetail = computed(() =>
             <router-link
               v-if="state.assignmentSubmittedUsers.includes(csu)"
               :to="`/course/${props.courseSession.course.slug}/cockpit/assignment/${learningContentAssignment.content_assignment_id}/${csu.user_id}`"
-              class="w-full text-right underline"
+              class="link lg:w-full lg:text-right"
               data-cy="show-results"
             >
               {{ $t("Ergebnisse anzeigen") }}
diff --git a/client/src/pages/cockpit/cockpitPage/CockpitPage.vue b/client/src/pages/cockpit/cockpitPage/CockpitPage.vue
index da95521b..2ad8ebd2 100644
--- a/client/src/pages/cockpit/cockpitPage/CockpitPage.vue
+++ b/client/src/pages/cockpit/cockpitPage/CockpitPage.vue
@@ -95,8 +95,8 @@ function setActiveClasses(translationKey: string) {
         </div>
       </div>
       <!-- Status -->
-      <div class="mb-4 grid grid-rows-3 gap-4 lg:grid-cols-3 lg:grid-rows-none">
-        <div class="flex flex-col justify-between bg-white px-6 py-5">
+      <div class="mb-4 gap-4 lg:grid lg:grid-cols-3 lg:grid-rows-none">
+        <div class="my-4 flex flex-col justify-between bg-white p-6 lg:my-0">
           <div>
             <h3 class="heading-3 mb-4 flex items-center gap-2">
               {{ $t("Trainerunterlagen") }}
@@ -115,7 +115,7 @@ function setActiveClasses(translationKey: string) {
             </a>
           </div>
         </div>
-        <div class="flex flex-col justify-between bg-white p-6">
+        <div class="my-4 flex flex-col justify-between bg-white p-6 lg:my-0">
           <div>
             <h3 class="heading-3 mb-4 flex items-center gap-2">
               {{ $t("Anwesenheitskontrolle Präsenzkurse") }}
@@ -158,13 +158,13 @@ function setActiveClasses(translationKey: string) {
             >
               <template #center>
                 <div
-                  class="mt-2 flex w-full flex-row items-center justify-between lg:mt-0"
+                  class="mt-2 flex w-full flex-col items-center justify-between lg:mt-0 lg:flex-row"
                 >
                   <ul class="w-full">
                     <li
                       v-for="(circle, i) of cockpitStore.selectedCircles"
                       :key="i"
-                      class="flex h-12 items-center justify-between"
+                      class="flex flex-col justify-between lg:h-12 lg:flex-row lg:items-center"
                     >
                       <LearningPathDiagram
                         v-if="
@@ -222,7 +222,7 @@ function setActiveClasses(translationKey: string) {
               <template #link>
                 <router-link
                   :to="`/course/${props.courseSlug}/cockpit/profile/${csu.user_id}`"
-                  class="w-full text-right underline"
+                  class="link w-full lg:text-right"
                 >
                   {{ $t("general.profileLink") }}
                 </router-link>
diff --git a/client/src/pages/cockpit/cockpitPage/SubmissionsOverview.vue b/client/src/pages/cockpit/cockpitPage/SubmissionsOverview.vue
index bb679d13..d5676613 100644
--- a/client/src/pages/cockpit/cockpitPage/SubmissionsOverview.vue
+++ b/client/src/pages/cockpit/cockpitPage/SubmissionsOverview.vue
@@ -132,10 +132,15 @@ const getIconName = (lc: LearningContent) => {
       <div
         v-for="submittable in submittables"
         :key="submittable.id"
-        class="flex flex-row justify-between py-4"
+        class="flex flex-col justify-between gap-2 py-4 lg:flex-row lg:gap-4"
       >
-        <div class="flex w-1/3 flex-row items-center space-x-4 pr-2">
-          <component :is="getIconName(submittable.content)" class="h-9 w-9"></component>
+        <div class="flex flex-row items-center gap-2 lg:w-1/3">
+          <div class="min-h-9 min-w-9">
+            <component
+              :is="getIconName(submittable.content)"
+              class="min-h-9 min-w-9"
+            ></component>
+          </div>
           <div class="flex flex-col">
             <h3 class="text-bold flex items-center gap-2">{{ submittable.title }}</h3>
             <p class="text-gray-800">Circle «{{ submittable.circleName }}»</p>
@@ -154,7 +159,7 @@ const getIconName = (lc: LearningContent) => {
           :circle-id="submittable.content.parentCircle.id"
           class="grow pr-8"
         ></FeedbackSubmissionProgress>
-        <div class="flex w-1/4 items-center justify-end">
+        <div class="flex items-center lg:w-1/4 lg:justify-end">
           <button class="btn-primary">
             <router-link
               :to="submittable.detailsLink"
diff --git a/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue b/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue
index 2c888d82..b7fe02a0 100644
--- a/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue
+++ b/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue
@@ -2,7 +2,6 @@
 import { useCurrentCourseSession } from "@/composables";
 import { UPSERT_ASSIGNMENT_COMPLETION_MUTATION } from "@/graphql/mutations";
 import { ASSIGNMENT_COMPLETION_QUERY } from "@/graphql/queries";
-import EvaluationSummary from "@/pages/cockpit/assignmentEvaluationPage/EvaluationSummary.vue";
 import AssignmentIntroductionView from "@/pages/learningPath/learningContentPage/assignment/AssignmentIntroductionView.vue";
 import AssignmentSubmissionView from "@/pages/learningPath/learningContentPage/assignment/AssignmentSubmissionView.vue";
 import AssignmentTaskView from "@/pages/learningPath/learningContentPage/assignment/AssignmentTaskView.vue";
@@ -25,6 +24,7 @@ import { computed, onMounted, reactive } from "vue";
 import { useTranslation } from "i18next-vue";
 import { bustItGetCache } from "@/fetchHelpers";
 import { learningContentTypeData } from "@/utils/typeMaps";
+import EvaluationSummary from "@/pages/cockpit/assignmentEvaluationPage/EvaluationSummary.vue";
 
 const { t } = useTranslation();
 const courseSession = useCurrentCourseSession();
@@ -194,7 +194,18 @@ const assignmentUser = computed(() => {
   <div v-else-if="queryResult.error.value">{{ queryResult.error.value }}</div>
   <div v-else>
     <div v-if="assignment && assignmentCompletion">
-      <div class="flex">
+      <div class="flex flex-col lg:flex-row">
+        <div
+          v-if="assignmentCompletion?.completion_status === 'EVALUATION_SUBMITTED'"
+          class="min-w-2/5 mr-4 bg-gray-200 px-6 py-6 lg:order-last"
+        >
+          <EvaluationSummary
+            :assignment-user="assignmentUser"
+            :assignment="assignment"
+            :assignment-completion="assignmentCompletion"
+            :show-evaluation-user="true"
+          ></EvaluationSummary>
+        </div>
         <LearningContentMultiLayout
           :current-step="stepIndex"
           :sub-title="subTitle"
@@ -239,17 +250,6 @@ const assignmentUser = computed(() => {
             </div>
           </div>
         </LearningContentMultiLayout>
-        <div
-          v-if="assignmentCompletion?.completion_status === 'EVALUATION_SUBMITTED'"
-          class="min-w-2/5 mr-4 bg-gray-200 px-6 py-6"
-        >
-          <EvaluationSummary
-            :assignment-user="assignmentUser"
-            :assignment="assignment"
-            :assignment-completion="assignmentCompletion"
-            :show-evaluation-user="true"
-          ></EvaluationSummary>
-        </div>
       </div>
     </div>
     <div v-else>Could not load all data</div>
diff --git a/client/src/pages/learningPath/learningPathPage/LearningPathPage.vue b/client/src/pages/learningPath/learningPathPage/LearningPathPage.vue
index f499a0d7..37678a14 100644
--- a/client/src/pages/learningPath/learningPathPage/LearningPathPage.vue
+++ b/client/src/pages/learningPath/learningPathPage/LearningPathPage.vue
@@ -74,7 +74,7 @@ const changeViewType = (viewType: ViewType) => {
     <!-- Top -->
     <div class="flex flex-row justify-between space-x-8 bg-gray-200 p-6 sm:p-12">
       <!-- Left -->
-      <div class="flex w-1/2 flex-col justify-between">
+      <div class="flex flex-col justify-between lg:w-1/2">
         <div>
           <p class="font-bold">
             {{ $t("learningPathPage.welcomeBack") }}

From 45da2ab7d79de1a3ffe450d0392eed1263880efc Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Thu, 14 Sep 2023 15:07:26 +0200
Subject: [PATCH 37/49] =?UTF-8?q?=C3=9Cbersetzungen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/pages/competence/CompetenceCertificateComponent.vue | 2 +-
 client/src/pages/competence/CompetenceIndexPage.vue            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/pages/competence/CompetenceCertificateComponent.vue b/client/src/pages/competence/CompetenceCertificateComponent.vue
index 6dac954a..60be7d86 100644
--- a/client/src/pages/competence/CompetenceCertificateComponent.vue
+++ b/client/src/pages/competence/CompetenceCertificateComponent.vue
@@ -78,7 +78,7 @@ const progressStatusCount = computed(() => {
       <ItProgress :status-count="progressStatusCount" />
       <div>
         {{
-          $t("assignment.x von y Arbeiten abgeschlossen", {
+          $t("assignment.x von y Kompetenznachweis-Elementen abgeschlossen", {
             x: numAssignmentsEvaluated,
             y: numAssignmentsTotal,
           })
diff --git a/client/src/pages/competence/CompetenceIndexPage.vue b/client/src/pages/competence/CompetenceIndexPage.vue
index 7a4fe486..bbea6509 100644
--- a/client/src/pages/competence/CompetenceIndexPage.vue
+++ b/client/src/pages/competence/CompetenceIndexPage.vue
@@ -99,7 +99,7 @@ const performanceCriteriaStatusCount = computed(() => {
             <div class="flex">
               <div>
                 {{
-                  $t("assignment.x von y Arbeiten abgeschlossen", {
+                  $t("assignment.x von y Kompetenznachweis-Elementen abgeschlossen", {
                     x: certificate.assignments.filter(
                       (a) => a.completion?.completion_status === "EVALUATION_SUBMITTED"
                     ).length,

From c7e443a4e332aa40d0741a0a471926e104272820 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Thu, 14 Sep 2023 15:18:57 +0200
Subject: [PATCH 38/49] Style changes in circle page

---
 .../circlePage/LearningSequence.vue           | 165 +++++++++---------
 1 file changed, 87 insertions(+), 78 deletions(-)

diff --git a/client/src/pages/learningPath/circlePage/LearningSequence.vue b/client/src/pages/learningPath/circlePage/LearningSequence.vue
index 3c10808a..1ee3ebf3 100644
--- a/client/src/pages/learningPath/circlePage/LearningSequence.vue
+++ b/client/src/pages/learningPath/circlePage/LearningSequence.vue
@@ -157,91 +157,100 @@ function checkboxIconUncheckedTailwindClass(lc: LearningContent) {
             v-for="learningContent in learningUnit.learningContents"
             :key="learningContent.id"
           >
-            <div class="flex items-center gap-4 pb-6">
-              <div v-if="props.readonly">
-                <it-icon-check
-                  v-if="learningContent.completion_status === 'SUCCESS'"
-                  class="block h-8 w-8"
-                ></it-icon-check>
-                <div v-else class="h-8 w-8"></div>
-              </div>
-              <ItCheckbox
-                v-else
-                :checkbox-item="{
-                  value: learningContent.completion_status,
-                  checked: learningContent.completion_status === 'SUCCESS',
-                }"
-                :disabled="!learningContent.can_user_self_toggle_course_completion"
-                :data-cy="`${learningContent.slug}-checkbox`"
-                :icon-checked-tailwind-class="
-                  checkboxIconCheckedTailwindClass(learningContent)
-                "
-                :icon-unchecked-tailwind-class="
-                  checkboxIconUncheckedTailwindClass(learningContent)
-                "
-                @toggle="toggleCompleted(learningContent)"
-              />
-              <div class="flex flex-auto flex-col gap-4 xl:flex-row xl:justify-between">
-                <div class="xl:order-last">
-                  <LearningContentBadge :learning-content="learningContent" />
+            <div class="pb-6">
+              <div class="flex items-center gap-4">
+                <div v-if="props.readonly">
+                  <it-icon-check
+                    v-if="learningContent.completion_status === 'SUCCESS'"
+                    class="block h-8 w-8"
+                  ></it-icon-check>
+                  <div v-else class="h-8 w-8"></div>
                 </div>
-
-                <div>
-                  <div v-if="props.readonly" class="w-full text-left sm:w-auto">
-                    {{ learningContent.title }}
+                <ItCheckbox
+                  v-else
+                  :checkbox-item="{
+                    value: learningContent.completion_status,
+                    checked: learningContent.completion_status === 'SUCCESS',
+                  }"
+                  :data-cy="`${learningContent.slug}-checkbox`"
+                  :icon-checked-tailwind-class="
+                    checkboxIconCheckedTailwindClass(learningContent)
+                  "
+                  :icon-unchecked-tailwind-class="
+                    checkboxIconUncheckedTailwindClass(learningContent)
+                  "
+                  @toggle="toggleCompleted(learningContent)"
+                  @click.stop="
+                    () => {
+                      // when disabled open the learning content directly
+                      if (!learningContent.can_user_self_toggle_course_completion)
+                        circleStore.openLearningContent(learningContent);
+                    }
+                  "
+                />
+                <div
+                  class="flex flex-auto flex-col gap-4 xl:flex-row xl:justify-between"
+                >
+                  <div class="xl:order-last">
+                    <LearningContentBadge :learning-content="learningContent" />
+                  </div>
+
+                  <div>
+                    <div v-if="props.readonly" class="w-full text-left sm:w-auto">
+                      {{ learningContent.title }}
+                    </div>
+                    <button
+                      v-else
+                      class="w-full cursor-pointer text-left sm:w-auto"
+                      :data-cy="`${learningContent.slug}`"
+                      @click.stop="circleStore.openLearningContent(learningContent)"
+                    >
+                      {{ learningContent.title }}
+                    </button>
                   </div>
-                  <button
-                    v-else
-                    class="w-full cursor-pointer text-left sm:w-auto"
-                    :data-cy="`${learningContent.slug}`"
-                    @click.stop="circleStore.openLearningContent(learningContent)"
-                  >
-                    {{ learningContent.title }}
-                  </button>
                 </div>
               </div>
-            </div>
-
-            <div
-              v-if="belongsToCompetenceCertificate(learningContent)"
-              class="mb-8 ml-16 text-sm text-gray-800"
-            >
-              {{
-                $t("circlePage.Dieser Inhalt gehört zu x", {
-                  x: (learningContent as LearninContentWithCompetenceCertificate)
-                    ?.competence_certificate?.title,
-                })
-              }}
-              <br />
-              <router-link
-                v-if="(learningContent as LearninContentWithCompetenceCertificate).competence_certificate?.frontend_url"
-                :to="(learningContent as LearninContentWithCompetenceCertificate).competence_certificate?.frontend_url ?? ''"
-                class="link"
-                data-cy="show-results"
+              <div
+                v-if="belongsToCompetenceCertificate(learningContent)"
+                class="ml-16 text-sm text-gray-800"
               >
-                {{ $t("circlePage.Im KompetenzNavi anschauen") }}
-              </router-link>
-            </div>
+                {{
+                  $t("circlePage.Dieser Inhalt gehört zu x", {
+                    x: (learningContent as LearninContentWithCompetenceCertificate)
+                      ?.competence_certificate?.title,
+                  })
+                }}
+                <br />
+                <router-link
+                  v-if="(learningContent as LearninContentWithCompetenceCertificate).competence_certificate?.frontend_url"
+                  :to="(learningContent as LearninContentWithCompetenceCertificate).competence_certificate?.frontend_url ?? ''"
+                  class="link"
+                  data-cy="show-results"
+                >
+                  {{ $t("circlePage.Im KompetenzNavi anschauen") }}
+                </router-link>
+              </div>
 
-            <div
-              v-if="
-                learningContent.translation_key === continueTranslationKeyTuple[0] &&
-                !props.readonly
-              "
-              class="mb-6"
-            >
-              <button
-                class="btn-blue order-1 sm:order-none"
-                data-cy="ls-continue-button"
-                @click.stop="circleStore.openLearningContent(learningContent)"
+              <div
+                v-if="
+                  learningContent.translation_key === continueTranslationKeyTuple[0] &&
+                  !props.readonly
+                "
+                class="my-4"
               >
-                <span v-if="continueTranslationKeyTuple[1]" class="whitespace-nowrap">
-                  {{ $t("general.start") }}
-                </span>
-                <span v-else class="whitespace-nowrap">
-                  {{ $t("general.nextStep") }}
-                </span>
-              </button>
+                <button
+                  class="btn-blue order-1 sm:order-none"
+                  data-cy="ls-continue-button"
+                  @click.stop="circleStore.openLearningContent(learningContent)"
+                >
+                  <span v-if="continueTranslationKeyTuple[1]" class="whitespace-nowrap">
+                    {{ $t("general.start") }}
+                  </span>
+                  <span v-else class="whitespace-nowrap">
+                    {{ $t("general.nextStep") }}
+                  </span>
+                </button>
+              </div>
             </div>
           </li>
         </ol>

From 83fcb84303a4a9afe9d052e10104b1f9ab9f2396 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Thu, 14 Sep 2023 15:40:07 +0200
Subject: [PATCH 39/49] Add "Kompetenznachweis"-text to
 AssignmentIntroductionView

---
 client/src/gql/gql.ts                         |  4 +--
 client/src/gql/graphql.ts                     |  8 ++++--
 client/src/gql/schema.graphql                 | 27 ++++++++++---------
 client/src/graphql/queries.ts                 |  3 +++
 client/src/pages/DashboardPage.vue            |  2 +-
 .../EvaluationSummary.vue                     | 12 ++++++---
 .../assignmentsPage/AssignmentDetails.vue     |  4 +--
 .../assignment/AssignmentIntroductionView.vue | 20 ++++++++++++++
 client/src/services/assignmentService.ts      |  2 ++
 client/src/types.ts                           |  9 +++++++
 .../vbv_lernwelt/assignment/graphql/types.py  |  1 +
 server/vbv_lernwelt/assignment/views.py       |  1 +
 12 files changed, 69 insertions(+), 24 deletions(-)

diff --git a/client/src/gql/gql.ts b/client/src/gql/gql.ts
index 01bbd64e..d8778e4d 100644
--- a/client/src/gql/gql.ts
+++ b/client/src/gql/gql.ts
@@ -18,7 +18,7 @@ const documents = {
     "\n  mutation UpsertAssignmentCompletion(\n    $assignmentId: ID!\n    $courseSessionId: ID!\n    $learningContentId: ID\n    $assignmentUserId: UUID\n    $completionStatus: AssignmentCompletionStatus!\n    $completionDataString: String!\n    $evaluationGrade: Float\n    $evaluationPoints: Float\n    $initializeCompletion: Boolean\n  ) {\n    upsert_assignment_completion(\n      assignment_id: $assignmentId\n      course_session_id: $courseSessionId\n      learning_content_page_id: $learningContentId\n      assignment_user_id: $assignmentUserId\n      completion_status: $completionStatus\n      completion_data_string: $completionDataString\n      evaluation_grade: $evaluationGrade\n      evaluation_points: $evaluationPoints\n      initialize_completion: $initializeCompletion\n    ) {\n      assignment_completion {\n        id\n        completion_status\n        submitted_at\n        evaluation_submitted_at\n        evaluation_grade\n        evaluation_points\n        completion_data\n      }\n    }\n  }\n": types.UpsertAssignmentCompletionDocument,
     "\n  fragment CoursePageFields on CoursePageInterface {\n    title\n    id\n    slug\n    content_type\n    frontend_url\n  }\n": types.CoursePageFieldsFragmentDoc,
     "\n  query attendanceCheckQuery($courseSessionId: ID!) {\n    course_session_attendance_course(id: $courseSessionId) {\n      id\n      attendance_user_list {\n        user_id\n        status\n      }\n    }\n  }\n": types.AttendanceCheckQueryDocument,
-    "\n  query assignmentCompletionQuery(\n    $assignmentId: ID!\n    $courseSessionId: ID!\n    $learningContentId: ID\n    $assignmentUserId: UUID\n  ) {\n    assignment(id: $assignmentId) {\n      assignment_type\n      max_points\n      content_type\n      effort_required\n      evaluation_description\n      evaluation_document_url\n      evaluation_tasks\n      id\n      intro_text\n      performance_objectives\n      slug\n      tasks\n      title\n      translation_key\n    }\n    assignment_completion(\n      assignment_id: $assignmentId\n      course_session_id: $courseSessionId\n      assignment_user_id: $assignmentUserId\n      learning_content_page_id: $learningContentId\n    ) {\n      id\n      completion_status\n      submitted_at\n      evaluation_submitted_at\n      evaluation_user {\n        id\n      }\n      assignment_user {\n        id\n      }\n      evaluation_grade\n      evaluation_points\n      completion_data\n    }\n  }\n": types.AssignmentCompletionQueryDocument,
+    "\n  query assignmentCompletionQuery(\n    $assignmentId: ID!\n    $courseSessionId: ID!\n    $learningContentId: ID\n    $assignmentUserId: UUID\n  ) {\n    assignment(id: $assignmentId) {\n      assignment_type\n      max_points\n      content_type\n      effort_required\n      evaluation_description\n      evaluation_document_url\n      evaluation_tasks\n      id\n      intro_text\n      performance_objectives\n      slug\n      tasks\n      title\n      translation_key\n      competence_certificate {\n        ...CoursePageFields\n      }\n    }\n    assignment_completion(\n      assignment_id: $assignmentId\n      course_session_id: $courseSessionId\n      assignment_user_id: $assignmentUserId\n      learning_content_page_id: $learningContentId\n    ) {\n      id\n      completion_status\n      submitted_at\n      evaluation_submitted_at\n      evaluation_user {\n        id\n      }\n      assignment_user {\n        id\n      }\n      evaluation_grade\n      evaluation_points\n      completion_data\n    }\n  }\n": types.AssignmentCompletionQueryDocument,
     "\n  query courseQuery($courseId: Int!) {\n    course(id: $courseId) {\n      id\n      slug\n      title\n      category_name\n      learning_path {\n        id\n      }\n    }\n  }\n": types.CourseQueryDocument,
     "\n  query competenceCertificateQuery($courseSlug: String!, $courseSessionId: ID!) {\n    competence_certificate_list(course_slug: $courseSlug) {\n      ...CoursePageFields\n      competence_certificates {\n        ...CoursePageFields\n        assignments {\n          ...CoursePageFields\n          assignment_type\n          max_points\n          completion(course_session_id: $courseSessionId) {\n            id\n            completion_status\n            submitted_at\n            evaluation_points\n          }\n          learning_content {\n            title\n            id\n            slug\n            content_type\n            frontend_url\n            circle {\n              ...CoursePageFields\n            }\n          }\n        }\n      }\n    }\n  }\n": types.CompetenceCertificateQueryDocument,
 };
@@ -60,7 +60,7 @@ export function graphql(source: "\n  query attendanceCheckQuery($courseSessionId
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  query assignmentCompletionQuery(\n    $assignmentId: ID!\n    $courseSessionId: ID!\n    $learningContentId: ID\n    $assignmentUserId: UUID\n  ) {\n    assignment(id: $assignmentId) {\n      assignment_type\n      max_points\n      content_type\n      effort_required\n      evaluation_description\n      evaluation_document_url\n      evaluation_tasks\n      id\n      intro_text\n      performance_objectives\n      slug\n      tasks\n      title\n      translation_key\n    }\n    assignment_completion(\n      assignment_id: $assignmentId\n      course_session_id: $courseSessionId\n      assignment_user_id: $assignmentUserId\n      learning_content_page_id: $learningContentId\n    ) {\n      id\n      completion_status\n      submitted_at\n      evaluation_submitted_at\n      evaluation_user {\n        id\n      }\n      assignment_user {\n        id\n      }\n      evaluation_grade\n      evaluation_points\n      completion_data\n    }\n  }\n"): (typeof documents)["\n  query assignmentCompletionQuery(\n    $assignmentId: ID!\n    $courseSessionId: ID!\n    $learningContentId: ID\n    $assignmentUserId: UUID\n  ) {\n    assignment(id: $assignmentId) {\n      assignment_type\n      max_points\n      content_type\n      effort_required\n      evaluation_description\n      evaluation_document_url\n      evaluation_tasks\n      id\n      intro_text\n      performance_objectives\n      slug\n      tasks\n      title\n      translation_key\n    }\n    assignment_completion(\n      assignment_id: $assignmentId\n      course_session_id: $courseSessionId\n      assignment_user_id: $assignmentUserId\n      learning_content_page_id: $learningContentId\n    ) {\n      id\n      completion_status\n      submitted_at\n      evaluation_submitted_at\n      evaluation_user {\n        id\n      }\n      assignment_user {\n        id\n      }\n      evaluation_grade\n      evaluation_points\n      completion_data\n    }\n  }\n"];
+export function graphql(source: "\n  query assignmentCompletionQuery(\n    $assignmentId: ID!\n    $courseSessionId: ID!\n    $learningContentId: ID\n    $assignmentUserId: UUID\n  ) {\n    assignment(id: $assignmentId) {\n      assignment_type\n      max_points\n      content_type\n      effort_required\n      evaluation_description\n      evaluation_document_url\n      evaluation_tasks\n      id\n      intro_text\n      performance_objectives\n      slug\n      tasks\n      title\n      translation_key\n      competence_certificate {\n        ...CoursePageFields\n      }\n    }\n    assignment_completion(\n      assignment_id: $assignmentId\n      course_session_id: $courseSessionId\n      assignment_user_id: $assignmentUserId\n      learning_content_page_id: $learningContentId\n    ) {\n      id\n      completion_status\n      submitted_at\n      evaluation_submitted_at\n      evaluation_user {\n        id\n      }\n      assignment_user {\n        id\n      }\n      evaluation_grade\n      evaluation_points\n      completion_data\n    }\n  }\n"): (typeof documents)["\n  query assignmentCompletionQuery(\n    $assignmentId: ID!\n    $courseSessionId: ID!\n    $learningContentId: ID\n    $assignmentUserId: UUID\n  ) {\n    assignment(id: $assignmentId) {\n      assignment_type\n      max_points\n      content_type\n      effort_required\n      evaluation_description\n      evaluation_document_url\n      evaluation_tasks\n      id\n      intro_text\n      performance_objectives\n      slug\n      tasks\n      title\n      translation_key\n      competence_certificate {\n        ...CoursePageFields\n      }\n    }\n    assignment_completion(\n      assignment_id: $assignmentId\n      course_session_id: $courseSessionId\n      assignment_user_id: $assignmentUserId\n      learning_content_page_id: $learningContentId\n    ) {\n      id\n      completion_status\n      submitted_at\n      evaluation_submitted_at\n      evaluation_user {\n        id\n      }\n      assignment_user {\n        id\n      }\n      evaluation_grade\n      evaluation_points\n      completion_data\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
diff --git a/client/src/gql/graphql.ts b/client/src/gql/graphql.ts
index 6dfaa4dd..0669b763 100644
--- a/client/src/gql/graphql.ts
+++ b/client/src/gql/graphql.ts
@@ -99,6 +99,7 @@ export type AssignmentObjectType = CoursePageInterface & {
   __typename?: 'AssignmentObjectType';
   assignment_type: AssignmentAssignmentAssignmentTypeChoices;
   circle?: Maybe<CircleObjectType>;
+  competence_certificate?: Maybe<CompetenceCertificateObjectType>;
   completion?: Maybe<AssignmentCompletionObjectType>;
   content_type?: Maybe<Scalars['String']['output']>;
   course?: Maybe<CourseObjectType>;
@@ -751,7 +752,10 @@ export type AssignmentCompletionQueryQueryVariables = Exact<{
 }>;
 
 
-export type AssignmentCompletionQueryQuery = { __typename?: 'Query', assignment?: { __typename?: 'AssignmentObjectType', assignment_type: AssignmentAssignmentAssignmentTypeChoices, max_points?: number | null, content_type?: string | null, effort_required: string, evaluation_description: string, evaluation_document_url: string, evaluation_tasks?: any | null, id?: string | null, intro_text: string, performance_objectives?: any | null, slug?: string | null, tasks?: any | null, title?: string | null, translation_key?: string | null } | null, assignment_completion?: { __typename?: 'AssignmentCompletionObjectType', id: any, completion_status: AssignmentAssignmentCompletionCompletionStatusChoices, submitted_at?: any | null, evaluation_submitted_at?: any | null, evaluation_grade?: number | null, evaluation_points?: number | null, completion_data?: any | null, evaluation_user?: { __typename?: 'UserType', id: any } | null, assignment_user: { __typename?: 'UserType', id: any } } | null };
+export type AssignmentCompletionQueryQuery = { __typename?: 'Query', assignment?: { __typename?: 'AssignmentObjectType', assignment_type: AssignmentAssignmentAssignmentTypeChoices, max_points?: number | null, content_type?: string | null, effort_required: string, evaluation_description: string, evaluation_document_url: string, evaluation_tasks?: any | null, id?: string | null, intro_text: string, performance_objectives?: any | null, slug?: string | null, tasks?: any | null, title?: string | null, translation_key?: string | null, competence_certificate?: (
+      { __typename?: 'CompetenceCertificateObjectType' }
+      & { ' $fragmentRefs'?: { 'CoursePageFieldsCompetenceCertificateObjectTypeFragment': CoursePageFieldsCompetenceCertificateObjectTypeFragment } }
+    ) | null } | null, assignment_completion?: { __typename?: 'AssignmentCompletionObjectType', id: any, completion_status: AssignmentAssignmentCompletionCompletionStatusChoices, submitted_at?: any | null, evaluation_submitted_at?: any | null, evaluation_grade?: number | null, evaluation_points?: number | null, completion_data?: any | null, evaluation_user?: { __typename?: 'UserType', id: any } | null, assignment_user: { __typename?: 'UserType', id: any } } | null };
 
 export type CourseQueryQueryVariables = Exact<{
   courseId: Scalars['Int']['input'];
@@ -812,6 +816,6 @@ export const SendFeedbackMutationDocument = {"kind":"Document","definitions":[{"
 export const AttendanceCheckMutationDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"AttendanceCheckMutation"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"attendanceCourseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"attendanceUserList"}},"type":{"kind":"NonNullType","type":{"kind":"ListType","type":{"kind":"NamedType","name":{"kind":"Name","value":"AttendanceUserInputType"}}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"update_course_session_attendance_course_users"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"attendanceCourseId"}}},{"kind":"Argument","name":{"kind":"Name","value":"attendance_user_list"},"value":{"kind":"Variable","name":{"kind":"Name","value":"attendanceUserList"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course_session_attendance_course"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"attendance_user_list"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"user_id"}},{"kind":"Field","name":{"kind":"Name","value":"first_name"}},{"kind":"Field","name":{"kind":"Name","value":"last_name"}},{"kind":"Field","name":{"kind":"Name","value":"email"}},{"kind":"Field","name":{"kind":"Name","value":"status"}}]}}]}}]}}]}}]} as unknown as DocumentNode<AttendanceCheckMutationMutation, AttendanceCheckMutationMutationVariables>;
 export const UpsertAssignmentCompletionDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpsertAssignmentCompletion"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"learningContentId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"assignmentUserId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"completionStatus"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"AssignmentCompletionStatus"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"completionDataString"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"evaluationGrade"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Float"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"evaluationPoints"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Float"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"initializeCompletion"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Boolean"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"upsert_assignment_completion"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"assignment_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}}},{"kind":"Argument","name":{"kind":"Name","value":"course_session_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}}},{"kind":"Argument","name":{"kind":"Name","value":"learning_content_page_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"learningContentId"}}},{"kind":"Argument","name":{"kind":"Name","value":"assignment_user_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentUserId"}}},{"kind":"Argument","name":{"kind":"Name","value":"completion_status"},"value":{"kind":"Variable","name":{"kind":"Name","value":"completionStatus"}}},{"kind":"Argument","name":{"kind":"Name","value":"completion_data_string"},"value":{"kind":"Variable","name":{"kind":"Name","value":"completionDataString"}}},{"kind":"Argument","name":{"kind":"Name","value":"evaluation_grade"},"value":{"kind":"Variable","name":{"kind":"Name","value":"evaluationGrade"}}},{"kind":"Argument","name":{"kind":"Name","value":"evaluation_points"},"value":{"kind":"Variable","name":{"kind":"Name","value":"evaluationPoints"}}},{"kind":"Argument","name":{"kind":"Name","value":"initialize_completion"},"value":{"kind":"Variable","name":{"kind":"Name","value":"initializeCompletion"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"assignment_completion"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"completion_status"}},{"kind":"Field","name":{"kind":"Name","value":"submitted_at"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_submitted_at"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_grade"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points"}},{"kind":"Field","name":{"kind":"Name","value":"completion_data"}}]}}]}}]}}]} as unknown as DocumentNode<UpsertAssignmentCompletionMutation, UpsertAssignmentCompletionMutationVariables>;
 export const AttendanceCheckQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"attendanceCheckQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course_session_attendance_course"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"attendance_user_list"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"user_id"}},{"kind":"Field","name":{"kind":"Name","value":"status"}}]}}]}}]}}]} as unknown as DocumentNode<AttendanceCheckQueryQuery, AttendanceCheckQueryQueryVariables>;
-export const AssignmentCompletionQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"assignmentCompletionQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"learningContentId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"assignmentUserId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"assignment"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"assignment_type"}},{"kind":"Field","name":{"kind":"Name","value":"max_points"}},{"kind":"Field","name":{"kind":"Name","value":"content_type"}},{"kind":"Field","name":{"kind":"Name","value":"effort_required"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_description"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_document_url"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_tasks"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"intro_text"}},{"kind":"Field","name":{"kind":"Name","value":"performance_objectives"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"tasks"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"translation_key"}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignment_completion"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"assignment_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}}},{"kind":"Argument","name":{"kind":"Name","value":"course_session_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}}},{"kind":"Argument","name":{"kind":"Name","value":"assignment_user_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentUserId"}}},{"kind":"Argument","name":{"kind":"Name","value":"learning_content_page_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"learningContentId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"completion_status"}},{"kind":"Field","name":{"kind":"Name","value":"submitted_at"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_submitted_at"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignment_user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_grade"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points"}},{"kind":"Field","name":{"kind":"Name","value":"completion_data"}}]}}]}}]} as unknown as DocumentNode<AssignmentCompletionQueryQuery, AssignmentCompletionQueryQueryVariables>;
+export const AssignmentCompletionQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"assignmentCompletionQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"learningContentId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"assignmentUserId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"assignment"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"assignment_type"}},{"kind":"Field","name":{"kind":"Name","value":"max_points"}},{"kind":"Field","name":{"kind":"Name","value":"content_type"}},{"kind":"Field","name":{"kind":"Name","value":"effort_required"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_description"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_document_url"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_tasks"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"intro_text"}},{"kind":"Field","name":{"kind":"Name","value":"performance_objectives"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"tasks"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"translation_key"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignment_completion"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"assignment_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}}},{"kind":"Argument","name":{"kind":"Name","value":"course_session_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}}},{"kind":"Argument","name":{"kind":"Name","value":"assignment_user_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentUserId"}}},{"kind":"Argument","name":{"kind":"Name","value":"learning_content_page_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"learningContentId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"completion_status"}},{"kind":"Field","name":{"kind":"Name","value":"submitted_at"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_submitted_at"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignment_user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_grade"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points"}},{"kind":"Field","name":{"kind":"Name","value":"completion_data"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"CoursePageFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"CoursePageInterface"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"content_type"}},{"kind":"Field","name":{"kind":"Name","value":"frontend_url"}}]}}]} as unknown as DocumentNode<AssignmentCompletionQueryQuery, AssignmentCompletionQueryQueryVariables>;
 export const CourseQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"courseQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"Int"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"category_name"}},{"kind":"Field","name":{"kind":"Name","value":"learning_path"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}}]}}]} as unknown as DocumentNode<CourseQueryQuery, CourseQueryQueryVariables>;
 export const CompetenceCertificateQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"competenceCertificateQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSlug"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_list"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_slug"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseSlug"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificates"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"assignments"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type"}},{"kind":"Field","name":{"kind":"Name","value":"max_points"}},{"kind":"Field","name":{"kind":"Name","value":"completion"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_session_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"completion_status"}},{"kind":"Field","name":{"kind":"Name","value":"submitted_at"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points"}}]}},{"kind":"Field","name":{"kind":"Name","value":"learning_content"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"content_type"}},{"kind":"Field","name":{"kind":"Name","value":"frontend_url"}},{"kind":"Field","name":{"kind":"Name","value":"circle"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}}]}}]}}]}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"CoursePageFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"CoursePageInterface"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"content_type"}},{"kind":"Field","name":{"kind":"Name","value":"frontend_url"}}]}}]} as unknown as DocumentNode<CompetenceCertificateQueryQuery, CompetenceCertificateQueryQueryVariables>;
\ No newline at end of file
diff --git a/client/src/gql/schema.graphql b/client/src/gql/schema.graphql
index d27f988a..6ccb205c 100644
--- a/client/src/gql/schema.graphql
+++ b/client/src/gql/schema.graphql
@@ -226,6 +226,7 @@ type LearningContentAssignmentObjectType implements LearningContentInterface {
 
 type AssignmentObjectType implements CoursePageInterface {
   assignment_type: AssignmentAssignmentAssignmentTypeChoices!
+  competence_certificate: CompetenceCertificateObjectType
 
   """Erläuterung der Ausgangslage"""
   intro_text: String!
@@ -273,6 +274,19 @@ enum AssignmentAssignmentAssignmentTypeChoices {
   EDONIQ_TEST
 }
 
+type CompetenceCertificateObjectType implements CoursePageInterface {
+  id: ID
+  title: String
+  slug: String
+  content_type: String
+  live: Boolean
+  translation_key: String
+  frontend_url: String
+  circle: CircleObjectType
+  course: CourseObjectType
+  assignments: [AssignmentObjectType]
+}
+
 scalar JSONStreamField
 
 type AssignmentCompletionObjectType {
@@ -487,19 +501,6 @@ enum AttendanceUserStatus {
   ABSENT
 }
 
-type CompetenceCertificateObjectType implements CoursePageInterface {
-  id: ID
-  title: String
-  slug: String
-  content_type: String
-  live: Boolean
-  translation_key: String
-  frontend_url: String
-  circle: CircleObjectType
-  course: CourseObjectType
-  assignments: [AssignmentObjectType]
-}
-
 type CompetenceCertificateListObjectType implements CoursePageInterface {
   id: ID
   path: String!
diff --git a/client/src/graphql/queries.ts b/client/src/graphql/queries.ts
index a1d2d1e1..954037f9 100644
--- a/client/src/graphql/queries.ts
+++ b/client/src/graphql/queries.ts
@@ -45,6 +45,9 @@ export const ASSIGNMENT_COMPLETION_QUERY = graphql(`
       tasks
       title
       translation_key
+      competence_certificate {
+        ...CoursePageFields
+      }
     }
     assignment_completion(
       assignment_id: $assignmentId
diff --git a/client/src/pages/DashboardPage.vue b/client/src/pages/DashboardPage.vue
index b6187e97..4a2b8523 100644
--- a/client/src/pages/DashboardPage.vue
+++ b/client/src/pages/DashboardPage.vue
@@ -103,7 +103,7 @@ const getNextStepLink = (courseSession: CourseSession) => {
     <aside class="m-8 lg:order-1 lg:w-[343px]">
       <div class="mx-auto mb-6 pb-6 text-center">
         <img
-          class="mb-4 inline-block max-w-[150px] rounded-full"
+          class="mb-4 inline-block h-36 w-36 rounded-full"
           :src="userStore.avatar_url"
         />
         <div>
diff --git a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationSummary.vue b/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationSummary.vue
index bf067201..4d44b3b9 100644
--- a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationSummary.vue
+++ b/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationSummary.vue
@@ -105,10 +105,14 @@ const evaluationUser = computed(() => {
     <h3 v-else class="mb-6">{{ $t("a.Bewertung Freigabe") }}</h3>
 
     <section class="mb-6 border p-6">
-      <div class="text-lg font-bold">Note: {{ grade }}</div>
-      <div class="text-gray-900">
-        {{ $t("a.Gesamtpunktzahl") }} {{ userPoints }} / {{ maxPoints }}
-      </div>
+      <section class="flex items-center">
+        <div class="heading-1 py-4">
+          {{ userPoints }}
+        </div>
+        <div class="pl-2">
+          {{ $t("assignment.von x Punkten", { x: maxPoints }) }}
+        </div>
+      </section>
 
       <p class="my-4">
         {{ $t("assignment.evaluationInstrumentDescriptionText") }}
diff --git a/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue b/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue
index 734d7e9f..ad11dbbf 100644
--- a/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue
+++ b/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue
@@ -126,10 +126,10 @@ const assignmentDetail = computed(() =>
                   state.gradedUsers.map((gradedUser) => gradedUser.user).includes(csu)
                 "
               >
-                Note:
                 {{
-                  state.gradedUsers.find((u) => u.user.user_id === csu.user_id)?.grade
+                  state.gradedUsers.find((u) => u.user.user_id === csu.user_id)?.points
                 }}
+                {{ $t("a.Punkte") }}
               </div>
             </section>
           </template>
diff --git a/client/src/pages/learningPath/learningContentPage/assignment/AssignmentIntroductionView.vue b/client/src/pages/learningPath/learningContentPage/assignment/AssignmentIntroductionView.vue
index b61c414f..911e0c71 100644
--- a/client/src/pages/learningPath/learningContentPage/assignment/AssignmentIntroductionView.vue
+++ b/client/src/pages/learningPath/learningContentPage/assignment/AssignmentIntroductionView.vue
@@ -88,4 +88,24 @@ const step = useRouteQuery("step");
       </a>
     </p>
   </div>
+
+  <div>
+    <h3 class="mb-4 mt-8">{{ $t("a.Kompetenznachweis") }}</h3>
+    <p class="text-large">
+      {{
+        $t("circlePage.Dieser Inhalt gehört zu x", {
+          x: assignment?.competence_certificate?.title,
+        })
+      }}
+      <br />
+      <router-link
+        v-if="assignment.competence_certificate?.frontend_url"
+        :to="assignment.competence_certificate?.frontend_url ?? ''"
+        class="link"
+        data-cy="open-competence-certificate"
+      >
+        {{ $t("circlePage.Im KompetenzNavi anschauen") }}
+      </router-link>
+    </p>
+  </div>
 </template>
diff --git a/client/src/services/assignmentService.ts b/client/src/services/assignmentService.ts
index 06e546e4..62f58efe 100644
--- a/client/src/services/assignmentService.ts
+++ b/client/src/services/assignmentService.ts
@@ -17,6 +17,7 @@ import pick from "lodash/pick";
 export interface GradedUser {
   user: CourseSessionUser;
   grade: number;
+  points: number;
 }
 
 export function calcLearningContentAssignments(learningPath?: LearningPath) {
@@ -62,6 +63,7 @@ export async function loadAssignmentCompletionStatusData(
       gradedUsers.push({
         user: csu,
         grade: userAssignmentStatus.evaluation_grade ?? 0,
+        points: userAssignmentStatus.evaluation_points ?? 0,
       });
     }
   }
diff --git a/client/src/types.ts b/client/src/types.ts
index 356c5b97..802dcbc6 100644
--- a/client/src/types.ts
+++ b/client/src/types.ts
@@ -380,6 +380,14 @@ export interface Assignment extends BaseCourseWagtailPage {
   readonly tasks: AssignmentTask[];
   readonly evaluation_tasks: AssignmentEvaluationTask[];
   readonly max_points: number;
+  readonly competence_certificate?: {
+    id: number;
+    title: string;
+    slug: string;
+    content_type: string;
+    translation_key: string;
+    frontend_url: string;
+  } | null;
 }
 
 export interface PerformanceCriteria extends BaseCourseWagtailPage {
@@ -610,6 +618,7 @@ export interface UserAssignmentCompletionStatus {
   assignment_user_id: string;
   completion_status: AssignmentCompletionStatus;
   evaluation_grade: number | null;
+  evaluation_points: number | null;
   learning_content_page_id: number;
 }
 
diff --git a/server/vbv_lernwelt/assignment/graphql/types.py b/server/vbv_lernwelt/assignment/graphql/types.py
index 989121a8..198ff0ff 100644
--- a/server/vbv_lernwelt/assignment/graphql/types.py
+++ b/server/vbv_lernwelt/assignment/graphql/types.py
@@ -59,6 +59,7 @@ class AssignmentObjectType(DjangoObjectType):
             "evaluation_description",
             "evaluation_document_url",
             "learning_content",
+            "competence_certificate",
         )
 
     def resolve_max_points(self, info):
diff --git a/server/vbv_lernwelt/assignment/views.py b/server/vbv_lernwelt/assignment/views.py
index 82b8ca40..58cef7ab 100644
--- a/server/vbv_lernwelt/assignment/views.py
+++ b/server/vbv_lernwelt/assignment/views.py
@@ -21,6 +21,7 @@ def request_assignment_completion_status(request, assignment_id, course_session_
             "assignment_user_id",
             "completion_status",
             "evaluation_grade",
+            "evaluation_points",
             "learning_content_page_id",
         )
         return Response(status=200, data=qs)

From 00a36b52c868eebbc9ce52a791f356b8587e2cf5 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Thu, 14 Sep 2023 16:19:18 +0200
Subject: [PATCH 40/49] =?UTF-8?q?=C3=9Cbersetzungen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EvaluationContainer.vue                   |  2 +-
 .../EvaluationSummary.vue                     |  7 +++--
 .../EvaluationTask.vue                        |  6 ++--
 .../assignmentsPage/AssignmentDetails.vue     |  2 +-
 .../cockpitPage/SubmissionsOverview.vue       |  2 +-
 .../circlePage/LearningSequence.vue           |  9 ++++--
 .../attendanceCourse/AttendanceCourse.vue     |  6 ++--
 .../selfEvaluationPage/SelfEvaluation.vue     |  4 +--
 server/vbv_lernwelt/competence/factories.py   |  4 +--
 .../migrations/0004_rename_models.py          | 26 ++++++++--------
 .../migrations/0005_move_action_competence.py | 30 ++++++++++++++-----
 11 files changed, 60 insertions(+), 38 deletions(-)

diff --git a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationContainer.vue b/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationContainer.vue
index 36fb835c..916fb7a9 100644
--- a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationContainer.vue
+++ b/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationContainer.vue
@@ -94,7 +94,7 @@ function finishButtonEnabled() {
 
 <template>
   <div class="flex min-h-full flex-col">
-    <div class="flex-1 overflow-y-auto">
+    <div class="overflow-y-auto">
       <section class="p-10">
         <EvaluationIntro
           v-if="stepIndex === 0"
diff --git a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationSummary.vue b/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationSummary.vue
index 4d44b3b9..ea535174 100644
--- a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationSummary.vue
+++ b/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationSummary.vue
@@ -131,7 +131,7 @@ const evaluationUser = computed(() => {
       <div
         v-if="props.assignmentCompletion.completion_status === 'EVALUATION_SUBMITTED'"
       >
-        Freigabetermin:
+        {{ $t("assignment.dueDateEvaluation") }}:
         {{
           dayjs(props.assignmentCompletion.evaluation_submitted_at).format("DD.MM.YYYY")
         }}
@@ -157,7 +157,8 @@ const evaluationUser = computed(() => {
         <article class="border-t py-4">
           <div class="flex flex-row justify-between">
             <div class="mb-4 text-gray-900">
-              Bewertungskriterium {{ index + 1 }}: {{ task.value.title }}
+              {{ $t("a.Beurteilungskriterium") }} {{ index + 1 }}:
+              {{ task.value.title }}
             </div>
             <div
               v-if="
@@ -196,7 +197,7 @@ const evaluationUser = computed(() => {
           </section>
 
           <div>
-            <span class="font-bold">Begründung:</span>
+            <span class="font-bold">{{ $t("a.Begründung") }}:</span>
             {{ evaluationForTask(task).text }}
           </div>
         </article>
diff --git a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationTask.vue b/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationTask.vue
index 0ea67c73..e23242a7 100644
--- a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationTask.vue
+++ b/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationTask.vue
@@ -87,7 +87,7 @@ const evaluateAssignmentCompletionDebounced = useDebounceFn(
   <!-- eslint-disable vue/no-v-html -->
   <div data-cy="evaluation-task">
     <div class="text-bold mb-4 text-sm">
-      Beurteilungskriterium {{ taskIndex + 1 }} /
+      {{ $t("a.Beurteilungskriterium") }} {{ taskIndex + 1 }} /
       {{ props.assignment.evaluation_tasks.length }}
       {{ task.value.title }}
     </div>
@@ -127,9 +127,9 @@ const evaluateAssignmentCompletionDebounced = useDebounceFn(
     <ItTextarea
       class="mt-8"
       :model-value="expertData.text ?? ''"
-      label="Begründung"
+      :label="$t('a.Begründung')"
       :disabled="!props.allowEdit"
-      placeholder="Hier muss zwingend eine Begründung erfasst werden."
+      :placeholder="$t('assignment.justificationRequiredText')"
       data-cy="reason-text"
       @update:model-value="onUpdateText($event)"
     ></ItTextarea>
diff --git a/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue b/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue
index ad11dbbf..d343d7c8 100644
--- a/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue
+++ b/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue
@@ -140,7 +140,7 @@ const assignmentDetail = computed(() =>
               class="link lg:w-full lg:text-right"
               data-cy="show-results"
             >
-              {{ $t("Ergebnisse anzeigen") }}
+              {{ $t("a.Ergebnisse anschauen") }}
             </router-link>
           </template>
         </ItPersonRow>
diff --git a/client/src/pages/cockpit/cockpitPage/SubmissionsOverview.vue b/client/src/pages/cockpit/cockpitPage/SubmissionsOverview.vue
index d5676613..b25263bd 100644
--- a/client/src/pages/cockpit/cockpitPage/SubmissionsOverview.vue
+++ b/client/src/pages/cockpit/cockpitPage/SubmissionsOverview.vue
@@ -91,7 +91,7 @@ const getShowDetailsText = (lc: LearningContent) => {
   if (isAssignment(lc)) {
     const assignmentType = (lc as LearningContentAssignment).assignment_type;
     if (assignmentType === "CASEWORK" || assignmentType === "REFLECTION") {
-      return t("Ergebnisse anschauen");
+      return t("a.Ergebnisse anschauen");
     } else if (
       assignmentType === "PREP_ASSIGNMENT" ||
       assignmentType === "CONDITION_ACCEPTANCE"
diff --git a/client/src/pages/learningPath/circlePage/LearningSequence.vue b/client/src/pages/learningPath/circlePage/LearningSequence.vue
index 1ee3ebf3..6e6cd218 100644
--- a/client/src/pages/learningPath/circlePage/LearningSequence.vue
+++ b/client/src/pages/learningPath/circlePage/LearningSequence.vue
@@ -180,11 +180,14 @@ function checkboxIconUncheckedTailwindClass(lc: LearningContent) {
                     checkboxIconUncheckedTailwindClass(learningContent)
                   "
                   @toggle="toggleCompleted(learningContent)"
-                  @click.stop="
-                    () => {
+                  @click="
+                    (event) => {
                       // when disabled open the learning content directly
-                      if (!learningContent.can_user_self_toggle_course_completion)
+                      if (!learningContent.can_user_self_toggle_course_completion) {
                         circleStore.openLearningContent(learningContent);
+                        event.preventDefault();
+                        event.stopPropagation();
+                      }
                     }
                   "
                 />
diff --git a/client/src/pages/learningPath/learningContentPage/attendanceCourse/AttendanceCourse.vue b/client/src/pages/learningPath/learningContentPage/attendanceCourse/AttendanceCourse.vue
index bc8b4d3d..57e3241a 100644
--- a/client/src/pages/learningPath/learningContentPage/attendanceCourse/AttendanceCourse.vue
+++ b/client/src/pages/learningPath/learningContentPage/attendanceCourse/AttendanceCourse.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="mb-12 grid grid-cols-icon-card gap-x-4 grid-areas-icon-card">
     <it-icon-calendar-light class="w-[60px] grid-in-icon" />
-    <h2 class="text-large font-bold grid-in-title">Datum</h2>
+    <h2 class="text-large font-bold grid-in-title">{{ $t("a.Datum") }}</h2>
     <p class="grid-in-value">{{ formatDate(start, end) }}</p>
   </div>
   <div class="mb-12 grid grid-cols-icon-card gap-x-4 grid-areas-icon-card">
     <it-icon-location class="w-[60px] grid-in-icon" />
-    <h2 class="text-large font-bold grid-in-title">Standort</h2>
+    <h2 class="text-large font-bold grid-in-title">{{ $t("a.Standort") }}</h2>
     <p v-if="location.startsWith('https://')" class="grid-in-value">
       <a class="link" target="_blank" :href="location">{{ location }}</a>
     </p>
@@ -14,7 +14,7 @@
   </div>
   <div class="grid grid-cols-icon-card content-between gap-x-4 grid-areas-icon-card">
     <it-icon-trainer class="w-[60px] grid-in-icon" />
-    <h2 class="text-large font-bold grid-in-title">Trainer</h2>
+    <h2 class="text-large font-bold grid-in-title">{{ $t("a.Trainer") }}</h2>
     <p class="grid-in-value">{{ trainer }}</p>
   </div>
 </template>
diff --git a/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluation.vue b/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluation.vue
index 6bbc5dd4..f47d1486 100644
--- a/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluation.vue
+++ b/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluation.vue
@@ -73,7 +73,7 @@ onUnmounted(() => {
       <LearningContentMultiLayout
         :current-step="questionIndex"
         :sub-title="$t('a.Selbsteinschätzung')"
-        :title="`${$t('a.Selbsteinschätzung')}: ${learningUnit.title}`"
+        :title="`${learningUnit.title}`"
         icon="it-icon-lc-learning-module"
         :steps-count="questions.length"
         :show-next-button="showNextButton"
@@ -87,7 +87,7 @@ onUnmounted(() => {
         <div class="h-full">
           <div class="mt-8">
             <h3 class="heading-3">
-              {{ currentQuestion.competence_id }} {{ currentQuestion.title }}
+              {{ currentQuestion.title }}
             </h3>
 
             <div
diff --git a/server/vbv_lernwelt/competence/factories.py b/server/vbv_lernwelt/competence/factories.py
index fde1f16c..6046169a 100644
--- a/server/vbv_lernwelt/competence/factories.py
+++ b/server/vbv_lernwelt/competence/factories.py
@@ -1,11 +1,11 @@
 import wagtail_factories
 
 from vbv_lernwelt.competence.models import (
+    ActionCompetence,
+    ActionCompetenceListPage,
     CompetenceCertificate,
     CompetenceCertificateList,
     CompetenceNaviPage,
-    ActionCompetence,
-    ActionCompetenceListPage,
     PerformanceCriteria,
 )
 
diff --git a/server/vbv_lernwelt/competence/migrations/0004_rename_models.py b/server/vbv_lernwelt/competence/migrations/0004_rename_models.py
index 0f278cca..7fef8650 100644
--- a/server/vbv_lernwelt/competence/migrations/0004_rename_models.py
+++ b/server/vbv_lernwelt/competence/migrations/0004_rename_models.py
@@ -5,25 +5,27 @@ from django.db import migrations
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('wagtailforms', '0005_alter_formsubmission_form_data'),
-        ('wagtailcore', '0089_log_entry_data_json_null_to_object'),
-        ('wagtailredirects', '0008_add_verbose_name_plural'),
+        ("wagtailforms", "0005_alter_formsubmission_form_data"),
+        ("wagtailcore", "0089_log_entry_data_json_null_to_object"),
+        ("wagtailredirects", "0008_add_verbose_name_plural"),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('course', '0004_auto_20230823_1744'),
-        ('duedate', '0004_alter_duedate_start'),
-        ('contenttypes', '0002_remove_content_type_name'),
-        ('competence', '0003_competencecertificate_competencecertificatelist_competencenavipage'),
+        ("course", "0004_auto_20230823_1744"),
+        ("duedate", "0004_alter_duedate_start"),
+        ("contenttypes", "0002_remove_content_type_name"),
+        (
+            "competence",
+            "0003_competencecertificate_competencecertificatelist_competencenavipage",
+        ),
     ]
 
     operations = [
         migrations.RenameModel(
-            old_name='CompetencePage',
-            new_name='ActionCompetence',
+            old_name="CompetencePage",
+            new_name="ActionCompetence",
         ),
         migrations.RenameModel(
-            old_name='CompetenceProfilePage',
-            new_name='ActionCompetenceListPage',
+            old_name="CompetenceProfilePage",
+            new_name="ActionCompetenceListPage",
         ),
     ]
diff --git a/server/vbv_lernwelt/competence/migrations/0005_move_action_competence.py b/server/vbv_lernwelt/competence/migrations/0005_move_action_competence.py
index 37732c04..0a29cc72 100644
--- a/server/vbv_lernwelt/competence/migrations/0005_move_action_competence.py
+++ b/server/vbv_lernwelt/competence/migrations/0005_move_action_competence.py
@@ -6,9 +6,9 @@ from django.db.models import Q
 from vbv_lernwelt.assignment.models import Assignment
 from vbv_lernwelt.competence.models import (
     ActionCompetenceListPage,
-    CompetenceNaviPage,
-    CompetenceCertificateList,
     CompetenceCertificate,
+    CompetenceCertificateList,
+    CompetenceNaviPage,
 )
 from vbv_lernwelt.course.consts import (
     COURSE_TEST_ID,
@@ -55,12 +55,22 @@ def refactor_competence_wagtail_tree(apps=None, schema_editor=None):
             COURSE_UK_IT,
         ]:
             if not competence_certificate_list:
-                competence_certificate_list = CompetenceCertificateList(
-                    title="Kompetenznachweise",
-                )
+                title = "Kompetenznachweise"
+                if course_page.course.id == COURSE_UK_FR:
+                    title = "Contrôles de compétences"
+                if course_page.course.id == COURSE_UK_IT:
+                    title = "Controlli delle competenze"
+
+                competence_certificate_list = CompetenceCertificateList(title=title)
                 competence_navi_page.add_child(instance=competence_certificate_list)
+
+                title = "Kompetenznachweis 1"
+                if course_page.course.id == COURSE_UK_FR:
+                    title = "Contrôle de compétences 1"
+                if course_page.course.id == COURSE_UK_IT:
+                    title = "Controllo delle competenze 1"
                 competence_certificate = CompetenceCertificate(
-                    title="Kompetenznachweis 1",
+                    title=title,
                 )
                 competence_certificate_list.add_child(instance=competence_certificate)
 
@@ -70,9 +80,15 @@ def refactor_competence_wagtail_tree(apps=None, schema_editor=None):
                     casework_assignment.competence_certificate = competence_certificate
                     casework_assignment.save()
 
+                title = "Wissens- und Verständnisfragen"
+                if course_page.course.id == COURSE_UK_FR:
+                    title = "Questions de connaissance et de compréhension "
+                if course_page.course.id == COURSE_UK_IT:
+                    title = "Domande di conoscenza e di comprensione"
+
                 edoniq_test = create_edoniq_test_assignment(
                     course_id=course_page.course.id,
-                    title="Edoniq Wissens- und Verständisfragen",
+                    title=title,
                     competence_certificate=competence_certificate,
                 )
 

From b4638e372f3cf1b9cb22796ba7b62807ab39fb03 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Thu, 14 Sep 2023 17:31:00 +0200
Subject: [PATCH 41/49] Open Assignment evaluation on last step when not in
 progress

---
 .../pages/competence/CompetenceIndexPage.vue  |  4 +--
 .../circlePage/LearningSequence.vue           |  2 +-
 .../assignment/AssignmentView.vue             | 35 ++++++++++++-------
 client/src/types.ts                           |  2 +-
 4 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/client/src/pages/competence/CompetenceIndexPage.vue b/client/src/pages/competence/CompetenceIndexPage.vue
index bbea6509..ce475151 100644
--- a/client/src/pages/competence/CompetenceIndexPage.vue
+++ b/client/src/pages/competence/CompetenceIndexPage.vue
@@ -88,11 +88,11 @@ const performanceCriteriaStatusCount = computed(() => {
             </div>
             <div class="mt-4 lg:mt-0">
               <span class="text-bold">
-                {{ assignmentsMaxEvaluationPoints(certificate.assignments) }}
+                {{ assignmentsUserPoints(certificate.assignments) }}
               </span>
               {{
                 $t("assignment.von x Punkten", {
-                  x: assignmentsUserPoints(certificate.assignments),
+                  x: assignmentsMaxEvaluationPoints(certificate.assignments),
                 })
               }}
             </div>
diff --git a/client/src/pages/learningPath/circlePage/LearningSequence.vue b/client/src/pages/learningPath/circlePage/LearningSequence.vue
index 6e6cd218..0f693cc2 100644
--- a/client/src/pages/learningPath/circlePage/LearningSequence.vue
+++ b/client/src/pages/learningPath/circlePage/LearningSequence.vue
@@ -181,7 +181,7 @@ function checkboxIconUncheckedTailwindClass(lc: LearningContent) {
                   "
                   @toggle="toggleCompleted(learningContent)"
                   @click="
-                    (event) => {
+                    (event: MouseEvent) => {
                       // when disabled open the learning content directly
                       if (!learningContent.can_user_self_toggle_course_completion) {
                         circleStore.openLearningContent(learningContent);
diff --git a/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue b/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue
index b7fe02a0..392f1fb2 100644
--- a/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue
+++ b/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue
@@ -20,7 +20,7 @@ import { useMutation, useQuery } from "@urql/vue";
 import { useRouteQuery } from "@vueuse/router";
 import dayjs from "dayjs";
 import * as log from "loglevel";
-import { computed, onMounted, reactive } from "vue";
+import { computed, onMounted, reactive, ref, watchEffect } from "vue";
 import { useTranslation } from "i18next-vue";
 import { bustItGetCache } from "@/fetchHelpers";
 import { learningContentTypeData } from "@/utils/typeMaps";
@@ -75,6 +75,28 @@ const completionStatus = computed(() => {
   return assignmentCompletion.value?.completion_status ?? "IN_PROGRESS";
 });
 
+const hasRunUseQueryPostFetch = ref(false);
+watchEffect(() => {
+  if (
+    queryResult.data.value &&
+    !queryResult.error.value &&
+    !hasRunUseQueryPostFetch.value
+  ) {
+    // workaround for setting step to last when not IN_PROGRESS anymore
+    hasRunUseQueryPostFetch.value = true;
+    try {
+      if (
+        stepIndex.value === 0 &&
+        (completionStatus.value ?? "IN_PROGRESS") !== "IN_PROGRESS"
+      ) {
+        stepIndex.value = numPages.value - 1;
+      }
+    } catch (error) {
+      log.error(error);
+    }
+  }
+});
+
 onMounted(async () => {
   log.debug(
     "AssignmentView mounted",
@@ -90,17 +112,6 @@ onMounted(async () => {
   // have reactivity problem accessing it.
   await initUpsertAssignmentCompletion();
   queryResult.resume();
-
-  try {
-    if (
-      stepIndex.value === 0 &&
-      (completionStatus.value ?? "IN_PROGRESS") !== "IN_PROGRESS"
-    ) {
-      stepIndex.value = numPages.value - 1;
-    }
-  } catch (error) {
-    log.error(error);
-  }
 });
 
 const numTasks = computed(() => assignment.value?.tasks?.length ?? 0);
diff --git a/client/src/types.ts b/client/src/types.ts
index 802dcbc6..62e85168 100644
--- a/client/src/types.ts
+++ b/client/src/types.ts
@@ -395,7 +395,7 @@ export interface PerformanceCriteria extends BaseCourseWagtailPage {
   readonly competence_id: string;
   readonly circle: CircleLight;
   readonly course_category: CourseCategory;
-  readonly learning_unit: BaseCourseWagtailPage;
+  readonly learning_unit: BaseCourseWagtailPage & { evaluate_url: string };
 }
 
 export interface CompetencePage extends BaseCourseWagtailPage {

From b5e9b9e3551dd80e9cb93a385bbeb6bd5c216caf Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Thu, 14 Sep 2023 18:11:28 +0200
Subject: [PATCH 42/49] Fix tests

---
 cypress/e2e/competence.cy.js                  |  2 +-
 cypress/e2e/notifications.cy.js               |  2 +-
 .../create_uk_competence_profile.py           | 22 ++++-----
 .../create_uk_training_competence_profile.py  | 16 +++---
 .../create_vv_competence_profile.py           |  8 +--
 .../create_vv_new_competence_profile.py       | 14 ++++--
 server/vbv_lernwelt/competence/factories.py   |  6 +--
 .../migrations/0005_move_action_competence.py |  9 +++-
 .../course/creators/test_course.py            | 49 ++++++++-----------
 9 files changed, 67 insertions(+), 61 deletions(-)

diff --git a/cypress/e2e/competence.cy.js b/cypress/e2e/competence.cy.js
index 42bf38f6..0c7bdea3 100644
--- a/cypress/e2e/competence.cy.js
+++ b/cypress/e2e/competence.cy.js
@@ -4,7 +4,7 @@ describe("competence.cy.js", () => {
   beforeEach(() => {
     cy.manageCommand("cypress_reset");
 
-    login("admin", "test");
+    login("test-student1@example.com", "test");
 
     // test-lehrgang-lp-circle-reisen-lu-reisen ist eine Selbstevaluation
     // mit mehreren Schritten
diff --git a/cypress/e2e/notifications.cy.js b/cypress/e2e/notifications.cy.js
index 4f929a5e..7402211d 100644
--- a/cypress/e2e/notifications.cy.js
+++ b/cypress/e2e/notifications.cy.js
@@ -7,7 +7,7 @@ describe("notification list page", () => {
   });
 
   it("can paginate notifications", () => {
-    login("admin", "test");
+    login("test-student1@example.com", "test");
     cy.visit("/notifications");
 
     cy.get('[data-cy="no-notifications"]').should("not.exist");
diff --git a/server/vbv_lernwelt/competence/create_uk_competence_profile.py b/server/vbv_lernwelt/competence/create_uk_competence_profile.py
index 488c2d34..912b59c7 100644
--- a/server/vbv_lernwelt/competence/create_uk_competence_profile.py
+++ b/server/vbv_lernwelt/competence/create_uk_competence_profile.py
@@ -1,9 +1,9 @@
 from vbv_lernwelt.competence.factories import (
-    CompetencePageFactory,
-    CompetenceProfilePageFactory,
+    ActionCompetenceFactory,
+    ActionCompetenceListPageFactory,
     PerformanceCriteriaFactory,
 )
-from vbv_lernwelt.competence.models import ActionCompetence
+from vbv_lernwelt.competence.models import ActionCompetence, CompetenceNaviPage
 from vbv_lernwelt.course.consts import COURSE_UK, COURSE_UK_FR, COURSE_UK_IT
 from vbv_lernwelt.course.models import CoursePage
 from vbv_lernwelt.learnpath.models import LearningPath, LearningUnit
@@ -13,9 +13,9 @@ def create_uk_competence_profile(course_id=COURSE_UK):
     course_page = CoursePage.objects.get(course_id=course_id)
     slug_prefix = course_page.get_children().exact_type(LearningPath).first().slug
 
-    competence_profile_page = CompetenceProfilePageFactory(
-        title="KompetenzNavi",
-        parent=course_page,
+    competence_profile_page = ActionCompetenceListPageFactory(
+        title="Handlungskompetenzen",
+        parent=course_page.get_descendants().exact_type(CompetenceNaviPage).first(),
     )
 
     competences = [
@@ -52,7 +52,7 @@ def create_uk_competence_profile(course_id=COURSE_UK):
     ]
 
     for c in competences:
-        CompetencePageFactory(
+        ActionCompetenceFactory(
             parent=competence_profile_page,
             competence_id=c["competence_id"],
             title=c["title"],
@@ -227,7 +227,7 @@ def create_uk_fr_competence_profile(course_id=COURSE_UK_FR):
     course_page = CoursePage.objects.get(course_id=course_id)
     slug_prefix = course_page.get_children().exact_type(LearningPath).first().slug
 
-    competence_profile_page = CompetenceProfilePageFactory(
+    competence_profile_page = ActionCompetenceListPageFactory(
         title="KompetenzNavi",
         parent=course_page,
     )
@@ -266,7 +266,7 @@ def create_uk_fr_competence_profile(course_id=COURSE_UK_FR):
     ]
 
     for c in competences:
-        CompetencePageFactory(
+        ActionCompetenceFactory(
             parent=competence_profile_page,
             competence_id=c["competence_id"],
             title=c["title"],
@@ -380,7 +380,7 @@ def create_uk_it_competence_profile(course_id=COURSE_UK_IT):
     course_page = CoursePage.objects.get(course_id=course_id)
     slug_prefix = course_page.get_children().exact_type(LearningPath).first().slug
 
-    competence_profile_page = CompetenceProfilePageFactory(
+    competence_profile_page = ActionCompetenceListPageFactory(
         title="KompetenzNavi",
         parent=course_page,
     )
@@ -419,7 +419,7 @@ def create_uk_it_competence_profile(course_id=COURSE_UK_IT):
     ]
 
     for c in competences:
-        CompetencePageFactory(
+        ActionCompetenceFactory(
             parent=competence_profile_page,
             competence_id=c["competence_id"],
             title=c["title"],
diff --git a/server/vbv_lernwelt/competence/create_uk_training_competence_profile.py b/server/vbv_lernwelt/competence/create_uk_training_competence_profile.py
index b2e3bb9a..e1b8fddf 100644
--- a/server/vbv_lernwelt/competence/create_uk_training_competence_profile.py
+++ b/server/vbv_lernwelt/competence/create_uk_training_competence_profile.py
@@ -1,6 +1,6 @@
 from vbv_lernwelt.competence.factories import (
-    CompetencePageFactory,
-    CompetenceProfilePageFactory,
+    ActionCompetenceFactory,
+    ActionCompetenceListPageFactory,
     PerformanceCriteriaFactory,
 )
 from vbv_lernwelt.competence.models import ActionCompetence
@@ -13,7 +13,7 @@ def create_uk_training_competence_profile(course_id=COURSE_UK):
     course_page = CoursePage.objects.get(course_id=course_id)
     slug_prefix = course_page.get_children().exact_type(LearningPath).first().slug
 
-    competence_profile_page = CompetenceProfilePageFactory(
+    competence_profile_page = ActionCompetenceListPageFactory(
         title="KompetenzNavi",
         parent=course_page,
     )
@@ -53,7 +53,7 @@ def create_uk_training_competence_profile(course_id=COURSE_UK):
 
     for c in competences:
         print(c["title"])
-        CompetencePageFactory(
+        ActionCompetenceFactory(
             parent=competence_profile_page,
             competence_id=c["competence_id"],
             title=c["title"],
@@ -166,7 +166,7 @@ def create_uk_fr_training_competence_profile(course_id=COURSE_UK):
     course_page = CoursePage.objects.get(course_id=course_id)
     slug_prefix = course_page.get_children().exact_type(LearningPath).first().slug
 
-    competence_profile_page = CompetenceProfilePageFactory(
+    competence_profile_page = ActionCompetenceListPageFactory(
         title="KompetenzNavi",
         parent=course_page,
     )
@@ -206,7 +206,7 @@ def create_uk_fr_training_competence_profile(course_id=COURSE_UK):
 
     for c in competences:
         print(c["title"])
-        CompetencePageFactory(
+        ActionCompetenceFactory(
             parent=competence_profile_page,
             competence_id=c["competence_id"],
             title=c["title"],
@@ -319,7 +319,7 @@ def create_uk_it_training_competence_profile(course_id=COURSE_UK):
     course_page = CoursePage.objects.get(course_id=course_id)
     slug_prefix = course_page.get_children().exact_type(LearningPath).first().slug
 
-    competence_profile_page = CompetenceProfilePageFactory(
+    competence_profile_page = ActionCompetenceListPageFactory(
         title="KompetenzNavi",
         parent=course_page,
     )
@@ -359,7 +359,7 @@ def create_uk_it_training_competence_profile(course_id=COURSE_UK):
 
     for c in competences:
         print(c["title"])
-        CompetencePageFactory(
+        ActionCompetenceFactory(
             parent=competence_profile_page,
             competence_id=c["competence_id"],
             title=c["title"],
diff --git a/server/vbv_lernwelt/competence/create_vv_competence_profile.py b/server/vbv_lernwelt/competence/create_vv_competence_profile.py
index 886c612d..5a293a98 100644
--- a/server/vbv_lernwelt/competence/create_vv_competence_profile.py
+++ b/server/vbv_lernwelt/competence/create_vv_competence_profile.py
@@ -1,6 +1,6 @@
 from vbv_lernwelt.competence.factories import (
-    CompetencePageFactory,
-    CompetenceProfilePageFactory,
+    ActionCompetenceFactory,
+    ActionCompetenceListPageFactory,
     PerformanceCriteriaFactory,
 )
 from vbv_lernwelt.competence.models import ActionCompetence
@@ -12,7 +12,7 @@ def create_vv_competence_profile(course_id):
     course_page = CoursePage.objects.get(course_id=course_id)
     slug_prefix = course_page.get_children().exact_type(LearningPath).first().slug
 
-    competence_profile_page = CompetenceProfilePageFactory(
+    competence_profile_page = ActionCompetenceListPageFactory(
         title="KompetenzNavi",
         parent=course_page,
     )
@@ -122,7 +122,7 @@ def create_vv_competence_profile(course_id):
     ]
 
     for c in competences:
-        CompetencePageFactory(
+        ActionCompetenceFactory(
             parent=competence_profile_page,
             competence_id=c["competence_id"],
             title=c["title"],
diff --git a/server/vbv_lernwelt/competence/create_vv_new_competence_profile.py b/server/vbv_lernwelt/competence/create_vv_new_competence_profile.py
index d6b0820b..0b4b4b51 100644
--- a/server/vbv_lernwelt/competence/create_vv_new_competence_profile.py
+++ b/server/vbv_lernwelt/competence/create_vv_new_competence_profile.py
@@ -1,6 +1,7 @@
 from vbv_lernwelt.competence.factories import (
-    CompetencePageFactory,
-    CompetenceProfilePageFactory,
+    ActionCompetenceFactory,
+    ActionCompetenceListPageFactory,
+    CompetenceNaviPageFactory,
 )
 from vbv_lernwelt.course.consts import COURSE_VERSICHERUNGSVERMITTLERIN_ID
 from vbv_lernwelt.course.models import CoursePage
@@ -9,11 +10,16 @@ from vbv_lernwelt.course.models import CoursePage
 def create_vv_new_competence_profile(course_id=COURSE_VERSICHERUNGSVERMITTLERIN_ID):
     course_page = CoursePage.objects.get(course_id=course_id)
 
-    competence_profile_page = CompetenceProfilePageFactory(
+    competence_navi_page = CompetenceNaviPageFactory(
         title="KompetenzNavi",
         parent=course_page,
     )
 
+    competence_profile_page = ActionCompetenceListPageFactory(
+        title="Handlungskompetenzen",
+        parent=competence_navi_page,
+    )
+
     competences = [
         {
             "competence_id": "V1",
@@ -38,7 +44,7 @@ def create_vv_new_competence_profile(course_id=COURSE_VERSICHERUNGSVERMITTLERIN_
     ]
 
     for c in competences:
-        CompetencePageFactory(
+        ActionCompetenceFactory(
             parent=competence_profile_page,
             competence_id=c["competence_id"],
             title=c["title"],
diff --git a/server/vbv_lernwelt/competence/factories.py b/server/vbv_lernwelt/competence/factories.py
index 6046169a..c435e573 100644
--- a/server/vbv_lernwelt/competence/factories.py
+++ b/server/vbv_lernwelt/competence/factories.py
@@ -31,14 +31,14 @@ class CompetenceCertificateFactory(wagtail_factories.PageFactory):
         model = CompetenceCertificate
 
 
-class CompetenceProfilePageFactory(wagtail_factories.PageFactory):
-    title = "KompetenzNavi"
+class ActionCompetenceListPageFactory(wagtail_factories.PageFactory):
+    title = "Handlungskompetenzen"
 
     class Meta:
         model = ActionCompetenceListPage
 
 
-class CompetencePageFactory(wagtail_factories.PageFactory):
+class ActionCompetenceFactory(wagtail_factories.PageFactory):
     competence_id = "A1"
     title = "Weiterempfehlung für Neukunden generieren"
 
diff --git a/server/vbv_lernwelt/competence/migrations/0005_move_action_competence.py b/server/vbv_lernwelt/competence/migrations/0005_move_action_competence.py
index 0a29cc72..c3cfa689 100644
--- a/server/vbv_lernwelt/competence/migrations/0005_move_action_competence.py
+++ b/server/vbv_lernwelt/competence/migrations/0005_move_action_competence.py
@@ -5,6 +5,7 @@ from django.db.models import Q
 
 from vbv_lernwelt.assignment.models import Assignment
 from vbv_lernwelt.competence.models import (
+    ActionCompetence,
     ActionCompetenceListPage,
     CompetenceCertificate,
     CompetenceCertificateList,
@@ -34,7 +35,7 @@ def refactor_competence_wagtail_tree(apps=None, schema_editor=None):
             course_page.add_child(instance=competence_navi_page)
 
         acl = course_page.get_descendants().exact_type(ActionCompetenceListPage).first()
-        acl.title = "Kompetenzprofil"
+        acl.title = "Handlungskompetenzen"
         acl.save()
         acl.specific.save_revision().publish()
 
@@ -107,6 +108,12 @@ def refactor_competence_wagtail_tree(apps=None, schema_editor=None):
                         learning_content_edoniq.content_assignment = edoniq_test
                         learning_content_edoniq.save()
 
+    for competence in ActionCompetence.objects.all():
+        if competence.competence_id.endswith(":"):
+            # remove trailing colon
+            competence.competence_id = competence.competence_id[:-1]
+            competence.save()
+
 
 class Migration(migrations.Migration):
     dependencies = [
diff --git a/server/vbv_lernwelt/course/creators/test_course.py b/server/vbv_lernwelt/course/creators/test_course.py
index 284b181f..1851668c 100644
--- a/server/vbv_lernwelt/course/creators/test_course.py
+++ b/server/vbv_lernwelt/course/creators/test_course.py
@@ -23,11 +23,11 @@ from vbv_lernwelt.assignment.tests.assignment_factories import (
     EvaluationTaskBlockFactory,
 )
 from vbv_lernwelt.competence.factories import (
+    ActionCompetenceFactory,
+    ActionCompetenceListPageFactory,
     CompetenceCertificateFactory,
     CompetenceCertificateListFactory,
     CompetenceNaviPageFactory,
-    CompetencePageFactory,
-    CompetenceProfilePageFactory,
     PerformanceCriteriaFactory,
 )
 from vbv_lernwelt.competence.models import ActionCompetence
@@ -82,10 +82,8 @@ from vbv_lernwelt.media_library.tests.media_library_factories import (
 def create_test_course(include_uk=True, include_vv=True, with_sessions=False):
     # create_locales_for_wagtail()
     course = create_test_course_with_categories()
-
-    create_test_competence_profile()
+    competence_certificate = create_test_competence_navi()
     if include_uk:
-        competence_certificate = create_test_competence_navi()
         # assignments create assignments parent page
         course_page = CoursePage.objects.get(course_id=COURSE_TEST_ID)
         _assignment_list_page = AssignmentListPageFactory(
@@ -518,15 +516,29 @@ def create_test_circle_reisen(lp):
     )
 
 
-def create_test_competence_profile():
-    _course = Course.objects.get(id=COURSE_TEST_ID)
+def create_test_competence_navi():
     course_page = CoursePage.objects.get(course_id=COURSE_TEST_ID)
 
-    competence_profile_page = CompetenceProfilePageFactory(
+    competence_navi_page = CompetenceNaviPageFactory(
         title="KompetenzNavi",
         parent=course_page,
     )
 
+    competence_certificate_list = CompetenceCertificateListFactory(
+        title="Kompetenznachweise",
+        parent=competence_navi_page,
+    )
+
+    competence_certificate = CompetenceCertificateFactory(
+        title="Kompetenznachweis 1",
+        parent=competence_certificate_list,
+    )
+
+    competence_profile_page = ActionCompetenceListPageFactory(
+        title="Handlungskompetenzen",
+        parent=competence_navi_page,
+    )
+
     competences = [
         {
             "competence_id": "X1",
@@ -556,32 +568,13 @@ def create_test_competence_profile():
     ]
 
     for c in competences:
-        CompetencePageFactory(
+        ActionCompetenceFactory(
             parent=competence_profile_page,
             competence_id=c["competence_id"],
             title=c["title"],
             items=[("item", i) for i in c["items"]],
         )
 
-
-def create_test_competence_navi():
-    course_page = CoursePage.objects.get(course_id=COURSE_TEST_ID)
-
-    competence_navi_page = CompetenceNaviPageFactory(
-        title="KompetenzNavi",
-        parent=course_page,
-    )
-
-    competence_certificate_list = CompetenceCertificateListFactory(
-        title="Kompetenznachweise",
-        parent=competence_navi_page,
-    )
-
-    competence_certificate = CompetenceCertificateFactory(
-        title="Kompetenznachweis 1",
-        parent=competence_certificate_list,
-    )
-
     return competence_certificate
 
 

From 9eec62c31bebd06fc07210a65b352cf7bdf380f2 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Fri, 15 Sep 2023 09:47:17 +0200
Subject: [PATCH 43/49] Fix problems with slugs in moved ActionCompetences

---
 client/src/pages/cockpit/CockpitParentPage.vue              | 2 +-
 client/src/pages/competence/CompetenceParentPage.vue        | 2 +-
 .../competence/migrations/0005_move_action_competence.py    | 4 ++++
 server/vbv_lernwelt/competence/models.py                    | 4 ++--
 server/vbv_lernwelt/competence/tests/test_api.py            | 2 +-
 server/vbv_lernwelt/course/models.py                        | 6 ++++--
 6 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/client/src/pages/cockpit/CockpitParentPage.vue b/client/src/pages/cockpit/CockpitParentPage.vue
index f39be69c..984f1c2d 100644
--- a/client/src/pages/cockpit/CockpitParentPage.vue
+++ b/client/src/pages/cockpit/CockpitParentPage.vue
@@ -25,7 +25,7 @@ onMounted(async () => {
     await cockpitStore.loadCourseSessionUsers(courseSession.value.id);
     cockpitStore.courseSessionUsers?.forEach((csu) => {
       competenceStore.loadCompetenceProfilePage(
-        props.courseSlug + "-competence",
+        props.courseSlug + "-competencenavi-competences",
         csu.user_id
       );
 
diff --git a/client/src/pages/competence/CompetenceParentPage.vue b/client/src/pages/competence/CompetenceParentPage.vue
index 1cdd8ca9..7b2333ff 100644
--- a/client/src/pages/competence/CompetenceParentPage.vue
+++ b/client/src/pages/competence/CompetenceParentPage.vue
@@ -34,7 +34,7 @@ onMounted(async () => {
   log.debug("CompetenceParentPage mounted", props.courseSlug);
 
   try {
-    const competencePageSlug = props.courseSlug + "-competence";
+    const competencePageSlug = props.courseSlug + "-competencenavi-competences";
     await competenceStore.loadCompetenceProfilePage(competencePageSlug);
   } catch (error) {
     log.error(error);
diff --git a/server/vbv_lernwelt/competence/migrations/0005_move_action_competence.py b/server/vbv_lernwelt/competence/migrations/0005_move_action_competence.py
index c3cfa689..57305186 100644
--- a/server/vbv_lernwelt/competence/migrations/0005_move_action_competence.py
+++ b/server/vbv_lernwelt/competence/migrations/0005_move_action_competence.py
@@ -108,6 +108,10 @@ def refactor_competence_wagtail_tree(apps=None, schema_editor=None):
                         learning_content_edoniq.content_assignment = edoniq_test
                         learning_content_edoniq.save()
 
+    for ac in ActionCompetenceListPage.objects.all():
+        # trigger slug update by saving
+        ac.save()
+
     for competence in ActionCompetence.objects.all():
         if competence.competence_id.endswith(":"):
             # remove trailing colon
diff --git a/server/vbv_lernwelt/competence/models.py b/server/vbv_lernwelt/competence/models.py
index 2c08bbcf..fc9ba44a 100644
--- a/server/vbv_lernwelt/competence/models.py
+++ b/server/vbv_lernwelt/competence/models.py
@@ -77,11 +77,11 @@ class ActionCompetenceListPage(CourseBasePage):
     ]
 
     def get_frontend_url(self):
-        return f"/course/{self.slug.replace('-competence', '')}/competence"
+        return f"/course/{self.slug.replace('-competencenavi-competences', '')}/competence/competences"
 
     def save(self, clean=True, user=None, log_action=False, **kwargs):
         self.slug = find_available_slug(
-            slugify(f"{self.get_parent().slug}-competence", allow_unicode=True),
+            slugify(f"{self.get_parent().slug}-competences", allow_unicode=True),
             ignore_page_id=self.id,
         )
         super(ActionCompetenceListPage, self).save(clean, user, log_action, **kwargs)
diff --git a/server/vbv_lernwelt/competence/tests/test_api.py b/server/vbv_lernwelt/competence/tests/test_api.py
index 857ffe14..bf9b181a 100644
--- a/server/vbv_lernwelt/competence/tests/test_api.py
+++ b/server/vbv_lernwelt/competence/tests/test_api.py
@@ -14,7 +14,7 @@ class CompetenceAPITestCase(APITestCase):
         self.client.login(username="admin", password="test")
 
     def test_get_compentence_page(self):
-        slug = "test-lehrgang-competence"
+        slug = "test-lehrgang-competencenavi-competence"
         competence_profile = ActionCompetenceListPage.objects.get(slug=slug)
         response = self.client.get(f"/api/course/page/{slug}/")
 
diff --git a/server/vbv_lernwelt/course/models.py b/server/vbv_lernwelt/course/models.py
index 86bfccdc..3b621aa9 100644
--- a/server/vbv_lernwelt/course/models.py
+++ b/server/vbv_lernwelt/course/models.py
@@ -39,10 +39,12 @@ class Course(models.Model):
         return self.get_learning_path().get_cockpit_url()
 
     def get_competence_url(self):
-        from vbv_lernwelt.competence.models import CompetenceNaviPage
+        from vbv_lernwelt.competence.models import ActionCompetenceListPage
 
         competence_page = (
-            self.coursepage.get_children().exact_type(CompetenceNaviPage).first()
+            self.coursepage.get_descendants()
+            .exact_type(ActionCompetenceListPage)
+            .first()
         )
         return competence_page.specific.get_frontend_url()
 

From 68d37e4f8ea0026485ce737e33131f1fbf178e73 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Fri, 15 Sep 2023 09:55:45 +0200
Subject: [PATCH 44/49] Fix test

---
 server/vbv_lernwelt/competence/tests/test_api.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/vbv_lernwelt/competence/tests/test_api.py b/server/vbv_lernwelt/competence/tests/test_api.py
index bf9b181a..a271d7d5 100644
--- a/server/vbv_lernwelt/competence/tests/test_api.py
+++ b/server/vbv_lernwelt/competence/tests/test_api.py
@@ -14,7 +14,7 @@ class CompetenceAPITestCase(APITestCase):
         self.client.login(username="admin", password="test")
 
     def test_get_compentence_page(self):
-        slug = "test-lehrgang-competencenavi-competence"
+        slug = "test-lehrgang-competencenavi-competences"
         competence_profile = ActionCompetenceListPage.objects.get(slug=slug)
         response = self.client.get(f"/api/course/page/{slug}/")
 

From e6fbf0d276a0a7f4bffdd852566a517f61fca9e5 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Fri, 15 Sep 2023 10:59:44 +0200
Subject: [PATCH 45/49] Fix link in to KompetenzNavi in main navigation bar

---
 .../components/header/MainNavigationBar.vue   |  6 ++++-
 client/src/stores/competence.ts               | 23 +++++++++++--------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/client/src/components/header/MainNavigationBar.vue b/client/src/components/header/MainNavigationBar.vue
index bbaa5c82..13c6d8ac 100644
--- a/client/src/components/header/MainNavigationBar.vue
+++ b/client/src/components/header/MainNavigationBar.vue
@@ -126,7 +126,11 @@ onMounted(() => {
 
                 <router-link
                   v-if="inCourse() && courseSessionsStore.currentCourseSession"
-                  :to="`${courseSessionsStore.currentCourseSession.competence_url}`"
+                  :to="`${courseSessionsStore.currentCourseSession.competence_url.replace(
+                    // TODO: remove the `competence_url` with url to Navi...
+                    '/competences',
+                    ''
+                  )}`"
                   class="nav-item"
                   :class="{ 'nav-item--active': inCompetenceProfile() }"
                 >
diff --git a/client/src/stores/competence.ts b/client/src/stores/competence.ts
index e20c128d..bd83b35a 100644
--- a/client/src/stores/competence.ts
+++ b/client/src/stores/competence.ts
@@ -9,6 +9,7 @@ import type {
   PerformanceCriteria,
 } from "@/types";
 import i18next from "i18next";
+import _ from "lodash";
 import cloneDeep from "lodash/cloneDeep";
 import groupBy from "lodash/groupBy";
 import orderBy from "lodash/orderBy";
@@ -115,15 +116,19 @@ export const useCompetenceStore = defineStore({
         const competenceProfilePage = this.competenceProfilePages.get(userId);
 
         if (competenceProfilePage?.children.length) {
-          return competenceProfilePage.children.filter((competence) => {
-            let criteria = competence.children;
-            if (this.selectedCircle.id != "all") {
-              criteria = criteria.filter((criteria) => {
-                return criteria.circle.translation_key === this.selectedCircle.id;
-              });
-            }
-            return criteria.length > 0;
-          });
+          return _.orderBy(
+            competenceProfilePage.children.filter((competence) => {
+              let criteria = competence.children;
+              if (this.selectedCircle.id != "all") {
+                criteria = criteria.filter((criteria) => {
+                  return criteria.circle.translation_key === this.selectedCircle.id;
+                });
+              }
+              return criteria.length > 0;
+            }),
+            ["competence_id"],
+            ["asc"]
+          );
         }
       }
 

From dbd6b3189510fbfe2ec3c9336167ad9152f40fc5 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Fri, 15 Sep 2023 11:28:49 +0200
Subject: [PATCH 46/49] Add cypress tests

---
 .../competence/CompetenceAssignmentRow.vue    |   1 +
 .../CompetenceCertificateComponent.vue        |   6 +-
 .../CompetenceCertificateListPage.vue         |   2 +-
 .../pages/competence/CompetenceIndexPage.vue  |  19 ++-
 .../competence/PerformanceCriteriaPage.vue    |  13 +-
 cypress/e2e/competence.cy.js                  |  43 ------
 .../competenceCertificate.cy.js               | 144 ++++++++++++++++++
 .../e2e/competenceNavi/selfEvaluation.cy.js   | 135 ++++++++++++++++
 8 files changed, 310 insertions(+), 53 deletions(-)
 delete mode 100644 cypress/e2e/competence.cy.js
 create mode 100644 cypress/e2e/competenceNavi/competenceCertificate.cy.js
 create mode 100644 cypress/e2e/competenceNavi/selfEvaluation.cy.js

diff --git a/client/src/pages/competence/CompetenceAssignmentRow.vue b/client/src/pages/competence/CompetenceAssignmentRow.vue
index c471b9a1..02722efe 100644
--- a/client/src/pages/competence/CompetenceAssignmentRow.vue
+++ b/client/src/pages/competence/CompetenceAssignmentRow.vue
@@ -25,6 +25,7 @@ const getIconName = () => {
   <div
     class="flex flex-col gap-4 py-8 lg:flex-row lg:items-center lg:gap-0"
     :class="{ 'border-b': props.addBorderBottom }"
+    :data-cy="`assignment-${assignment.slug}`"
   >
     <component :is="getIconName()" class="mr-4 hidden h-9 w-9 lg:block"></component>
     <div class="flex w-[420px] flex-col">
diff --git a/client/src/pages/competence/CompetenceCertificateComponent.vue b/client/src/pages/competence/CompetenceCertificateComponent.vue
index 60be7d86..436de3dd 100644
--- a/client/src/pages/competence/CompetenceCertificateComponent.vue
+++ b/client/src/pages/competence/CompetenceCertificateComponent.vue
@@ -44,7 +44,10 @@ const progressStatusCount = computed(() => {
 
 <template>
   <div>
-    <div class="mb-4 bg-white p-8">
+    <div
+      class="mb-4 bg-white p-8"
+      :data-cy="`certificate-${competenceCertificate.slug}`"
+    >
       <div class="flex flex-col lg:flex-row lg:items-center">
         <div
           v-if="numAssignmentsEvaluated < numAssignmentsTotal"
@@ -89,6 +92,7 @@ const progressStatusCount = computed(() => {
         <router-link
           :to="competenceCertificate.frontend_url"
           class="btn-text mt-4 inline-flex items-center py-2 pl-0"
+          :data-cy="`certificate-${competenceCertificate.slug}-detail-link`"
         >
           <span>{{ $t("a.Details anzeigen") }}</span>
           <it-icon-arrow-right></it-icon-arrow-right>
diff --git a/client/src/pages/competence/CompetenceCertificateListPage.vue b/client/src/pages/competence/CompetenceCertificateListPage.vue
index 69d4d1b9..7d407425 100644
--- a/client/src/pages/competence/CompetenceCertificateListPage.vue
+++ b/client/src/pages/competence/CompetenceCertificateListPage.vue
@@ -61,7 +61,7 @@ onMounted(async () => {
   <div class="container-large">
     <h2 class="mb-4 lg:py-4">{{ $t("a.Kompetenznachweise") }}</h2>
 
-    <div class="mb-4 bg-white p-8">
+    <div class="mb-4 bg-white p-8" data-cy="certificate-total-points-text">
       <div class="flex flex-col lg:flex-row lg:items-center">
         <div
           v-if="numAssignmentsEvaluated < assignments.length"
diff --git a/client/src/pages/competence/CompetenceIndexPage.vue b/client/src/pages/competence/CompetenceIndexPage.vue
index ce475151..bc444caf 100644
--- a/client/src/pages/competence/CompetenceIndexPage.vue
+++ b/client/src/pages/competence/CompetenceIndexPage.vue
@@ -63,7 +63,7 @@ const performanceCriteriaStatusCount = computed(() => {
       <div class="flex items-center">
         <h3>{{ $t("a.Kompetenznachweise") }}</h3>
       </div>
-      <div class="mt-4">
+      <div class="mt-4" data-cy="certificate-total-points-text">
         <div v-if="userPointsEvaluatedAssignments > 0">
           {{ $t("a.Zwischenstand") }} {{ $t("a.Gesamtpunktzahl") }}:
           <span class="font-bold">
@@ -82,6 +82,7 @@ const performanceCriteriaStatusCount = computed(() => {
             v-for="certificate in competenceCertificates"
             :key="certificate.id"
             class="flex flex-col justify-between border-b py-4 first:border-t lg:flex-row lg:items-center"
+            :data-cy="`certificate-${certificate.slug}`"
           >
             <div class="text-bold text-xl">
               {{ certificate.title }}
@@ -120,6 +121,7 @@ const performanceCriteriaStatusCount = computed(() => {
             <router-link
               :to="`/course/${props.courseSlug}/competence/certificates`"
               class="btn-text mt-4 inline-flex items-center py-2 pl-0"
+              data-cy="certificates-show-all-button"
             >
               <span>{{ $t("a.Details anzeigen") }}</span>
               <it-icon-arrow-right></it-icon-arrow-right>
@@ -142,7 +144,10 @@ const performanceCriteriaStatusCount = computed(() => {
           <h5 class="mb-4 text-gray-700">«{{ $t("selfEvaluation.no") }}»</h5>
           <div class="flex flex-row items-center">
             <it-icon-smiley-thinking class="h-16 w-16"></it-icon-smiley-thinking>
-            <p class="ml-4 inline-block text-7xl font-bold">
+            <p
+              class="ml-4 inline-block text-7xl font-bold"
+              data-cy="self-evaluation-fail"
+            >
               {{ performanceCriteriaStatusCount.FAIL }}
             </p>
           </div>
@@ -153,7 +158,10 @@ const performanceCriteriaStatusCount = computed(() => {
           <h5 class="mb-4 text-gray-700">«{{ $t("selfEvaluation.yes") }}»</h5>
           <div class="flex flex-row items-center">
             <it-icon-smiley-happy class="h-16 w-16"></it-icon-smiley-happy>
-            <p class="ml-4 inline-block text-7xl font-bold">
+            <p
+              class="ml-4 inline-block text-7xl font-bold"
+              data-cy="self-evaluation-success"
+            >
               {{ performanceCriteriaStatusCount.SUCCESS }}
             </p>
           </div>
@@ -162,7 +170,10 @@ const performanceCriteriaStatusCount = computed(() => {
           <h5 class="mb-4 text-gray-700">{{ $t("competences.notAssessed") }}</h5>
           <div class="flex flex-row items-center">
             <it-icon-smiley-neutral class="h-16 w-16"></it-icon-smiley-neutral>
-            <p class="ml-4 inline-block text-7xl font-bold">
+            <p
+              class="ml-4 inline-block text-7xl font-bold"
+              data-cy="self-evaluation-unknown"
+            >
               {{ performanceCriteriaStatusCount.UNKNOWN }}
             </p>
           </div>
diff --git a/client/src/pages/competence/PerformanceCriteriaPage.vue b/client/src/pages/competence/PerformanceCriteriaPage.vue
index 46172047..b477d563 100644
--- a/client/src/pages/competence/PerformanceCriteriaPage.vue
+++ b/client/src/pages/competence/PerformanceCriteriaPage.vue
@@ -25,6 +25,7 @@ const uniqueLearningUnits = computed(() => {
         return {
           luId: pc.learning_unit.id,
           luTitle: pc.learning_unit.title,
+          luSlug: pc.learning_unit.slug,
           circleId: pc.circle.id,
           circleTitle: pc.circle.title,
           url: pc.learning_unit.evaluate_url,
@@ -73,7 +74,7 @@ const criteriaByLearningUnit = computed(() => {
             <it-icon-smiley-thinking
               class="mr-2 inline-block h-8 w-8"
             ></it-icon-smiley-thinking>
-            <div class="w-6">
+            <div class="w-6" :data-cy="`${selfEvaluation.luSlug}-fail`">
               {{ selfEvaluation.countFail }}
             </div>
           </div>
@@ -81,7 +82,7 @@ const criteriaByLearningUnit = computed(() => {
             <it-icon-smiley-happy
               class="mr-2 inline-block h-8 w-8"
             ></it-icon-smiley-happy>
-            <div class="w-6">
+            <div class="w-6" :data-cy="`${selfEvaluation.luSlug}-success`">
               {{ selfEvaluation.countSuccess }}
             </div>
           </li>
@@ -89,14 +90,18 @@ const criteriaByLearningUnit = computed(() => {
             <it-icon-smiley-neutral
               class="mr-2 inline-block h-8 w-8"
             ></it-icon-smiley-neutral>
-            <div class="w-6">
+            <div class="w-6" :data-cy="`${selfEvaluation.luSlug}-unknown`">
               {{ selfEvaluation.countUnknown }}
             </div>
           </li>
         </div>
 
         <div>
-          <router-link :to="selfEvaluation.url" class="link">
+          <router-link
+            :to="selfEvaluation.url"
+            class="link"
+            :data-cy="`${selfEvaluation.luSlug}-open`"
+          >
             {{ $t("a.Selbsteinschätzung anschauen") }}
           </router-link>
         </div>
diff --git a/cypress/e2e/competence.cy.js b/cypress/e2e/competence.cy.js
deleted file mode 100644
index 0c7bdea3..00000000
--- a/cypress/e2e/competence.cy.js
+++ /dev/null
@@ -1,43 +0,0 @@
-import { login } from "./helpers";
-
-describe("competence.cy.js", () => {
-  beforeEach(() => {
-    cy.manageCommand("cypress_reset");
-
-    login("test-student1@example.com", "test");
-
-    // test-lehrgang-lp-circle-reisen-lu-reisen ist eine Selbstevaluation
-    // mit mehreren Schritten
-    cy.visit("/course/test-lehrgang/learn/reisen");
-  });
-
-  it("self evaluation should be neutral", () => {
-    cy.get('[data-cy="test-lehrgang-lp-circle-reisen-lu-reisen"]')
-      .find('[data-cy="unknown"]')
-      .should("exist");
-  });
-
-  it("should be able to make a happy self evaluation", () => {
-    cy.get('[data-cy="test-lehrgang-lp-circle-reisen-lu-reisen"]').click();
-    cy.makeSelfEvaluation([true, true]);
-    cy.get('[data-cy="test-lehrgang-lp-circle-reisen-lu-reisen"]')
-      .find('[data-cy="success"]')
-      .should("exist");
-  });
-
-  it("should be able to make a fail self evaluation", () => {
-    cy.get('[data-cy="test-lehrgang-lp-circle-reisen-lu-reisen"]').click();
-    cy.makeSelfEvaluation([false, false]);
-    cy.get('[data-cy="test-lehrgang-lp-circle-reisen-lu-reisen"]')
-      .find('[data-cy="fail"]')
-      .should("exist");
-  });
-
-  it("should be able to make a mixed self evaluation", () => {
-    cy.get('[data-cy="test-lehrgang-lp-circle-reisen-lu-reisen"]').click();
-    cy.makeSelfEvaluation([false, true]);
-    cy.get('[data-cy="test-lehrgang-lp-circle-reisen-lu-reisen"]')
-      .find('[data-cy="fail"]')
-      .should("exist");
-  });
-});
diff --git a/cypress/e2e/competenceNavi/competenceCertificate.cy.js b/cypress/e2e/competenceNavi/competenceCertificate.cy.js
new file mode 100644
index 00000000..687a3b94
--- /dev/null
+++ b/cypress/e2e/competenceNavi/competenceCertificate.cy.js
@@ -0,0 +1,144 @@
+import { login } from "../helpers";
+
+describe("competenceCertificate.cy.js", () => {
+  beforeEach(() => {});
+
+  it("check without points", () => {
+    cy.manageCommand("cypress_reset");
+    login("test-student1@example.com", "test");
+    cy.visit("/course/test-lehrgang/competence");
+
+    cy.get('[data-cy="certificate-total-points-text"]').contains(
+      "Der Punktestand wird zu einem späteren Zeitpunkt berechnet."
+    );
+
+    cy.get(
+      '[data-cy="certificate-test-lehrgang-competencenavi-certificates-kompetenznachweis-1"]'
+    )
+      .should("contain", "0 von 0 Punkten")
+      .and("contain", "0 von 2 Kompetenznachweis-Elementen");
+
+    // check on certificates page
+    cy.get('[data-cy="certificates-show-all-button"]').click();
+    cy.get('[data-cy="certificate-total-points-text"]').contains(
+      "Der Punktestand wird zu einem späteren Zeitpunkt berechnet."
+    );
+
+    cy.get(
+      '[data-cy="certificate-test-lehrgang-competencenavi-certificates-kompetenznachweis-1"]'
+    )
+      .should(
+        "contain",
+        "Der Punktestand wird zu einem späteren Zeitpunkt berechnet."
+      )
+      .and("contain", "0 von 2 Kompetenznachweis-Elementen");
+
+    // check certificate detail page
+    cy.get(
+      '[data-cy="certificate-test-lehrgang-competencenavi-certificates-kompetenznachweis-1-detail-link"]'
+    ).click();
+
+    cy.get(
+      '[data-cy="assignment-test-lehrgang-assignment-überprüfen-einer-motorfahrzeugs-versicherungspolice"]'
+    ).should("contain", "Höchstpunktzahl");
+    cy.get(
+      '[data-cy="assignment-test-lehrgang-assignment-edoniq-wissens-und-verständisfragen-circle-fahrzeug-demo"]'
+    ).should("contain", "Höchstpunktzahl");
+  });
+
+  it("check with finished edoniq test", () => {
+    cy.manageCommand(
+      "cypress_reset --create-assignment-completion --create-edoniq-test-results"
+    );
+    login("test-student1@example.com", "test");
+    cy.visit("/course/test-lehrgang/competence");
+
+    cy.get('[data-cy="certificate-total-points-text"]').contains(
+      "Zwischenstand Gesamtpunktzahl: 19 von 24 Punkten"
+    );
+
+    cy.get(
+      '[data-cy="certificate-test-lehrgang-competencenavi-certificates-kompetenznachweis-1"]'
+    )
+      .should("contain", "19 von 24 Punkten")
+      .and("contain", "1 von 2 Kompetenznachweis-Elementen");
+
+    // check on certificates page
+    cy.get('[data-cy="certificates-show-all-button"]').click();
+    cy.get('[data-cy="certificate-total-points-text"]')
+      .should("contain", "19")
+      .and("contain", "Zwischenstand");
+
+    cy.get(
+      '[data-cy="certificate-test-lehrgang-competencenavi-certificates-kompetenznachweis-1"]'
+    )
+      .should("contain", "19")
+      .and("contain", "Zwischenstand")
+      .and("contain", "1 von 2 Kompetenznachweis-Elementen");
+
+    // check certificate detail page
+    cy.get(
+      '[data-cy="certificate-test-lehrgang-competencenavi-certificates-kompetenznachweis-1-detail-link"]'
+    ).click();
+
+    cy.get(
+      '[data-cy="assignment-test-lehrgang-assignment-überprüfen-einer-motorfahrzeugs-versicherungspolice"]'
+    )
+      .should("contain", "Höchstpunktzahl")
+      .and("contain", "Ergebnisse abgegeben");
+    cy.get(
+      '[data-cy="assignment-test-lehrgang-assignment-edoniq-wissens-und-verständisfragen-circle-fahrzeug-demo"]'
+    )
+      .should("contain", "19")
+      .and("contain", "Bewertung freigegeben");
+  });
+
+  it("check with finished edoniq test and finished casework", () => {
+    cy.manageCommand(
+      "cypress_reset --create-assignment-evaluation --create-edoniq-test-results"
+    );
+    login("test-student1@example.com", "test");
+    cy.visit("/course/test-lehrgang/competence");
+
+    cy.get('[data-cy="certificate-total-points-text"]').contains(
+      "Zwischenstand Gesamtpunktzahl: 43 von 48 Punkten"
+    );
+
+    cy.get(
+      '[data-cy="certificate-test-lehrgang-competencenavi-certificates-kompetenznachweis-1"]'
+    )
+      .should("contain", "43 von 48 Punkten")
+      .and("contain", "2 von 2 Kompetenznachweis-Elementen");
+
+    // check on certificates page
+    cy.get('[data-cy="certificates-show-all-button"]').click();
+    cy.get('[data-cy="certificate-total-points-text"]')
+      .should("contain", "43")
+      .and("not.contain", "Zwischenstand");
+
+    cy.get(
+      '[data-cy="certificate-test-lehrgang-competencenavi-certificates-kompetenznachweis-1"]'
+    )
+      .should("contain", "43")
+      .and("not.contain", "Zwischenstand")
+      .and("contain", "2 von 2 Kompetenznachweis-Elementen");
+
+    // check certificate detail page
+    cy.get(
+      '[data-cy="certificate-test-lehrgang-competencenavi-certificates-kompetenznachweis-1-detail-link"]'
+    ).click();
+
+    cy.get(
+      '[data-cy="assignment-test-lehrgang-assignment-überprüfen-einer-motorfahrzeugs-versicherungspolice"]'
+    )
+      .should("contain", "24")
+      .and("contain", "von 24 Punkten")
+      .and("contain", "Bewertung freigegeben");
+    cy.get(
+      '[data-cy="assignment-test-lehrgang-assignment-edoniq-wissens-und-verständisfragen-circle-fahrzeug-demo"]'
+    )
+      .should("contain", "19")
+      .and("contain", "von 24 Punkten")
+      .and("contain", "Bewertung freigegeben");
+  });
+});
diff --git a/cypress/e2e/competenceNavi/selfEvaluation.cy.js b/cypress/e2e/competenceNavi/selfEvaluation.cy.js
new file mode 100644
index 00000000..76b128c0
--- /dev/null
+++ b/cypress/e2e/competenceNavi/selfEvaluation.cy.js
@@ -0,0 +1,135 @@
+import { login } from "../helpers";
+
+describe("selfEvaluation.cy.js", () => {
+  beforeEach(() => {
+    cy.manageCommand("cypress_reset");
+
+    login("test-student1@example.com", "test");
+
+    // test-lehrgang-lp-circle-reisen-lu-reisen ist eine Selbstevaluation
+    // mit mehreren Schritten
+    cy.visit("/course/test-lehrgang/learn/reisen");
+  });
+
+  it("self evaluation should be neutral", () => {
+    cy.get('[data-cy="test-lehrgang-lp-circle-reisen-lu-reisen"]')
+      .find('[data-cy="unknown"]')
+      .should("exist");
+  });
+
+  it("self evaluation from KompetenzNavi", () => {
+    cy.get('[data-cy="test-lehrgang-lp-circle-reisen-lu-reisen"]')
+      .find('[data-cy="unknown"]')
+      .should("exist");
+
+    // data in KompetenzNavi/Übersicht is correct
+    cy.visit("/course/test-lehrgang/competence");
+    cy.get('[data-cy="self-evaluation-fail"]').should("have.text", "0");
+    cy.get('[data-cy="self-evaluation-success"]').should("have.text", "0");
+    cy.get('[data-cy="self-evaluation-unknown"]').should("have.text", "4");
+
+    // data in KompetenzNavi/Selbsteinschätzungen is correct
+    cy.visit("/course/test-lehrgang/competence/criteria");
+    cy.get('[data-cy="test-lehrgang-lp-circle-reisen-lu-reisen-fail"]').should(
+      "have.text",
+      "0"
+    );
+    cy.get(
+      '[data-cy="test-lehrgang-lp-circle-reisen-lu-reisen-success"]'
+    ).should("have.text", "0");
+    cy.get(
+      '[data-cy="test-lehrgang-lp-circle-reisen-lu-reisen-unknown"]'
+    ).should("have.text", "2");
+
+    // it can open self evaluation from within KompetenzNavi
+    cy.get('[data-cy="test-lehrgang-lp-circle-reisen-lu-reisen-open"]').click();
+
+    // starting the self evaluation will return to KompetenzNavi
+    cy.makeSelfEvaluation([true, false]);
+    cy.url().should("include", "/course/test-lehrgang/competence/criteria");
+
+    // check data again on KompetenzNavi
+    cy.get('[data-cy="test-lehrgang-lp-circle-reisen-lu-reisen-fail"]').should(
+      "have.text",
+      "1"
+    );
+    cy.get(
+      '[data-cy="test-lehrgang-lp-circle-reisen-lu-reisen-success"]'
+    ).should("have.text", "1");
+    cy.get(
+      '[data-cy="test-lehrgang-lp-circle-reisen-lu-reisen-unknown"]'
+    ).should("have.text", "0");
+
+    // data in KompetenzNavi/Übersicht is correct
+    cy.visit("/course/test-lehrgang/competence");
+    cy.get('[data-cy="self-evaluation-fail"]').should("have.text", "1");
+    cy.get('[data-cy="self-evaluation-success"]').should("have.text", "1");
+    cy.get('[data-cy="self-evaluation-unknown"]').should("have.text", "2");
+  });
+
+  it("should be able to make a happy self evaluation", () => {
+    cy.get('[data-cy="test-lehrgang-lp-circle-reisen-lu-reisen"]').click();
+    cy.makeSelfEvaluation([true, true]);
+    cy.get('[data-cy="test-lehrgang-lp-circle-reisen-lu-reisen"]')
+      .find('[data-cy="success"]')
+      .should("exist");
+
+    // starting the self evaluation from circle should return to circle
+    cy.url().should("include", "/course/test-lehrgang/learn/reisen");
+
+    // data in KompetenzNavi / Selbsteinschätzungen is correct
+    cy.visit("/course/test-lehrgang/competence/criteria");
+    cy.get('[data-cy="test-lehrgang-lp-circle-reisen-lu-reisen-fail"]').should(
+      "have.text",
+      "0"
+    );
+    cy.get(
+      '[data-cy="test-lehrgang-lp-circle-reisen-lu-reisen-success"]'
+    ).should("have.text", "2");
+    cy.get(
+      '[data-cy="test-lehrgang-lp-circle-reisen-lu-reisen-unknown"]'
+    ).should("have.text", "0");
+  });
+
+  it("should be able to make a fail self evaluation", () => {
+    cy.get('[data-cy="test-lehrgang-lp-circle-reisen-lu-reisen"]').click();
+    cy.makeSelfEvaluation([false, false]);
+    cy.get('[data-cy="test-lehrgang-lp-circle-reisen-lu-reisen"]')
+      .find('[data-cy="fail"]')
+      .should("exist");
+
+    // data in KompetenzNavi / Selbsteinschätzungen is correct
+    cy.visit("/course/test-lehrgang/competence/criteria");
+    cy.get('[data-cy="test-lehrgang-lp-circle-reisen-lu-reisen-fail"]').should(
+      "have.text",
+      "2"
+    );
+    cy.get(
+      '[data-cy="test-lehrgang-lp-circle-reisen-lu-reisen-success"]'
+    ).should("have.text", "0");
+    cy.get(
+      '[data-cy="test-lehrgang-lp-circle-reisen-lu-reisen-unknown"]'
+    ).should("have.text", "0");
+  });
+
+  it("should be able to make a mixed self evaluation", () => {
+    cy.get('[data-cy="test-lehrgang-lp-circle-reisen-lu-reisen"]').click();
+    cy.makeSelfEvaluation([false, true]);
+    cy.get('[data-cy="test-lehrgang-lp-circle-reisen-lu-reisen"]')
+      .find('[data-cy="fail"]')
+      .should("exist");
+
+    // data in KompetenzNavi / Selbsteinschätzungen is correct
+    cy.visit("/course/test-lehrgang/competence/criteria");
+    cy.get('[data-cy="test-lehrgang-lp-circle-reisen-lu-reisen-fail"]').should(
+      "have.text",
+      "1"
+    );
+    cy.get(
+      '[data-cy="test-lehrgang-lp-circle-reisen-lu-reisen-success"]'
+    ).should("have.text", "1");
+    cy.get(
+      '[data-cy="test-lehrgang-lp-circle-reisen-lu-reisen-unknown"]'
+    ).should("have.text", "0");
+  });
+});

From f5d44bcb90c1365c47d85f6b716ec0e8e4840b8c Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Fri, 15 Sep 2023 14:14:00 +0200
Subject: [PATCH 47/49] VBV-520: Replace "Fahrzeug"-image

---
 .../handlungsfelder/icon-hf-fahrzeug.svg      | 547 +++++++++++++++++-
 1 file changed, 546 insertions(+), 1 deletion(-)

diff --git a/server/vbv_lernwelt/static/icons/handlungsfelder/icon-hf-fahrzeug.svg b/server/vbv_lernwelt/static/icons/handlungsfelder/icon-hf-fahrzeug.svg
index dd4087c7..9e7b36f6 100644
--- a/server/vbv_lernwelt/static/icons/handlungsfelder/icon-hf-fahrzeug.svg
+++ b/server/vbv_lernwelt/static/icons/handlungsfelder/icon-hf-fahrzeug.svg
@@ -1 +1,546 @@
-<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 150 150"><g id="b"><g><ellipse cx="75" cy="95" rx="60" ry="35" fill="#edf2f6"/><g><path d="M71.21,71.1c-.08-.04-.14-.09-.2-.14,.06,.05,.12,.1,.2,.14Z" fill="none"/><path d="M70.84,70.75s-.04-.07-.06-.11c.01,.04,.04,.07,.06,.11Z" fill="none"/><path d="M88.03,64.79s.02,.05,.03,.07c-.01-.02-.02-.05-.03-.07Z" fill="none"/><path d="M87.9,64.64s.03,.04,.05,.06c-.02-.02-.03-.04-.05-.06Z" fill="none"/><path d="M70.98,70.92s-.08-.08-.11-.12c.03,.04,.07,.08,.11,.12Z" fill="none"/><path d="M124.75,81.03s-.03,.03-.04,.05c.02-.01,.03-.03,.04-.05Z" fill="none"/><path d="M124.95,80.68s0,.05-.01,.08c0-.02,0-.05,.01-.08Z" fill="none"/><path d="M124.88,80.86s-.02,.04-.03,.07c.02-.02,.02-.04,.03-.07Z" fill="none"/><path d="M88.12,64.95s0,.05,.01,.07c0-.02,0-.05-.01-.07Z" fill="none"/><path d="M88.13,65.02s0-.05-.01-.07c-.01-.03-.03-.06-.05-.09-.01-.02-.02-.05-.03-.07-.02-.03-.05-.06-.08-.09-.02-.02-.03-.04-.05-.06-.05-.05-.12-.09-.19-.13-.58-.34-1.53-.34-2.12,0l-6.72,3.88c-.29,.17-.44,.39-.44,.61,0,.22,.15,.44,.44,.61,0,0,0,0,0,0,.58,.33,1.53,.33,2.11,0l4.61-2.66,2.11-1.22c.34-.2,.48-.46,.43-.72h0Z" fill="#0d4169"/><polygon points="93.11 70.15 92.3 70.61 92.3 70.61 93.11 70.15" fill="#fff"/><path d="M71.01,70.96s-.02-.02-.03-.03c-.04-.04-.08-.08-.11-.12-.01-.02-.02-.04-.03-.06-.02-.04-.04-.07-.06-.11,0-.02,0-.05-.01-.07,0-.03-.02-.07-.02-.1,.01,4.21,.02-.03,.04,4.18,0,.23,.15,.46,.45,.63l-.04-4.18c-.08-.04-.14-.09-.2-.14Z" fill="#41b5fa"/><path d="M88.19,71.59l.76,.44,.44,.25,1.45-.84,1.45-.84-.44-.26-.76-.44c-.79-.46-2.09-.46-2.89,0-.8,.46-.8,1.21,0,1.67h0Zm.45-1.42c.56-.32,1.46-.32,2.02,0l.76,.44-2.02,1.17-.76-.44c-.55-.32-.55-.85,0-1.17Z" fill="#fff"/><path d="M88.63,71.34l.76,.44,2.02-1.17-.76-.44c-.55-.32-1.46-.32-2.02,0-.56,.32-.56,.85,0,1.17Z" fill="#007ac3"/><polygon points="92.3 70.61 92.3 70.61 90.85 71.45 92.3 70.61" fill="#fff"/><polygon points="88.58 72.76 91.61 74.52 96.13 71.9 93.11 70.15 92.3 70.61 90.85 71.45 89.4 72.29 89.4 72.29 88.58 72.76" fill="#007ac3"/><path d="M80.03,73.74l7.94,4.62,14.8-8.54-7.95-4.62s-14.8,8.55-14.8,8.55Zm11.06-3.82l.76,.44,1.25-.72,3.9,2.27-5.41,3.12-3.9-2.27,1.25-.72-.76-.44c-.8-.46-.79-1.21,0-1.67,.8-.46,2.1-.46,2.89,0h0Z" fill="#007ac3"/><polygon points="99.07 77.5 97.55 78.38 97.9 78.18 99.07 77.5" fill="#fff"/><polygon points="99.07 77.5 97.9 78.18 100.93 79.93 105.46 77.32 102.43 75.56 100.23 76.83 99.07 77.5" fill="#007ac3"/><path d="M99.07,77.5l1.16-.67-.44-.25-.76-.44c-.8-.46-2.09-.46-2.89,0-.8,.46-.81,1.21,0,1.67l.44-.25c-.55-.32-.55-.85,0-1.17,.56-.32,1.46-.32,2.01,0l.76,.44-2.24,1.29,.44,.25s1.52-.88,1.52-.88Z" fill="#fff"/><polygon points="111.42 79.32 110.88 79.32 111.42 79.32 111.42 79.32" fill="#56606d"/><polygon points="102.43 75.05 99.8 76.58 100.23 76.83 102.43 75.56 105.46 77.32 100.93 79.93 97.9 78.18 97.55 78.38 97.11 78.12 97.03 78.17 100.93 80.44 106.33 77.32 102.43 75.05" fill="#fff"/><polygon points="106.64 80.41 106.64 80.41 106.25 80.63 106.64 80.41" fill="#56606d"/><rect x="110.88" y="79.32" width=".54" height="1.32" transform="translate(-.12 .17) rotate(-.09)" fill="#fff"/><polygon points="106.34 80.68 107.72 81.48 108.1 81.26 108.02 81.21 106.72 80.46 106.34 80.68" fill="#fff"/><polygon points="115 80.76 114.62 80.54 113.23 81.34 113.61 81.56 115 80.76" fill="#fff"/><polygon points="106.74 83.45 106.74 83.14 104.46 83.13 104.45 83.44 106.74 83.45" fill="#fff"/><path d="M108.91,81.95c-.93,.54-.93,1.41-.01,1.95l1.96,1.14,3.37-1.95-1.96-1.14c-.92-.54-2.43-.54-3.36,0Z" fill="#007ac3"/><path d="M108.53,81.73c-1.14,.66-1.15,1.73-.01,2.39l2.34,1.36,4.14-2.39-2.34-1.36c-1.13-.66-2.98-.66-4.13,0Zm5.7,1.36l-3.37,1.95-1.96-1.14c-.92-.54-.92-1.41,.01-1.95,.93-.54,2.44-.54,3.36,0l1.96,1.14Z" fill="#fff"/><polygon points="108.1 84.74 107.72 84.52 106.33 85.33 106.71 85.55 108.1 84.74" fill="#fff"/><path d="M98.34,84.38l7.95,4.62,14.8-8.55-7.95-4.62s-14.8,8.54-14.8,8.54Zm13.08-5.06h0v1.32s-.54,0-.54,0v-1.32s.54,0,.54,0Zm-4.78,1.08h0l1.38,.8,.09,.05-.38,.22-1.38-.8-.08-.05,.38-.22h0Zm-2.18,3.04v-.31s2.28,0,2.28,0v.31s-2.28,0-2.28,0Zm2.25,2.1l-.38-.22,1.39-.8,.38,.22s-1.39,.8-1.39,.8Zm7.92-5.01l.38,.22-1.39,.8-.38-.22,1.39-.8Zm.37,2.55l-4.14,2.39-2.34-1.36c-1.13-.66-1.13-1.73,.01-2.39,1.14-.66,2.99-.66,4.13,0l2.34,1.36Z" fill="#007ac3"/><path d="M70.84,70.75s.02,.04,.03,.06c.03,.04,.07,.08,.11,.12,.01,.01,.02,.02,.03,.03,.06,.05,.12,.1,.2,.14l34.22,19.88c.6,.35,1.58,.35,2.18,0l4.24-2.45,6.81-3.94,5.85-3.38c.08-.04,.14-.09,.2-.14,.02-.01,.03-.03,.04-.05,.04-.03,.07-.07,.1-.11,.02-.02,.02-.04,.03-.07,.02-.03,.04-.07,.05-.1,0-.02,0-.05,.01-.08,0-.03,.02-.06,.02-.1,0-.23-.15-.46-.45-.63l-34.22-19.88c-.6-.35-1.58-.35-2.18,0l-16.91,9.76c-.35,.2-.49,.47-.44,.73,0,.02,0,.05,.01,.07,.01,.04,.04,.07,.06,.11h0Zm50.24,9.7l-14.8,8.55-7.95-4.62,14.8-8.54,7.95,4.62Zm-9.17-5.33l-14.8,8.55-7.95-4.62,14.8-8.55s7.95,4.62,7.95,4.62Zm-17.08-9.92l7.95,4.62-14.8,8.54-7.94-4.62s14.8-8.55,14.8-8.55Zm-15.97,3.19l6.72-3.88c.59-.34,1.54-.34,2.12,0,.07,.04,.14,.09,.19,.13,.02,.02,.03,.04,.05,.06,.03,.03,.06,.06,.08,.09,.02,.02,.02,.05,.03,.07,.02,.03,.04,.06,.05,.09,0,.02,0,.05,.01,.07,.05,.26-.09,.52-.43,.72l-2.11,1.22-4.61,2.66c-.58,.34-1.53,.34-2.11,0,0,0,0,0,0,0-.29-.17-.44-.39-.44-.61,0-.22,.15-.44,.44-.61h0Z" fill="#2198df"/><polygon points="93.11 70.15 96.13 71.9 91.61 74.52 88.58 72.76 89.4 72.29 89.4 72.29 88.96 72.03 87.7 72.76 91.6 75.02 97.01 71.9 93.11 69.64 91.86 70.36 92.3 70.61 93.11 70.15" fill="#fff"/><polygon points="106.72 80.46 108.02 81.21 106.64 80.41 106.64 80.41 106.64 80.41 106.25 80.63 106.34 80.68 106.72 80.46" fill="#fff"/><path d="M89.16,79.05l7.95,4.62,14.8-8.55-7.95-4.62s-14.8,8.55-14.8,8.55Zm17.17-1.73l-5.41,3.12-3.9-2.27,.09-.05,2.24-1.29-.76-.44c-.55-.32-1.46-.32-2.01,0-.56,.32-.56,.85,0,1.17l-.44,.25c-.8-.46-.79-1.21,0-1.67,.8-.46,2.1-.46,2.89,0l.76,.44,2.64-1.52,3.9,2.27h0Z" fill="#007ac3"/><polygon points="105.42 90.98 71.21 71.1 71.24 75.27 105.46 95.16 105.42 90.98" fill="#41b5fa"/><path d="M124.96,80.58h0s0,.07-.02,.1c0,.03,0,.05-.01,.08-.01,.03-.03,.07-.05,.1-.01,.02-.02,.04-.03,.07-.03,.04-.06,.07-.1,.11-.01,.02-.03,.03-.04,.05-.06,.05-.12,.1-.2,.14l-5.85,3.38-6.81,3.94-4.24,2.45c-.61,.35-1.58,.35-2.18,0l.04,4.18c.6,.35,1.58,.35,2.18,0l4.24-2.45,6.81-3.93,5.85-3.38c.3-.17,.46-.41,.45-.64,0,0-.04-4.18-.04-4.18Z" fill="#41b5fa"/><g><path d="M41.89,76.73c-.31-.18-.47-.42-.47-.65l-.04,2.36c0,.24,.16,.47,.47,.65l4.36,2.52,.04-2.37-4.36-2.51Z" fill="#585f63"/><polygon points="49.64 81.21 49.6 83.58 46.21 81.62 46.25 79.25 49.64 81.21" fill="#30363e"/><polygon points="49.86 81.34 49.82 83.71 49.6 83.58 49.64 81.21 49.86 81.34" fill="#30363e"/><polygon points="53.25 83.29 53.21 85.66 49.82 83.71 49.86 81.34 53.25 83.29" fill="#30363e"/><path d="M75.47,76.73l-15.62,9.08-.04,2.37,15.62-9.07c.31-.18,.46-.41,.46-.64,.01-4.33,.04,1.91,.04-2.37,0,.23-.15,.47-.46,.64Z" fill="#585f63"/><polygon points="57.61 85.81 57.57 88.18 53.21 85.66 53.25 83.29 57.61 85.81" fill="#585f63"/><path d="M75.46,75.43c.62,.36,.62,.94,0,1.3l-15.62,9.08c-.62,.36-1.62,.36-2.24,0l-4.36-2.51-3.39-1.96-.23-.13-3.39-1.96-4.36-2.51c-.62-.36-.63-.94,0-1.3l15.62-9.08c.62-.36,1.62-.36,2.24,0l15.72,9.08h0Zm-12.31-1.95c.71,.41,1.85,.41,2.55,0,.7-.41,.7-1.07,0-1.48-.71-.41-1.85-.41-2.55,0-.7,.41-.7,1.07,0,1.48" fill="#0a0a0a"/><path d="M59.85,85.81l-.04,2.37c-.62,.36-1.62,.36-2.24,0l.04-2.37c.62,.36,1.62,.36,2.24,0Z" fill="#585f63"/><polygon points="26.08 95.35 26.04 97.73 25.47 97.4 25.51 95.03 26.08 95.35" fill="#959388"/><polygon points="49.86 81.34 49.82 83.71 25.87 97.63 25.91 95.25 49.86 81.34" fill="#959388"/><polygon points="49.64 81.21 46.96 82.76 42.77 85.2 36.81 88.66 32.61 91.1 32.08 91.41 30.58 92.28 25.68 95.12 25.51 95.03 25.04 94.75 28.11 91.75 30.58 90.31 31.34 89.87 31.35 89.21 32.08 88.79 32.08 88.79 32.13 87.73 32.32 87.62 32.61 87.46 35.37 85.85 36.47 85.21 36.81 85.2 38.5 85.17 40.42 82.63 42.77 81.27 46.25 79.25 46.96 79.66 49.64 81.21" fill="#aba99f"/><polygon points="53.25 83.29 47.42 86.68 46.96 86.79 43.06 87.8 42.99 88.97 42.77 89.1 41.89 89.62 38.84 91.39 38.65 91.49 36.83 91.52 36.81 91.53 36.1 91.95 34.96 91.96 32.61 93.33 32.08 93.63 31.73 93.83 30.58 94.23 26.55 95.63 26.08 95.35 25.91 95.25 30.58 92.54 32.08 91.67 32.61 91.36 36.81 88.92 42.77 85.46 46.96 83.02 49.86 81.34 53.25 83.29" fill="#aba99f"/><polygon points="49.86 81.34 25.91 95.25 25.68 95.13 49.64 81.21 49.86 81.34" fill="#fff"/><polygon points="25.91 95.25 25.87 97.63 25.65 97.5 25.68 95.13 25.91 95.25" fill="#fff"/><polygon points="25.68 95.13 25.91 95.25 49.63 81.47 49.64 81.21 25.68 95.13" fill="#fff"/><polygon points="53.25 83.29 53.21 85.66 47.39 89.05 47.43 86.68 53.25 83.29" fill="#959388"/><polygon points="47.43 86.68 47.39 89.05 43.02 90.17 43.06 87.8 47.43 86.68" fill="#cbc9be"/><polygon points="43.06 87.8 43.02 90.17 42.95 91.34 42.99 88.97 43.06 87.8" fill="#adab9b"/><polygon points="42.99 88.97 42.95 91.34 41.85 91.99 41.89 89.62 42.99 88.97" fill="#959388"/><polygon points="41.89 89.62 41.85 91.99 38.8 93.76 38.84 91.39 41.89 89.62" fill="#959388"/><polygon points="38.84 91.39 38.8 93.76 38.61 93.87 38.65 91.49 38.84 91.39" fill="#959388"/><polygon points="38.65 91.49 38.61 93.87 36.79 93.9 36.83 91.53 38.65 91.49" fill="#b8b6ac"/><polygon points="36.83 91.53 36.79 93.9 36.06 94.32 36.1 91.95 36.83 91.53" fill="#cbc9be"/><polygon points="36.1 91.95 36.06 94.32 34.93 94.33 34.96 91.96 36.1 91.95" fill="#959388"/><polygon points="34.96 91.96 34.93 94.33 31.7 96.21 31.73 93.84 34.96 91.96" fill="#cbc9be"/><polygon points="25.51 95.03 25.47 97.4 25 97.13 25.04 94.75 25.51 95.03" fill="#959388"/><polygon points="31.73 93.84 31.7 96.21 26.52 98 26.55 95.63 31.73 93.84" fill="#cbc9be"/><polygon points="26.55 95.63 26.52 98 26.04 97.73 26.08 95.35 26.55 95.63" fill="#959388"/></g><polygon points="32.08 88.79 32.08 93.63 31.73 93.83 30.58 94.23 30.58 90.31 31.34 89.87 31.35 89.21 32.08 88.79" fill="#959388"/><polygon points="36.81 85.2 36.81 91.53 36.1 91.95 34.96 91.96 32.61 93.33 32.61 87.46 35.37 85.85 36.47 85.21 36.81 85.2" fill="#959388"/><polygon points="46.96 79.66 46.96 86.79 43.06 87.8 42.99 88.97 42.77 89.1 42.77 81.27 46.25 79.25 46.96 79.66" fill="#959388"/><polygon points="25.68 95.13 25.91 95.25 49.63 81.47 49.64 81.21 25.68 95.13" fill="#fff"/><g><path d="M82.38,62.91v.04c0,1.19-.17,2.44-.48,3.68-.25,1.02-.59,2.04-1.02,3.03-.14,.07-.29,.12-.46,.15,.42-.97,.77-1.95,1.03-2.93,.35-1.33,.55-2.65,.55-3.91v-.03c0-2.06-.53-3.67-1.41-4.76-.02-.03-.04-.05-.06-.08-.54-.64-1.21-1.09-1.98-1.35,0,0,0,0,0,0-.48-.16-.99-.24-1.55-.24-1.22,0-2.61,.4-4.09,1.25-2.53,1.46-4.83,3.97-6.5,6.85-1.32,2.27-2.23,4.78-2.56,7.16-.09,.63-.13,1.26-.13,1.87v.06c-.13-.04-.26-.07-.37-.12,0-.56,.04-1.12,.12-1.7,.32-2.49,1.27-5.09,2.63-7.45,1.7-2.94,4.05-5.51,6.65-7.01,1.52-.88,2.97-1.3,4.27-1.3,1.52,0,2.83,.59,3.77,1.68,.03,.04,.07,.08,.1,.12,.58,.71,1,1.62,1.24,2.71,.16,.69,.24,1.46,.24,2.28h0Z" fill="#959486"/><path d="M82.92,63.45v.04c0,.88-.09,1.79-.26,2.7-.18,.96-.45,1.94-.8,2.91l-.5,.29c.38-.98,.68-1.97,.87-2.95,.21-.99,.32-1.97,.32-2.92v-.03c0-1.08-.15-2.04-.41-2.86-.24-.75-.58-1.38-.99-1.9-.19-.23-.39-.44-.61-.62-.81-.69-1.82-1.05-2.99-1.05s-2.61,.4-4.09,1.25c-2.53,1.46-4.83,3.97-6.5,6.86-1.21,2.09-2.08,4.36-2.47,6.56-.12,.7-.2,1.38-.22,2.05-.13,0-.26-.02-.38-.04,.02-.66,.09-1.33,.22-2,.39-2.27,1.29-4.61,2.53-6.76,1.7-2.94,4.05-5.51,6.65-7.01,1.52-.88,2.97-1.3,4.27-1.3,.34,0,.66,.03,.98,.09,0,0,0,0,0,0,.84,.15,1.61,.51,2.24,1.05,.23,.2,.45,.42,.64,.66,.94,1.17,1.48,2.86,1.49,4.99Z" fill="#959486"/></g></g></g></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Anzeigebild" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 150 150">
+  <defs>
+    <style>
+      .cls-1 {
+        clip-path: url(#clippath);
+      }
+
+      .cls-2 {
+        fill: none;
+      }
+
+      .cls-2, .cls-3, .cls-4, .cls-5, .cls-6, .cls-7, .cls-8, .cls-9, .cls-10, .cls-11, .cls-12, .cls-13, .cls-14, .cls-15, .cls-16, .cls-17, .cls-18, .cls-19, .cls-20, .cls-21, .cls-22, .cls-23, .cls-24, .cls-25, .cls-26, .cls-27, .cls-28, .cls-29, .cls-30, .cls-31, .cls-32, .cls-33, .cls-34, .cls-35, .cls-36, .cls-37, .cls-38, .cls-39, .cls-40, .cls-41, .cls-42, .cls-43, .cls-44, .cls-45 {
+        stroke-width: 0px;
+      }
+
+      .cls-3 {
+        opacity: .5;
+      }
+
+      .cls-3, .cls-39 {
+        fill: #edf2f6;
+      }
+
+      .cls-46 {
+        opacity: 0;
+      }
+
+      .cls-4 {
+        fill: #fac852;
+      }
+
+      .cls-5 {
+        fill: #48ff60;
+      }
+
+      .cls-6 {
+        fill: #4f4539;
+      }
+
+      .cls-7 {
+        fill: #343434;
+      }
+
+      .cls-8 {
+        fill: #262a40;
+      }
+
+      .cls-9 {
+        fill: #7b7a71;
+      }
+
+      .cls-10 {
+        fill: #2957a6;
+      }
+
+      .cls-11 {
+        fill: #28181c;
+      }
+
+      .cls-12 {
+        fill: #5c5347;
+      }
+
+      .cls-13 {
+        fill: #87949d;
+      }
+
+      .cls-14 {
+        fill: #6f787e;
+      }
+
+      .cls-15 {
+        fill: #959388;
+      }
+
+      .cls-16 {
+        fill: #2f344e;
+      }
+
+      .cls-17 {
+        fill: #383f5e;
+      }
+
+      .cls-18 {
+        fill: #585f63;
+      }
+
+      .cls-19 {
+        fill: #0a0a0a;
+      }
+
+      .cls-20 {
+        fill: #40476a;
+      }
+
+      .cls-21 {
+        fill: #153d7a;
+      }
+
+      .cls-22 {
+        fill: #ddd;
+      }
+
+      .cls-23 {
+        fill: #cbc9be;
+      }
+
+      .cls-24 {
+        fill: #afafaf;
+      }
+
+      .cls-25 {
+        fill: #c5d2da;
+      }
+
+      .cls-26 {
+        fill: #e0e5ec;
+      }
+
+      .cls-27 {
+        fill: #dd6751;
+      }
+
+      .cls-28 {
+        fill: #b1c1ca;
+      }
+
+      .cls-29 {
+        fill: #cecece;
+      }
+
+      .cls-30 {
+        fill: #b8b6ac;
+      }
+
+      .cls-31 {
+        fill: #311f23;
+      }
+
+      .cls-32 {
+        fill: #999884;
+      }
+
+      .cls-33 {
+        fill: #999;
+      }
+
+      .cls-34 {
+        fill: #a1a9b5;
+      }
+
+      .cls-35 {
+        fill: #9299a5;
+      }
+
+      .cls-36 {
+        fill: #9eadb5;
+      }
+
+      .cls-37 {
+        fill: #876422;
+      }
+
+      .cls-38 {
+        fill: #fff;
+      }
+
+      .cls-40 {
+        fill: #e3a81d;
+      }
+
+      .cls-41 {
+        fill: #fadd98;
+      }
+
+      .cls-42 {
+        fill: #fbba20;
+      }
+
+      .cls-43 {
+        fill: #f4f4f4;
+      }
+
+      .cls-44 {
+        fill: #00224d;
+      }
+
+      .cls-45 {
+        fill: #687382;
+      }
+    </style>
+    <clipPath id="clippath">
+      <path class="cls-2" d="m69.85,78.33c-.56.37-1.21-.34-.84-.9,2.38-3.49,4.65-7.86,8.61-12.45,1.76-2.04,20.1-12.01,20.1-12.01,5.29-2.22,8.67,1.98,6.75,4.94l-34.62,20.41Zm4.63-14.6l-21.1-12.18c-.67-.38-1.51-.24-2.01.34-3.17,3.74-6.06,8.06-8.29,11.01-.74.98-.6,2.37.33,3.17,5.21,4.48,12.1,8.48,20.13,11.6,1.4.54,3.33.01,4.2-1.22,1.97-2.82,4.47-6.99,7.17-10.54.54-.71.34-1.73-.44-2.18Z"/>
+    </clipPath>
+  </defs>
+  <ellipse class="cls-39" cx="75" cy="100" rx="60" ry="35"/>
+  <g>
+    <g>
+      <path class="cls-25" d="m40.36,62.31c.44,1.33.63,3.47,2.64.85,2.01-2.62,1.44-4.28,1-5.6-1.71-5.12-4.36,2.57-3.63,4.75Z"/>
+      <path class="cls-39" d="m42.99,63.16c-.42.55-.75.88-1.03,1.07-.34-.38-.58-1.13-.85-1.71-.72-1.54.04-6.23,1.36-6.67.67-.15,1.19.72,1.52,1.7.44,1.33,1.01,2.98-1,5.6Z"/>
+      <polygon class="cls-14" points="108.09 72.45 99.63 67.56 102.33 64.03 108.78 68.5 108.09 72.45"/>
+      <path class="cls-19" d="m105.89,69.03c-1.21-.7-2.68-.32-3.89.38-4.74,2.74-7.44,11.02-3.89,13.09l-3.29-1.9c-3.46-2-.98-10.28,3.89-13.09,1.52-.88,2.89-.96,3.89-.38l3.29,1.9Z"/>
+      <path class="cls-18" d="m107.51,72.59c0,5.6-5.92,11.91-9.39,9.91-1.2-.7-1.61-2.18-1.61-3.56,0-4.78,4.51-10.56,8.21-10.27,1.94.15,2.79,1.93,2.79,3.92Z"/>
+      <ellipse class="cls-39" cx="102" cy="75.77" rx="5.19" ry="3" transform="translate(-14.61 126.22) rotate(-60)"/>
+      <path class="cls-13" d="m102.42,73.72c-.31.07-.6.26-.83.48-.37-1.35-.87-1.42.41-2.16,1.3-.75.79-.04.42,1.68Z"/>
+      <path class="cls-13" d="m103.56,74.37c-.06-.25-.18-.48-.42-.59.99-1.72,1-2.41,1.64-1.5.65.92.09.94-1.23,2.09Z"/>
+      <path class="cls-13" d="m103.15,76.42c.2-.33.35-.7.41-1.07,1.35-.37,1.88-1,1.23.66-.65,1.67-.7.99-1.65.41Z"/>
+      <path class="cls-13" d="m101.59,77.81c.31-.07.6-.26.83-.48.37,1.35.87,1.42-.41,2.16-1.3.75-.79.04-.42-1.68Z"/>
+      <path class="cls-13" d="m100.44,77.16c.05.25.18.48.42.59-.99,1.72-1,2.41-1.64,1.5-.65-.92-.09-.94,1.23-2.09Z"/>
+      <path class="cls-13" d="m100.86,75.11c-.2.33-.35.7-.41,1.07-1.35.37-1.88,1-1.23-.66.65-1.67.7-.99,1.65-.41Z"/>
+      <path class="cls-24" d="m102.45,75.51c0,.28-.2.63-.44.77-.25.14-.44.03-.44-.26s.2-.63.44-.77c.25-.14.44-.03.44.26Z"/>
+      <path class="cls-18" d="m100.86,75.11c-.2.32-.35.7-.41,1.07-.59.16-1.02.37-1.26.42.13-.71.42-1.44.82-2.1.2.08.44.36.86.62Z"/>
+      <path class="cls-18" d="m102.82,72.07c-.05.33-.24.89-.4,1.65-.31.07-.6.26-.83.48-.16-.58-.34-.93-.4-1.19.45-.42,1.03-.8,1.63-.94Z"/>
+      <path class="cls-18" d="m104.83,73.34c-.25.24-.68.53-1.27,1.03-.05-.25-.19-.48-.41-.59.43-.74.67-1.29.86-1.61.39.21.68.6.82,1.16Z"/>
+      <path class="cls-18" d="m104.83,74.93c-.13.71-.42,1.44-.82,2.1-.2-.08-.44-.36-.86-.61.2-.32.35-.7.41-1.07.59-.16,1.02-.37,1.26-.42Z"/>
+      <path class="cls-18" d="m102.82,78.52c-.45.42-1.03.8-1.63.94.05-.33.24-.89.4-1.65.31-.07.6-.26.83-.48.16.58.34.93.4,1.19Z"/>
+      <path class="cls-18" d="m100.86,77.74c-.43.74-.67,1.3-.86,1.61-.39-.21-.68-.6-.82-1.16.25-.24.68-.53,1.27-1.04.05.25.18.48.42.59Z"/>
+      <path class="cls-14" d="m102.42,73.72c-.3.07-.6.26-.83.48-.03-.11-.06-.22-.1-.32.21-.17.45-.32.71-.38.18-.85.4-1.45.42-1.75.46-.09.08.63-.2,1.97Z"/>
+      <path class="cls-14" d="m103.57,74.37c-.02-.11-.06-.21-.11-.3,1.24-1.06,1.85-1.12,1.02-2.15.09.06.19.18.32.36.65.92.09.94-1.23,2.09Z"/>
+      <path class="cls-14" d="m104.8,76.01c-.65,1.67-.7.99-1.65.41,0-.02.02-.03.03-.05.72.52.82.95,1.41-.57.17-.43.25-.7.27-.87.3-.05.29.17-.06,1.08Z"/>
+      <path class="cls-14" d="m102.01,79.49c-.66.38-.85.39-.83.08.13-.03.33-.12.62-.29,1.18-.68.85-.79.5-1.84.04-.03.08-.07.12-.1.37,1.35.87,1.42-.41,2.16Z"/>
+      <path class="cls-14" d="m100.86,77.74c-.93,1.62-1,2.33-1.54,1.65.36.24.53-.47,1.31-1.83.07.08.14.14.23.18Z"/>
+      <path class="cls-14" d="m100.86,75.11c-.19.32-.35.7-.41,1.07-1,.27-1.55.69-1.51.21.24-.04.68-.26,1.29-.42.06-.35.2-.71.38-1.02.07.05.15.11.24.16Z"/>
+      <path class="cls-33" d="m102.45,75.51c0,.28-.2.63-.44.77-.21.12-.39.05-.43-.15.33.03.73-.54.66-.93.13.01.22.13.22.32Z"/>
+      <polygon class="cls-14" points="71.81 93.45 63.35 88.56 66.06 85.02 72.87 89.76 71.81 93.45"/>
+      <path class="cls-19" d="m69.65,89.79c-1.27-.73-2.82-.33-4.08.4-4.99,2.88-7.81,11.6-4.08,13.74l-3.4-1.96c-3.63-2.09-1.03-10.79,4.08-13.74,1.59-.92,3.04-1,4.08-.4l3.4,1.96Z"/>
+      <path class="cls-18" d="m71.34,93.52c0,5.92-6.25,12.51-9.86,10.41-1.26-.73-1.69-2.28-1.69-3.74,0-5.02,4.73-11.09,8.62-10.78,2.03.16,2.93,2.03,2.93,4.11Z"/>
+      <path class="cls-26" d="m65.57,101.31c-2.12,1.23-3.85.23-3.85-2.22s1.73-5.45,3.85-6.67c2.12-1.23,3.85-.23,3.85,2.22s-1.73,5.45-3.85,6.67Z"/>
+      <path class="cls-13" d="m66,94.72c-.32.07-.63.28-.87.5-.39-1.42-.92-1.49.43-2.26,1.36-.79.83-.05.44,1.76Z"/>
+      <path class="cls-13" d="m67.21,95.4c-.06-.26-.19-.5-.44-.62,1.04-1.8,1.05-2.53,1.73-1.57.68.97.09.99-1.29,2.19Z"/>
+      <path class="cls-13" d="m66.77,97.55c.21-.34.37-.73.43-1.12,1.42-.39,1.97-1.05,1.3.69-.68,1.76-.74,1.04-1.73.43Z"/>
+      <path class="cls-13" d="m65.13,99.01c.32-.07.63-.28.87-.5.39,1.42.92,1.49-.43,2.26-1.36.79-.83.05-.44-1.76Z"/>
+      <path class="cls-13" d="m63.93,98.32c.06.26.19.5.44.62-1.04,1.8-1.05,2.53-1.73,1.57-.68-.97-.09-.99,1.29-2.19Z"/>
+      <path class="cls-13" d="m64.36,96.18c-.21.34-.37.73-.43,1.12-1.42.39-1.97,1.05-1.3-.69.68-1.76.74-1.04,1.73-.43Z"/>
+      <path class="cls-13" d="m66.03,96.59c0,.3-.21.66-.47.81-.26.15-.47.03-.47-.27s.21-.66.47-.81c.26-.15.47-.03.47.27Z"/>
+      <path class="cls-18" d="m64.36,96.18c-.21.34-.37.73-.43,1.12-.62.17-1.07.39-1.33.44.14-.74.44-1.51.86-2.21.21.09.46.38.9.65Z"/>
+      <path class="cls-18" d="m66.43,92.98c-.05.34-.25.93-.42,1.73-.32.07-.63.28-.87.5-.17-.61-.36-.97-.42-1.25.48-.44,1.08-.84,1.71-.99Z"/>
+      <path class="cls-18" d="m68.54,94.31c-.26.25-.72.55-1.33,1.09-.06-.26-.19-.5-.44-.62.45-.78.71-1.36.91-1.69.41.22.72.63.86,1.22Z"/>
+      <path class="cls-18" d="m68.53,95.99c-.14.74-.44,1.51-.86,2.21-.21-.09-.46-.38-.9-.65.21-.34.37-.73.43-1.12.62-.17,1.07-.39,1.33-.44Z"/>
+      <path class="cls-18" d="m66.42,99.75c-.48.44-1.08.84-1.71.99.05-.34.25-.93.42-1.73.33-.07.63-.28.87-.5.17.61.36.97.42,1.25Z"/>
+      <path class="cls-18" d="m64.37,98.94c-.45.78-.71,1.36-.91,1.69-.41-.22-.72-.63-.86-1.22.26-.25.72-.55,1.33-1.09.06.26.19.5.44.62Z"/>
+      <path class="cls-14" d="m66,94.72c-.32.07-.63.28-.87.5-.03-.12-.07-.23-.1-.33.22-.18.48-.34.75-.39.19-.89.42-1.53.44-1.84.48-.1.09.66-.21,2.06Z"/>
+      <path class="cls-14" d="m67.21,95.4c-.03-.11-.06-.22-.12-.31,1.3-1.11,1.94-1.18,1.07-2.26.09.06.2.19.34.38.68.97.09.99-1.29,2.19Z"/>
+      <path class="cls-14" d="m68.5,97.12c-.68,1.76-.74,1.04-1.73.43.01-.02.02-.03.03-.05.76.55.86.99,1.48-.6.17-.45.27-.74.28-.91.31-.05.31.18-.06,1.13Z"/>
+      <path class="cls-14" d="m65.57,100.77c-.69.4-.89.41-.88.08.14-.03.35-.13.65-.3,1.23-.71.89-.83.53-1.93.04-.03.08-.07.12-.11.39,1.42.92,1.49-.43,2.26Z"/>
+      <path class="cls-14" d="m64.37,98.94c-.97,1.7-1.05,2.44-1.61,1.73.38.25.56-.49,1.37-1.92.07.08.15.15.24.19Z"/>
+      <path class="cls-14" d="m64.36,96.18c-.2.34-.37.73-.43,1.12-1.05.29-1.63.72-1.58.22.25-.04.72-.27,1.36-.45.06-.37.21-.74.4-1.07.08.06.16.11.25.17Z"/>
+      <path class="cls-14" d="m66.03,96.59c0,.3-.21.66-.47.81-.22.13-.41.06-.46-.16.35.03.77-.57.69-.98.14.01.23.13.23.33Z"/>
+      <path class="cls-21" d="m108.82,65.34v-6.25c0-1.8-.58-3.61-1.8-5.15.86,1.42.91,2.64-.36,3.53-46.73,26.98-37.52,21.49-48.27,28.38l-.86,7.6.86,6.52c0-4.28,3-9.48,6.71-11.62,3.71-2.14,6.71-.41,6.71,3.87,0,0,22.86-13.2,22.86-13.2-.03-4.25,2.96-9.51,6.71-11.67,3.71-2.14,6.71-.41,6.71,3.87,1.28-1.12.73-3.23.73-5.89Z"/>
+      <polygon class="cls-44" points="88.64 68.93 86.23 82.31 85.64 82.85 88.1 69.25 88.64 68.93"/>
+      <polygon class="cls-44" points="73.09 89.81 72.49 90.69 71.97 78.74 72.52 78.41 73.09 89.81"/>
+      <polygon class="cls-44" points="86.1 83.08 72.49 90.69 72.94 89.74 86.23 82.31 86.1 83.08"/>
+      <path class="cls-44" d="m85.88,73.21v.49c0,.21-.11.4-.29.5l-2.81,1.62c-.15.09-.35-.02-.35-.2v-.49c0-.21.11-.4.29-.5l2.81-1.63c.15-.09.35.02.35.2Z"/>
+      <polygon class="cls-10" points="66.45 80.69 58.39 85.85 31.17 70.63 39.34 65.03 66.45 80.69"/>
+      <path class="cls-10" d="m58.39,85.85s-3.5,3.15-10.86,1.85c-7.44-1.32-15.33-4.92-17.62-9.48-2.37-4.72,1.25-7.59,1.25-7.59l27.23,15.22Z"/>
+      <polygon class="cls-10" points="70 75.33 65.62 80.21 67.74 80.74 74.3 76.51 70 75.33"/>
+      <path class="cls-29" d="m58.39,85.85v14.12c-1.34.74-2.36.68-5.31.89-8.9.64-25.32-3.05-25.03-16.19.08-3.56-.66-8.39,1.66-12.26-1.13,1.74-.83,3.91.2,5.8,2.45,4.48,10.18,8.16,17.62,9.48,7.36,1.31,10.86-1.85,10.86-1.85Z"/>
+      <path class="cls-29" d="m29.72,72.41c-.09.15-.18.3-.26.46.08-.16.16-.31.26-.46Z"/>
+      <path class="cls-21" d="m58.39,85.85v14.12c-1.34.74-2.36.68-5.31.89-9.91.71-25.3-3.62-25.03-16.19.07-3.42-.61-8.01,1.4-11.79-.81,1.65-.48,3.62.46,5.34,2.45,4.48,10.18,8.16,17.62,9.48,7.36,1.31,10.86-1.85,10.86-1.85Z"/>
+      <path class="cls-18" d="m50.34,87.97v3.13c-7.97.4-19.67-5.49-21.82-10.41l.71-5.28c-.05,6.97,14.33,12.53,21.1,12.56Z"/>
+      <path class="cls-43" d="m29.72,72.41c-.54.89-.6,2.36-.67,3.03.04,1.94-.02,4.1-.52,5.24-.43-.98-.58-2.54-.37-3.57.24-1.58.42-3.17,1.57-4.71Z"/>
+      <path class="cls-41" d="m58.14,86.21s.3,2.83-2.3,3.86v-2.85c.89-.3,1.65-.69,2.3-1.01Z"/>
+      <path class="cls-10" d="m57.77,85.44l46.7-27.51.71,1.22-42.75,25.18c-2.39,1.34-5.45,2.53-6.6,2.75l1.93-1.63Z"/>
+      <path class="cls-43" d="m55.84,87.22c.41.76.42,1.73,0,2.85-1.83.73-3.67.93-5.5,1.02-.67-1.02-.64-2.06,0-3.13,2.08.01,3.95-.23,5.5-.74Z"/>
+      <path class="cls-22" d="m52.7,89.87c0,.39-.32.58-.71.41-.39-.16-.71-.61-.71-1.01s.32-.58.71-.41c.39.16.71.61.71,1.01Z"/>
+      <path class="cls-22" d="m54.5,89.52c0,.47-.38.69-.84.49-.47-.2-.84-.73-.84-1.2s.38-.69.84-.49c.47.2.84.73.84,1.2Z"/>
+      <path class="cls-39" d="m31.17,70.63c-1.22,1.12-1.99,2.72-1.96,4.34.06,3.97,4.08,6.97,7.61,8.79,3.35,1.74,7.5,3.1,11.68,3.76,3.46.51,6.41.08,9.65-1.21-3.06,1.66-6.27,2.26-9.73,1.84-7.26-.87-19.77-5.86-19.52-13.19.06-1.76,1-3.36,2.27-4.34Z"/>
+      <polygon class="cls-19" points="71.81 93.45 71.81 92.22 94.67 79.03 94.67 80.25 71.81 93.45"/>
+      <path class="cls-19" d="m108.09,72.45v-1.22c.4-.34.85-1.01.85-2.47,0,0,1.7,2.23-.85,3.7Z"/>
+      <polygon class="cls-44" points="88.64 68.92 88.1 69.25 87.28 68.01 87.8 67.71 88.64 68.92"/>
+      <polygon class="cls-5" points="72.52 78.41 71.97 78.74 72.35 76.84 72.91 76.51 72.52 78.41"/>
+      <path class="cls-44" d="m69.85,78.33c-.58.34-1.21-.34-.84-.9,2.38-3.49,4.65-7.86,8.61-12.45,1.76-2.04,18.8-11.27,23.03-13.6,0,0,1.21-2.81,1.21-2.81,3.32,1.92,5.18,5.41,5.19,5.4l-2.58,3.95s-24.89,14.71-34.62,20.41Z"/>
+      <path class="cls-39" d="m71.81,92.22c-.03-.12-.05-.25-.08-.37-.59-2.41-1.73-4.06-4.18-3.6-1.08.23-2.08.82-2.95,1.49-1.98,1.51-4.07,4.18-5.37,7.39-.62,1.55-.73,2.35-.85,2.84-.96-5.86,4.13-12.77,8.93-13.25,2.99-.31,5.11,1.98,4.49,5.51Z"/>
+      <path class="cls-39" d="m94.67,78.98c-.83-5.1,2.95-11.14,7.29-12.84,4-1.52,6.84,1.11,6.13,5.09-.21-.95-.43-1.86-1.01-2.7-1.25-1.98-3.72-1.55-5.64-.19-1.53,1.05-3.1,2.61-4.66,5.2-1.63,2.74-1.98,4.87-2.12,5.43Z"/>
+      <path class="cls-27" d="m108.82,59.09c0,3.22.02,2.98-.04,3.01-.48.28-.86.11-.86-.36v-2.04c0-.48.39-1.09.86-1.36.02.25.04.5.04.76Z"/>
+      <path class="cls-38" d="m77.63,64.99c-5.31,6.16-6.77,10.85-11.17,15.33-4.07,3.4-28.31-11.78-27.11-15.29,3.61-3.79,6.61-9.11,11.92-15.27,0,0,26.37,15.22,26.37,15.22Z"/>
+      <path class="cls-7" d="m74.92,65.91c-3.04,3.75-4.69,7.08-7.75,11.36-.99,1.39-2.7,2.07-4.29,1.46-8.08-3.13-14.93-7.24-20.17-11.74-.98-.84-1.06-2.16-.29-3.2,2.57-3.45,6.01-8.18,9.2-12.06l23.29,14.18Z"/>
+      <path class="cls-44" d="m74.92,65.91c-2.7,3.55-5.2,7.73-7.17,10.54-.86,1.23-2.8,1.76-4.2,1.22-8.03-3.12-14.92-7.12-20.13-11.6-.93-.8-1.07-2.19-.33-3.17,2.23-2.96,5.12-7.27,8.29-11.01.5-.59,1.34-.73,2.01-.34l21.1,12.18c.77.45.98,1.47.44,2.18Z"/>
+      <path class="cls-18" d="m59.1,54.85l-13.24,7.65c-.46.26-.97-.24-.72-.7,2.64-4.91,4.14-6.91,6.39-9.51.19-.22.51-.54.96-.95.31-.02.62.05.9.21l5.71,3.3Z"/>
+      <g class="cls-1">
+        <polygon class="cls-19" points="93.08 54.19 99.63 61.53 107.05 57.15 96.82 51.19 93.08 54.19"/>
+        <polygon class="cls-8" points="63.55 79.05 52.03 72.36 70.97 61.42 82.5 68.11 63.55 79.05"/>
+        <polygon class="cls-44" points="95.6 71.51 69.42 56.36 70.99 48.59 97.17 63.74 95.6 71.51"/>
+        <path class="cls-16" d="m87.14,80.36l-26.18-15.15c-.13-.08-.21-.24-.21-.47l26.18,15.15c0,.23.08.39.21.47Z"/>
+        <path class="cls-44" d="m73.57,40.99l26.18,15.15c-.13-.08-.32-.07-.52.05l-26.18-15.15c.2-.12.39-.13.52-.05Z"/>
+        <polygon class="cls-44" points="86.92 79.9 60.74 64.74 60.74 62.21 86.92 77.36 86.92 79.9"/>
+        <polygon class="cls-44" points="87.64 76.1 61.46 60.95 69.42 56.36 95.6 71.51 87.64 76.1"/>
+        <path class="cls-44" d="m86.92,77.36l-26.18-15.15c0-.46.33-1.03.73-1.26l26.18,15.15c-.4.23-.73.8-.73,1.26Z"/>
+        <polygon class="cls-44" points="97.17 63.74 70.99 48.59 70.98 43.08 97.16 58.23 97.17 63.74"/>
+        <polygon class="cls-44" points="97.88 56.97 71.7 41.82 73.05 41.04 99.23 56.19 97.88 56.97"/>
+        <path class="cls-44" d="m99.23,56.19c.4-.23.73-.04.73.42l.02,5.94-2.45,12.07c-2.12,1.22-7.95,4.59-9.88,5.7-.4.23-.73.04-.73-.42v-2.54c0-.46.32-1.03.72-1.26l7.95-4.59,1.58-7.77-.02-5.51c0-.46.33-1.03.73-1.26l1.35-.78Z"/>
+        <path class="cls-44" d="m97.16,58.23l-26.18-15.15c0-.46.33-1.03.73-1.26l26.18,15.15c-.4.23-.73.8-.73,1.26Z"/>
+        <polygon class="cls-44" points="68.99 69.94 58.69 63.96 60.27 56.19 70.57 62.17 68.99 69.94"/>
+        <path class="cls-16" d="m60.53,78.8l-10.3-5.98c-.13-.08-.21-.24-.21-.47l10.3,5.98c0,.23.08.39.21.47Z"/>
+        <path class="cls-16" d="m62.85,48.59l10.3,5.98c-.13-.08-.32-.07-.52.05l-10.3-5.98c.2-.12.39-.13.52-.05Z"/>
+        <polygon class="cls-17" points="60.32 78.33 50.02 72.35 50.01 69.81 60.31 75.79 60.32 78.33"/>
+        <polygon class="cls-44" points="61.04 74.53 50.74 68.55 58.69 63.96 68.99 69.94 61.04 74.53"/>
+        <path class="cls-44" d="m60.31,75.79l-10.3-5.98c0-.46.33-1.03.73-1.26l10.3,5.98c-.4.23-.73.8-.73,1.26Z"/>
+        <polygon class="cls-44" points="70.57 62.17 60.27 56.19 60.25 50.68 70.55 56.66 70.57 62.17"/>
+        <polygon class="cls-17" points="71.28 55.4 60.98 49.42 62.33 48.64 72.63 54.62 71.28 55.4"/>
+        <path class="cls-44" d="m72.63,54.62c.4-.23.73-.04.73.42l.02,5.94-2.45,12.07c-2.12,1.22-7.95,4.59-9.88,5.7-.4.23-.73.04-.73-.42v-2.54c0-.46.32-1.03.72-1.26l7.95-4.59,1.58-7.77-.02-5.51c0-.46.33-1.03.73-1.26l1.35-.78Z"/>
+        <path class="cls-20" d="m70.55,56.66l-10.3-5.98c0-.46.33-1.03.73-1.26l10.3,5.98c-.4.23-.73.8-.73,1.26Z"/>
+        <polygon class="cls-44" points="83.65 78.41 72.13 71.72 73.7 63.95 85.23 70.64 83.65 78.41"/>
+        <path class="cls-16" d="m75.19,87.26l-11.52-6.69c-.13-.08-.21-.24-.21-.47l11.52,6.69c0,.23.08.39.21.47Z"/>
+        <path class="cls-44" d="m76.28,56.35l11.52,6.69c-.13-.08-.32-.07-.52.05l-11.52-6.69c.2-.12.39-.13.52-.05Z"/>
+        <polygon class="cls-17" points="74.98 86.79 63.46 80.11 63.45 77.57 74.97 84.26 74.98 86.79"/>
+        <polygon class="cls-44" points="75.7 83 64.18 76.31 72.13 71.72 83.65 78.41 75.7 83"/>
+        <path class="cls-44" d="m74.97,84.26l-11.52-6.69c0-.46.33-1.03.73-1.26l11.52,6.69c-.4.23-.73.8-.73,1.26Z"/>
+        <polygon class="cls-44" points="85.23 70.64 73.7 63.95 73.69 58.44 85.21 65.12 85.23 70.64"/>
+        <polygon class="cls-44" points="85.94 63.87 74.42 57.18 75.77 56.4 87.29 63.09 85.94 63.87"/>
+        <path class="cls-44" d="m87.29,63.09c.4-.23.73-.04.73.42l.02,5.94-2.45,12.07c-2.12,1.22-7.95,4.59-9.88,5.7-.4.23-.73.04-.73-.42v-2.54c0-.46.32-1.03.72-1.26l7.95-4.59,1.58-7.77-.02-5.51c0-.46.33-1.03.73-1.26l1.35-.78Z"/>
+        <path class="cls-44" d="m85.21,65.12l-11.52-6.69c0-.46.33-1.03.73-1.26l11.52,6.69c-.4.23-.73.8-.73,1.26Z"/>
+      </g>
+      <path class="cls-19" d="m88.02,58.23v9.35l-1.12.65v-9.32c.56-.35.54-.35,1.12-.68Z"/>
+      <path class="cls-19" d="m98.28,52.22v9.35l-1.12.65v-9.32c.56-.35.54-.35,1.12-.68Z"/>
+      <path class="cls-19" d="m67.74,76.45c-.86,1.23-2.8,1.76-4.2,1.22-8.03-3.12-14.92-7.12-20.13-11.6-.62-.53-.89-1.32-.78-2.08,0,0,2.82-1.47,14.96,7.99,4.53-.8,7.83.26,10.16,4.48Z"/>
+      <path class="cls-13" d="m60.36,76.36c-3.16-1.37-6.12-2.89-8.84-4.51l-6.61-11.45c1.07-1.48,2.24-3.12,3.48-4.77l11.97,20.73Z"/>
+      <path class="cls-13" d="m67.28,76.96c-.68.6-1.66.93-2.59.92l-14.31-24.79c.33-.41.66-.81,1-1.2.29-.34.69-.53,1.11-.55l14.8,25.63Z"/>
+      <path class="cls-38" d="m97.28,53.22c3.86-2.1,9.19,1.27,7.19,4.7,2.69-.89,3.51-2.81,2.55-3.98-.51,1-5.68-2.93-5.68-2.93-1.16.49-2.57,1.3-4.05,2.21Z"/>
+      <path class="cls-19" d="m46.08,100.56c-6.76-.98-14.25-4.02-16.97-10.26,0-1.42.4-2.63,1.18-3.37,2.88,3.28,8.58,6.21,14.09,7.41,1.24,2.16,1.81,4.41,1.71,6.22Z"/>
+      <path class="cls-18" d="m46.09,99.86c-6.54-1.1-13.56-4.14-16.17-10.14,0-.99.19-1.87.57-2.57,2.93,3.19,8.51,6.01,13.88,7.19,1.09,1.89,1.66,3.84,1.72,5.52Z"/>
+      <polygon class="cls-38" points="31.7 90.09 31.7 86.64 41.15 92.1 41.15 95.54 31.7 90.09"/>
+      <path class="cls-19" d="m31.84,86.89l9.17,5.29v3.12l-9.17-5.29c0-3.25-.02-3.12,0-3.12Zm-.14-.24v3.44l9.45,5.46v-3.44c-9.44-5.45-9.47-5.46-9.45-5.46Z"/>
+      <path class="cls-19" d="m73.01,71.2v5.26l-.76.44v-4.52c.25-.39.5-.78.76-1.17Z"/>
+      <path class="cls-19" d="m58.39,99.97c-1.1.72-2.19.9-5.94,1.23-.94.1-2.17.09-3.07.08-4.79-.19-7.86-.98-11.41-2.39-3.74-1.65-5.84-3.43-7.44-5.5-1.97-2.6-2.77-5.69-2.48-8.72.08,1.62.38,3.22.98,4.69,3.17,8.03,14.16,11.06,22.79,11.23.92,0,3.77-.07,4.24-.09.8-.04,1.59-.18,2.33-.53Z"/>
+      <path class="cls-10" d="m104.47,57.92c1.5-.98,3.45-1.85,2.55-3.98,1.38,1.6,1.48,2.87.01,4.06-.42.28-1.19.8-1.85,1.14l-.71-1.22Z"/>
+      <path class="cls-19" d="m97.28,53.22c2.58-1.52,6.02-.56,7.36,1.52.67,1.04.75,2.32-.07,3.3-.35.41-.64.56-1.37,1-8.82,5.41-23.82,14.17-33.35,19.3,9.28-5.97,24.37-14.93,33.03-19.84.78-.44.96-.52,1.25-.84.68-.77.64-1.8.12-2.68-1.15-1.96-4.38-3.04-6.97-1.76Z"/>
+      <path class="cls-39" d="m72.09,80.6c-1.72,0-3.87.41-3.87-1.82s2.16-2.22,3.87-2.22c6.63,0,2.82,4.03,0,4.03Z"/>
+      <path class="cls-38" d="m75.68,77.62c-.24,1.09-2.06,2.34-3.66,2.34s-3.42.33-3.8-1.19c0-2.22,2.16-2.21,3.87-2.21,1.49,0,3.17.25,3.59,1.06Z"/>
+      <path class="cls-2" d="m94.51,68.02v-1.12s-.26.15-.26.15v1.12s-.61.35-.61.35v-1.12s-.26.15-.26.15v1.12s-.17.1-.17.1v1.1c0,.42.26.61.6.49v.6s.26-.15.26-.15v-.6c.34-.27.61-.77.61-1.19,0-.2,0-.9,0-1.1l-.17.1Zm-.94,2.19l.31-.77-.35.2.74-1.3-.3.81.39-.21-.79,1.26Z"/>
+      <path class="cls-38" d="m101.33,51.01s-21.78,11.73-23.71,13.98l-26.36-15.22c1.93-2.24,20.76-12.36,20.76-12.36,11.11-6.24,34.57,10.09,29.31,13.6Z"/>
+      <path class="cls-3" d="m101.33,51.01s-21.78,11.73-23.71,13.98l-26.36-15.22c1.93-2.24,20.76-12.36,20.76-12.36,11.11-6.24,34.57,10.09,29.31,13.6Z"/>
+    </g>
+    <g>
+      <path class="cls-18" d="m82.34,89.12c.8-.53,1.56-.18,1.86.26.29.44.17,1.27-.64,1.75l-1.22-2.01Z"/>
+      <path class="cls-28" d="m82.85,89.32c.55-.22,1.08-.21,1.31,0,.02.02.03.04.05.07.02.03.04.07.06.11.09.33-.31.78-.93,1.03-.04.02-.09.03-.13.05l-.69-1.08c.1-.06.21-.12.33-.17Z"/>
+      <path class="cls-18" d="m82.16,89.63c0-.53.38-.75.84-.48.46.27.84.92.84,1.45s-.38.75-.84.48c-.46-.27-.84-.92-.84-1.45Z"/>
+      <path class="cls-4" d="m82.25,89.71c0-.45.31-.63.7-.4.39.22.71.77.7,1.21,0,.45-.31.63-.7.4-.39-.22-.7-.77-.7-1.22Z"/>
+      <path class="cls-42" d="m82.56,89.9c0-.33.23-.46.52-.29.29.16.52.56.52.89s-.23.46-.52.29c-.28-.16-.52-.56-.52-.89Z"/>
+      <path class="cls-19" d="m111.04,90.74c0,1.93-1.37,4.29-3.05,5.26-1.68.97-3.05.19-3.05-1.74s1.37-4.29,3.05-5.26c1.68-.97,3.05-.19,3.05,1.74Z"/>
+      <polygon class="cls-18" points="98.3 98.54 98.3 97.29 106.15 92.76 103.93 89.39 105.19 88.3 105.7 87.68 108.5 92 108.03 92.58 108.04 92.59 107.78 92.91 107.78 93.46 98.87 98.73 98.84 98.23 98.3 98.54"/>
+      <polygon class="cls-31" points="112.59 81.39 114.98 79.53 114.98 80.17 112.59 82.03 112.59 81.39"/>
+      <path class="cls-27" d="m114.92,78.23c.12-.2.38-.26.7-.13.5.21.96.8,1.02,1.33.03.2,0,.37-.09.48h.01s-.04.04-.06.06c-.03.03-.06.05-.1.07-.84.57-1.43.28-1.76-.1-.32-.37-.34-1.14.28-1.71Z"/>
+      <path class="cls-27" d="m111.64,75.91c.13-.2.38-.26.7-.13.5.21.95.8,1.02,1.33.03.2,0,.37-.09.48h.01s-.04.04-.06.06c-.03.03-.06.05-.1.07-.84.56-1.43.28-1.77-.1-.32-.37-.34-1.14.28-1.71Z"/>
+      <path class="cls-19" d="m114.58,78.35c.13-.22.41-.28.75-.14.53.22,1.03.87,1.1,1.44.03.22,0,.4-.1.52h.01s-.04.05-.06.06c-.03.03-.07.06-.11.08-.9.61-1.55.3-1.91-.11-.35-.4-.36-1.23.3-1.84Z"/>
+      <path class="cls-19" d="m111.37,76.01c.14-.22.41-.28.75-.14.54.22,1.03.87,1.1,1.44.03.22,0,.4-.1.52h.01s-.04.05-.06.06c-.03.03-.07.06-.11.08-.9.61-1.54.3-1.9-.11-.35-.4-.36-1.23.3-1.84Z"/>
+      <path class="cls-19" d="m110.75,83.99c4.31-2.49,7.8-.5,7.8,4.45s-3.49,10.97-7.8,13.45c-4.31,2.49-7.8.5-7.8-4.45s3.49-10.97,7.8-13.45Zm-.29,15.3c3.09-1.78,5.59-6.1,5.59-9.65s-2.5-4.97-5.59-3.19c-3.09,1.78-5.6,6.1-5.6,9.65s2.51,4.97,5.6,3.19Z"/>
+      <path class="cls-18" d="m111.78,84.56c4.31-2.49,7.8-.5,7.8,4.45s-3.49,10.97-7.8,13.45c-4.31,2.49-7.8.5-7.8-4.45s3.49-10.97,7.8-13.45Zm.24,15.74c3.09-1.78,5.59-6.1,5.59-9.65s-2.5-4.97-5.59-3.19c-3.09,1.78-5.59,6.1-5.59,9.65s2.51,4.97,5.59,3.19Z"/>
+      <path class="cls-19" d="m111.78,84.56c3.07-1.77,5.72-1.27,7,.95l-2.79,1.55c-1.01-.58-2.41-.49-3.96.4-3.09,1.78-5.59,6.1-5.59,9.65,0,.94.18,1.73.49,2.35l-2.44,1.44c-.33-.8-.64-1.8-.64-2.92,0-4.94,3.62-10.93,7.93-13.42Z"/>
+      <polygon class="cls-11" points="104.21 97.11 102.23 95.91 104.26 88.19 106.97 90.68 104.21 97.11"/>
+      <polygon class="cls-19" points="86.2 85.51 86.81 85.52 81.84 99.31 81.23 99.31 86.2 85.51"/>
+      <polygon class="cls-19" points="86.42 85.66 87.02 85.67 82.06 99.46 81.46 99.45 86.42 85.66"/>
+      <polygon class="cls-39" points="87.2 85.27 84.4 81.09 83.43 81.56 86.76 86.34 87.2 85.27"/>
+      <polygon class="cls-36" points="86.82 85.47 84.02 81.3 82.84 80.88 86.54 86.16 86.82 85.47"/>
+      <polygon class="cls-19" points="81.08 98.72 82.23 99.26 78.83 108.71 77.52 108.69 81.08 98.72"/>
+      <path class="cls-13" d="m81.11,107.19c0,1.93-1.36,4.29-3.05,5.26-1.68.97-3.05.19-3.05-1.74s1.37-4.29,3.05-5.26c1.68-.97,3.05-.19,3.05,1.74Z"/>
+      <path class="cls-19" d="m79.2,109.02c0,.41-.29.91-.64,1.11-.36.21-.64.04-.64-.37s.29-.91.64-1.11c.36-.21.64-.04.64.37Z"/>
+      <polygon class="cls-19" points="78.9 108.55 81.2 109.87 81.2 111.36 78.9 110.04 78.9 108.55"/>
+      <polygon class="cls-19" points="78.14 109.12 80.44 110.45 80.44 111.5 78.14 110.18 78.14 109.12"/>
+      <path class="cls-18" d="m103.48,99.66c0,.54-.38,1.21-.86,1.48-.47.27-.86.05-.86-.49s.38-1.21.86-1.48c.47-.27.86-.05.86.49Z"/>
+      <path class="cls-19" d="m114.31,92.75c0,1.93-1.37,4.29-3.05,5.26-1.68.97-3.05.19-3.05-1.74s1.36-4.29,3.05-5.26c1.68-.97,3.05-.19,3.05,1.74Z"/>
+      <path class="cls-18" d="m114.56,92.95c0,1.93-1.36,4.29-3.05,5.26-1.68.97-3.05.19-3.05-1.74s1.36-4.29,3.05-5.26c1.68-.97,3.05-.19,3.05,1.74Z"/>
+      <path class="cls-18" d="m110.64,91.86l1.97,3.33-3.97,2.35c-.11-.3-.17-.66-.17-1.07,0-1.58.92-3.45,2.18-4.61Z"/>
+      <g class="cls-46">
+        <path class="cls-19" d="m109.14,96.18c0,.14-.1.3-.22.37-.12.07-.22.01-.22-.12s.1-.3.22-.37c.12-.07.22-.01.22.12Z"/>
+        <path class="cls-19" d="m109.3,95.12c0,.14-.1.3-.21.37-.12.07-.22.01-.22-.12s.1-.3.22-.37c.12-.07.21-.01.21.12Z"/>
+        <path class="cls-19" d="m109.73,94.03c0,.14-.09.3-.21.37-.12.07-.22.01-.22-.12s.1-.3.22-.37c.12-.07.21-.01.21.12Z"/>
+        <path class="cls-19" d="m110.3,92.93c0,.14-.1.3-.22.37-.12.07-.22.01-.22-.12s.1-.3.22-.37c.12-.07.22-.01.22.12Z"/>
+        <path class="cls-19" d="m110.97,92.18c0,.14-.1.3-.21.37-.12.07-.21.01-.21-.12s.09-.3.21-.37c.12-.07.21-.01.21.12Z"/>
+        <path class="cls-19" d="m111.89,91.52c0,.14-.1.3-.21.37-.12.07-.22.01-.22-.12s.1-.3.22-.37c.12-.07.21-.01.21.12Z"/>
+        <path class="cls-19" d="m112.9,91.15c0,.14-.1.3-.21.37-.12.07-.22.01-.22-.12s.1-.3.22-.37c.12-.07.21-.01.21.12Z"/>
+        <path class="cls-19" d="m113.69,91.45c0,.14-.1.3-.22.37-.12.07-.21.01-.21-.12s.1-.3.21-.37c.12-.07.22-.01.22.12Z"/>
+        <path class="cls-19" d="m114.24,92.01c0,.14-.1.3-.21.37-.12.07-.22.01-.22-.12s.1-.3.22-.37c.12-.07.21-.01.21.12Z"/>
+        <path class="cls-19" d="m114.35,93c0,.14-.1.3-.22.37-.12.07-.21.01-.21-.12s.1-.3.21-.37c.12-.07.22-.01.22.12Z"/>
+        <path class="cls-19" d="m114.2,94.09c0,.14-.1.3-.22.37-.12.07-.21.01-.21-.12s.1-.3.21-.37c.12-.07.22-.01.22.12Z"/>
+        <path class="cls-19" d="m113.74,95.17c0,.14-.09.3-.21.37-.12.07-.22.01-.22-.12s.1-.3.22-.37c.12-.07.21-.01.21.12Z"/>
+        <path class="cls-19" d="m113.18,96.14c0,.14-.1.3-.22.37-.12.07-.21.01-.21-.12s.1-.3.21-.37c.12-.07.22-.01.22.12Z"/>
+        <path class="cls-19" d="m112.35,97.02c0,.14-.1.3-.22.37-.12.07-.22.01-.22-.12s.1-.3.22-.37c.12-.07.22-.01.22.12Z"/>
+        <path class="cls-19" d="m111.62,97.59c0,.14-.1.3-.22.37-.12.07-.22.01-.22-.12s.1-.3.22-.37c.12-.07.22-.01.22.12Z"/>
+        <path class="cls-19" d="m110.72,97.83c0,.14-.1.3-.22.37-.12.07-.21.01-.21-.12s.1-.3.21-.37c.12-.07.22-.01.22.12Z"/>
+        <path class="cls-19" d="m109.95,97.74c0,.14-.1.3-.22.37-.12.07-.21.01-.21-.12s.09-.3.21-.37c.12-.07.22-.01.22.12Z"/>
+        <path class="cls-19" d="m109.4,97.15c0,.14-.1.3-.21.37-.12.07-.22.01-.22-.12s.1-.3.22-.37c.12-.07.21-.01.21.12Z"/>
+      </g>
+      <path class="cls-14" d="m113.39,93.92c0,1.17-.83,2.6-1.85,3.19-1.02.59-1.85.12-1.85-1.06s.83-2.6,1.85-3.19c1.02-.59,1.85-.12,1.85,1.06Z"/>
+      <polygon class="cls-31" points="105.18 88.31 114.1 80.16 114.32 82.59 105.85 89.64 105.18 88.31"/>
+      <path class="cls-36" d="m106.18,87.98l10.54-7.88c.6-.45,1.4-.5,2.05-.15l.53.29c.61.33.98.99.94,1.68l-3.85,2.37-9.78,4.31-.43-.62Z"/>
+      <path class="cls-13" d="m116.66,83.75l3.34-2.79c.31.49.54,1.3-.2,2.03l-2.97,2.96-.17-2.2Z"/>
+      <polygon class="cls-14" points="106.74 87.59 112.51 84.67 116.84 83.64 116.84 85.97 112.66 86.31 106.74 89.05 106.74 87.59"/>
+      <polygon class="cls-31" points="89.43 89.08 91.83 89.29 90.37 93.06 87.96 92.85 89.43 89.08"/>
+      <polygon class="cls-19" points="87.15 88.38 91.79 90.99 89.36 97.22 86.85 97 83.26 94.94 85.25 89.22 87.15 88.38"/>
+      <polygon class="cls-31" points="90.09 85.99 91.94 86.07 90.69 89.48 88.83 89.4 90.09 85.99"/>
+      <path class="cls-35" d="m90.61,100.49c1.82,1.57,3.88,1.03,7.51-1.38v1.31c-5.68,3.9-7.71,4.67-9.97,1.48l2.46-1.42Z"/>
+      <polygon class="cls-19" points="84.72 92.64 85.06 91.05 89.2 98.91 90.38 97.56 88.47 91.41 96.34 86.85 97.83 86.64 101.16 86.85 93.55 105.05 88.97 102.44 84.12 94.18 84.72 92.64"/>
+      <path class="cls-14" d="m92.23,104.19l-4.1-2.28c1.67,2.55,6.32,4.26,6.78,4.21l-2.69-1.93Z"/>
+      <polygon class="cls-19" points="87.37 94.31 88.5 94.34 94.17 104.46 93.03 104.43 87.37 94.31"/>
+      <path class="cls-14" d="m89.01,94.16l1.19-1.07,4.14,7.86.82-1.03-1.91-6.15,8.3-7.6,1.49-.2,2.9,3.25-4.05,12.65c-2.69,2.35-8.14,2.93-8.14,2.93l-5.33-9.09.61-1.54Z"/>
+      <path class="cls-18" d="m89.01,94.16l1.19-1.07,4.14,7.86.82-1.03-1.91-6.15,8.3-7.6,1.49-.2,2.68,3.1-4.21,12.72c-2.69,2.35-7.77,3.01-7.77,3.01l-5.33-9.09.61-1.54Z"/>
+      <path class="cls-19" d="m97.6,101.05c0-1.21.9-2.72,2.01-3.36,1.11-.64,2.01-.18,2.01,1.04s-.9,2.72-2.01,3.36c-1.11.64-2.01.18-2.01-1.04Z"/>
+      <polygon class="cls-19" points="101.91 101.55 101.48 101.33 95.59 104.3 95.89 104.69 101.91 101.55"/>
+      <path class="cls-34" d="m94.47,102.89c1.82,1.57,3.68.74,7.31-1.67l.38.19c-5.68,3.9-7.42,5.99-9.67,2.81l1.98-1.33Z"/>
+      <polygon class="cls-19" points="93.87 102.81 93.44 102.59 92.06 103.29 92.35 103.68 93.87 102.81"/>
+      <polygon class="cls-19" points="95.57 92.68 95.28 97.39 91.46 99.59 89.01 94.45 95.43 90.73 95.57 92.68"/>
+      <path class="cls-19" d="m100.07,96.91l.44-7.25,4.99-1.91s1.69,8.15-5.43,9.16Z"/>
+      <polygon class="cls-11" points="101.66 88.5 101.22 92.1 96.15 94.82 97.02 89.86 101.6 87.25 101.66 88.5"/>
+      <polygon class="cls-11" points="100.97 92.6 100.06 94.87 94.99 97.59 95.87 92.63 100.45 90.02 100.97 92.6"/>
+      <polygon class="cls-19" points="92.85 89.46 90.28 96.46 88.75 96.37 86.29 91.23 92.72 87.52 92.85 89.46"/>
+      <path class="cls-19" d="m91.37,99.75c0-.67.27-1.37.6-1.56.33-.19.6.2.6.87s-.27,1.37-.6,1.56c-.33.19-.6-.2-.6-.87Z"/>
+      <path class="cls-19" d="m91.88,99.59l7.3-4.22s.05-.04.08-.06c.33-.19.6.2.6.87s-.27,1.37-.6,1.56c-.33.19-.6-.2-.6-.87,0-.05,0-.1,0-.15l-6.79,3.92v-1.06Z"/>
+      <polygon class="cls-13" points="94.09 102.56 92.16 103.66 88.49 101.7 88.13 101.92 88.36 102.2 92.23 104.19 94.64 102.76 94.09 102.56"/>
+      <polygon class="cls-14" points="97.31 91.88 100.15 90.32 100.57 90.45 97.63 95.72 96.97 95.48 97.31 91.88"/>
+      <polygon class="cls-25" points="98.15 91.86 100.61 90.45 100.61 93.99 97.62 95.71 98.15 91.86"/>
+      <polygon class="cls-14" points="99.09 91.2 99.67 90.86 99.67 92.41 98.96 92.82 99.09 91.2"/>
+      <path class="cls-14" d="m88.95,101.3l-2.38-1.25c-1.07-3.78-7.04-2.49-7.04-2.49l-2.23-1.17.02-.67c4.51-1.09,11.7,1.14,11.62,5.58Z"/>
+      <path class="cls-36" d="m89.87,101.04l-.98.3c-1.39-3.7-6.16-4.06-9.45-3.74l.28-.93c4.51-1.09,9.08.31,10.16,4.37Z"/>
+      <path class="cls-12" d="m91.54,99.32c-.2-.64-.13-1.31.14-1.49.28-.18.66.19.85.83.2.64.13,1.31-.14,1.49-.28.18-.66-.19-.85-.83Z"/>
+      <path class="cls-6" d="m92.2,99.11c-.27,0-.49.11-.64.28,0-.02-.01-.05-.02-.07-.2-.64-.13-1.31.14-1.49.28-.18.66.19.85.83.06.18.09.36.1.53-.14-.05-.29-.09-.44-.09Z"/>
+      <polygon class="cls-18" points="96.73 92.9 96.16 97 92.42 99.15 92.03 98.3 91.26 97.88 90.59 96.36 89.96 95.04 96.73 91.23 96.73 92.9"/>
+      <polygon class="cls-14" points="97.36 93.31 96.78 97.4 93.05 99.56 91.07 95.26 97.36 91.63 97.36 93.31"/>
+      <polygon class="cls-18" points="91.86 98.1 97.06 95.34 96.98 95.91 92.18 98.46 91.86 98.1"/>
+      <polygon class="cls-13" points="92.2 97.75 97.22 95.07 97.14 95.64 92.17 98.29 92.2 97.75"/>
+      <polygon class="cls-18" points="91.51 97.33 97.15 94.39 97.07 94.97 91.85 97.68 91.51 97.33"/>
+      <polygon class="cls-13" points="91.85 96.98 97.33 94.12 97.25 94.69 91.83 97.5 91.85 96.98"/>
+      <polygon class="cls-18" points="91.01 96.6 97.35 93.23 97.26 93.81 91.39 96.93 91.01 96.6"/>
+      <polygon class="cls-13" points="91.45 96.19 97.55 92.95 97.46 93.52 91.41 96.69 91.45 96.19"/>
+      <polygon class="cls-18" points="90.65 95.71 97.44 92.04 97.34 92.62 91.14 96.11 90.65 95.71"/>
+      <polygon class="cls-14" points="91.15 95.29 97.64 91.75 97.55 92.33 91.27 95.73 91.15 95.29"/>
+      <polygon class="cls-18" points="96.78 97.4 93.05 99.56 92.6 98.63 96.93 96.17 96.78 97.4"/>
+      <polygon class="cls-18" points="97.35 92.38 91.25 95.89 90.81 94.96 97.5 91.15 97.35 92.38"/>
+      <polygon class="cls-14" points="95.72 92.71 95.41 95.17 94.05 95.94 92.84 94.38 95.72 92.71"/>
+      <polygon class="cls-19" points="95.64 92.56 95.33 95.02 93.97 95.79 92.76 94.23 95.64 92.56"/>
+      <polygon class="cls-18" points="94.89 93.05 94.61 94.81 93.76 95.33 92.73 94.21 94.89 93.05"/>
+      <path class="cls-19" d="m95.06,101.91c0-.59.44-1.33.98-1.64.54-.31.98-.09.98.51s-.44,1.33-.98,1.64c-.54.31-.98.08-.98-.51Z"/>
+      <path class="cls-14" d="m95.28,101.86c0-.59.44-1.33.98-1.64.54-.31.98-.09.98.51s-.44,1.33-.98,1.64c-.54.31-.98.09-.98-.51Z"/>
+      <path class="cls-13" d="m95.46,101.93c0-.59.44-1.33.98-1.64.54-.31.98-.09.98.51s-.44,1.33-.98,1.64c-.54.31-.98.09-.98-.51Z"/>
+      <path class="cls-19" d="m96.5,99.23c0-.39.29-.87.64-1.07.35-.2.64-.06.64.33s-.29.87-.64,1.07c-.35.21-.64.06-.64-.33Z"/>
+      <path class="cls-14" d="m96.65,99.19c0-.39.29-.87.64-1.07.35-.2.64-.06.64.33s-.29.87-.64,1.07c-.35.2-.64.06-.64-.33Z"/>
+      <path class="cls-13" d="m96.77,99.24c0-.39.29-.87.64-1.07.35-.2.64-.06.64.33s-.29.87-.64,1.07c-.35.2-.64.06-.64-.33Z"/>
+      <path class="cls-36" d="m94.64,102.76c1.82,1.57,3.88,1.03,7.51-1.38v1.31c-5.68,3.9-7.71,4.67-9.97,1.48l2.46-1.42Z"/>
+      <path class="cls-32" d="m93.53,86.86l5.39-1.11.76.81-.24,2.24-1.5,1.61-5.75,4.29c-.86.52-2.22.48-3.06-.06l-.22-1.32,2.1-3.82,2.52-2.65Z"/>
+      <path class="cls-37" d="m107.32,75.52c.72-.74,1.88-.86,2.74-.28l.96.65-.21,2.56-9.73,10.39-3.88-2.22.22-2.82,4.99-3.4c.29-.2.56-.42.8-.67l4.1-4.22Z"/>
+      <path class="cls-30" d="m96.48,84c1.24.46,3.12,1.2,4.2,2.32l-5.17,2.56-8.12,4.69-1.11-2.29,1.4-3.09c1.73-3.82,7.66-4.62,8.8-4.2Z"/>
+      <polygon class="cls-19" points="86.7 86.49 91.06 88.88 88.48 95.49 84.12 93.1 86.7 86.49"/>
+      <path class="cls-23" d="m100.23,86.03c.43.12.7.53.65.97-.06.5-.04,2.77-2.53,4.2l-6.23,3.55-.07.02c-.88.21-1.79-.22-2.17-1.04l-.21-.44,1.51-3.32c1.43-3.15,6.91-4.51,9.05-3.92Z"/>
+      <path class="cls-23" d="m100.31,86.16c.42.11.69.5.62.93-.07.48-.09,2.69-2.58,4.11l-6.23,3.55-.07.02c-.87.22-1.76-.18-2.13-.97l-.2-.43,1.55-3.24c1.47-3.08,6.92-4.5,9.03-3.97Z"/>
+      <polygon class="cls-26" points="106.36 88.2 106.92 87.57 111.75 94.76 111.18 95.4 106.36 88.2"/>
+      <polygon class="cls-39" points="106.63 87.94 107.19 87.3 112.02 94.5 111.46 95.14 106.63 87.94"/>
+      <polygon class="cls-18" points="107.95 91.46 109.27 90.33 112.06 94.66 110.96 96.02 107.95 91.46"/>
+      <polygon class="cls-36" points="108.63 91.1 109.73 89.74 112.53 94.07 111.42 95.43 108.63 91.1"/>
+      <path class="cls-18" d="m108.13,90.83c.02.06.04.11.09.15.17.13.47-.01.7-.29.35-.41.06-.77.04-.78l-.26-.25c.33-.21.66-.27.87-.11.32.24.23.89-.19,1.44-.43.55-1.03.8-1.35.56-.22-.17-.25-.59-.1-.98l.2.26Z"/>
+      <path class="cls-18" d="m106,88.19l1.03-1.93,1.9,2.63c.18.84-.65,1.79-1.54,1.87l-1.4-2.57Z"/>
+      <path class="cls-36" d="m108.52,90.17l-.81-1.33.24-1.29.98,1.36c.09.44-.09.91-.41,1.27Z"/>
+      <polygon class="cls-18" points="102.33 99.36 111.47 94.08 111.47 95.34 102.33 100.61 102.33 99.36"/>
+      <path class="cls-18" d="m102.32,99.35c.48-.37,1.09-.4,1.35-.06.26.34.08.92-.41,1.29-.48.37-1.09.4-1.35.06-.26-.34-.08-.92.41-1.29Z"/>
+      <polygon class="cls-36" points="102.85 99.91 111.81 94.28 111.81 95.53 102.9 100.79 102.85 99.91"/>
+      <path class="cls-15" d="m92.38,99.12l7.3-4.22s.05-.04.08-.06c.33-.19.6.2.6.87s-.27,1.37-.6,1.56c-.33.19-.6-.2-.6-.87,0-.05,0-.1,0-.15l-6.79,3.92v-1.06Z"/>
+      <path class="cls-9" d="m91.99,100.02l7.62-4.45s0,.1,0,.15c0,.67.27,1.06.6.87,0,0,.01,0,.02-.01-.11.33-.27.59-.46.7-.33.19-.6-.2-.6-.87,0-.05,0-.1,0-.15l-6.79,3.92c-.2.05-.32.05-.39-.16Z"/>
+      <path class="cls-36" d="m108.54,93.53c.21.23.31.54.26.85-.05.31-.23.58-.5.74l-3.45,1.99c-.22.13-.49.11-.69-.05-.2-.16-.28-.42-.2-.66l1.81-5.83,2.77,2.96Z"/>
+      <path class="cls-11" d="m104.24,95.49l1.53-4.92,1.41,1.5c-.88,1.99-1.98,2.96-2.93,3.41Z"/>
+      <path class="cls-18" d="m112.85,94.26c0,.73-.51,1.62-1.15,1.98-.64.37-1.15.07-1.15-.66s.51-1.62,1.15-1.98c.64-.37,1.15-.07,1.15.66Z"/>
+      <path class="cls-26" d="m113.1,94.43c0,.73-.51,1.62-1.15,1.98-.64.37-1.15.07-1.15-.66s.52-1.62,1.15-1.98c.64-.37,1.15-.07,1.15.66Z"/>
+      <path class="cls-14" d="m101.5,86.22l-.43,8.95s4.6,1.74,6.07-8.49l-5.64-.46Z"/>
+      <path class="cls-26" d="m102.16,86.36l-.74,8.89s5.19,1.31,6.47-9.02l-5.73.13Z"/>
+      <path class="cls-19" d="m101.8,92.88c0-1.4,1.04-3.13,2.32-3.87,1.28-.74,2.31-.2,2.31,1.19s-1.04,3.13-2.31,3.87c-1.28.74-2.32.2-2.32-1.19Z"/>
+      <path class="cls-18" d="m101.89,92.9c0-1.4,1.04-3.13,2.31-3.87,1.28-.74,2.32-.2,2.32,1.19s-1.04,3.13-2.32,3.87c-1.28.74-2.31.2-2.31-1.19Z"/>
+      <polygon class="cls-15" points="101.27 88.13 108.29 85.7 107.65 86.82 101.36 89.2 101.27 88.13"/>
+      <path class="cls-42" d="m101.29,86.02l-3.86-2.22,5.42-3.69,5.15-5.3c.33-.34.86-.41,1.27-.18l4.44,2.55-7,5.15-5.43,3.69Z"/>
+      <path class="cls-42" d="m111.4,77.19c.45-.46,1.15-.56,1.71-.25l.26.15c.81.45,1.28,1.35,1.17,2.28l-.06.51c-.06.48-.3.92-.67,1.22l-5.6,4.54c-.58.47-1.23.84-1.93,1.1l-4.12-.67-1.15-.09,4.53-3.08c.6-.41,1.15-.87,1.66-1.39l4.2-4.32Z"/>
+      <path class="cls-40" d="m111.67,77.24c.45-.46,1.15-.56,1.71-.25l.26.15c.81.45,1.27,1.35,1.17,2.28l-.06.51c-.06.48-.3.92-.67,1.22l-5.6,4.54c-.58.47-1.23.84-1.93,1.1l-5.49,2.06.22-2.82,4.53-3.08c.6-.41,1.15-.87,1.66-1.39l4.2-4.32Z"/>
+      <path class="cls-19" d="m80.37,101.46c4.31-2.49,7.8-.5,7.8,4.45s-3.49,10.97-7.8,13.45c-4.31,2.49-7.8.5-7.8-4.45s3.49-10.97,7.8-13.45Zm-.29,15.3c3.09-1.78,5.59-6.1,5.59-9.65s-2.51-4.97-5.59-3.19c-3.09,1.78-5.59,6.1-5.59,9.65s2.5,4.97,5.59,3.19Z"/>
+      <path class="cls-18" d="m81.39,102.03c4.31-2.49,7.8-.5,7.8,4.45s-3.49,10.97-7.8,13.45c-4.31,2.49-7.8.5-7.8-4.45s3.49-10.97,7.8-13.45Zm.24,15.74c3.09-1.78,5.6-6.1,5.6-9.65s-2.5-4.97-5.6-3.19c-3.09,1.78-5.59,6.1-5.59,9.65s2.5,4.97,5.59,3.19Z"/>
+      <polygon class="cls-26" points="90.93 87.57 91.54 87.58 86.35 102.11 85.75 102.11 90.93 87.57"/>
+      <polygon class="cls-39" points="91.19 87.68 91.79 87.69 86.61 102.22 86 102.22 91.19 87.68"/>
+      <path class="cls-19" d="m84.93,109.44c0,1.93-1.37,4.29-3.05,5.26-1.68.97-3.05.19-3.05-1.74s1.37-4.29,3.05-5.26c1.68-.97,3.05-.19,3.05,1.74Z"/>
+      <path class="cls-18" d="m85.15,109.54c0,1.93-1.36,4.29-3.05,5.26-1.69.97-3.05.19-3.05-1.74s1.36-4.29,3.05-5.26c1.68-.97,3.05-.19,3.05,1.74Z"/>
+      <g class="cls-46">
+        <path class="cls-19" d="m79.68,112.91c0,.14-.1.3-.22.37-.12.07-.22.01-.22-.12s.1-.3.22-.37c.12-.07.22-.01.22.12Z"/>
+        <path class="cls-19" d="m79.85,111.85c0,.14-.1.3-.22.37-.12.07-.21.01-.21-.12s.1-.3.21-.37c.12-.07.22-.01.22.12Z"/>
+        <path class="cls-19" d="m80.27,110.77c0,.14-.09.3-.22.37-.12.07-.21.01-.21-.12s.1-.3.21-.37c.12-.07.22-.01.22.12Z"/>
+        <path class="cls-19" d="m80.84,109.67c0,.14-.09.3-.21.37-.12.07-.22.01-.22-.12s.1-.3.22-.37c.12-.07.21-.01.21.12Z"/>
+        <path class="cls-19" d="m81.52,108.91c0,.14-.1.3-.22.37-.12.07-.21.01-.21-.12s.1-.3.21-.37c.12-.07.22-.01.22.12Z"/>
+        <path class="cls-19" d="m82.43,108.25c0,.14-.1.3-.22.37-.12.07-.22.01-.22-.12s.1-.3.22-.37c.12-.07.22-.01.22.12Z"/>
+        <path class="cls-19" d="m83.44,107.89c0,.14-.1.3-.22.37-.12.07-.22.01-.22-.12s.1-.3.22-.37c.12-.07.22-.01.22.12Z"/>
+        <path class="cls-19" d="m84.78,108.75c0,.14-.1.3-.22.37-.12.07-.21.01-.21-.12s.1-.3.21-.37c.12-.07.22-.01.22.12Z"/>
+        <path class="cls-19" d="m84.89,109.74c0,.14-.1.3-.22.37-.12.07-.21.01-.21-.12s.1-.3.21-.37c.12-.07.22-.01.22.12Z"/>
+        <path class="cls-19" d="m84.75,110.82c0,.14-.1.3-.22.37-.12.07-.22.01-.22-.12s.1-.3.22-.37c.12-.07.22-.01.22.12Z"/>
+        <path class="cls-19" d="m84.29,111.91c0,.14-.1.3-.22.37-.12.07-.21.01-.21-.12s.1-.3.21-.37c.12-.07.22-.01.22.12Z"/>
+        <path class="cls-19" d="m83.72,112.88c0,.14-.1.3-.21.37-.12.07-.22.01-.22-.12s.1-.3.21-.37c.12-.07.22-.01.22.12Z"/>
+        <path class="cls-19" d="m82.89,113.76c0,.14-.1.3-.22.37-.12.07-.21.01-.21-.12s.1-.3.21-.37c.12-.07.22-.01.22.12Z"/>
+        <path class="cls-19" d="m82.16,114.33c0,.14-.1.3-.22.37-.12.07-.22.01-.22-.12s.1-.3.22-.37c.12-.07.22-.01.22.12Z"/>
+        <path class="cls-19" d="m81.26,114.57c0,.14-.1.3-.22.37-.12.07-.22.01-.22-.12s.1-.3.22-.37c.12-.07.22-.01.22.12Z"/>
+        <path class="cls-19" d="m80.49,114.47c0,.14-.1.3-.22.37-.12.07-.21.01-.21-.12s.09-.3.21-.37c.12-.07.22-.01.22.12Z"/>
+        <path class="cls-19" d="m79.94,113.89c0,.14-.1.3-.22.37-.12.07-.21.01-.21-.12s.1-.3.21-.37c.12-.07.22-.01.22.12Z"/>
+      </g>
+      <path class="cls-28" d="m83.87,110.36c0,1.06-.75,2.35-1.68,2.89-.92.53-1.67.11-1.67-.95s.75-2.35,1.67-2.89c.92-.53,1.68-.11,1.68.96Z"/>
+      <polygon class="cls-26" points="85.63 101.49 86.79 102.03 83.38 111.47 82.08 111.45 85.63 101.49"/>
+      <polygon class="cls-28" points="85.63 101.49 86.09 102.04 82.79 111.34 82.08 111.45 85.63 101.49"/>
+      <path class="cls-26" d="m84.31,110.56c0,1.06-.75,2.35-1.67,2.89-.93.53-1.67.11-1.67-.95s.75-2.36,1.67-2.89c.92-.53,1.67-.11,1.67.95Z"/>
+      <path class="cls-39" d="m84.35,110.68c0,1-.71,2.22-1.58,2.72-.87.5-1.58.1-1.58-.9s.7-2.22,1.58-2.72c.87-.5,1.58-.1,1.58.9Z"/>
+      <polygon class="cls-36" points="90.22 89.53 91.38 89.95 90.11 93.78 88.95 93.36 90.22 89.53"/>
+      <polygon class="cls-18" points="89.63 89.27 90.79 89.69 89.52 93.52 88.36 93.1 89.63 89.27"/>
+      <polygon class="cls-18" points="85.36 86.64 86.52 87.06 85.26 90.89 84.09 90.47 85.36 86.64"/>
+      <path class="cls-11" d="m92.4,99.1s-.35.18-.38-.8l.38.8Z"/>
+      <path class="cls-11" d="m99.12,96.29l.25-.17s.05.69-.23.87l-.03-.7Z"/>
+      <polygon class="cls-18" points="96.67 96.63 96.68 96.31 97.03 96.11 97.02 96.43 96.67 96.63"/>
+      <polygon class="cls-39" points="83.61 109.39 86.64 101.96 86.02 101.74 83.41 109.35 83.61 109.39"/>
+      <rect class="cls-45" x="85.81" y="101.08" width=".81" height="1.66" transform="translate(-40.54 143.74) rotate(-68.03)"/>
+      <polygon class="cls-19" points="86.46 94.58 88.81 93.31 87.96 92.85 88.49 91.05 86.36 90.25 86.48 89.78 86.06 90.17 84.82 89.64 85.77 86.8 85.36 86.64 83.32 93.45 86.46 94.58"/>
+      <path class="cls-18" d="m83.77,89.64c1.53-1.01,2.98-.35,3.55.5.55.83.33,2.43-1.23,3.33l-2.32-3.84Z"/>
+      <path class="cls-28" d="m84.73,90.02c1.04-.43,2.07-.41,2.51,0,.03.04.06.08.09.12.04.06.08.13.11.2.17.63-.6,1.49-1.76,1.97-.09.03-.17.07-.25.1l-1.31-2.06c.19-.12.4-.23.63-.32Z"/>
+      <path class="cls-18" d="m83.41,90.6c0-1.02.72-1.43,1.61-.92.88.51,1.6,1.75,1.6,2.77s-.72,1.43-1.6.92c-.89-.51-1.61-1.75-1.61-2.77Z"/>
+      <path class="cls-18" d="m83.73,111.5c0,.42-.3.94-.67,1.15-.37.21-.66.04-.66-.38,0-.42.3-.94.67-1.15.37-.21.67-.04.66.38Z"/>
+      <path class="cls-14" d="m83.37,111.54c0,.25-.17.55-.39.67-.21.12-.38.03-.38-.22s.17-.54.39-.67c.21-.12.39-.03.38.22Z"/>
+      <rect class="cls-14" x="83.38" y="85.41" width="4.06" height="1.89" transform="translate(-26.55 133.44) rotate(-68.13)"/>
+      <rect class="cls-36" x="84.03" y="85.82" width="4.06" height="1.57" transform="translate(-26.36 134.25) rotate(-68.15)"/>
+      <path class="cls-39" d="m83.58,90.77c0-.85.6-1.19,1.34-.77.74.43,1.35,1.47,1.35,2.32s-.6,1.19-1.35.77c-.74-.43-1.34-1.47-1.34-2.32Z"/>
+      <path class="cls-26" d="m84.18,91.12c0-.62.44-.88.98-.56.54.31.99,1.08.98,1.7,0,.62-.44.88-.98.56-.54-.31-.98-1.07-.98-1.7Z"/>
+      <path class="cls-18" d="m88.49,91.95c.8-.53,1.56-.18,1.86.26.29.44.18,1.28-.64,1.75l-1.22-2.01Z"/>
+      <path class="cls-28" d="m88.99,92.15c.55-.22,1.08-.21,1.31,0,.02.02.03.04.04.06.02.03.04.07.06.11.09.33-.31.78-.93,1.03-.04.02-.09.03-.13.05l-.69-1.08c.1-.06.21-.12.33-.17Z"/>
+      <path class="cls-18" d="m88.3,92.45c0-.53.38-.75.84-.48.46.27.84.92.84,1.45s-.38.75-.84.48c-.46-.27-.84-.92-.84-1.45Z"/>
+      <path class="cls-4" d="m88.39,92.54c0-.45.31-.63.7-.4.39.23.7.77.7,1.22s-.31.62-.7.4c-.39-.22-.7-.77-.7-1.21Z"/>
+      <path class="cls-42" d="m88.7,92.73c0-.33.23-.46.52-.29.28.17.52.56.52.89s-.23.46-.52.29c-.28-.16-.52-.56-.52-.89Z"/>
+      <path class="cls-14" d="m98.02,100.65c0-1.16.85-2.59,1.91-3.2,1.06-.61,1.92-.17,1.92.99s-.86,2.59-1.92,3.2c-1.06.61-1.91.17-1.91-.99Z"/>
+      <path class="cls-13" d="m98.37,100.91c0-1.16.86-2.59,1.91-3.2,1.06-.61,1.91-.17,1.91.99s-.86,2.59-1.91,3.2c-1.06.61-1.91.17-1.91-.99Z"/>
+      <path class="cls-14" d="m98.67,100.74c0-.97.72-2.18,1.61-2.69.89-.51,1.61-.14,1.61.83s-.72,2.18-1.61,2.69c-.89.51-1.61.14-1.61-.83Z"/>
+      <polygon class="cls-26" points="90.91 87.56 95.5 86.47 95.88 87.47 90.54 88.63 90.91 87.56"/>
+      <polygon class="cls-26" points="91.03 87.76 95.62 86.67 96.13 87.29 90.79 88.45 91.03 87.76"/>
+      <polygon class="cls-39" points="80.62 79.31 99.74 88.41 99.74 89.37 80.62 80.27 80.62 79.31"/>
+      <polygon class="cls-25" points="80.22 79.64 99.34 88.74 99.34 89.29 80.22 80.19 80.22 79.64"/>
+      <rect class="cls-14" x="86.03" y="83.09" width=".76" height="3.49" transform="translate(-24.51 133.41) rotate(-68.12)"/>
+      <rect class="cls-26" x="85.44" y="83.33" width=".39" height="1.98" transform="translate(-24.52 132.38) rotate(-68.13)"/>
+      <rect class="cls-14" x="86.41" y="86.54" width="4.06" height="1.89" transform="translate(-25.68 137) rotate(-68.14)"/>
+      <rect class="cls-36" x="87.07" y="86.96" width="4.06" height="1.57" transform="translate(-25.51 137.76) rotate(-68.14)"/>
+      <rect class="cls-14" x="88.84" y="84.26" width=".96" height="3.58" transform="translate(-23.8 136.9) rotate(-68.13)"/>
+      <rect class="cls-26" x="89.64" y="84.54" width=".49" height="2.98" transform="translate(-23.42 137.44) rotate(-68.15)"/>
+      <polygon class="cls-37" points="108.26 85.95 106.75 81.81 106.05 82.39 107.13 86.68 108.26 85.95"/>
+      <polygon class="cls-37" points="106.05 82.52 102.51 80.34 103.29 79.6 106.91 81.68 106.05 82.52"/>
+      <polygon class="cls-4" points="106.35 82.25 102.8 80.07 103.36 79.53 106.98 81.61 106.35 82.25"/>
+      <polygon class="cls-4" points="108.51 85.77 107.01 81.62 106.31 82.21 107.39 86.5 108.51 85.77"/>
+      <path class="cls-19" d="m96.42,86.71c.24-.14.44-.11.55.05.12,0,.22.04.29.14.12,0,.22.04.28.14.12,0,.22.04.29.14.12,0,.22.04.29.14.12,0,.22.04.28.14.12,0,.22.04.28.14.12,0,.22.04.28.14.12,0,.22.04.29.14.12,0,.22.04.29.14.12,0,.22.04.28.14.22,0,.37.15.37.45,0,.4-.28.88-.63,1.09-.24.14-.44.11-.55-.06-.12,0-.22-.04-.29-.14-.12,0-.22-.04-.28-.14-.12,0-.22-.04-.28-.14-.12,0-.22-.04-.28-.14-.12,0-.22-.04-.29-.14-.12,0-.22-.04-.29-.14-.12,0-.22-.04-.28-.14-.12,0-.22-.04-.28-.14-.12,0-.22-.04-.29-.14-.12,0-.22-.04-.28-.14-.21,0-.36-.15-.36-.45,0-.4.28-.89.63-1.09Z"/>
+      <path class="cls-19" d="m79.69,78.6c.24-.14.44-.11.55.05.12,0,.22.04.28.14.12,0,.22.04.29.14.12,0,.22.04.29.14.12,0,.22.04.28.14.12,0,.22.04.29.14.12,0,.22.04.29.14.12,0,.22.04.28.14.12,0,.22.04.29.14.12,0,.22.04.28.14.12,0,.22.04.29.14.21,0,.36.15.36.44,0,.4-.28.89-.63,1.09-.24.14-.44.11-.55-.05-.12,0-.22-.04-.29-.14-.12,0-.22-.04-.29-.14-.12,0-.22-.04-.28-.14-.12,0-.22-.04-.29-.14-.12,0-.22-.04-.29-.14-.12,0-.22-.04-.28-.14-.12,0-.22-.04-.29-.14-.12,0-.22-.04-.29-.14-.12,0-.22-.04-.28-.14-.12,0-.22-.04-.29-.14-.22,0-.36-.15-.36-.44,0-.4.28-.89.63-1.09Z"/>
+      <path class="cls-39" d="m82.77,81.05c0-.32.19-.58.41-.58s.41.26.41.58-.19.58-.41.58-.41-.26-.41-.58Z"/>
+      <path class="cls-25" d="m82.77,80.85l1.1.51v.57l-.95-.44c-.19-.22-.15-.38-.15-.65Z"/>
+    </g>
+  </g>
+</svg>
\ No newline at end of file

From db4036824489bdfc691356bab78cba65ab16e399 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Fri, 15 Sep 2023 14:50:52 +0200
Subject: [PATCH 48/49] =?UTF-8?q?VBV-514:=20Termine=20nur=20f=C3=BCr=20aus?=
 =?UTF-8?q?gew=C3=A4hlte=20Circles=20anzeigen=20im=20Cockpit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/dueDates/DueDateSingle.vue |  4 +-
 .../src/components/dueDates/dueDatesUtils.ts  | 41 +++++++++++--------
 .../cockpit/cockpitPage/CockpitDates.vue      | 17 ++++++--
 .../attendanceCourse/AttendanceCourse.vue     |  8 ++--
 client/src/stores/courseSessions.ts           |  4 --
 client/src/types.ts                           |  6 +--
 server/vbv_lernwelt/course/models.py          | 10 +++++
 server/vbv_lernwelt/duedate/models.py         |  7 ++++
 server/vbv_lernwelt/duedate/serializers.py    | 26 +++++++++++-
 9 files changed, 89 insertions(+), 34 deletions(-)

diff --git a/client/src/components/dueDates/DueDateSingle.vue b/client/src/components/dueDates/DueDateSingle.vue
index e1a0b75d..9b557cb6 100644
--- a/client/src/components/dueDates/DueDateSingle.vue
+++ b/client/src/components/dueDates/DueDateSingle.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { formatDate } from "@/components/dueDates/dueDatesUtils";
+import { formatDueDate } from "@/components/dueDates/dueDatesUtils";
 import type { DueDate } from "@/types";
 
 const props = defineProps<{
@@ -30,7 +30,7 @@ const props = defineProps<{
       </div>
     </div>
     <div>
-      {{ formatDate(props.dueDate.start, props.dueDate.end) }}
+      {{ formatDueDate(props.dueDate.start, props.dueDate.end) }}
     </div>
   </div>
 </template>
diff --git a/client/src/components/dueDates/dueDatesUtils.ts b/client/src/components/dueDates/dueDatesUtils.ts
index 333a6893..0c305f05 100644
--- a/client/src/components/dueDates/dueDatesUtils.ts
+++ b/client/src/components/dueDates/dueDatesUtils.ts
@@ -1,38 +1,45 @@
 import type { Dayjs } from "dayjs";
+import dayjs from "dayjs";
+import LocalizedFormat from "dayjs/plugin/localizedFormat";
 import i18next from "i18next";
 
-export const formatDate = (start: Dayjs, end: Dayjs) => {
-  const startDateString = getDateString(start);
-  const endDateString = getDateString(end);
+export const formatDueDate = (start: string, end: string) => {
+  dayjs.extend(LocalizedFormat);
+  const startDayjs = dayjs(start);
+  const endDayjs = dayjs(end);
+  const startDateString = getDateString(startDayjs);
+  const endDateString = getDateString(endDayjs);
 
-  // if start isundefined, dont show the day twice
+  // if startDayjs isundefined, dont show the day twice
 
-  if (!start.isValid() && !end.isValid()) {
+  if (!startDayjs.isValid() && !endDayjs.isValid()) {
     return i18next.t("Termin nicht festgelegt");
   }
 
-  if (!start || (!start.isValid() && end.isValid())) {
-    return `${endDateString} ${getTimeString(end)} ${end.format("[Uhr]")}`;
+  if (!startDayjs || (!startDayjs.isValid() && endDayjs.isValid())) {
+    return `${endDateString} ${getTimeString(endDayjs)} ${endDayjs.format("[Uhr]")}`;
   }
-  if (!end || (!end.isValid() && start.isValid())) {
-    return `${startDateString} ${getTimeString(start)} ${start.format("[Uhr]")}`;
+  if (!endDayjs || (!endDayjs.isValid() && startDayjs.isValid())) {
+    return `${startDateString} ${getTimeString(startDayjs)} ${startDayjs.format(
+      "[Uhr]"
+    )}`;
   }
 
-  // if start and end are on the same day, dont show the day twice
+  // if startDayjs and endDayjs are on the same day, dont show the day twice
   if (startDateString === endDateString) {
-    return `${startDateString} ${getTimeString(start)} - ${getTimeString(
-      end
-    )} ${end.format("[Uhr]")}`;
+    return `${startDateString} ${getTimeString(startDayjs)} - ${getTimeString(
+      endDayjs
+    )} ${endDayjs.format("[Uhr]")}`;
   }
 
-  return `${startDateString} ${getTimeString(start)} - ${endDateString} ${getTimeString(
-    end
-  )}`;
+  return `${startDateString} ${getTimeString(
+    startDayjs
+  )} - ${endDateString} ${getTimeString(endDayjs)}`;
 };
 
 export const getTimeString = (date?: Dayjs) => {
   if (date) {
-    return `${date.format("H:mm")}`;
+    return `${date.format("HH:mm")}`;
   }
   return "";
 };
diff --git a/client/src/pages/cockpit/cockpitPage/CockpitDates.vue b/client/src/pages/cockpit/cockpitPage/CockpitDates.vue
index e1c79ec6..9bc73ffc 100644
--- a/client/src/pages/cockpit/cockpitPage/CockpitDates.vue
+++ b/client/src/pages/cockpit/cockpitPage/CockpitDates.vue
@@ -1,22 +1,33 @@
 <script setup lang="ts">
 import { useCurrentCourseSession } from "@/composables";
 import DueDateSingle from "@/components/dueDates/DueDateSingle.vue";
+import { computed } from "vue";
+import { useCockpitStore } from "@/stores/cockpit";
 
+const cockpitStore = useCockpitStore();
 const courseSession = useCurrentCourseSession();
-const dueDates = courseSession.value.due_dates.slice(0, 2);
+
+const circleDates = computed(() => {
+  const dueDates = courseSession.value.due_dates.filter((dueDate) => {
+    return cockpitStore.selectedCircles.includes(
+      dueDate?.circle?.translation_key ?? ""
+    );
+  });
+  return dueDates.slice(0, 4);
+});
 </script>
 
 <template>
   <div class="flex flex-col space-y-2">
     <h3 class="heading-3">{{ $t("Nächste Termine") }}</h3>
     <div
-      v-for="dueDate in dueDates"
+      v-for="dueDate in circleDates"
       :key="dueDate.id"
       class="border-t border-gray-500 pt-2"
     >
       <DueDateSingle :due-date="dueDate" :single-line="true"></DueDateSingle>
     </div>
-    <div v-if="dueDates.length === 0">{{ $t("dueDates.noDueDatesAvailable") }}</div>
+    <div v-if="circleDates.length === 0">{{ $t("dueDates.noDueDatesAvailable") }}</div>
     <a class="border-t border-gray-500 pt-8 underline" href="">
       {{ $t("dueDates.showAllDueDates") }}
     </a>
diff --git a/client/src/pages/learningPath/learningContentPage/attendanceCourse/AttendanceCourse.vue b/client/src/pages/learningPath/learningContentPage/attendanceCourse/AttendanceCourse.vue
index 57e3241a..84d09904 100644
--- a/client/src/pages/learningPath/learningContentPage/attendanceCourse/AttendanceCourse.vue
+++ b/client/src/pages/learningPath/learningContentPage/attendanceCourse/AttendanceCourse.vue
@@ -2,7 +2,9 @@
   <div class="mb-12 grid grid-cols-icon-card gap-x-4 grid-areas-icon-card">
     <it-icon-calendar-light class="w-[60px] grid-in-icon" />
     <h2 class="text-large font-bold grid-in-title">{{ $t("a.Datum") }}</h2>
-    <p class="grid-in-value">{{ formatDate(start, end) }}</p>
+    <p class="grid-in-value">
+      {{ formatDueDate(props.attendanceCourse.start, props.attendanceCourse.end) }}
+    </p>
   </div>
   <div class="mb-12 grid grid-cols-icon-card gap-x-4 grid-areas-icon-card">
     <it-icon-location class="w-[60px] grid-in-icon" />
@@ -20,7 +22,7 @@
 </template>
 
 <script setup lang="ts">
-import { formatDate } from "@/components/dueDates/dueDatesUtils";
+import { formatDueDate } from "@/components/dueDates/dueDatesUtils";
 import type { CourseSessionAttendanceCourse } from "@/types";
 import dayjs from "dayjs";
 import LocalizedFormat from "dayjs/plugin/localizedFormat";
@@ -33,8 +35,6 @@ export interface Props {
 const props = defineProps<Props>();
 
 dayjs.extend(LocalizedFormat);
-const start = computed(() => dayjs(props.attendanceCourse.start));
-const end = computed(() => dayjs(props.attendanceCourse.end));
 const location = computed(() => props.attendanceCourse.location);
 const trainer = computed(() => props.attendanceCourse.trainer);
 </script>
diff --git a/client/src/stores/courseSessions.ts b/client/src/stores/courseSessions.ts
index 223f6e19..4bb35007 100644
--- a/client/src/stores/courseSessions.ts
+++ b/client/src/stores/courseSessions.ts
@@ -40,10 +40,6 @@ export const useCourseSessionsStore = defineStore("courseSessions", () => {
             reload: reload,
           })) as CourseSessionUser[];
           cs.users = users;
-          cs.due_dates.forEach((dueDate) => {
-            dueDate.start = dayjs(dueDate.start);
-            dueDate.end = dayjs(dueDate.end);
-          });
           sortDueDates(cs.due_dates);
         })
       );
diff --git a/client/src/types.ts b/client/src/types.ts
index 62e85168..a300e47f 100644
--- a/client/src/types.ts
+++ b/client/src/types.ts
@@ -1,6 +1,5 @@
 import type { AssignmentCompletionStatus as AssignmentCompletionStatusGenerated } from "@/gql/graphql";
 import type { Circle } from "@/services/circle";
-import type { Dayjs } from "dayjs";
 import type { Component } from "vue";
 
 export type LoginMethod = "local" | "sso";
@@ -624,8 +623,8 @@ export interface UserAssignmentCompletionStatus {
 
 export type DueDate = {
   id: number;
-  start: Dayjs;
-  end: Dayjs;
+  start: string;
+  end: string;
   title: string;
   assignment_type_translation_key: string;
   date_type_translation_key: string;
@@ -633,4 +632,5 @@ export type DueDate = {
   url: string;
   course_session: number | null;
   page: number | null;
+  circle: CircleLight | null;
 };
diff --git a/server/vbv_lernwelt/course/models.py b/server/vbv_lernwelt/course/models.py
index 3b621aa9..a040dc95 100644
--- a/server/vbv_lernwelt/course/models.py
+++ b/server/vbv_lernwelt/course/models.py
@@ -103,6 +103,16 @@ class CourseBasePage(Page):
             return course_parent_page.specific.course
         return None
 
+    def get_circle(self):
+        from vbv_lernwelt.learnpath.models import Circle
+
+        try:
+            return self.get_ancestors().exact_type(Circle).first()
+        except Exception:
+            # noop
+            pass
+        return None
+
     def get_circles(self):
         course_parent_page = self.get_course_parent()
 
diff --git a/server/vbv_lernwelt/duedate/models.py b/server/vbv_lernwelt/duedate/models.py
index bb1f2028..5156bb59 100644
--- a/server/vbv_lernwelt/duedate/models.py
+++ b/server/vbv_lernwelt/duedate/models.py
@@ -97,6 +97,13 @@ class DueDate(models.Model):
             return datetime.timedelta(0)
         return self.end - self.start
 
+    def get_circle(self):
+        try:
+            return self.page.specific.get_circle()
+        except Exception:
+            # noop
+            return None
+
     @classmethod
     def get_users_next_events_qs(
         cls, user: User, course_session: CourseSession = None, limit=10
diff --git a/server/vbv_lernwelt/duedate/serializers.py b/server/vbv_lernwelt/duedate/serializers.py
index f4e0f392..425f8b01 100644
--- a/server/vbv_lernwelt/duedate/serializers.py
+++ b/server/vbv_lernwelt/duedate/serializers.py
@@ -4,6 +4,30 @@ from vbv_lernwelt.duedate.models import DueDate
 
 
 class DueDateSerializer(serializers.ModelSerializer):
+    circle = serializers.SerializerMethodField()
+
     class Meta:
         model = DueDate
-        fields = "__all__"
+        fields = [
+            "start",
+            "end",
+            "manual_override_fields",
+            "title",
+            "assignment_type_translation_key",
+            "date_type_translation_key",
+            "subtitle",
+            "url",
+            "course_session",
+            "page",
+            "circle",
+        ]
+
+    def get_circle(self, obj):
+        circle = obj.get_circle()
+        if circle:
+            return {
+                "id": circle.id,
+                "title": circle.title,
+                "translation_key": circle.translation_key,
+            }
+        return None

From abddf3079a72977fa1819dfcf08017131ddbd76b Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Mon, 18 Sep 2023 18:59:34 +0200
Subject: [PATCH 49/49] Fix mobile navigation and minor mobile problems

---
 client/src/components/header/MobileMenu.vue   | 51 ++++++++++++-------
 .../competence/ActionCompetenceListPage.vue   |  2 +-
 .../competence/CompetenceAssignmentRow.vue    |  2 +-
 .../pages/competence/CompetenceIndexPage.vue  |  6 +--
 .../SinglePerformanceCriteriaRow.vue          |  2 +-
 5 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/client/src/components/header/MobileMenu.vue b/client/src/components/header/MobileMenu.vue
index c1549b9e..d05c84e5 100644
--- a/client/src/components/header/MobileMenu.vue
+++ b/client/src/components/header/MobileMenu.vue
@@ -3,6 +3,7 @@ import ItFullScreenModal from "@/components/ui/ItFullScreenModal.vue";
 import type { UserState } from "@/stores/user";
 import type { CourseSession } from "@/types";
 import { useRouter } from "vue-router";
+import { useCourseSessionsStore } from "@/stores/courseSessions";
 
 const router = useRouter();
 
@@ -21,6 +22,8 @@ const clickLink = (to: string | undefined) => {
     emit("closemodal");
   }
 };
+
+const courseSessionsStore = useCourseSessionsStore();
 </script>
 
 <template>
@@ -49,20 +52,38 @@ const clickLink = (to: string | undefined) => {
           </div>
         </div>
         <div>
-          <div v-if="courseSession" class="mt-6 border-b pb-6">
+          <div v-if="courseSession" class="mt-6 border-b">
             <h4 class="text-sm text-gray-900">{{ courseSession?.course.title }}</h4>
             <ul class="mt-6">
-              <li>
-                <button @click="clickLink(courseSession?.learning_path_url)">
-                  {{ $t("general.learningPath") }}
-                </button>
-              </li>
-              <li class="mt-6">
+              <li
+                v-if="courseSessionsStore.currentCourseSessionHasCockpit"
+                class="mb-6"
+              >
                 <button @click="clickLink(`${courseSession?.course_url}/cockpit`)">
                   {{ $t("cockpit.title") }}
                 </button>
               </li>
-              <li class="mt-6">
+              <li class="mb-6">
+                <button @click="clickLink(courseSession?.learning_path_url)">
+                  {{ $t("general.learningPath") }}
+                </button>
+              </li>
+              <li class="mb-6">
+                <button
+                  @click="
+                    clickLink(
+                      courseSession?.competence_url.replace(
+                        // TODO: remove the `competence_url` with url to Navi...
+                        '/competences',
+                        ''
+                      )
+                    )
+                  "
+                >
+                  {{ $t("competences.title") }}
+                </button>
+              </li>
+              <li class="mb-6">
                 <button
                   data-cy="medialibrary-link"
                   @click="clickLink(`${courseSession?.media_library_url}`)"
@@ -72,16 +93,12 @@ const clickLink = (to: string | undefined) => {
               </li>
             </ul>
           </div>
-          <div class="mt-6 border-b pb-6">
+          <div class="mt-6 border-b">
             <ul>
-              <li>
-                <a
-                  class="nav-item"
-                  target="_blank"
-                  href="https://bildung.vbv.ch/ilp/pages/catalogsearch.jsf"
-                >
-                  Shop
-                </a>
+              <li class="mb-6">
+                <button data-cy="medialibrary-link" @click="clickLink('/')">
+                  myVBV
+                </button>
               </li>
             </ul>
           </div>
diff --git a/client/src/pages/competence/ActionCompetenceListPage.vue b/client/src/pages/competence/ActionCompetenceListPage.vue
index b4f782cd..9b4bd7df 100644
--- a/client/src/pages/competence/ActionCompetenceListPage.vue
+++ b/client/src/pages/competence/ActionCompetenceListPage.vue
@@ -28,7 +28,7 @@ function toggleOpen() {
       <div class="text-xl lg:w-3/4">
         {{ $t("competence.listPageDescription") }}
       </div>
-      <div class="whitespace-nowrap">
+      <div class="lg:whitespace-nowrap">
         <button class="link" @click="toggleOpen()">
           <span v-if="isOpenAll">
             {{ $t("a.Alle zuklappen") }}
diff --git a/client/src/pages/competence/CompetenceAssignmentRow.vue b/client/src/pages/competence/CompetenceAssignmentRow.vue
index 02722efe..c1acb8ae 100644
--- a/client/src/pages/competence/CompetenceAssignmentRow.vue
+++ b/client/src/pages/competence/CompetenceAssignmentRow.vue
@@ -28,7 +28,7 @@ const getIconName = () => {
     :data-cy="`assignment-${assignment.slug}`"
   >
     <component :is="getIconName()" class="mr-4 hidden h-9 w-9 lg:block"></component>
-    <div class="flex w-[420px] flex-col">
+    <div class="flex flex-col lg:w-[420px]">
       <h3 class="text-bold flex items-center gap-2">{{ assignment.title }}</h3>
       <p class="text-gray-800">
         <a
diff --git a/client/src/pages/competence/CompetenceIndexPage.vue b/client/src/pages/competence/CompetenceIndexPage.vue
index bc444caf..54328354 100644
--- a/client/src/pages/competence/CompetenceIndexPage.vue
+++ b/client/src/pages/competence/CompetenceIndexPage.vue
@@ -139,7 +139,7 @@ const performanceCriteriaStatusCount = computed(() => {
         class="mb-6 flex flex-col lg:flex-row lg:items-center lg:justify-between lg:gap-8"
       >
         <li
-          class="mb-4 inline-block w-1/3 flex-1 border-b pb-4 lg:mb-0 lg:border-b-0 lg:border-r lg:pb-0"
+          class="mb-4 inline-block flex-1 border-b pb-4 lg:mb-0 lg:w-1/3 lg:border-b-0 lg:border-r lg:pb-0"
         >
           <h5 class="mb-4 text-gray-700">«{{ $t("selfEvaluation.no") }}»</h5>
           <div class="flex flex-row items-center">
@@ -153,7 +153,7 @@ const performanceCriteriaStatusCount = computed(() => {
           </div>
         </li>
         <li
-          class="mb-4 inline-block w-1/3 flex-1 border-b pb-4 lg:mb-0 lg:border-b-0 lg:border-r lg:pb-0"
+          class="mb-4 inline-block flex-1 border-b pb-4 lg:mb-0 lg:w-1/3 lg:border-b-0 lg:border-r lg:pb-0"
         >
           <h5 class="mb-4 text-gray-700">«{{ $t("selfEvaluation.yes") }}»</h5>
           <div class="flex flex-row items-center">
@@ -166,7 +166,7 @@ const performanceCriteriaStatusCount = computed(() => {
             </p>
           </div>
         </li>
-        <li class="w-1/3 flex-1 border-b pb-4 lg:mb-0 lg:border-b-0 lg:pb-0">
+        <li class="flex-1 border-b pb-4 lg:mb-0 lg:w-1/3 lg:border-b-0 lg:pb-0">
           <h5 class="mb-4 text-gray-700">{{ $t("competences.notAssessed") }}</h5>
           <div class="flex flex-row items-center">
             <it-icon-smiley-neutral class="h-16 w-16"></it-icon-smiley-neutral>
diff --git a/client/src/pages/competence/SinglePerformanceCriteriaRow.vue b/client/src/pages/competence/SinglePerformanceCriteriaRow.vue
index 03922783..e3c1dd90 100644
--- a/client/src/pages/competence/SinglePerformanceCriteriaRow.vue
+++ b/client/src/pages/competence/SinglePerformanceCriteriaRow.vue
@@ -30,7 +30,7 @@ const props = withDefaults(defineProps<Props>(), {
         {{ criteria.title }}
       </div>
     </div>
-    <span class="whitespace-nowrap">
+    <span class="lg:whitespace-nowrap">
       <router-link
         v-if="props.showAssessAgain"
         class="link"