From 28445cf1a59584b9d6448ef870b1a44233508db8 Mon Sep 17 00:00:00 2001
From: Reto Aebersold <aeby@substyle.ch>
Date: Tue, 9 Jan 2024 17:21:06 +0100
Subject: [PATCH 01/24] feat: add avatar upload

---
 .../src/pages/onboarding/AccountProfile.vue   | 29 +++---
 client/src/services/files.ts                  | 17 ++--
 client/src/stores/user.ts                     |  5 ++
 server/config/urls.py                         |  6 +-
 server/vbv_lernwelt/api/user.py               | 16 +++-
 server/vbv_lernwelt/core/admin.py             |  2 +-
 .../vbv_lernwelt/core/create_default_users.py | 89 +++++++++++--------
 server/vbv_lernwelt/core/graphql/types.py     |  3 +
 .../commands/create_default_users.py          |  2 +-
 .../migrations/0004_auto_20240108_0943.py     | 29 ++++++
 server/vbv_lernwelt/core/models.py            | 20 ++++-
 .../media_files/tests/test_user_images.py     | 64 +++++++++++++
 server/vbv_lernwelt/media_files/views.py      | 39 ++++++++
 13 files changed, 260 insertions(+), 61 deletions(-)
 create mode 100644 server/vbv_lernwelt/core/migrations/0004_auto_20240108_0943.py
 create mode 100644 server/vbv_lernwelt/media_files/tests/test_user_images.py
 create mode 100644 server/vbv_lernwelt/media_files/views.py

diff --git a/client/src/pages/onboarding/AccountProfile.vue b/client/src/pages/onboarding/AccountProfile.vue
index 1eb9bb78..31b982b8 100644
--- a/client/src/pages/onboarding/AccountProfile.vue
+++ b/client/src/pages/onboarding/AccountProfile.vue
@@ -6,6 +6,7 @@ import { useUserStore } from "@/stores/user";
 import { useRoute } from "vue-router";
 import { useTranslation } from "i18next-vue";
 import { profileNextRoute, useEntities } from "@/services/onboarding";
+import AvatarImage from "@/components/ui/AvatarImage.vue";
 
 const { t } = useTranslation();
 
@@ -36,17 +37,23 @@ const validOrganisation = computed(() => {
   return selectedOrganisation.value.id !== 0;
 });
 
-/* TODO: We do this later (not in the first release)
-const {
-  upload: avatarUpload,
-  loading: avatarLoading,
-  error: avatarError,
-  fileInfo: avatarFileInfo,
-} = useFileUpload();
+const avatarError = ref(false);
+const avatarLoading = ref(false);
 
-watch(avatarFileInfo, (info) => {
-  console.log("fileInfo changed", info);
-})*/
+async function avatarUpload(e: Event) {
+  const { files } = e.target as HTMLInputElement;
+  if (!files?.length) return;
+  avatarLoading.value = true;
+  avatarError.value = false;
+
+  try {
+    await user.setUserAvatar(files[0]);
+  } catch (e) {
+    avatarError.value = true;
+  } finally {
+    avatarLoading.value = false;
+  }
+}
 
 watch(selectedOrganisation, async (organisation) => {
   await user.setUserOrganisation(organisation.id);
@@ -74,7 +81,6 @@ const nextRoute = computed(() => {
 
       <ItDropdownSelect v-model="selectedOrganisation" :items="organisations" />
 
-      <!--- TODO: We do this later (not in the first release)
       <div class="mt-16 flex flex-col justify-between gap-12 lg:flex-row lg:gap-24">
         <div>
           <h3 class="mb-3">{{ $t("a.Profilbild") }}</h3>
@@ -103,7 +109,6 @@ const nextRoute = computed(() => {
         </div>
         <AvatarImage :loading="avatarLoading" :image-url="user.avatar_url" />
       </div>
-      -->
     </template>
 
     <template #footer>
diff --git a/client/src/services/files.ts b/client/src/services/files.ts
index 37d18cfd..169461ff 100644
--- a/client/src/services/files.ts
+++ b/client/src/services/files.ts
@@ -24,27 +24,30 @@ export async function uploadFile(fileData: FileData, file: File) {
   if (fileData.fields) {
     return s3Upload(fileData, file);
   } else {
-    return directUpload(fileData, file);
+    return directUpload(fileData.url, file);
   }
 }
 
-function directUpload(fileData: FileData, file: File) {
+export function directUpload(url: string, file: File) {
   const formData = new FormData();
   formData.append("file", file);
 
-  const headers = {
+  const headers: HeadersInit = {
     Accept: "application/json",
-  } as HeadersInit;
+  };
+
+  const csrfToken = getCookieValue("csrftoken");
+  if (csrfToken) {
+    headers["X-CSRFToken"] = csrfToken;
+  }
 
   const options = {
     method: "POST",
     headers: headers,
     body: formData,
   };
-  // @ts-ignore
-  options.headers["X-CSRFToken"] = getCookieValue("csrftoken");
 
-  return handleUpload(fileData.url, options);
+  return handleUpload(url, options);
 }
 
 function s3Upload(fileData: FileData, file: File) {
diff --git a/client/src/stores/user.ts b/client/src/stores/user.ts
index 1c7c41c4..1243cb19 100644
--- a/client/src/stores/user.ts
+++ b/client/src/stores/user.ts
@@ -2,6 +2,7 @@ import log from "loglevel";
 
 import { bustItGetCache, itGetCached, itPost } from "@/fetchHelpers";
 import { setI18nLanguage } from "@/i18nextWrapper";
+import { directUpload } from "@/services/files";
 import dayjs from "dayjs";
 import { defineStore } from "pinia";
 
@@ -150,5 +151,9 @@ export const useUserStore = defineStore({
       this.$state.organisation = organisation;
       await itPost("/api/core/me/", { organisation }, { method: "PUT" });
     },
+    async setUserAvatar(file: File) {
+      const r = await directUpload("/api/core/avatar/", file);
+      this.$state.avatar_url = r.url;
+    },
   },
 });
diff --git a/server/config/urls.py b/server/config/urls.py
index f7d27476..6cd5c4ad 100644
--- a/server/config/urls.py
+++ b/server/config/urls.py
@@ -12,7 +12,7 @@ from django_ratelimit.exceptions import Ratelimited
 from graphene_django.views import GraphQLView
 
 from vbv_lernwelt.api.directory import list_entities
-from vbv_lernwelt.api.user import get_cockpit_type, me_user_view
+from vbv_lernwelt.api.user import get_cockpit_type, me_user_view, post_avatar
 from vbv_lernwelt.assignment.views import request_assignment_completion_status
 from vbv_lernwelt.core.middleware.auth import django_view_authentication_exempt
 from vbv_lernwelt.core.schema import schema
@@ -54,6 +54,7 @@ from vbv_lernwelt.importer.views import (
     coursesessions_trainers_import,
     t2l_sync,
 )
+from vbv_lernwelt.media_files.views import user_image
 from vbv_lernwelt.notify.views import email_notification_settings
 from wagtail import urls as wagtail_urls
 from wagtail.admin import urls as wagtailadmin_urls
@@ -99,6 +100,7 @@ urlpatterns = [
     # user management
     path("sso/", include("vbv_lernwelt.sso.urls")),
     re_path(r'api/core/me/$', me_user_view, name='me_user_view'),
+    re_path(r'api/core/avatar/$', post_avatar, name='post_avatar'),
     re_path(r'api/core/entities/$', list_entities, name='list_entities'),
 
     re_path(r'api/core/login/$', django_view_authentication_exempt(vue_login),
@@ -140,6 +142,8 @@ urlpatterns = [
         name="request_assignment_completion_status"),
 
     # documents
+    path("api/core/userimage/<int:image_id>", user_image, name="user_image"),
+
     # TODO: remfactor to files app
     path(r'api/core/document/start/', document_upload_start,
          name='file_upload_start'),
diff --git a/server/vbv_lernwelt/api/user.py b/server/vbv_lernwelt/api/user.py
index 2ff2b3d3..b984ba23 100644
--- a/server/vbv_lernwelt/api/user.py
+++ b/server/vbv_lernwelt/api/user.py
@@ -5,10 +5,10 @@ from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
 
 from vbv_lernwelt.core.serializers import UserSerializer
-
 from vbv_lernwelt.course.models import Course, CourseSessionUser
 from vbv_lernwelt.course_session_group.models import CourseSessionGroup
 from vbv_lernwelt.learning_mentor.models import LearningMentor
+from vbv_lernwelt.media_files.models import UserImage
 
 
 @api_view(["GET", "PUT"])
@@ -59,3 +59,17 @@ def get_cockpit_type(request, course_id: int):
         cockpit_type = None
 
     return Response({"type": cockpit_type})
+
+
+@api_view(["POST"])
+@permission_classes([IsAuthenticated])
+def post_avatar(request):
+    if "file" not in request.FILES:
+        return Response(status=400)
+
+    request.user.avatar = UserImage.objects.create(
+        file=request.FILES["file"],
+    )
+    request.user.save()
+
+    return Response({"url": request.user.avatar_url})
diff --git a/server/vbv_lernwelt/core/admin.py b/server/vbv_lernwelt/core/admin.py
index 7171b3bb..2fb286cc 100644
--- a/server/vbv_lernwelt/core/admin.py
+++ b/server/vbv_lernwelt/core/admin.py
@@ -43,7 +43,7 @@ class UserAdmin(auth_admin.UserAdmin):
             },
         ),
         (_("Important dates"), {"fields": ("last_login", "date_joined")}),
-        (_("Profile"), {"fields": ("organisation", "language")}),
+        (_("Profile"), {"fields": ("organisation", "language", "avatar")}),
         (_("Additional data"), {"fields": ("additional_json_data",)}),
     )
     list_display = [
diff --git a/server/vbv_lernwelt/core/create_default_users.py b/server/vbv_lernwelt/core/create_default_users.py
index aef8516d..a401ba6c 100644
--- a/server/vbv_lernwelt/core/create_default_users.py
+++ b/server/vbv_lernwelt/core/create_default_users.py
@@ -1,7 +1,11 @@
+from django.conf import settings
 from django.contrib.auth.hashers import make_password
 from django.contrib.auth.models import Group, Permission
+from django.core.files import File
 from environs import Env
 
+from vbv_lernwelt.media_files.models import UserImage
+
 env = Env()
 env.read_env()
 
@@ -24,52 +28,54 @@ default_users = [
         "email": "student",
         "first_name": "Student",
         "last_name": "Meier",
-        "avatar_url": "/static/avatars/avatar_iterativ.png",
+        "avatar_image": "avatar_iterativ.png",
     },
     {
         "email": "daniel.egger@iterativ.ch",
         "first_name": "Daniel",
         "last_name": "Egger",
-        "avatar_url": "/static/avatars/avatar_iterativ.png",
+        "avatar_image": "avatar_iterativ.png",
     },
     {
         "email": "axel.manderbach@lernetz.ch",
         "first_name": "Axel",
         "last_name": "Manderbach",
-        "avatar_url": "/static/avatars/avatar_axel.jpg",
+        "avatar_image": "avatar_axel.jpg",
     },
     {
         "email": "christoph.bosshard@vbv-afa.ch",
         "first_name": "Christoph",
         "last_name": "Bosshard",
-        "avatar_url": "/static/avatars/avatar_christoph.png",
+        "avatar_image": "avatar_christoph.png",
         "password": "myvbv1234",
     },
     {
         "email": "alexandra.vangelista@lernetz.ch",
         "first_name": "Alexandra",
         "last_name": "Vangelista",
-        "avatar_url": "/static/avatars/avatar_alexandra.png",
+        "avatar_image": "avatar_alexandra.png",
         "password": "myvbv1234",
     },
     {
         "email": "chantal.rosenberg@vbv-afa.ch",
         "first_name": "Chantal",
         "last_name": "Rosenberg",
-        "avatar_url": "/static/avatars/avatar_chantal.png",
+        "avatar_image": "avatar_chantal.png",
         "password": "myvbv1234",
     },
     {
         "email": "bianca.muster@eiger-versicherungen.ch",
         "first_name": "Bianca",
         "last_name": "Muster",
-        "avatar_url": "/static/avatars/avatar_bianca.png",
+        "avatar_image": "avatar_bianca.png",
         "password": "myvbv1234",
     },
 ]
 
+AVATAR_DIR = settings.APPS_DIR / "static" / "avatars"
 
-def create_default_users(default_password="test"):
+
+def create_default_users(default_password="test", set_avatar=False):
     admin_group, created = Group.objects.get_or_create(name="admin_group")
     _content_creator_grop, _created = Group.objects.get_or_create(
         name="content_creator_grop"
@@ -81,9 +87,9 @@ def create_default_users(default_password="test"):
         email,
         first_name,
         last_name,
-        avatar_url,
         language,
         password,
+        avatar_image: str = None,
     ):
         user, _ = User.objects.get_or_create(
             id=_id,
@@ -92,25 +98,33 @@ def create_default_users(default_password="test"):
             language=language,
             first_name=first_name,
             last_name=last_name,
-            avatar_url=avatar_url,
             password=make_password(password),
         )
+
+        if avatar_image and set_avatar:
+            with open(AVATAR_DIR / avatar_image, "rb") as f:
+                image, _ = UserImage.objects.get_or_create(
+                    file=File(f),
+                )
+                user.avatar = image
+                user.save()
+
         return user
 
     def _create_student_user(
         email,
         first_name,
         last_name,
-        avatar_url="",
         password=default_password,
         language="de",
+        avatar_image=None,
         id=None,
     ):
         student_user = _create_user(
             email=email,
             first_name=first_name,
             last_name=last_name,
-            avatar_url=avatar_url,
+            avatar_image=avatar_image,
             language=language,
             password=password,
             _id=id,
@@ -120,13 +134,18 @@ def create_default_users(default_password="test"):
         student_user.save()
 
     def _create_admin_user(
-        email, first_name, last_name, avatar_url="", id=None, password=default_password
+        email,
+        first_name,
+        last_name,
+        avatar_image=None,
+        id=None,
+        password=default_password,
     ):
         admin_user = _create_user(
             email=email,
             first_name=first_name,
             last_name=last_name,
-            avatar_url=avatar_url,
+            avatar_image=avatar_image,
             password=password,
             language="de",
             _id=id,
@@ -145,7 +164,7 @@ def create_default_users(default_password="test"):
             email=email,
             first_name=first_name,
             last_name=last_name,
-            avatar_url="",
+            avatar_image=None,
             language="de",
             password=password,
         )
@@ -158,7 +177,7 @@ def create_default_users(default_password="test"):
         email="info@iterativ.ch",
         first_name="Info",
         last_name="Iterativ",
-        avatar_url="/static/avatars/avatar_iterativ.png",
+        avatar_image="avatar_iterativ.png",
         password=env("IT_DEFAULT_ADMIN_PASSWORD", default_password),
     )
 
@@ -166,7 +185,7 @@ def create_default_users(default_password="test"):
         email="admin",
         first_name="Peter",
         last_name="Adminson",
-        avatar_url="/static/avatars/avatar_iterativ.png",
+        avatar_image="avatar_iterativ.png",
         id=ADMIN_USER_ID,
         password=env("IT_DEFAULT_ADMIN_PASSWORD", default_password),
     )
@@ -183,7 +202,7 @@ def create_default_users(default_password="test"):
         email="expert-vv.expert2@eiger-versicherungen.ch",
         first_name="Christa",
         last_name="von Allmen",
-        avatar_url="/static/avatars/uk1.patrizia.huggel.jpg",
+        avatar_image="uk1.patrizia.huggel.jpg",
     )
     _create_student_user(
         email="expert-vv.expert3@eiger-versicherungen.ch",
@@ -199,53 +218,53 @@ def create_default_users(default_password="test"):
         email="patrizia.huggel@eiger-versicherungen.ch",
         first_name="Patrizia",
         last_name="Huggel",
-        avatar_url="/static/avatars/uk1.patrizia.huggel.jpg",
+        avatar_image="uk1.patrizia.huggel.jpg",
         password="myvbv1234",
     )
     _create_student_user(
         email="andreas.feuz@eiger-versicherungen.ch",
         first_name="Andreas",
         last_name="Feuz",
-        avatar_url="/static/avatars/uk1.daniel.tanaka.jpg",
+        avatar_image="uk1.daniel.tanaka.jpg",
         password="myvbv1234",
     )
     _create_student_user(
         email="daniel.tanaka@eiger-versicherung.ch",
         first_name="Daniel",
         last_name="Tanaka",
-        avatar_url="/static/avatars/uk1.daniel.tanaka.jpg",
+        avatar_image="uk1.daniel.tanaka.jpg",
     )
     _create_student_user(
         email="maria.spini@eiger-versicherung.ch",
         first_name="Maria",
         last_name="Spini",
-        avatar_url="/static/avatars/uk1.maria.spini.jpg",
+        avatar_image="uk1.maria.spini.jpg",
     )
     _create_student_user(
         email="christian.koller@eiger-versicherung.ch",
         first_name="Christian",
         last_name="Koller",
-        avatar_url="/static/avatars/uk1.christian.koller.jpg",
+        avatar_image="uk1.christian.koller.jpg",
     )
     _create_student_user(
         email="michael.meier@example.com",
         first_name="Michael",
         last_name="Meier",
-        avatar_url="/static/avatars/uk1.michael.meier.jpg",
+        avatar_image="uk1.michael.meier.jpg",
         password="myvbv1234",
     )
     _create_student_user(
         email="lina.egger@example.com",
         first_name="Lina",
         last_name="Egger",
-        avatar_url="/static/avatars/uk1.lina.egger.jpg",
+        avatar_image="uk1.lina.egger.jpg",
         password="myvbv1234",
     )
     _create_student_user(
         email="evelyn.schmid@example.com",
         first_name="Evelyn",
         last_name="Schmid",
-        avatar_url="/static/avatars/uk1.evelyn.schmid.jpg",
+        avatar_image="uk1.evelyn.schmid.jpg",
     )
 
     _create_student_user(
@@ -272,7 +291,7 @@ def create_default_users(default_password="test"):
         email="luca.dupont@assurance.ch",
         first_name="Luca",
         last_name="Dupont",
-        avatar_url="/static/avatars/uk1.michael.meier.jpg",
+        avatar_image="uk1.michael.meier.jpg",
         password="myafa1234",
         language="fr",
     )
@@ -280,7 +299,7 @@ def create_default_users(default_password="test"):
         email="patrick.muster@eiger-versicherungen.ch",
         first_name="Patrick",
         last_name="Muster",
-        avatar_url="/static/avatars/uk1.michael.meier.jpg",
+        avatar_image="uk1.michael.meier.jpg",
         password="myvbv1234",
         language="de",
     )
@@ -288,7 +307,7 @@ def create_default_users(default_password="test"):
         email="geraldine.kolly@assurance.ch",
         first_name="Géraldine",
         last_name="Kolly",
-        avatar_url="/static/avatars/uk1.patrizia.huggel.jpg",
+        avatar_image="uk1.patrizia.huggel.jpg",
         password="myafa1234",
         language="fr",
     )
@@ -299,35 +318,35 @@ def create_default_users(default_password="test"):
         email="test-trainer1@example.com",
         first_name="Test",
         last_name="Trainer1",
-        avatar_url="/static/avatars/uk1.patrizia.huggel.jpg",
+        avatar_image="uk1.patrizia.huggel.jpg",
     )
     _create_student_user(
         id=TEST_TRAINER2_USER_ID,
         email="test-trainer2@example.com",
         first_name="Test",
         last_name="Trainer2",
-        avatar_url="/static/avatars/uk1.christian.koller.jpg",
+        avatar_image="uk1.christian.koller.jpg",
     )
     _create_student_user(
         id=TEST_STUDENT1_USER_ID,
         email="test-student1@example.com",
         first_name="Test",
         last_name="Student1",
-        avatar_url="/static/avatars/uk1.michael.meier.jpg",
+        avatar_image="uk1.michael.meier.jpg",
     )
     _create_student_user(
         id=TEST_STUDENT2_USER_ID,
         email="test-student2@example.com",
         first_name="Test",
         last_name="Student2",
-        avatar_url="/static/avatars/uk1.lina.egger.jpg",
+        avatar_image="uk1.lina.egger.jpg",
     )
     _create_student_user(
         id=TEST_STUDENT3_USER_ID,
         email="test-student3@example.com",
         first_name="Test",
         last_name="Student3",
-        avatar_url="/static/avatars/uk1.christian.koller.jpg",
+        avatar_image="uk1.christian.koller.jpg",
     )
     _create_staff_user(
         email="matthias.wirth@vbv-afa.ch",
@@ -341,7 +360,6 @@ def create_default_users(default_password="test"):
         last_name="Regionalleiter",
         password=default_password,
         language="de",
-        avatar_url="",
     )
     _create_user(
         _id=TEST_MENTOR1_USER_ID,
@@ -350,7 +368,6 @@ def create_default_users(default_password="test"):
         last_name="Mentor",
         password=default_password,
         language="de",
-        avatar_url="",
     )
 
 
diff --git a/server/vbv_lernwelt/core/graphql/types.py b/server/vbv_lernwelt/core/graphql/types.py
index 961275d6..25a22b53 100644
--- a/server/vbv_lernwelt/core/graphql/types.py
+++ b/server/vbv_lernwelt/core/graphql/types.py
@@ -1,5 +1,6 @@
 import json
 
+from graphene import String
 from graphene.types.generic import GenericScalar
 from graphene_django import DjangoObjectType
 
@@ -7,6 +8,8 @@ from vbv_lernwelt.core.models import User
 
 
 class UserObjectType(DjangoObjectType):
+    avatar_url = String(source="avatar_url")
+
     class Meta:
         model = User
         fields = (
diff --git a/server/vbv_lernwelt/core/management/commands/create_default_users.py b/server/vbv_lernwelt/core/management/commands/create_default_users.py
index 2053c336..b5daf874 100644
--- a/server/vbv_lernwelt/core/management/commands/create_default_users.py
+++ b/server/vbv_lernwelt/core/management/commands/create_default_users.py
@@ -6,4 +6,4 @@ from vbv_lernwelt.core.create_default_users import create_default_users
 @click.command()
 def command():
     print("Creating default users.")
-    create_default_users()
+    create_default_users(set_avatar=True)
diff --git a/server/vbv_lernwelt/core/migrations/0004_auto_20240108_0943.py b/server/vbv_lernwelt/core/migrations/0004_auto_20240108_0943.py
new file mode 100644
index 00000000..f56c3a82
--- /dev/null
+++ b/server/vbv_lernwelt/core/migrations/0004_auto_20240108_0943.py
@@ -0,0 +1,29 @@
+# Generated by Django 3.2.20 on 2024-01-08 08:43
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("media_files", "0001_initial"),
+        ("core", "0003_organisations"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="user",
+            name="avatar_url",
+        ),
+        migrations.AddField(
+            model_name="user",
+            name="avatar",
+            field=models.ForeignKey(
+                blank=True,
+                help_text="Avatar image for the user",
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                to="media_files.userimage",
+            ),
+        ),
+    ]
diff --git a/server/vbv_lernwelt/core/models.py b/server/vbv_lernwelt/core/models.py
index 4895d2d3..d8a9bb2c 100644
--- a/server/vbv_lernwelt/core/models.py
+++ b/server/vbv_lernwelt/core/models.py
@@ -3,6 +3,7 @@ import uuid
 from django.contrib.auth.models import AbstractUser
 from django.db import models
 from django.db.models import JSONField
+from django.urls import reverse
 
 
 class Organisation(models.Model):
@@ -34,9 +35,14 @@ class User(AbstractUser):
 
     id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
 
-    avatar_url = models.CharField(
-        max_length=254, blank=True, default="/static/avatars/myvbv-default-avatar.png"
+    avatar = models.ForeignKey(
+        "media_files.UserImage",
+        null=True,
+        blank=True,
+        on_delete=models.SET_NULL,
+        help_text="Avatar image for the user",
     )
+
     email = models.EmailField("email address", unique=True)
     sso_id = models.UUIDField(
         "SSO subscriber ID", unique=True, null=True, blank=True, default=None
@@ -48,6 +54,16 @@ class User(AbstractUser):
         Organisation, on_delete=models.SET_NULL, null=True, blank=True
     )
 
+    @property
+    def avatar_url(self):
+        if self.avatar:
+            filter_spec = "fill-400x400"
+            self.avatar.get_rendition(filter_spec)
+            url = reverse("user_image", kwargs={"image_id": self.avatar.id})
+            return f"{url}?filter={filter_spec}"
+        else:
+            return "/static/avatars/myvbv-default-avatar.png"
+
 
 class SecurityRequestResponseLog(models.Model):
     label = models.CharField(max_length=255, blank=True, default="")
diff --git a/server/vbv_lernwelt/media_files/tests/test_user_images.py b/server/vbv_lernwelt/media_files/tests/test_user_images.py
new file mode 100644
index 00000000..adb796b6
--- /dev/null
+++ b/server/vbv_lernwelt/media_files/tests/test_user_images.py
@@ -0,0 +1,64 @@
+from pathlib import Path
+
+from django.core.files import File
+from django.test import RequestFactory, TestCase
+from django.urls import reverse
+
+from vbv_lernwelt.course.creators.test_utils import create_user
+from vbv_lernwelt.media_files.models import UserImage
+
+TEST_IMAGE = Path(__file__).parent / "test_images" / "user1_profile.jpg"
+
+
+class UserImageViewTest(TestCase):
+    def setUp(self):
+        self.factory = RequestFactory()
+        self.user = create_user("supervisor")
+
+        with open(TEST_IMAGE, "rb") as f:
+            self.user_image, _ = UserImage.objects.get_or_create(
+                file=File(f, name=TEST_IMAGE.name),
+            )
+
+    def test_image(self):
+        # GIVEN
+        self.client.force_login(self.user)
+
+        # WHEN
+        response = self._get_image(self.user_image.id, "fill-300x150")
+
+        # THEN
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(response["Content-Type"], "image/jpeg")
+
+    def test_invalid_id(self):
+        # GIVEN
+        image_id = 123456789
+        self.client.force_login(self.user)
+
+        # WHEN
+        response = self._get_image(image_id)
+
+        # THEN
+        self.assertEqual(response.status_code, 404)
+
+    def test_invalid_filter(self):
+        # GIVEN
+        self.client.force_login(self.user)
+        filter_spec = "invalid-filter"
+
+        # WHEN
+        response = self._get_image(self.user_image.id, filter_spec)
+
+        # THEN
+        self.assertEqual(response.status_code, 400)
+        self.assertEqual(
+            response.content, f"Invalid filter spec: {filter_spec}".encode()
+        )
+
+    def _get_image(self, image_id, filter_spec=None):
+        url = reverse("user_image", kwargs={"image_id": image_id})
+        if filter_spec:
+            url += f"?filter={filter_spec}"
+
+        return self.client.get(url)
diff --git a/server/vbv_lernwelt/media_files/views.py b/server/vbv_lernwelt/media_files/views.py
new file mode 100644
index 00000000..96d624a4
--- /dev/null
+++ b/server/vbv_lernwelt/media_files/views.py
@@ -0,0 +1,39 @@
+import imghdr
+from wsgiref.util import FileWrapper
+
+import structlog
+from django.contrib.auth.decorators import login_required
+from django.http import HttpResponse, StreamingHttpResponse
+from django.shortcuts import get_object_or_404
+from wagtail.images.exceptions import InvalidFilterSpecError
+from wagtail.images.models import SourceImageIOError
+
+from vbv_lernwelt.media_files.models import UserImage
+
+logger = structlog.get_logger(__name__)
+
+
+@login_required
+def user_image(request, image_id):
+    image = get_object_or_404(UserImage, id=image_id)
+
+    filter_spec = request.GET.get("filter", "original")
+
+    try:
+        rendition = image.get_rendition(filter_spec)
+    except SourceImageIOError:
+        return HttpResponse(
+            "Source image file not found", content_type="text/plain", status=410
+        )
+    except InvalidFilterSpecError:
+        return HttpResponse(
+            "Invalid filter spec: " + filter_spec,
+            content_type="text/plain",
+            status=400,
+        )
+
+    rendition.file.open("rb")
+    image_format = imghdr.what(rendition.file)
+    return StreamingHttpResponse(
+        FileWrapper(rendition.file), content_type="image/" + image_format
+    )

From 20885a53dbf44bde9b1ccb3468d71b906c13d7c9 Mon Sep 17 00:00:00 2001
From: Reto Aebersold <aeby@substyle.ch>
Date: Wed, 10 Jan 2024 09:28:46 +0100
Subject: [PATCH 02/24] feat: add avatar migration

---
 .../migrations/0004_auto_20240108_0943.py     | 13 ++++---
 server/vbv_lernwelt/core/model_utils.py       | 38 +++++++++++++++++++
 .../media_files/tests/test_user_images.py     |  6 +++
 3 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/server/vbv_lernwelt/core/migrations/0004_auto_20240108_0943.py b/server/vbv_lernwelt/core/migrations/0004_auto_20240108_0943.py
index f56c3a82..fa170a01 100644
--- a/server/vbv_lernwelt/core/migrations/0004_auto_20240108_0943.py
+++ b/server/vbv_lernwelt/core/migrations/0004_auto_20240108_0943.py
@@ -1,8 +1,8 @@
-# Generated by Django 3.2.20 on 2024-01-08 08:43
-
 import django.db.models.deletion
 from django.db import migrations, models
 
+from vbv_lernwelt.core.model_utils import migrate_avatars
+
 
 class Migration(migrations.Migration):
     dependencies = [
@@ -11,10 +11,6 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.RemoveField(
-            model_name="user",
-            name="avatar_url",
-        ),
         migrations.AddField(
             model_name="user",
             name="avatar",
@@ -26,4 +22,9 @@ class Migration(migrations.Migration):
                 to="media_files.userimage",
             ),
         ),
+        migrations.RunPython(migrate_avatars),
+        migrations.RemoveField(
+            model_name="user",
+            name="avatar_url",
+        ),
     ]
diff --git a/server/vbv_lernwelt/core/model_utils.py b/server/vbv_lernwelt/core/model_utils.py
index ad9a1fde..a8b3a0c1 100644
--- a/server/vbv_lernwelt/core/model_utils.py
+++ b/server/vbv_lernwelt/core/model_utils.py
@@ -1,3 +1,5 @@
+from django.conf import settings
+from django.core.files import File
 from wagtail.models import Page
 
 
@@ -144,3 +146,39 @@ def remove_organisations(apps=None, schema_editor=None):
         Organisation.objects.filter(
             organisation_id=org_id,
         ).delete()
+
+
+def migrate_avatars(apps=None, schema_editor=None):
+    # pylint: disable=import-outside-toplevel
+    if apps is None:
+        from vbv_lernwelt.core.models import User
+        from vbv_lernwelt.media_files.models import UserImage
+    else:
+        User = apps.get_model("core", "User")
+        UserImage = apps.get_model("media_files", "UserImage")
+
+    # Models created by Django migration don't contain methods of the original models.
+    # We need to add them manually.
+    from wagtail.images.models import AbstractImage
+
+    UserImage.get_upload_to = AbstractImage.get_upload_to
+
+    avatar_dir = settings.APPS_DIR / "static" / "avatars"
+
+    for user in User.objects.all().exclude(
+        avatar_url="/static/avatars/myvbv-default-avatar.png"
+    ):
+        if not user.avatar_url:
+            continue
+
+        avatar_file = user.avatar_url.split("/")[-1]
+
+        try:
+            with open(avatar_dir / avatar_file, "rb") as f:
+                image = UserImage.objects.create(
+                    file=File(f),
+                )
+                user.avatar = image
+                user.save()
+        except FileNotFoundError:
+            pass
diff --git a/server/vbv_lernwelt/media_files/tests/test_user_images.py b/server/vbv_lernwelt/media_files/tests/test_user_images.py
index adb796b6..238d1bf0 100644
--- a/server/vbv_lernwelt/media_files/tests/test_user_images.py
+++ b/server/vbv_lernwelt/media_files/tests/test_user_images.py
@@ -1,4 +1,6 @@
+import os
 from pathlib import Path
+from unittest import skipIf
 
 from django.core.files import File
 from django.test import RequestFactory, TestCase
@@ -10,6 +12,10 @@ from vbv_lernwelt.media_files.models import UserImage
 TEST_IMAGE = Path(__file__).parent / "test_images" / "user1_profile.jpg"
 
 
+@skipIf(
+    os.environ.get("ENABLE_S3_STORAGE_UNIT_TESTS") is None,
+    "Only enable tests by setting ENABLE_S3_STORAGE_UNIT_TESTS=1",
+)
 class UserImageViewTest(TestCase):
     def setUp(self):
         self.factory = RequestFactory()

From 1626bcbdbc95f4a2c109062bbf325c114f55fab2 Mon Sep 17 00:00:00 2001
From: Reto Aebersold <aeby@substyle.ch>
Date: Wed, 10 Jan 2024 09:30:52 +0100
Subject: [PATCH 03/24] chore: clarify model hack

---
 server/vbv_lernwelt/core/model_utils.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/vbv_lernwelt/core/model_utils.py b/server/vbv_lernwelt/core/model_utils.py
index a8b3a0c1..77b8897d 100644
--- a/server/vbv_lernwelt/core/model_utils.py
+++ b/server/vbv_lernwelt/core/model_utils.py
@@ -157,7 +157,7 @@ def migrate_avatars(apps=None, schema_editor=None):
         User = apps.get_model("core", "User")
         UserImage = apps.get_model("media_files", "UserImage")
 
-    # Models created by Django migration don't contain methods of the original models.
+    # Models created by Django migration don't contain methods of the parent model.
     # We need to add them manually.
     from wagtail.images.models import AbstractImage
 
@@ -166,7 +166,7 @@ def migrate_avatars(apps=None, schema_editor=None):
     avatar_dir = settings.APPS_DIR / "static" / "avatars"
 
     for user in User.objects.all().exclude(
-        avatar_url="/static/avatars/myvbv-default-avatar.png"
+            avatar_url="/static/avatars/myvbv-default-avatar.png"
     ):
         if not user.avatar_url:
             continue

From ef5662314346a82ef99aa7c9c3bb72c469b0b120 Mon Sep 17 00:00:00 2001
From: Reto Aebersold <aeby@substyle.ch>
Date: Wed, 10 Jan 2024 09:36:09 +0100
Subject: [PATCH 04/24] chore: clarify model hack

---
 server/vbv_lernwelt/core/model_utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/vbv_lernwelt/core/model_utils.py b/server/vbv_lernwelt/core/model_utils.py
index 77b8897d..f363f917 100644
--- a/server/vbv_lernwelt/core/model_utils.py
+++ b/server/vbv_lernwelt/core/model_utils.py
@@ -166,7 +166,7 @@ def migrate_avatars(apps=None, schema_editor=None):
     avatar_dir = settings.APPS_DIR / "static" / "avatars"
 
     for user in User.objects.all().exclude(
-            avatar_url="/static/avatars/myvbv-default-avatar.png"
+        avatar_url="/static/avatars/myvbv-default-avatar.png"
     ):
         if not user.avatar_url:
             continue

From 6a985ce60797b46a83559af95059c943cd3d8f41 Mon Sep 17 00:00:00 2001
From: Reto Aebersold <aeby@substyle.ch>
Date: Mon, 15 Jan 2024 11:33:45 +0100
Subject: [PATCH 05/24] feat: cockpit user profile

---
 .../cockpit/profile/CockpitProfileContent.vue |  10 ++
 .../pages/cockpit/CockpitUserProfilePage.vue  | 116 ------------------
 .../profilePage/CockpitUserProfilePage.vue    |  74 +++++++++++
 .../profilePage/LearningPathProfilePage.vue   |  72 +++++++++++
 client/src/router/index.ts                    |  12 +-
 server/config/urls.py                         |   3 +-
 server/vbv_lernwelt/api/user.py               |  15 ++-
 server/vbv_lernwelt/iam/permissions.py        |  26 +++-
 server/vbv_lernwelt/iam/tests/test_experts.py |  82 +++++++++++++
 9 files changed, 288 insertions(+), 122 deletions(-)
 create mode 100644 client/src/components/cockpit/profile/CockpitProfileContent.vue
 delete mode 100644 client/src/pages/cockpit/CockpitUserProfilePage.vue
 create mode 100644 client/src/pages/cockpit/profilePage/CockpitUserProfilePage.vue
 create mode 100644 client/src/pages/cockpit/profilePage/LearningPathProfilePage.vue
 create mode 100644 server/vbv_lernwelt/iam/tests/test_experts.py

diff --git a/client/src/components/cockpit/profile/CockpitProfileContent.vue b/client/src/components/cockpit/profile/CockpitProfileContent.vue
new file mode 100644
index 00000000..77eb78d1
--- /dev/null
+++ b/client/src/components/cockpit/profile/CockpitProfileContent.vue
@@ -0,0 +1,10 @@
+<template>
+  <div>
+    <div class="flex-none border-r bg-white p-4 lg:p-8">
+      <slot name="side"></slot>
+    </div>
+    <div class="flex-1 p-4 lg:p-8">
+      <slot name="main"></slot>
+    </div>
+  </div>
+</template>
diff --git a/client/src/pages/cockpit/CockpitUserProfilePage.vue b/client/src/pages/cockpit/CockpitUserProfilePage.vue
deleted file mode 100644
index 88df5bd4..00000000
--- a/client/src/pages/cockpit/CockpitUserProfilePage.vue
+++ /dev/null
@@ -1,116 +0,0 @@
-<script setup lang="ts">
-import * as log from "loglevel";
-import { computed, onMounted } from "vue";
-
-import CompetenceDetail from "@/pages/competence/ActionCompetenceDetail.vue";
-import LearningPathPathView from "@/pages/learningPath/learningPathPage/LearningPathPathView.vue";
-import {
-  useCourseDataWithCompletion,
-  useCourseSessionDetailQuery,
-} from "@/composables";
-import { useExpertCockpitPageData } from "@/pages/cockpit/cockpitPage/composables";
-
-const props = defineProps<{
-  userId: string;
-  courseSlug: string;
-}>();
-
-log.debug("CockpitUserProfilePage created", props.userId);
-
-const { loading } = useExpertCockpitPageData(props.courseSlug);
-
-const courseCompletionData = useCourseDataWithCompletion(
-  props.courseSlug,
-  props.userId
-);
-
-onMounted(async () => {
-  log.debug("CockpitUserProfilePage mounted");
-});
-
-const lpQueryResult = useCourseDataWithCompletion(props.courseSlug, props.userId);
-
-const learningPath = computed(() => {
-  return lpQueryResult.learningPath.value;
-});
-
-const { findUser } = useCourseSessionDetailQuery();
-
-const user = computed(() => {
-  return findUser(props.userId);
-});
-
-function setActiveClasses(isActive: boolean) {
-  return isActive ? ["border-blue-900", "border-b-2"] : ["text-bg-900"];
-}
-</script>
-
-<template>
-  <div v-if="!loading" class="bg-gray-200">
-    <div v-if="user" class="container-large">
-      <nav class="py-4 pb-4">
-        <router-link
-          class="btn-text inline-flex items-center pl-0"
-          :to="`/course/${props.courseSlug}/cockpit`"
-        >
-          <it-icon-arrow-left />
-          <span>{{ $t("general.back") }}</span>
-        </router-link>
-      </nav>
-      <header class="mb-12 flex flex-row items-center">
-        <img class="mr-8 h-44 w-44 rounded-full" :src="user.avatar_url" />
-        <div>
-          <h1 class="mb-2">{{ user.first_name }} {{ user.last_name }}</h1>
-          <p class="mb-2">{{ user.email }}</p>
-          <p class="bg-message bg-[center_left_-4px] bg-no-repeat pl-6">
-            {{ $t("messages.sendMessage") }}
-          </p>
-        </div>
-      </header>
-      <main>
-        <div v-if="learningPath" class="mb-8 w-full bg-white pb-1 pt-2">
-          <!-- TODO: rework this section with next redesign -->
-          <LearningPathPathView
-            :use-mobile-layout="false"
-            :hide-buttons="true"
-            :learning-path="learningPath"
-            :next-learning-content="undefined"
-            :override-circle-url-base="`/course/${props.courseSlug}/cockpit/profile/${props.userId}`"
-          ></LearningPathPathView>
-        </div>
-        <ul class="mb-5 flex flex-row border-b-2">
-          <li class="relative top-px mr-12 pb-3" :class="setActiveClasses(true)">
-            <button>{{ $t("competences.competences") }}</button>
-          </li>
-          <li class="mr-12">
-            <button>{{ $t("general.transferTask_other") }}</button>
-          </li>
-          <li class="mr-12">
-            <button>{{ $t("general.exam_other") }}</button>
-          </li>
-          <li class="mr-12">
-            <button>{{ $t("general.certificate_other") }}</button>
-          </li>
-        </ul>
-        <div>
-          <ul class="bg-white px-8">
-            <li
-              v-for="competence in courseCompletionData.actionCompetences.value ?? []"
-              :key="competence.id"
-              class="border-b border-gray-500 p-8 last:border-0"
-            >
-              <CompetenceDetail
-                :competence="competence"
-                :course-slug="props.courseSlug"
-                :show-assess-again="false"
-                :is-inline="true"
-              ></CompetenceDetail>
-            </li>
-          </ul>
-        </div>
-      </main>
-    </div>
-  </div>
-</template>
-
-<style scoped></style>
diff --git a/client/src/pages/cockpit/profilePage/CockpitUserProfilePage.vue b/client/src/pages/cockpit/profilePage/CockpitUserProfilePage.vue
new file mode 100644
index 00000000..e06f7f96
--- /dev/null
+++ b/client/src/pages/cockpit/profilePage/CockpitUserProfilePage.vue
@@ -0,0 +1,74 @@
+<script setup lang="ts">
+import { onMounted, ref } from "vue";
+import { useRoute, useRouter } from "vue-router";
+import { useTranslation } from "i18next-vue";
+import { useFetch } from "@vueuse/core";
+import { useCurrentCourseSession } from "@/composables";
+
+const props = defineProps<{
+  userId: string;
+  courseSlug: string;
+}>();
+
+const { t } = useTranslation();
+
+const pages = ref([
+  { label: t("general.learningPath"), route: "cockpitProfileLearningPath" },
+]);
+
+const courseSession = useCurrentCourseSession();
+const { data: user } = useFetch(
+  `/api/core/profile/${courseSession.value.id}/${props.userId}`
+).json();
+
+const route = useRoute();
+const router = useRouter();
+
+onMounted(() => {
+  // if current route name not in pages, redirect to first page
+  if (route.name && !pages.value.find((page) => page.route === route.name)) {
+    router.push({
+      name: pages.value[0].route,
+      params: { userId: props.userId, courseSlug: props.courseSlug },
+    });
+  }
+});
+</script>
+
+<template>
+  <div v-if="user" class="flex flex-col bg-gray-200">
+    <div class="relative border-b bg-white shadow-md">
+      <div class="container-large pb-0">
+        <router-link
+          class="btn-text inline-flex items-center pl-0"
+          :to="`/course/${props.courseSlug}/cockpit`"
+        >
+          <it-icon-arrow-left />
+          <span>{{ $t("general.back") }}</span>
+        </router-link>
+
+        <div class="mb-12 mt-2 flex items-center">
+          <img class="mr-8 h-48 w-48 rounded-full" :src="user.avatar_url" />
+          <div class="flex flex-col">
+            <h2 class="mb-2">{{ user.first_name }} {{ user.last_name }}</h2>
+            <p class="mb-2">{{ user.email }}</p>
+            <p class="text-gray-800">{{ $t("a.Teilnehmer") }}</p>
+          </div>
+        </div>
+      </div>
+      <ul class="flex flex-row px-4 lg:px-8">
+        <li
+          v-for="page in pages"
+          :key="page.route"
+          class="relative top-px mr-12 pb-3"
+          :class="[route.name === page.route ? 'border-b-2 border-blue-900 pb-3' : '']"
+        >
+          <router-link :to="{ name: page.route }">
+            {{ page.label }}
+          </router-link>
+        </li>
+      </ul>
+    </div>
+    <router-view class="flex flex-grow py-0" />
+  </div>
+</template>
diff --git a/client/src/pages/cockpit/profilePage/LearningPathProfilePage.vue b/client/src/pages/cockpit/profilePage/LearningPathProfilePage.vue
new file mode 100644
index 00000000..c4bbfb9b
--- /dev/null
+++ b/client/src/pages/cockpit/profilePage/LearningPathProfilePage.vue
@@ -0,0 +1,72 @@
+<script setup lang="ts">
+import { calculateCircleSectorData } from "@/pages/learningPath/learningPathPage/utils";
+import { useCourseDataWithCompletion } from "@/composables";
+import CockpitProfileContent from "@/components/cockpit/profile/CockpitProfileContent.vue";
+import LearningPathCircle from "@/pages/learningPath/learningPathPage/LearningPathCircle.vue";
+import LearningSequence from "@/pages/learningPath/circlePage/LearningSequence.vue";
+import { ref, watch } from "vue";
+import type { CircleType } from "@/types";
+
+const props = defineProps<{
+  userId: string;
+  courseSlug: string;
+}>();
+
+const selectedCircle = ref();
+
+const lpQueryResult = useCourseDataWithCompletion(props.courseSlug, props.userId);
+
+function selectCircle(circle: CircleType) {
+  selectedCircle.value = circle;
+}
+
+watch(lpQueryResult.learningPath, () => {
+  if (lpQueryResult.learningPath?.value?.topics?.length) {
+    selectCircle(lpQueryResult.learningPath.value.topics[0].circles[0]);
+  }
+});
+</script>
+
+<template>
+  <CockpitProfileContent>
+    <template #side>
+      <div
+        v-for="topic in lpQueryResult.learningPath?.value?.topics ?? []"
+        :key="topic.id"
+        class="mb-4"
+      >
+        <h4 class="mb-1 font-semibold text-gray-800">
+          {{ topic.title }}
+        </h4>
+        <button
+          v-for="circle in topic.circles"
+          :key="circle.id"
+          class="flex w-full items-center space-x-2 p-2 pr-4 hover:bg-gray-200 lg:pr-8"
+          :class="{ 'bg-gray-200': selectedCircle === circle }"
+          @click="selectCircle(circle)"
+        >
+          <LearningPathCircle
+            :sectors="calculateCircleSectorData(circle)"
+            class="h-10 w-10 snap-center rounded-full bg-white p-0.5"
+          ></LearningPathCircle>
+          <span>{{ circle.title }}</span>
+        </button>
+      </div>
+    </template>
+    <template #main>
+      <ol v-if="selectedCircle" class="flex-auto bg-gray-200 px-6 py-4 lg:px-16">
+        <li
+          v-for="learningSequence in selectedCircle.learning_sequences ?? []"
+          :key="learningSequence.id"
+        >
+          <LearningSequence
+            :course-slug="props.courseSlug"
+            :circle="selectedCircle"
+            :learning-sequence="learningSequence"
+            readonly
+          ></LearningSequence>
+        </li>
+      </ol>
+    </template>
+  </CockpitProfileContent>
+</template>
diff --git a/client/src/router/index.ts b/client/src/router/index.ts
index 2e0deef5..44eeb299 100644
--- a/client/src/router/index.ts
+++ b/client/src/router/index.ts
@@ -221,9 +221,19 @@ const router = createRouter({
         },
         {
           path: "profile/:userId",
-          component: () => import("@/pages/cockpit/CockpitUserProfilePage.vue"),
+          component: () =>
+            import("@/pages/cockpit/profilePage/CockpitUserProfilePage.vue"),
           props: true,
           name: "cockpitUserProfile",
+          children: [
+            {
+              path: "learning-path",
+              component: () =>
+                import("@/pages/cockpit/profilePage/LearningPathProfilePage.vue"),
+              props: true,
+              name: "cockpitProfileLearningPath",
+            },
+          ],
         },
         {
           path: "profile/:userId/:circleSlug",
diff --git a/server/config/urls.py b/server/config/urls.py
index f7d27476..0634c233 100644
--- a/server/config/urls.py
+++ b/server/config/urls.py
@@ -12,7 +12,7 @@ from django_ratelimit.exceptions import Ratelimited
 from graphene_django.views import GraphQLView
 
 from vbv_lernwelt.api.directory import list_entities
-from vbv_lernwelt.api.user import get_cockpit_type, me_user_view
+from vbv_lernwelt.api.user import get_cockpit_type, get_profile, me_user_view
 from vbv_lernwelt.assignment.views import request_assignment_completion_status
 from vbv_lernwelt.core.middleware.auth import django_view_authentication_exempt
 from vbv_lernwelt.core.schema import schema
@@ -100,6 +100,7 @@ urlpatterns = [
     path("sso/", include("vbv_lernwelt.sso.urls")),
     re_path(r'api/core/me/$', me_user_view, name='me_user_view'),
     re_path(r'api/core/entities/$', list_entities, name='list_entities'),
+    path(r'api/core/profile/<signed_int:course_session_id>/<uuid:user_id>', get_profile, name='get_profile_view'),
 
     re_path(r'api/core/login/$', django_view_authentication_exempt(vue_login),
             name='vue_login'),
diff --git a/server/vbv_lernwelt/api/user.py b/server/vbv_lernwelt/api/user.py
index 2ff2b3d3..9aeecaf3 100644
--- a/server/vbv_lernwelt/api/user.py
+++ b/server/vbv_lernwelt/api/user.py
@@ -5,9 +5,9 @@ from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
 
 from vbv_lernwelt.core.serializers import UserSerializer
-
 from vbv_lernwelt.course.models import Course, CourseSessionUser
 from vbv_lernwelt.course_session_group.models import CourseSessionGroup
+from vbv_lernwelt.iam.permissions import can_view_profile
 from vbv_lernwelt.learning_mentor.models import LearningMentor
 
 
@@ -59,3 +59,16 @@ def get_cockpit_type(request, course_id: int):
         cockpit_type = None
 
     return Response({"type": cockpit_type})
+
+
+@api_view(["GET"])
+@permission_classes([IsAuthenticated])
+def get_profile(request, course_session_id: int, user_id: str):
+    course_session_user = get_object_or_404(
+        CourseSessionUser, course_session_id=course_session_id, user_id=user_id
+    )
+
+    if not can_view_profile(request.user, course_session_user):
+        return Response(status=403)
+
+    return Response(UserSerializer(course_session_user.user).data)
diff --git a/server/vbv_lernwelt/iam/permissions.py b/server/vbv_lernwelt/iam/permissions.py
index e0b0fd92..c243b62c 100644
--- a/server/vbv_lernwelt/iam/permissions.py
+++ b/server/vbv_lernwelt/iam/permissions.py
@@ -36,17 +36,24 @@ def is_course_session_expert(user, course_session_id: int):
     if user.is_superuser:
         return True
 
+    course_session = CourseSession.objects.get(id=course_session_id)
+
     is_supervisor = CourseSessionGroup.objects.filter(
-        supervisor=user, course_session__id=course_session_id
+        supervisor=user, course_session=course_session
     ).exists()
 
     is_expert = CourseSessionUser.objects.filter(
-        course_session_id=course_session_id,
+        course_session=course_session,
         user=user,
         role=CourseSessionUser.Role.EXPERT,
     ).exists()
 
-    return is_supervisor or is_expert
+    is_learning_mentor = LearningMentor.objects.filter(
+        mentor=user,
+        course=course_session.course,
+    ).exists()
+
+    return is_supervisor or is_expert or is_learning_mentor
 
 
 def is_course_session_member(user, course_session_id: int | None = None):
@@ -150,3 +157,16 @@ def has_role_in_course(user: User, course: Course) -> bool:
         return True
 
     return False
+
+
+def can_view_profile(user: User, profile_user: CourseSessionUser) -> bool:
+    if user.is_superuser:
+        return True
+
+    if user == profile_user.user:
+        return True
+
+    if is_course_session_expert(user, profile_user.course_session_id):
+        return True
+
+    return False
diff --git a/server/vbv_lernwelt/iam/tests/test_experts.py b/server/vbv_lernwelt/iam/tests/test_experts.py
new file mode 100644
index 00000000..f0032656
--- /dev/null
+++ b/server/vbv_lernwelt/iam/tests/test_experts.py
@@ -0,0 +1,82 @@
+from django.test import TestCase
+
+from vbv_lernwelt.course.creators.test_utils import (
+    create_course,
+    create_course_session,
+    create_user,
+)
+from vbv_lernwelt.course.models import CourseSessionUser
+from vbv_lernwelt.course_session_group.models import CourseSessionGroup
+from vbv_lernwelt.iam.permissions import is_course_session_expert
+from vbv_lernwelt.learning_mentor.models import LearningMentor
+
+
+class ExpertTestCase(TestCase):
+    def setUp(self):
+        self.course, _ = create_course("Test Course")
+        self.course_session = create_course_session(
+            course=self.course, title="Test Session"
+        )
+
+        self.user = create_user("user")
+
+    def test_member(self):
+        # GIVEN
+        csu = CourseSessionUser.objects.create(
+            course_session=self.course_session,
+            user=self.user,
+            role=CourseSessionUser.Role.MEMBER,
+        )
+
+        # WHEN
+        is_expert = is_course_session_expert(
+            user=csu.user, course_session_id=self.course_session.id
+        )
+
+        # THEN
+        self.assertFalse(is_expert)
+
+    def test_supervisor(self):
+        # GIVEN
+        csg = CourseSessionGroup.objects.create(name="Test Group", course=self.course)
+        csg.course_session.add(self.course_session)
+        csg.supervisor.add(self.user)
+
+        # WHEN
+        is_expert = is_course_session_expert(
+            user=self.user, course_session_id=self.course_session.id
+        )
+
+        # THEN
+        self.assertTrue(is_expert)
+
+    def test_learning_mentor(self):
+        # GIVEN
+        lm = LearningMentor.objects.create(
+            mentor=self.user,
+            course=self.course,
+        )
+
+        # WHEN
+        is_expert = is_course_session_expert(
+            user=lm.mentor, course_session_id=self.course_session.id
+        )
+
+        # THEN
+        self.assertTrue(is_expert)
+
+    def test_expert(self):
+        # GIVEN
+        csu = CourseSessionUser.objects.create(
+            course_session=self.course_session,
+            user=self.user,
+            role=CourseSessionUser.Role.EXPERT,
+        )
+
+        # WHEN
+        is_expert = is_course_session_expert(
+            user=csu.user, course_session_id=self.course_session.id
+        )
+
+        # THEN
+        self.assertTrue(is_expert)

From a8c09651db16e43a3dce682fd7d5f55529b8edad Mon Sep 17 00:00:00 2001
From: Reto Aebersold <aeby@substyle.ch>
Date: Mon, 15 Jan 2024 14:39:17 +0100
Subject: [PATCH 06/24] chore: hide profile links and add profile test

---
 .../profilePage/LearningPathProfilePage.vue   |  1 +
 .../circlePage/LearningSequence.vue           |  7 +--
 server/vbv_lernwelt/api/tests/test_profile.py | 60 +++++++++++++++++++
 3 files changed, 63 insertions(+), 5 deletions(-)
 create mode 100644 server/vbv_lernwelt/api/tests/test_profile.py

diff --git a/client/src/pages/cockpit/profilePage/LearningPathProfilePage.vue b/client/src/pages/cockpit/profilePage/LearningPathProfilePage.vue
index c4bbfb9b..c094e729 100644
--- a/client/src/pages/cockpit/profilePage/LearningPathProfilePage.vue
+++ b/client/src/pages/cockpit/profilePage/LearningPathProfilePage.vue
@@ -64,6 +64,7 @@ watch(lpQueryResult.learningPath, () => {
             :circle="selectedCircle"
             :learning-sequence="learningSequence"
             readonly
+            hide-links
           ></LearningSequence>
         </li>
       </ol>
diff --git a/client/src/pages/learningPath/circlePage/LearningSequence.vue b/client/src/pages/learningPath/circlePage/LearningSequence.vue
index 2f52f837..2457c591 100644
--- a/client/src/pages/learningPath/circlePage/LearningSequence.vue
+++ b/client/src/pages/learningPath/circlePage/LearningSequence.vue
@@ -32,6 +32,7 @@ type Props = {
   learningSequence: LearningSequence;
   circle: CircleType;
   readonly?: boolean;
+  hideLinks?: boolean;
 };
 
 const props = withDefaults(defineProps<Props>(), {
@@ -229,7 +230,7 @@ function checkboxIconUncheckedTailwindClass(lc: LearningContent) {
                 </div>
               </div>
               <div
-                v-if="belongsToCompetenceCertificate(learningContent)"
+                v-if="belongsToCompetenceCertificate(learningContent) && !hideLinks"
                 class="ml-16 text-sm text-gray-800"
               >
                 {{
@@ -298,11 +299,7 @@ function checkboxIconUncheckedTailwindClass(lc: LearningContent) {
             <div>{{ $t("a.Selbsteinschätzung") }}</div>
           </div>
         </div>
-
-        <!--        <hr v-if="!learningUnit.last" class="-mx-4 text-gray-500" />-->
       </li>
     </ol>
   </div>
 </template>
-
-<style scoped></style>
diff --git a/server/vbv_lernwelt/api/tests/test_profile.py b/server/vbv_lernwelt/api/tests/test_profile.py
new file mode 100644
index 00000000..4c73b50e
--- /dev/null
+++ b/server/vbv_lernwelt/api/tests/test_profile.py
@@ -0,0 +1,60 @@
+from django.urls import reverse
+from rest_framework import status
+from rest_framework.test import APITestCase
+
+from vbv_lernwelt.course.creators.test_utils import (
+    add_course_session_user,
+    create_course,
+    create_course_session,
+    create_user,
+)
+from vbv_lernwelt.course.models import CourseSessionUser
+
+
+class ProfileViewTest(APITestCase):
+    def setUp(self) -> None:
+        self.course, _ = create_course("Test Course")
+        self.course_session = create_course_session(
+            course=self.course, title="Test Session"
+        )
+
+        self.user = create_user("user")
+        add_course_session_user(
+            self.course_session,
+            self.user,
+            role=CourseSessionUser.Role.MEMBER,
+        )
+
+        self.client.force_login(self.user)
+
+    def test_user_profile(self) -> None:
+        # GIVEN
+        url = reverse(
+            "get_profile_view",
+            kwargs={
+                "course_session_id": self.course_session.id,
+                "user_id": self.user.id,
+            },
+        )
+
+        # WHEN
+        response = self.client.get(url)
+
+        # THEN
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        profile = response.data
+        self.assertEqual(
+            profile,
+            {
+                "id": str(self.user.id),
+                "first_name": self.user.first_name,
+                "last_name": self.user.last_name,
+                "email": self.user.email,
+                "username": self.user.username,
+                "avatar_url": "/static/avatars/myvbv-default-avatar.png",
+                "organisation": None,
+                "is_superuser": False,
+                "course_session_experts": [],
+                "language": "de",
+            },
+        )

From f7aa5a35ca7ae2cad5cf5c8a6ba6a697000de961 Mon Sep 17 00:00:00 2001
From: Reto Aebersold <aeby@substyle.ch>
Date: Mon, 15 Jan 2024 15:48:30 +0100
Subject: [PATCH 07/24] fix: wait for completion before nav

---
 .../learningContentPage/LearningContentParent.vue         | 4 ++--
 client/src/stores/circle.ts                               | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/client/src/pages/learningPath/learningContentPage/LearningContentParent.vue b/client/src/pages/learningPath/learningContentPage/LearningContentParent.vue
index 012f966f..e33113fd 100644
--- a/client/src/pages/learningPath/learningContentPage/LearningContentParent.vue
+++ b/client/src/pages/learningPath/learningContentPage/LearningContentParent.vue
@@ -64,8 +64,8 @@ function handleFinishedLearningContent() {
     props.learningContent,
     props.circle,
     previousRoute,
-    (lc: LearningContentWithCompletion) => {
-      courseCompletionData.markCompletion(lc, "SUCCESS");
+    async (lc: LearningContentWithCompletion) => {
+      await courseCompletionData.markCompletion(lc, "SUCCESS");
     }
   );
 }
diff --git a/client/src/stores/circle.ts b/client/src/stores/circle.ts
index 1bebc5db..5756c775 100644
--- a/client/src/stores/circle.ts
+++ b/client/src/stores/circle.ts
@@ -73,16 +73,18 @@ export const useCircleStore = defineStore({
         });
       }
     },
-    continueFromLearningContent(
+    async continueFromLearningContent(
       currentLearningContent: LearningContentWithCompletion,
       circle: CircleType,
       returnRoute?: RouteLocationNormalized,
-      markCompletionFn?: (learningContent: LearningContentWithCompletion) => void
+      markCompletionFn?: (
+        learningContent: LearningContentWithCompletion
+      ) => Promise<void>
     ) {
       if (currentLearningContent) {
         if (currentLearningContent.can_user_self_toggle_course_completion) {
           if (markCompletionFn) {
-            markCompletionFn(currentLearningContent);
+            await markCompletionFn(currentLearningContent);
           }
         }
         this.closeLearningContent(currentLearningContent, circle, returnRoute);

From 57f80ea1092ce50f91a7aff3b09d52693ef04cc3 Mon Sep 17 00:00:00 2001
From: Reto Aebersold <aeby@substyle.ch>
Date: Thu, 18 Jan 2024 08:33:08 +0100
Subject: [PATCH 08/24] chore: format

---
 server/config/urls.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/server/config/urls.py b/server/config/urls.py
index 1008ba73..56b9ad07 100644
--- a/server/config/urls.py
+++ b/server/config/urls.py
@@ -12,7 +12,12 @@ from django_ratelimit.exceptions import Ratelimited
 from graphene_django.views import GraphQLView
 
 from vbv_lernwelt.api.directory import list_entities
-from vbv_lernwelt.api.user import get_cockpit_type, get_profile, me_user_view, post_avatar
+from vbv_lernwelt.api.user import (
+    get_cockpit_type,
+    get_profile,
+    me_user_view,
+    post_avatar,
+)
 from vbv_lernwelt.assignment.views import request_assignment_completion_status
 from vbv_lernwelt.core.middleware.auth import django_view_authentication_exempt
 from vbv_lernwelt.core.schema import schema

From 6de8d72e52c71c072f5a6992a4c4583b7f91a38c Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Thu, 18 Jan 2024 14:49:41 +0100
Subject: [PATCH 09/24] Fix assignment reminder user group

---
 server/vbv_lernwelt/notify/email/reminders/assigment.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/server/vbv_lernwelt/notify/email/reminders/assigment.py b/server/vbv_lernwelt/notify/email/reminders/assigment.py
index 50a030c3..e3d0439e 100644
--- a/server/vbv_lernwelt/notify/email/reminders/assigment.py
+++ b/server/vbv_lernwelt/notify/email/reminders/assigment.py
@@ -9,6 +9,7 @@ from vbv_lernwelt.course_session.models import (
     CourseSessionAssignment,
     CourseSessionEdoniqTest,
 )
+from vbv_lernwelt.learnpath.models import Circle
 from vbv_lernwelt.notify.services import NotificationService
 
 logger = structlog.get_logger(__name__)
@@ -63,9 +64,12 @@ def send_assignment_reminder_notifications():
             AssignmentType.CASEWORK.value,
         ],
     ):
+        circle_page = assignment.learning_content.get_parent_circle()
+        circle = Circle.objects.get(page_ptr=circle_page.id)
         for expert in CourseSessionUser.objects.filter(
             course_session_id=assignment.course_session.id,
             role=CourseSessionUser.Role.EXPERT,
+            expert=circle,
         ):
             sent.append(
                 NotificationService.send_casework_expert_evaluation_reminder(

From 278b6e6b64dcf3fe8f293a69bd63e38263a82063 Mon Sep 17 00:00:00 2001
From: Livio Bieri <livio@livio.li>
Date: Wed, 10 Jan 2024 14:45:46 +0100
Subject: [PATCH 10/24] wip: mentor feedback (praxisauftrag)

---
 client/src/gql/gql.ts                         |  4 ++--
 client/src/gql/graphql.ts                     |  4 ++--
 client/src/graphql/queries.ts                 |  3 +++
 .../AssignmentEvaluationPage.vue              | 21 +++++++++----------
 .../mentor/MentorPraxisAssignment.vue         | 17 ++++++++++++++-
 .../assignment/AssignmentView.vue             |  1 -
 client/src/services/mentorCockpit.ts          |  1 +
 .../content/praxis_assignment.py              |  1 +
 .../vbv_lernwelt/learning_mentor/entities.py  |  1 +
 .../learning_mentor/serializers.py            |  1 +
 .../learning_mentor/tests/test_assignments.py |  4 ++++
 11 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/client/src/gql/gql.ts b/client/src/gql/gql.ts
index 2fbc4386..25a201a6 100644
--- a/client/src/gql/gql.ts
+++ b/client/src/gql/gql.ts
@@ -17,7 +17,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    $evaluationPoints: Float\n    $initializeCompletion: Boolean\n    $evaluationUserId: ID\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_points: $evaluationPoints\n      initialize_completion: $initializeCompletion\n      evaluation_user_id: $evaluationUserId\n    ) {\n      assignment_completion {\n        id\n        completion_status\n        submitted_at\n        evaluation_submitted_at\n        evaluation_points\n        completion_data\n        task_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      needs_expert_evaluation\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      solution_sample {\n        id\n        url\n      }\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_points\n      evaluation_max_points\n      evaluation_passed\n      edoniq_extended_time_flag\n      completion_data\n      task_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      needs_expert_evaluation\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      solution_sample {\n        id\n        url\n      }\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        avatar_url\n        first_name\n        last_name\n        id\n      }\n      evaluation_points\n      evaluation_max_points\n      evaluation_passed\n      edoniq_extended_time_flag\n      completion_data\n      task_completion_data\n    }\n  }\n": types.AssignmentCompletionQueryDocument,
     "\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            evaluation_max_points\n            evaluation_passed\n          }\n          learning_content {\n            ...CoursePageFields\n            circle {\n              id\n              title\n              slug\n            }\n          }\n        }\n      }\n    }\n  }\n": types.CompetenceCertificateQueryDocument,
     "\n  query courseSessionDetail($courseSessionId: ID!) {\n    course_session(id: $courseSessionId) {\n      id\n      title\n      course {\n        id\n        title\n        slug\n        enable_circle_documents\n        circle_contact_type\n      }\n      users {\n        id\n        user_id\n        first_name\n        last_name\n        email\n        avatar_url\n        role\n        circles {\n          id\n          title\n          slug\n        }\n      }\n      attendance_courses {\n        id\n        location\n        trainer\n        due_date {\n          id\n          start\n          end\n        }\n        learning_content_id\n        learning_content {\n          id\n          title\n          circle {\n            id\n            title\n            slug\n          }\n        }\n      }\n      assignments {\n        id\n        submission_deadline {\n          id\n          start\n        }\n        evaluation_deadline {\n          id\n          start\n        }\n        learning_content {\n          id\n          title\n          content_assignment {\n            id\n            title\n            assignment_type\n          }\n        }\n      }\n      edoniq_tests {\n        id\n        deadline {\n          id\n          start\n          end\n        }\n        learning_content {\n          id\n          title\n          content_assignment {\n            id\n            title\n            assignment_type\n          }\n        }\n      }\n    }\n  }\n": types.CourseSessionDetailDocument,
     "\n  query courseQuery($slug: String!) {\n    course(slug: $slug) {\n      id\n      title\n      slug\n      category_name\n      enable_circle_documents\n      circle_contact_type\n      action_competences {\n        competence_id\n        ...CoursePageFields\n        performance_criteria {\n          competence_id\n          learning_unit {\n            id\n            slug\n            evaluate_url\n          }\n          ...CoursePageFields\n        }\n      }\n      learning_path {\n        ...CoursePageFields\n        topics {\n          is_visible\n          ...CoursePageFields\n          circles {\n            description\n            goals\n            ...CoursePageFields\n            learning_sequences {\n              icon\n              ...CoursePageFields\n              learning_units {\n                evaluate_url\n                ...CoursePageFields\n                performance_criteria {\n                  ...CoursePageFields\n                }\n                learning_contents {\n                  can_user_self_toggle_course_completion\n                  content_url\n                  minutes\n                  description\n                  ...CoursePageFields\n                  ... on LearningContentAssignmentObjectType {\n                    assignment_type\n                    content_assignment {\n                      id\n                      assignment_type\n                    }\n                    competence_certificate {\n                      ...CoursePageFields\n                    }\n                  }\n                  ... on LearningContentEdoniqTestObjectType {\n                    checkbox_text\n                    has_extended_time_test\n                    content_assignment {\n                      id\n                      assignment_type\n                    }\n                    competence_certificate {\n                      ...CoursePageFields\n                    }\n                  }\n                  ... on LearningContentRichTextObjectType {\n                    text\n                  }\n                }\n              }\n            }\n          }\n        }\n      }\n    }\n  }\n": types.CourseQueryDocument,
@@ -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      needs_expert_evaluation\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      solution_sample {\n        id\n        url\n      }\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_points\n      evaluation_max_points\n      evaluation_passed\n      edoniq_extended_time_flag\n      completion_data\n      task_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      needs_expert_evaluation\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      solution_sample {\n        id\n        url\n      }\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_points\n      evaluation_max_points\n      evaluation_passed\n      edoniq_extended_time_flag\n      completion_data\n      task_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      needs_expert_evaluation\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      solution_sample {\n        id\n        url\n      }\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        avatar_url\n        first_name\n        last_name\n        id\n      }\n      evaluation_points\n      evaluation_max_points\n      evaluation_passed\n      edoniq_extended_time_flag\n      completion_data\n      task_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      needs_expert_evaluation\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      solution_sample {\n        id\n        url\n      }\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        avatar_url\n        first_name\n        last_name\n        id\n      }\n      evaluation_points\n      evaluation_max_points\n      evaluation_passed\n      edoniq_extended_time_flag\n      completion_data\n      task_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 f2523e64..99c7abd1 100644
--- a/client/src/gql/graphql.ts
+++ b/client/src/gql/graphql.ts
@@ -1131,7 +1131,7 @@ export type AssignmentCompletionQueryQueryVariables = Exact<{
 export type AssignmentCompletionQueryQuery = { __typename?: 'Query', assignment?: { __typename?: 'AssignmentObjectType', assignment_type: AssignmentAssignmentAssignmentTypeChoices, needs_expert_evaluation: boolean, max_points?: number | null, content_type: string, effort_required: string, evaluation_description: string, evaluation_document_url: string, evaluation_tasks?: any | null, id: string, intro_text: string, performance_objectives?: any | null, slug: string, tasks?: any | null, title: string, translation_key: string, solution_sample?: { __typename?: 'ContentDocumentObjectType', id: string, url?: string | null } | null, competence_certificate?: (
       { __typename?: 'CompetenceCertificateObjectType' }
       & { ' $fragmentRefs'?: { 'CoursePageFieldsCompetenceCertificateObjectTypeFragment': CoursePageFieldsCompetenceCertificateObjectTypeFragment } }
-    ) | null } | null, assignment_completion?: { __typename?: 'AssignmentCompletionObjectType', id: string, completion_status: AssignmentAssignmentCompletionCompletionStatusChoices, submitted_at?: string | null, evaluation_submitted_at?: string | null, evaluation_points?: number | null, evaluation_max_points?: number | null, evaluation_passed?: boolean | null, edoniq_extended_time_flag: boolean, completion_data?: any | null, task_completion_data?: any | null, evaluation_user?: { __typename?: 'UserObjectType', id: string } | null, assignment_user: { __typename?: 'UserObjectType', id: string } } | null };
+    ) | null } | null, assignment_completion?: { __typename?: 'AssignmentCompletionObjectType', id: string, completion_status: AssignmentAssignmentCompletionCompletionStatusChoices, submitted_at?: string | null, evaluation_submitted_at?: string | null, evaluation_points?: number | null, evaluation_max_points?: number | null, evaluation_passed?: boolean | null, edoniq_extended_time_flag: boolean, completion_data?: any | null, task_completion_data?: any | null, evaluation_user?: { __typename?: 'UserObjectType', id: string } | null, assignment_user: { __typename?: 'UserObjectType', avatar_url: string, first_name: string, last_name: string, id: string } } | null };
 
 export type CompetenceCertificateQueryQueryVariables = Exact<{
   courseSlug: Scalars['String']['input'];
@@ -1300,7 +1300,7 @@ export const CoursePageFieldsFragmentDoc = {"kind":"Document","definitions":[{"k
 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":"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"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"evaluationUserId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}],"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_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"}}},{"kind":"Argument","name":{"kind":"Name","value":"evaluation_user_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"evaluationUserId"}}}],"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_points"}},{"kind":"Field","name":{"kind":"Name","value":"completion_data"}},{"kind":"Field","name":{"kind":"Name","value":"task_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":"needs_expert_evaluation"}},{"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":"solution_sample"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"url"}}]}},{"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_points"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_max_points"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_passed"}},{"kind":"Field","name":{"kind":"Name","value":"edoniq_extended_time_flag"}},{"kind":"Field","name":{"kind":"Name","value":"completion_data"}},{"kind":"Field","name":{"kind":"Name","value":"task_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 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":"needs_expert_evaluation"}},{"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":"solution_sample"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"url"}}]}},{"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":"avatar_url"}},{"kind":"Field","name":{"kind":"Name","value":"first_name"}},{"kind":"Field","name":{"kind":"Name","value":"last_name"}},{"kind":"Field","name":{"kind":"Name","value":"id"}}]}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_max_points"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_passed"}},{"kind":"Field","name":{"kind":"Name","value":"edoniq_extended_time_flag"}},{"kind":"Field","name":{"kind":"Name","value":"completion_data"}},{"kind":"Field","name":{"kind":"Name","value":"task_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 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":"evaluation_max_points"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_passed"}}]}},{"kind":"Field","name":{"kind":"Name","value":"learning_content"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"circle"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}}]}}]}}]}}]}}]}}]}},{"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>;
 export const CourseSessionDetailDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"courseSessionDetail"},"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"},"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":"title"}},{"kind":"Field","name":{"kind":"Name","value":"course"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"enable_circle_documents"}},{"kind":"Field","name":{"kind":"Name","value":"circle_contact_type"}}]}},{"kind":"Field","name":{"kind":"Name","value":"users"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"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":"avatar_url"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"circles"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"attendance_courses"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"location"}},{"kind":"Field","name":{"kind":"Name","value":"trainer"}},{"kind":"Field","name":{"kind":"Name","value":"due_date"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"start"}},{"kind":"Field","name":{"kind":"Name","value":"end"}}]}},{"kind":"Field","name":{"kind":"Name","value":"learning_content_id"}},{"kind":"Field","name":{"kind":"Name","value":"learning_content"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"circle"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignments"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"submission_deadline"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"start"}}]}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_deadline"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"start"}}]}},{"kind":"Field","name":{"kind":"Name","value":"learning_content"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"content_assignment"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type"}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"edoniq_tests"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"deadline"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"start"}},{"kind":"Field","name":{"kind":"Name","value":"end"}}]}},{"kind":"Field","name":{"kind":"Name","value":"learning_content"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"content_assignment"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type"}}]}}]}}]}}]}}]}}]} as unknown as DocumentNode<CourseSessionDetailQuery, CourseSessionDetailQueryVariables>;
 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":"slug"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"slug"},"value":{"kind":"Variable","name":{"kind":"Name","value":"slug"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"category_name"}},{"kind":"Field","name":{"kind":"Name","value":"enable_circle_documents"}},{"kind":"Field","name":{"kind":"Name","value":"circle_contact_type"}},{"kind":"Field","name":{"kind":"Name","value":"action_competences"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"competence_id"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"performance_criteria"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"competence_id"}},{"kind":"Field","name":{"kind":"Name","value":"learning_unit"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"evaluate_url"}}]}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"learning_path"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"topics"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"is_visible"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"circles"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"goals"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"learning_sequences"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"learning_units"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"evaluate_url"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"performance_criteria"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}}]}},{"kind":"Field","name":{"kind":"Name","value":"learning_contents"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"can_user_self_toggle_course_completion"}},{"kind":"Field","name":{"kind":"Name","value":"content_url"}},{"kind":"Field","name":{"kind":"Name","value":"minutes"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"LearningContentAssignmentObjectType"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"assignment_type"}},{"kind":"Field","name":{"kind":"Name","value":"content_assignment"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type"}}]}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}}]}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"LearningContentEdoniqTestObjectType"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"checkbox_text"}},{"kind":"Field","name":{"kind":"Name","value":"has_extended_time_test"}},{"kind":"Field","name":{"kind":"Name","value":"content_assignment"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type"}}]}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}}]}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"LearningContentRichTextObjectType"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"text"}}]}}]}}]}}]}}]}}]}}]}}]}}]}},{"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<CourseQueryQuery, CourseQueryQueryVariables>;
diff --git a/client/src/graphql/queries.ts b/client/src/graphql/queries.ts
index e8b6fc29..a37fc3b5 100644
--- a/client/src/graphql/queries.ts
+++ b/client/src/graphql/queries.ts
@@ -68,6 +68,9 @@ export const ASSIGNMENT_COMPLETION_QUERY = graphql(`
         id
       }
       assignment_user {
+        avatar_url
+        first_name
+        last_name
         id
       }
       evaluation_points
diff --git a/client/src/pages/cockpit/assignmentEvaluationPage/AssignmentEvaluationPage.vue b/client/src/pages/cockpit/assignmentEvaluationPage/AssignmentEvaluationPage.vue
index 513a66a3..08268d60 100644
--- a/client/src/pages/cockpit/assignmentEvaluationPage/AssignmentEvaluationPage.vue
+++ b/client/src/pages/cockpit/assignmentEvaluationPage/AssignmentEvaluationPage.vue
@@ -1,16 +1,15 @@
 <script setup lang="ts">
-import { useCourseSessionDetailQuery, useCurrentCourseSession } from "@/composables";
+import { useCurrentCourseSession } from "@/composables";
 import { ASSIGNMENT_COMPLETION_QUERY } from "@/graphql/queries";
 import EvaluationContainer from "@/pages/cockpit/assignmentEvaluationPage/EvaluationContainer.vue";
 import AssignmentSubmissionResponses from "@/pages/learningPath/learningContentPage/assignment/AssignmentSubmissionResponses.vue";
-import type { Assignment, AssignmentCompletion } from "@/types";
+import type { Assignment, AssignmentCompletion, CourseSessionUser } from "@/types";
 import { useQuery } from "@urql/vue";
 import log from "loglevel";
 import { computed, onMounted } from "vue";
 import { useRouter } from "vue-router";
 import { getPreviousRoute } from "@/router/history";
 import { getAssignmentTypeTitle } from "../../../utils/utils";
-import { useExpertCockpitPageData } from "@/pages/cockpit/cockpitPage/composables";
 
 const props = defineProps<{
   courseSlug: string;
@@ -20,7 +19,6 @@ const props = defineProps<{
 
 log.debug("AssignmentEvaluationPage created", props.assignmentId, props.userId);
 
-const { loading } = useExpertCockpitPageData(props.courseSlug);
 const courseSession = useCurrentCourseSession();
 const router = useRouter();
 
@@ -38,9 +36,6 @@ onMounted(async () => {
   log.debug("AssignmentView mounted", props.assignmentId, props.userId);
 });
 
-const courseSessionDetailResult = useCourseSessionDetailQuery();
-const assignmentUser = computed(() => courseSessionDetailResult.findUser(props.userId));
-
 const previousRoute = getPreviousRoute();
 
 function close() {
@@ -58,13 +53,17 @@ const assignmentCompletion = computed(
     queryResult.data.value?.assignment_completion as AssignmentCompletion | undefined
 );
 
+const assignmentUser = computed(
+  () => assignmentCompletion.value?.assignment_user as CourseSessionUser | undefined
+);
+
 const assignment = computed(
   () => queryResult.data.value?.assignment as Assignment | undefined
 );
 </script>
 
 <template>
-  <div v-if="!loading" class="absolute bottom-0 top-0 z-10 w-full bg-white">
+  <div class="absolute bottom-0 top-0 z-10 w-full bg-white">
     <div v-if="queryResult.fetching.value"></div>
     <div v-else-if="queryResult.error.value">{{ queryResult.error.value }}</div>
     <div v-else>
@@ -101,12 +100,12 @@ const assignment = computed(
 
               <div class="my-6 flex items-center">
                 <img
-                  :src="assignmentUser?.avatar_url"
+                  :src="assignmentUser.avatar_url"
                   class="mr-4 h-11 w-11 rounded-full"
                 />
                 <div class="font-bold">
-                  {{ assignmentUser?.first_name }}
-                  {{ assignmentUser?.last_name }}
+                  {{ assignmentUser.first_name }}
+                  {{ assignmentUser.last_name }}
                 </div>
               </div>
               <AssignmentSubmissionResponses
diff --git a/client/src/pages/cockpit/cockpitPage/mentor/MentorPraxisAssignment.vue b/client/src/pages/cockpit/cockpitPage/mentor/MentorPraxisAssignment.vue
index 2fa4d7d4..ae5b75c3 100644
--- a/client/src/pages/cockpit/cockpitPage/mentor/MentorPraxisAssignment.vue
+++ b/client/src/pages/cockpit/cockpitPage/mentor/MentorPraxisAssignment.vue
@@ -96,7 +96,22 @@ const getParticipantById = (id: string): Participant | null => {
             </template>
           </div>
           <!-- Right -->
-          <div></div>
+          <div>
+            <router-link
+              v-if="item.status == 'SUBMITTED'"
+              class="btn-primary"
+              :to="item.url"
+            >
+              {{ $t("a.Ergebnis bewerten") }}
+            </router-link>
+            <router-link
+              v-else-if="item.status == 'EVALUATED'"
+              class="underline"
+              :to="item.url"
+            >
+              {{ $t("a.Bewertung anzeigen") }}
+            </router-link>
+          </div>
         </div>
       </div>
     </div>
diff --git a/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue b/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue
index e6933ce8..e6a7c029 100644
--- a/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue
+++ b/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue
@@ -18,7 +18,6 @@ import { useRouteQuery } from "@vueuse/router";
 import * as log from "loglevel";
 import { computed, onMounted, ref, watchEffect } from "vue";
 import { useTranslation } from "i18next-vue";
-import { bustItGetCache } from "@/fetchHelpers";
 import { learningContentTypeData } from "@/utils/typeMaps";
 import EvaluationSummary from "@/pages/cockpit/assignmentEvaluationPage/EvaluationSummary.vue";
 
diff --git a/client/src/services/mentorCockpit.ts b/client/src/services/mentorCockpit.ts
index 3c6bdc76..213caa34 100644
--- a/client/src/services/mentorCockpit.ts
+++ b/client/src/services/mentorCockpit.ts
@@ -27,6 +27,7 @@ interface Completion {
   status: CompletionStatus;
   user_id: string;
   last_name: string;
+  url: string;
 }
 
 export interface PraxisAssignment {
diff --git a/server/vbv_lernwelt/learning_mentor/content/praxis_assignment.py b/server/vbv_lernwelt/learning_mentor/content/praxis_assignment.py
index 0e8298a8..b1746f5f 100644
--- a/server/vbv_lernwelt/learning_mentor/content/praxis_assignment.py
+++ b/server/vbv_lernwelt/learning_mentor/content/praxis_assignment.py
@@ -71,6 +71,7 @@ def get_assignment_completions(
             )[0],
             user_id=user.id,
             last_name=user.last_name,
+            url=f"/course/{course_session.course.slug}/cockpit/assignment/{assignment.id}/{user.id}",
         )
         for user in sorted_participants
     ]
diff --git a/server/vbv_lernwelt/learning_mentor/entities.py b/server/vbv_lernwelt/learning_mentor/entities.py
index 6dabcc26..2b4a9a04 100644
--- a/server/vbv_lernwelt/learning_mentor/entities.py
+++ b/server/vbv_lernwelt/learning_mentor/entities.py
@@ -14,6 +14,7 @@ class PraxisAssignmentCompletion:
     status: CompletionStatus
     user_id: str
     last_name: str
+    url: str
 
 
 @dataclass
diff --git a/server/vbv_lernwelt/learning_mentor/serializers.py b/server/vbv_lernwelt/learning_mentor/serializers.py
index e9cb7555..20333aaf 100644
--- a/server/vbv_lernwelt/learning_mentor/serializers.py
+++ b/server/vbv_lernwelt/learning_mentor/serializers.py
@@ -8,6 +8,7 @@ class PraxisAssignmentCompletionSerializer(serializers.Serializer):
     status = serializers.SerializerMethodField()
     user_id = serializers.CharField()
     last_name = serializers.CharField()
+    url = serializers.CharField()
 
     @staticmethod
     def get_status(obj):
diff --git a/server/vbv_lernwelt/learning_mentor/tests/test_assignments.py b/server/vbv_lernwelt/learning_mentor/tests/test_assignments.py
index 8b096c64..b60d78cc 100644
--- a/server/vbv_lernwelt/learning_mentor/tests/test_assignments.py
+++ b/server/vbv_lernwelt/learning_mentor/tests/test_assignments.py
@@ -84,6 +84,10 @@ class AttendanceServicesTestCase(TestCase):
         for i, result in enumerate(results):
             self.assertEqual(result.last_name, expected_order[i])
             self.assertEqual(result.status, expected_statuses[result.last_name])
+            self.assertEqual(
+                result.url,
+                f"/course/test-lehrgang/cockpit/assignment/{self.assignment.id}/{result.user_id}",
+            )
 
     def test_praxis_assignment_status(self):
         # GIVEN

From 51ad79d986829bebaaed9508c0f732db3b2a6c3e Mon Sep 17 00:00:00 2001
From: Livio Bieri <livio@livio.li>
Date: Thu, 11 Jan 2024 14:47:50 +0100
Subject: [PATCH 11/24] wip: mentor feedback (praxisauftrag)

---
 .../EvaluationIntro.vue                       |  2 +-
 .../EvaluationSummary.vue                     |  2 +-
 .../EvaluationTask.vue                        |  2 +-
 .../assignment/graphql/mutations.py           |  6 ++-
 .../vbv_lernwelt/assignment/graphql/types.py  |  2 +-
 server/vbv_lernwelt/iam/permissions.py        | 34 ++++++++++--
 server/vbv_lernwelt/iam/tests/test_roles.py   | 54 ++++++++++++++++++-
 7 files changed, 91 insertions(+), 11 deletions(-)

diff --git a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationIntro.vue b/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationIntro.vue
index 6d293307..931fb4ba 100644
--- a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationIntro.vue
+++ b/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationIntro.vue
@@ -58,7 +58,7 @@ async function startEvaluation() {
     upsertAssignmentCompletionMutation.executeMutation({
       assignmentId: props.assignment.id,
       courseSessionId: courseSession.value.id,
-      assignmentUserId: props.assignmentUser.user_id,
+      assignmentUserId: props.assignmentUser.id,
       completionStatus: "EVALUATION_IN_PROGRESS",
       completionDataString: JSON.stringify({}),
       // next line used for urql
diff --git a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationSummary.vue b/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationSummary.vue
index 9f29e01a..6e7a905e 100644
--- a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationSummary.vue
+++ b/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationSummary.vue
@@ -75,7 +75,7 @@ async function submitEvaluation() {
   upsertAssignmentCompletionMutation.executeMutation({
     assignmentId: props.assignment.id,
     courseSessionId: courseSession.value.id,
-    assignmentUserId: props.assignmentUser.user_id,
+    assignmentUserId: props.assignmentUser.id,
     completionStatus: "EVALUATION_SUBMITTED",
     completionDataString: JSON.stringify({}),
     evaluationPoints: userPoints.value,
diff --git a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationTask.vue b/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationTask.vue
index 1ccb03e0..e6750d3b 100644
--- a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationTask.vue
+++ b/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationTask.vue
@@ -91,7 +91,7 @@ async function evaluateAssignmentCompletion(completionData: AssignmentCompletion
   upsertAssignmentCompletionMutation.executeMutation({
     assignmentId: props.assignment.id,
     courseSessionId: courseSession.value.id,
-    assignmentUserId: props.assignmentUser.user_id,
+    assignmentUserId: props.assignmentUser.id,
     completionStatus: "EVALUATION_IN_PROGRESS",
     completionDataString: JSON.stringify(completionData),
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
diff --git a/server/vbv_lernwelt/assignment/graphql/mutations.py b/server/vbv_lernwelt/assignment/graphql/mutations.py
index 1e6b2ac2..7071876d 100644
--- a/server/vbv_lernwelt/assignment/graphql/mutations.py
+++ b/server/vbv_lernwelt/assignment/graphql/mutations.py
@@ -99,7 +99,11 @@ class AssignmentCompletionMutation(graphene.Mutation):
             AssignmentCompletionStatus.EVALUATION_SUBMITTED,
             AssignmentCompletionStatus.EVALUATION_IN_PROGRESS,
         ):
-            if not can_evaluate_assignments(info.context.user, course_session_id):
+            if not can_evaluate_assignments(
+                evaluation_user=info.context.user,
+                assignment_user_id=assignment_user_id,
+                course_session_id=course_session_id,
+            ):
                 raise PermissionDenied()
 
             evaluation_data = {
diff --git a/server/vbv_lernwelt/assignment/graphql/types.py b/server/vbv_lernwelt/assignment/graphql/types.py
index 70efc5b6..a0dfdb8a 100644
--- a/server/vbv_lernwelt/assignment/graphql/types.py
+++ b/server/vbv_lernwelt/assignment/graphql/types.py
@@ -109,7 +109,7 @@ def resolve_assignment_completion(
         assignment_user_id = info.context.user.id
 
     if str(assignment_user_id) == str(info.context.user.id) or can_evaluate_assignments(
-        info.context.user, course_session_id
+        evaluation_user=info.context.user, assignment_user_id=assignment_user_id, course_session_id=course_session_id
     ):
         course_id = CourseSession.objects.get(id=course_session_id).course_id
         if has_course_access(info.context.user, course_id):
diff --git a/server/vbv_lernwelt/iam/permissions.py b/server/vbv_lernwelt/iam/permissions.py
index e0b0fd92..01164834 100644
--- a/server/vbv_lernwelt/iam/permissions.py
+++ b/server/vbv_lernwelt/iam/permissions.py
@@ -18,6 +18,9 @@ def has_course_access(user, course_id):
     ).exists():
         return True
 
+    if LearningMentor.objects.filter(course_id=course_id, mentor=user).exists():
+        return True
+
     return CourseSessionUser.objects.filter(
         course_session__course_id=course_id, user=user
     ).exists()
@@ -32,6 +35,19 @@ def has_course_session_access(user, course_session_id: int):
     ).exists()
 
 
+def is_user_mentor(mentor: User, participant_user_id: str, course_session_id: int):
+    csu = CourseSessionUser.objects.filter(
+        course_session_id=course_session_id, user_id=participant_user_id
+    ).first()
+
+    if csu is None:
+        return False
+
+    return LearningMentor.objects.filter(
+        course_id=csu.course_session.course_id, mentor=mentor, participants=csu
+    ).exists()
+
+
 def is_course_session_expert(user, course_session_id: int):
     if user.is_superuser:
         return True
@@ -60,21 +76,29 @@ def is_course_session_member(user, course_session_id: int | None = None):
     ).exists()
 
 
-def can_evaluate_assignments(user, course_session_id: int):
-    if user.is_superuser:
+def can_evaluate_assignments(
+    evaluation_user: User, course_session_id: int, assignment_user_id: str | None = None
+):
+    if evaluation_user.is_superuser:
         return True
 
     is_supervisor = CourseSessionGroup.objects.filter(
-        supervisor=user, course_session__id=course_session_id
+        supervisor=evaluation_user, course_session__id=course_session_id
     ).exists()
 
     is_expert = CourseSessionUser.objects.filter(
         course_session_id=course_session_id,
-        user=user,
+        user=evaluation_user,
         role=CourseSessionUser.Role.EXPERT,
     ).exists()
 
-    return is_supervisor or is_expert
+    is_mentor = is_user_mentor(
+        mentor=evaluation_user,
+        participant_user_id=assignment_user_id,
+        course_session_id=course_session_id,
+    )
+
+    return is_supervisor or is_expert or is_mentor
 
 
 def course_sessions_for_user_qs(user):
diff --git a/server/vbv_lernwelt/iam/tests/test_roles.py b/server/vbv_lernwelt/iam/tests/test_roles.py
index 2cb221c6..6f77888e 100644
--- a/server/vbv_lernwelt/iam/tests/test_roles.py
+++ b/server/vbv_lernwelt/iam/tests/test_roles.py
@@ -8,7 +8,7 @@ from vbv_lernwelt.course.creators.test_utils import (
 )
 from vbv_lernwelt.course.models import CourseSessionUser
 from vbv_lernwelt.course_session_group.models import CourseSessionGroup
-from vbv_lernwelt.iam.permissions import has_role_in_course
+from vbv_lernwelt.iam.permissions import has_role_in_course, is_user_mentor
 from vbv_lernwelt.learning_mentor.models import LearningMentor
 
 
@@ -59,6 +59,58 @@ class RoleTestCase(TestCase):
         # THEN
         self.assertTrue(has_role)
 
+    def test_is_user_mentor(self):
+        # GIVEN
+        member = create_user("member")
+        mentor = create_user("mentor")
+
+        course, course_page = create_course("Test Course")
+        course_session = create_course_session(course=course, title=":)")
+
+        member_csu = add_course_session_user(
+            course_session=course_session,
+            user=member,
+            role=CourseSessionUser.Role.MEMBER,
+        )
+
+        learning_mentor = LearningMentor.objects.create(
+            mentor=mentor,
+            course=course,
+        )
+
+        learning_mentor.participants.add(member_csu)
+        learning_mentor.save()
+
+        # WHEN
+        is_mentor = is_user_mentor(
+            mentor=mentor, participant_user_id=member.id, course_id=course.id
+        )
+
+        # THEN
+        self.assertTrue(is_mentor)
+
+    def test_not_is_user_mentor(self):
+        # GIVEN
+        member = create_user("member")
+        wanna_be_mentor = create_user("wanna_be_mentor")
+
+        course, course_page = create_course("Test Course")
+        course_session = create_course_session(course=course, title=":)")
+
+        add_course_session_user(
+            course_session=course_session,
+            user=member,
+            role=CourseSessionUser.Role.MEMBER,
+        )
+
+        # WHEN
+        is_mentor = is_user_mentor(
+            mentor=wanna_be_mentor, participant_user_id=member.id, course_id=course.id
+        )
+
+        # THEN
+        self.assertFalse(is_mentor)
+
     def test_no_role(self):
         # GIVEN
         other_course, _ = create_course("Other Test Course")

From fa2e96d220357cc6d5073bcab1f95a96279d2834 Mon Sep 17 00:00:00 2001
From: Livio Bieri <livio@livio.li>
Date: Thu, 11 Jan 2024 14:47:55 +0100
Subject: [PATCH 12/24] wip: mentor feedback (praxisauftrag)

---
 .../learningContentPage/assignment/AssignmentView.vue         | 1 +
 server/vbv_lernwelt/assignment/graphql/types.py               | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue b/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue
index e6a7c029..d24ca582 100644
--- a/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue
+++ b/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue
@@ -20,6 +20,7 @@ import { computed, onMounted, ref, watchEffect } from "vue";
 import { useTranslation } from "i18next-vue";
 import { learningContentTypeData } from "@/utils/typeMaps";
 import EvaluationSummary from "@/pages/cockpit/assignmentEvaluationPage/EvaluationSummary.vue";
+import { bustItGetCache } from "@/fetchHelpers";
 
 const { t } = useTranslation();
 const courseSession = useCurrentCourseSession();
diff --git a/server/vbv_lernwelt/assignment/graphql/types.py b/server/vbv_lernwelt/assignment/graphql/types.py
index a0dfdb8a..cf0267ca 100644
--- a/server/vbv_lernwelt/assignment/graphql/types.py
+++ b/server/vbv_lernwelt/assignment/graphql/types.py
@@ -109,7 +109,9 @@ def resolve_assignment_completion(
         assignment_user_id = info.context.user.id
 
     if str(assignment_user_id) == str(info.context.user.id) or can_evaluate_assignments(
-        evaluation_user=info.context.user, assignment_user_id=assignment_user_id, course_session_id=course_session_id
+        evaluation_user=info.context.user,
+        assignment_user_id=assignment_user_id,
+        course_session_id=course_session_id,
     ):
         course_id = CourseSession.objects.get(id=course_session_id).course_id
         if has_course_access(info.context.user, course_id):

From a97ac4ec97c5f2a15bbfc340d54c5f772c389422 Mon Sep 17 00:00:00 2001
From: Livio Bieri <livio@livio.li>
Date: Mon, 15 Jan 2024 14:06:28 +0100
Subject: [PATCH 13/24] fix: refresh mentor completions on submission

---
 .../mentor/MentorPraxisAssignment.vue         | 19 ++++++++++---------
 client/src/services/mentorCockpit.ts          |  5 +++--
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/client/src/pages/cockpit/cockpitPage/mentor/MentorPraxisAssignment.vue b/client/src/pages/cockpit/cockpitPage/mentor/MentorPraxisAssignment.vue
index ae5b75c3..12119397 100644
--- a/client/src/pages/cockpit/cockpitPage/mentor/MentorPraxisAssignment.vue
+++ b/client/src/pages/cockpit/cockpitPage/mentor/MentorPraxisAssignment.vue
@@ -1,8 +1,9 @@
 <script setup lang="ts">
 import type { Participant, PraxisAssignment } from "@/services/mentorCockpit";
 import { useMentorCockpit } from "@/services/mentorCockpit";
-import { computed, type Ref } from "vue";
+import { computed, onMounted, type Ref } from "vue";
 import { useCurrentCourseSession } from "@/composables";
+import log from "loglevel";
 
 const props = defineProps<{
   praxisAssignmentId: string;
@@ -11,19 +12,19 @@ const props = defineProps<{
 const courseSession = useCurrentCourseSession();
 const mentorCockpitStore = useMentorCockpit(courseSession.value.id);
 
+const participants = computed(() => mentorCockpitStore.summary.value?.participants);
 const praxisAssignment: Ref<PraxisAssignment | null> = computed(() =>
   mentorCockpitStore.getPraxisAssignmentById(props.praxisAssignmentId)
 );
 
 const getParticipantById = (id: string): Participant | null => {
-  if (mentorCockpitStore.summary.value?.participants) {
-    const found = mentorCockpitStore.summary.value.participants.find(
-      (item) => item.id === id
-    );
-    return found || null;
-  }
-  return null;
+  return participants.value?.find((participant) => participant.id === id) || null;
 };
+
+onMounted(() => {
+  log.debug("MentorPraxisAssignment mounted");
+  mentorCockpitStore.fetchData();
+});
 </script>
 
 <template>
@@ -109,7 +110,7 @@ const getParticipantById = (id: string): Participant | null => {
               class="underline"
               :to="item.url"
             >
-              {{ $t("a.Bewertung anzeigen") }}
+              {{ $t("a.Bewertung ansehen") }}
             </router-link>
           </div>
         </div>
diff --git a/client/src/services/mentorCockpit.ts b/client/src/services/mentorCockpit.ts
index 213caa34..0818ae81 100644
--- a/client/src/services/mentorCockpit.ts
+++ b/client/src/services/mentorCockpit.ts
@@ -1,4 +1,4 @@
-import { itGetCached } from "@/fetchHelpers";
+import { itGet } from "@/fetchHelpers";
 import type { Ref } from "vue";
 import { ref, watchEffect } from "vue";
 
@@ -74,7 +74,7 @@ export const useMentorCockpit = (
     summary.value = null;
     error.value = null;
 
-    itGetCached(`/api/mentor/${courseSessionId}/summary`)
+    itGet(`/api/mentor/${courseSessionId}/summary`)
       .then((response) => {
         summary.value = response;
       })
@@ -94,5 +94,6 @@ export const useMentorCockpit = (
     error,
     getCircleTitleById,
     getPraxisAssignmentById,
+    fetchData,
   };
 };

From becbbd01caecda5d4536c9a804ef090294050e6f Mon Sep 17 00:00:00 2001
From: Livio Bieri <livio@livio.li>
Date: Mon, 15 Jan 2024 14:24:06 +0100
Subject: [PATCH 14/24] fix: test

---
 server/vbv_lernwelt/iam/tests/test_roles.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/server/vbv_lernwelt/iam/tests/test_roles.py b/server/vbv_lernwelt/iam/tests/test_roles.py
index 6f77888e..7e6b60a1 100644
--- a/server/vbv_lernwelt/iam/tests/test_roles.py
+++ b/server/vbv_lernwelt/iam/tests/test_roles.py
@@ -83,7 +83,9 @@ class RoleTestCase(TestCase):
 
         # WHEN
         is_mentor = is_user_mentor(
-            mentor=mentor, participant_user_id=member.id, course_id=course.id
+            mentor=mentor,
+            participant_user_id=member.id,
+            course_session_id=course_session.id,
         )
 
         # THEN
@@ -105,7 +107,9 @@ class RoleTestCase(TestCase):
 
         # WHEN
         is_mentor = is_user_mentor(
-            mentor=wanna_be_mentor, participant_user_id=member.id, course_id=course.id
+            mentor=wanna_be_mentor,
+            participant_user_id=member.id,
+            course_session_id=course_session.id,
         )
 
         # THEN

From 4af56f721b27a3790849885b60a300bdcf1e83b1 Mon Sep 17 00:00:00 2001
From: Reto Aebersold <aeby@substyle.ch>
Date: Mon, 22 Jan 2024 10:27:23 +0100
Subject: [PATCH 15/24] fix: cockpit url double slash

---
 server/vbv_lernwelt/course/models.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/vbv_lernwelt/course/models.py b/server/vbv_lernwelt/course/models.py
index cbd52a55..c32a9ca7 100644
--- a/server/vbv_lernwelt/course/models.py
+++ b/server/vbv_lernwelt/course/models.py
@@ -41,7 +41,7 @@ class Course(models.Model):
         return f"/course/{self.slug}"
 
     def get_cockpit_url(self):
-        return f"/{self.get_course_url()}/cockpit"
+        return f"{self.get_course_url()}/cockpit"
 
     def get_learning_path(self):
         from vbv_lernwelt.learnpath.models import LearningPath

From 31cb507092b3b6db1efa5796a8d2a5b28967c0f3 Mon Sep 17 00:00:00 2001
From: Reto Aebersold <aeby@substyle.ch>
Date: Mon, 22 Jan 2024 11:29:51 +0100
Subject: [PATCH 16/24] fix: show eval user

---
 client/src/gql/gql.ts                         |  4 ++--
 client/src/gql/graphql.ts                     |  4 ++--
 client/src/graphql/queries.ts                 |  2 ++
 .../EvaluationSummary.vue                     | 21 +++++++------------
 4 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/client/src/gql/gql.ts b/client/src/gql/gql.ts
index 25a201a6..fae3326e 100644
--- a/client/src/gql/gql.ts
+++ b/client/src/gql/gql.ts
@@ -17,7 +17,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    $evaluationPoints: Float\n    $initializeCompletion: Boolean\n    $evaluationUserId: ID\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_points: $evaluationPoints\n      initialize_completion: $initializeCompletion\n      evaluation_user_id: $evaluationUserId\n    ) {\n      assignment_completion {\n        id\n        completion_status\n        submitted_at\n        evaluation_submitted_at\n        evaluation_points\n        completion_data\n        task_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      needs_expert_evaluation\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      solution_sample {\n        id\n        url\n      }\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        avatar_url\n        first_name\n        last_name\n        id\n      }\n      evaluation_points\n      evaluation_max_points\n      evaluation_passed\n      edoniq_extended_time_flag\n      completion_data\n      task_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      needs_expert_evaluation\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      solution_sample {\n        id\n        url\n      }\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        first_name\n        last_name\n      }\n      assignment_user {\n        avatar_url\n        first_name\n        last_name\n        id\n      }\n      evaluation_points\n      evaluation_max_points\n      evaluation_passed\n      edoniq_extended_time_flag\n      completion_data\n      task_completion_data\n    }\n  }\n": types.AssignmentCompletionQueryDocument,
     "\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            evaluation_max_points\n            evaluation_passed\n          }\n          learning_content {\n            ...CoursePageFields\n            circle {\n              id\n              title\n              slug\n            }\n          }\n        }\n      }\n    }\n  }\n": types.CompetenceCertificateQueryDocument,
     "\n  query courseSessionDetail($courseSessionId: ID!) {\n    course_session(id: $courseSessionId) {\n      id\n      title\n      course {\n        id\n        title\n        slug\n        enable_circle_documents\n        circle_contact_type\n      }\n      users {\n        id\n        user_id\n        first_name\n        last_name\n        email\n        avatar_url\n        role\n        circles {\n          id\n          title\n          slug\n        }\n      }\n      attendance_courses {\n        id\n        location\n        trainer\n        due_date {\n          id\n          start\n          end\n        }\n        learning_content_id\n        learning_content {\n          id\n          title\n          circle {\n            id\n            title\n            slug\n          }\n        }\n      }\n      assignments {\n        id\n        submission_deadline {\n          id\n          start\n        }\n        evaluation_deadline {\n          id\n          start\n        }\n        learning_content {\n          id\n          title\n          content_assignment {\n            id\n            title\n            assignment_type\n          }\n        }\n      }\n      edoniq_tests {\n        id\n        deadline {\n          id\n          start\n          end\n        }\n        learning_content {\n          id\n          title\n          content_assignment {\n            id\n            title\n            assignment_type\n          }\n        }\n      }\n    }\n  }\n": types.CourseSessionDetailDocument,
     "\n  query courseQuery($slug: String!) {\n    course(slug: $slug) {\n      id\n      title\n      slug\n      category_name\n      enable_circle_documents\n      circle_contact_type\n      action_competences {\n        competence_id\n        ...CoursePageFields\n        performance_criteria {\n          competence_id\n          learning_unit {\n            id\n            slug\n            evaluate_url\n          }\n          ...CoursePageFields\n        }\n      }\n      learning_path {\n        ...CoursePageFields\n        topics {\n          is_visible\n          ...CoursePageFields\n          circles {\n            description\n            goals\n            ...CoursePageFields\n            learning_sequences {\n              icon\n              ...CoursePageFields\n              learning_units {\n                evaluate_url\n                ...CoursePageFields\n                performance_criteria {\n                  ...CoursePageFields\n                }\n                learning_contents {\n                  can_user_self_toggle_course_completion\n                  content_url\n                  minutes\n                  description\n                  ...CoursePageFields\n                  ... on LearningContentAssignmentObjectType {\n                    assignment_type\n                    content_assignment {\n                      id\n                      assignment_type\n                    }\n                    competence_certificate {\n                      ...CoursePageFields\n                    }\n                  }\n                  ... on LearningContentEdoniqTestObjectType {\n                    checkbox_text\n                    has_extended_time_test\n                    content_assignment {\n                      id\n                      assignment_type\n                    }\n                    competence_certificate {\n                      ...CoursePageFields\n                    }\n                  }\n                  ... on LearningContentRichTextObjectType {\n                    text\n                  }\n                }\n              }\n            }\n          }\n        }\n      }\n    }\n  }\n": types.CourseQueryDocument,
@@ -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      needs_expert_evaluation\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      solution_sample {\n        id\n        url\n      }\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        avatar_url\n        first_name\n        last_name\n        id\n      }\n      evaluation_points\n      evaluation_max_points\n      evaluation_passed\n      edoniq_extended_time_flag\n      completion_data\n      task_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      needs_expert_evaluation\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      solution_sample {\n        id\n        url\n      }\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        avatar_url\n        first_name\n        last_name\n        id\n      }\n      evaluation_points\n      evaluation_max_points\n      evaluation_passed\n      edoniq_extended_time_flag\n      completion_data\n      task_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      needs_expert_evaluation\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      solution_sample {\n        id\n        url\n      }\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        first_name\n        last_name\n      }\n      assignment_user {\n        avatar_url\n        first_name\n        last_name\n        id\n      }\n      evaluation_points\n      evaluation_max_points\n      evaluation_passed\n      edoniq_extended_time_flag\n      completion_data\n      task_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      needs_expert_evaluation\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      solution_sample {\n        id\n        url\n      }\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        first_name\n        last_name\n      }\n      assignment_user {\n        avatar_url\n        first_name\n        last_name\n        id\n      }\n      evaluation_points\n      evaluation_max_points\n      evaluation_passed\n      edoniq_extended_time_flag\n      completion_data\n      task_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 99c7abd1..418893bd 100644
--- a/client/src/gql/graphql.ts
+++ b/client/src/gql/graphql.ts
@@ -1131,7 +1131,7 @@ export type AssignmentCompletionQueryQueryVariables = Exact<{
 export type AssignmentCompletionQueryQuery = { __typename?: 'Query', assignment?: { __typename?: 'AssignmentObjectType', assignment_type: AssignmentAssignmentAssignmentTypeChoices, needs_expert_evaluation: boolean, max_points?: number | null, content_type: string, effort_required: string, evaluation_description: string, evaluation_document_url: string, evaluation_tasks?: any | null, id: string, intro_text: string, performance_objectives?: any | null, slug: string, tasks?: any | null, title: string, translation_key: string, solution_sample?: { __typename?: 'ContentDocumentObjectType', id: string, url?: string | null } | null, competence_certificate?: (
       { __typename?: 'CompetenceCertificateObjectType' }
       & { ' $fragmentRefs'?: { 'CoursePageFieldsCompetenceCertificateObjectTypeFragment': CoursePageFieldsCompetenceCertificateObjectTypeFragment } }
-    ) | null } | null, assignment_completion?: { __typename?: 'AssignmentCompletionObjectType', id: string, completion_status: AssignmentAssignmentCompletionCompletionStatusChoices, submitted_at?: string | null, evaluation_submitted_at?: string | null, evaluation_points?: number | null, evaluation_max_points?: number | null, evaluation_passed?: boolean | null, edoniq_extended_time_flag: boolean, completion_data?: any | null, task_completion_data?: any | null, evaluation_user?: { __typename?: 'UserObjectType', id: string } | null, assignment_user: { __typename?: 'UserObjectType', avatar_url: string, first_name: string, last_name: string, id: string } } | null };
+    ) | null } | null, assignment_completion?: { __typename?: 'AssignmentCompletionObjectType', id: string, completion_status: AssignmentAssignmentCompletionCompletionStatusChoices, submitted_at?: string | null, evaluation_submitted_at?: string | null, evaluation_points?: number | null, evaluation_max_points?: number | null, evaluation_passed?: boolean | null, edoniq_extended_time_flag: boolean, completion_data?: any | null, task_completion_data?: any | null, evaluation_user?: { __typename?: 'UserObjectType', id: string, first_name: string, last_name: string } | null, assignment_user: { __typename?: 'UserObjectType', avatar_url: string, first_name: string, last_name: string, id: string } } | null };
 
 export type CompetenceCertificateQueryQueryVariables = Exact<{
   courseSlug: Scalars['String']['input'];
@@ -1300,7 +1300,7 @@ export const CoursePageFieldsFragmentDoc = {"kind":"Document","definitions":[{"k
 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":"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"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"evaluationUserId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}],"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_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"}}},{"kind":"Argument","name":{"kind":"Name","value":"evaluation_user_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"evaluationUserId"}}}],"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_points"}},{"kind":"Field","name":{"kind":"Name","value":"completion_data"}},{"kind":"Field","name":{"kind":"Name","value":"task_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":"needs_expert_evaluation"}},{"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":"solution_sample"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"url"}}]}},{"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":"avatar_url"}},{"kind":"Field","name":{"kind":"Name","value":"first_name"}},{"kind":"Field","name":{"kind":"Name","value":"last_name"}},{"kind":"Field","name":{"kind":"Name","value":"id"}}]}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_max_points"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_passed"}},{"kind":"Field","name":{"kind":"Name","value":"edoniq_extended_time_flag"}},{"kind":"Field","name":{"kind":"Name","value":"completion_data"}},{"kind":"Field","name":{"kind":"Name","value":"task_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 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":"needs_expert_evaluation"}},{"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":"solution_sample"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"url"}}]}},{"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":"first_name"}},{"kind":"Field","name":{"kind":"Name","value":"last_name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignment_user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"avatar_url"}},{"kind":"Field","name":{"kind":"Name","value":"first_name"}},{"kind":"Field","name":{"kind":"Name","value":"last_name"}},{"kind":"Field","name":{"kind":"Name","value":"id"}}]}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_max_points"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_passed"}},{"kind":"Field","name":{"kind":"Name","value":"edoniq_extended_time_flag"}},{"kind":"Field","name":{"kind":"Name","value":"completion_data"}},{"kind":"Field","name":{"kind":"Name","value":"task_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 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":"evaluation_max_points"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_passed"}}]}},{"kind":"Field","name":{"kind":"Name","value":"learning_content"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"circle"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}}]}}]}}]}}]}}]}}]}},{"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>;
 export const CourseSessionDetailDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"courseSessionDetail"},"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"},"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":"title"}},{"kind":"Field","name":{"kind":"Name","value":"course"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"enable_circle_documents"}},{"kind":"Field","name":{"kind":"Name","value":"circle_contact_type"}}]}},{"kind":"Field","name":{"kind":"Name","value":"users"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"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":"avatar_url"}},{"kind":"Field","name":{"kind":"Name","value":"role"}},{"kind":"Field","name":{"kind":"Name","value":"circles"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"attendance_courses"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"location"}},{"kind":"Field","name":{"kind":"Name","value":"trainer"}},{"kind":"Field","name":{"kind":"Name","value":"due_date"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"start"}},{"kind":"Field","name":{"kind":"Name","value":"end"}}]}},{"kind":"Field","name":{"kind":"Name","value":"learning_content_id"}},{"kind":"Field","name":{"kind":"Name","value":"learning_content"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"circle"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignments"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"submission_deadline"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"start"}}]}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_deadline"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"start"}}]}},{"kind":"Field","name":{"kind":"Name","value":"learning_content"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"content_assignment"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type"}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"edoniq_tests"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"deadline"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"start"}},{"kind":"Field","name":{"kind":"Name","value":"end"}}]}},{"kind":"Field","name":{"kind":"Name","value":"learning_content"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"content_assignment"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type"}}]}}]}}]}}]}}]}}]} as unknown as DocumentNode<CourseSessionDetailQuery, CourseSessionDetailQueryVariables>;
 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":"slug"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"slug"},"value":{"kind":"Variable","name":{"kind":"Name","value":"slug"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"category_name"}},{"kind":"Field","name":{"kind":"Name","value":"enable_circle_documents"}},{"kind":"Field","name":{"kind":"Name","value":"circle_contact_type"}},{"kind":"Field","name":{"kind":"Name","value":"action_competences"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"competence_id"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"performance_criteria"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"competence_id"}},{"kind":"Field","name":{"kind":"Name","value":"learning_unit"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"evaluate_url"}}]}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"learning_path"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"topics"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"is_visible"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"circles"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"Field","name":{"kind":"Name","value":"goals"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"learning_sequences"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"icon"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"learning_units"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"evaluate_url"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"performance_criteria"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}}]}},{"kind":"Field","name":{"kind":"Name","value":"learning_contents"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"can_user_self_toggle_course_completion"}},{"kind":"Field","name":{"kind":"Name","value":"content_url"}},{"kind":"Field","name":{"kind":"Name","value":"minutes"}},{"kind":"Field","name":{"kind":"Name","value":"description"}},{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"LearningContentAssignmentObjectType"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"assignment_type"}},{"kind":"Field","name":{"kind":"Name","value":"content_assignment"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type"}}]}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}}]}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"LearningContentEdoniqTestObjectType"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"checkbox_text"}},{"kind":"Field","name":{"kind":"Name","value":"has_extended_time_test"}},{"kind":"Field","name":{"kind":"Name","value":"content_assignment"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type"}}]}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}}]}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"LearningContentRichTextObjectType"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"text"}}]}}]}}]}}]}}]}}]}}]}}]}}]}},{"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<CourseQueryQuery, CourseQueryQueryVariables>;
diff --git a/client/src/graphql/queries.ts b/client/src/graphql/queries.ts
index a37fc3b5..8561653e 100644
--- a/client/src/graphql/queries.ts
+++ b/client/src/graphql/queries.ts
@@ -66,6 +66,8 @@ export const ASSIGNMENT_COMPLETION_QUERY = graphql(`
       evaluation_submitted_at
       evaluation_user {
         id
+        first_name
+        last_name
       }
       assignment_user {
         avatar_url
diff --git a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationSummary.vue b/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationSummary.vue
index 6e7a905e..9115a7ce 100644
--- a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationSummary.vue
+++ b/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationSummary.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import ItSuccessAlert from "@/components/ui/ItSuccessAlert.vue";
-import { useCourseSessionDetailQuery, useCurrentCourseSession } from "@/composables";
+import { useCurrentCourseSession } from "@/composables";
 import { UPSERT_ASSIGNMENT_COMPLETION_MUTATION } from "@/graphql/mutations";
 import {
   maxAssignmentPoints,
@@ -110,26 +110,19 @@ const maxPoints = computed(() => maxAssignmentPoints(props.assignment));
 const userPoints = computed(() =>
   userAssignmentPoints(props.assignment, props.assignmentCompletion)
 );
-
-const courseSessionDetailResult = useCourseSessionDetailQuery();
-const evaluationUser = computed(() => {
-  if (props.assignmentCompletion.evaluation_user) {
-    return courseSessionDetailResult.findUser(
-      props.assignmentCompletion.evaluation_user?.id
-    );
-  }
-  return undefined;
-});
 </script>
 
 <template>
   <!-- eslint-disable vue/no-v-html -->
   <div>
-    <h3 v-if="evaluationUser && props.showEvaluationUser" class="mb-6">
+    <h3
+      v-if="assignmentCompletion.evaluation_user && props.showEvaluationUser"
+      class="mb-6"
+    >
       {{
         $t(text.evaluationFromUser, {
-          x: evaluationUser?.first_name,
-          y: evaluationUser?.last_name,
+          x: assignmentCompletion.evaluation_user.first_name,
+          y: assignmentCompletion.evaluation_user.last_name,
         })
       }}
     </h3>

From 587f354e52a48a6c7cf3bd77f72c1d345d0ce3b4 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Mon, 22 Jan 2024 15:38:37 +0100
Subject: [PATCH 17/24] Handle invalid recipient email addresses

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

diff --git a/server/vbv_lernwelt/notify/services.py b/server/vbv_lernwelt/notify/services.py
index bf792511..84102609 100644
--- a/server/vbv_lernwelt/notify/services.py
+++ b/server/vbv_lernwelt/notify/services.py
@@ -3,6 +3,8 @@ from __future__ import annotations
 from typing import TYPE_CHECKING
 
 import structlog
+from django.core.exceptions import ValidationError
+from django.core.validators import validate_email
 from django.db.models import Model
 from notifications.signals import notify
 
@@ -281,6 +283,13 @@ class NotificationService:
             template_data=template_data,
         )
         emailed = False
+
+        try:
+            validate_email(recipient.email)
+        except ValidationError:
+            log.info("Recipient email is invalid")
+            return f"{notification_identifier}_invalid_email"
+
         try:
             notification = NotificationService._find_duplicate_notification(
                 recipient=recipient,

From 55d418602f98f0919aee7906f884f967ae689f4f Mon Sep 17 00:00:00 2001
From: Reto Aebersold <aeby@substyle.ch>
Date: Tue, 23 Jan 2024 09:05:42 +0100
Subject: [PATCH 18/24] feat: vv user profile

---
 .../cockpitPage/mentor/MentorParticipants.vue    |  9 ++++++---
 server/vbv_lernwelt/course/views.py              | 11 +++++++++--
 server/vbv_lernwelt/iam/permissions.py           | 13 ++++++-------
 server/vbv_lernwelt/iam/tests/test_experts.py    | 16 ----------------
 4 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/client/src/pages/cockpit/cockpitPage/mentor/MentorParticipants.vue b/client/src/pages/cockpit/cockpitPage/mentor/MentorParticipants.vue
index c8fd6d15..5356d283 100644
--- a/client/src/pages/cockpit/cockpitPage/mentor/MentorParticipants.vue
+++ b/client/src/pages/cockpit/cockpitPage/mentor/MentorParticipants.vue
@@ -27,9 +27,12 @@ const { summary } = useMentorCockpit(courseSession.value.id);
           {{ participant.email }}
         </div>
       </div>
-      <!--      <router-link :to="{name: 'cockpitUserProfile', params: {userId: participant.id}}" class="underline">-->
-      <!--        {{ $t("a.Profil anzeigen") }}-->
-      <!--      </router-link>-->
+      <router-link
+        :to="{ name: 'cockpitUserProfile', params: { userId: participant.id } }"
+        class="underline"
+      >
+        {{ $t("cockpit.profileLink") }}
+      </router-link>
     </div>
   </div>
 </template>
diff --git a/server/vbv_lernwelt/course/views.py b/server/vbv_lernwelt/course/views.py
index 85b67714..d6e8afe6 100644
--- a/server/vbv_lernwelt/course/views.py
+++ b/server/vbv_lernwelt/course/views.py
@@ -23,6 +23,7 @@ from vbv_lernwelt.iam.permissions import (
     has_course_access_by_page_request,
     is_circle_expert,
     is_course_session_expert,
+    is_user_mentor,
 )
 from vbv_lernwelt.learning_mentor.models import LearningMentor
 
@@ -76,8 +77,14 @@ def request_course_completion(request, course_session_id):
 
 @api_view(["GET"])
 def request_course_completion_for_user(request, course_session_id, user_id):
-    if request.user.id == user_id or is_course_session_expert(
-        request.user, course_session_id
+    if (
+        request.user.id == user_id
+        or is_course_session_expert(request.user, course_session_id)
+        or is_user_mentor(
+            mentor=request.user,
+            participant_user_id=user_id,
+            course_session_id=course_session_id,
+        )
     ):
         return _request_course_completion(course_session_id, user_id)
     raise PermissionDenied()
diff --git a/server/vbv_lernwelt/iam/permissions.py b/server/vbv_lernwelt/iam/permissions.py
index 02a7e0a3..5a1d7cec 100644
--- a/server/vbv_lernwelt/iam/permissions.py
+++ b/server/vbv_lernwelt/iam/permissions.py
@@ -64,12 +64,7 @@ def is_course_session_expert(user, course_session_id: int):
         role=CourseSessionUser.Role.EXPERT,
     ).exists()
 
-    is_learning_mentor = LearningMentor.objects.filter(
-        mentor=user,
-        course=course_session.course,
-    ).exists()
-
-    return is_supervisor or is_expert or is_learning_mentor
+    return is_supervisor or is_expert
 
 
 def is_course_session_member(user, course_session_id: int | None = None):
@@ -190,7 +185,11 @@ def can_view_profile(user: User, profile_user: CourseSessionUser) -> bool:
     if user == profile_user.user:
         return True
 
-    if is_course_session_expert(user, profile_user.course_session_id):
+    if is_course_session_expert(user, profile_user.course_session.id) or is_user_mentor(
+        mentor=user,
+        participant_user_id=profile_user.user.id,
+        course_session_id=profile_user.course_session.id,
+    ):
         return True
 
     return False
diff --git a/server/vbv_lernwelt/iam/tests/test_experts.py b/server/vbv_lernwelt/iam/tests/test_experts.py
index f0032656..973bb368 100644
--- a/server/vbv_lernwelt/iam/tests/test_experts.py
+++ b/server/vbv_lernwelt/iam/tests/test_experts.py
@@ -8,7 +8,6 @@ from vbv_lernwelt.course.creators.test_utils import (
 from vbv_lernwelt.course.models import CourseSessionUser
 from vbv_lernwelt.course_session_group.models import CourseSessionGroup
 from vbv_lernwelt.iam.permissions import is_course_session_expert
-from vbv_lernwelt.learning_mentor.models import LearningMentor
 
 
 class ExpertTestCase(TestCase):
@@ -50,21 +49,6 @@ class ExpertTestCase(TestCase):
         # THEN
         self.assertTrue(is_expert)
 
-    def test_learning_mentor(self):
-        # GIVEN
-        lm = LearningMentor.objects.create(
-            mentor=self.user,
-            course=self.course,
-        )
-
-        # WHEN
-        is_expert = is_course_session_expert(
-            user=lm.mentor, course_session_id=self.course_session.id
-        )
-
-        # THEN
-        self.assertTrue(is_expert)
-
     def test_expert(self):
         # GIVEN
         csu = CourseSessionUser.objects.create(

From 6362d85aecbcb854bc22623fad62964578d0ce74 Mon Sep 17 00:00:00 2001
From: Reto Aebersold <aeby@substyle.ch>
Date: Tue, 23 Jan 2024 09:50:14 +0100
Subject: [PATCH 19/24] fix: force click next button

---
 cypress/e2e/circle.cy.js | 74 ++++++++++++++++++++--------------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/cypress/e2e/circle.cy.js b/cypress/e2e/circle.cy.js
index 98d41b73..de1185a1 100644
--- a/cypress/e2e/circle.cy.js
+++ b/cypress/e2e/circle.cy.js
@@ -9,71 +9,71 @@ describe("circle.cy.js", () => {
   });
 
   it("can open circle page", () => {
-    cy.get('[data-cy="circle-title"]').should("contain", "Fahrzeug");
+    cy.get("[data-cy=\"circle-title\"]").should("contain", "Fahrzeug");
   });
 
   it("can toggle learning content", () => {
-    cy.get('[data-cy="circle-title"]').should("contain", "Fahrzeug");
+    cy.get("[data-cy=\"circle-title\"]").should("contain", "Fahrzeug");
 
     cy.get(
-      '[data-cy="test-lehrgang-lp-circle-fahrzeug-lc-handlungsfeld-fahrzeug-checkbox"]'
+      "[data-cy=\"test-lehrgang-lp-circle-fahrzeug-lc-handlungsfeld-fahrzeug-checkbox\"]"
     ).should("have.class", "cy-unchecked");
 
     cy.get(
-      '[data-cy="test-lehrgang-lp-circle-fahrzeug-lc-handlungsfeld-fahrzeug-checkbox"]'
+      "[data-cy=\"test-lehrgang-lp-circle-fahrzeug-lc-handlungsfeld-fahrzeug-checkbox\"]"
     ).click();
 
     cy.get(
-      '[data-cy="test-lehrgang-lp-circle-fahrzeug-lc-handlungsfeld-fahrzeug-checkbox"]'
+      "[data-cy=\"test-lehrgang-lp-circle-fahrzeug-lc-handlungsfeld-fahrzeug-checkbox\"]"
     ).should("have.class", "cy-checked");
 
     // completion data should still be there after reload
     cy.reload();
     cy.get(
-      '[data-cy="test-lehrgang-lp-circle-fahrzeug-lc-handlungsfeld-fahrzeug-checkbox"]'
+      "[data-cy=\"test-lehrgang-lp-circle-fahrzeug-lc-handlungsfeld-fahrzeug-checkbox\"]"
     ).should("have.class", "cy-checked");
   });
 
   it("can open learning contents and complete them by continuing", () => {
     cy.get(
-      '[data-cy="test-lehrgang-lp-circle-fahrzeug-lc-verschaffe-dir-einen-überblick"]'
+      "[data-cy=\"test-lehrgang-lp-circle-fahrzeug-lc-verschaffe-dir-einen-überblick\"]"
     ).click();
-    cy.get('[data-cy="lc-title"]').should(
+    cy.get("[data-cy=\"lc-title\"]").should(
       "contain",
       "Verschaffe dir einen Überblick"
     );
-    cy.get('[data-cy="complete-and-continue"]').click({ force: true });
-    cy.get('[data-cy="circle-title"]').should("contain", "Fahrzeug");
+    cy.get("[data-cy=\"complete-and-continue\"]").click({ force: true });
+    cy.get("[data-cy=\"circle-title\"]").should("contain", "Fahrzeug");
 
-    cy.get('[data-cy="ls-continue-button"]').click();
-    cy.get('[data-cy="lc-title"]').should(
+    cy.get("[data-cy=\"ls-continue-button\"]").click({ force: true });
+    cy.get("[data-cy=\"lc-title\"]").should(
       "contain",
       "Handlungsfeld «Fahrzeug»"
     );
-    cy.get('[data-cy="complete-and-continue"]').click({ force: true });
-    cy.get('[data-cy="circle-title"]').should("contain", "Fahrzeug");
+    cy.get("[data-cy=\"complete-and-continue\"]").click({ force: true });
+    cy.get("[data-cy=\"circle-title\"]").should("contain", "Fahrzeug");
 
     cy.get(
-      '[data-cy="test-lehrgang-lp-circle-fahrzeug-lc-verschaffe-dir-einen-überblick-checkbox"]'
+      "[data-cy=\"test-lehrgang-lp-circle-fahrzeug-lc-verschaffe-dir-einen-überblick-checkbox\"]"
     ).should("have.class", "cy-checked");
     cy.get(
-      '[data-cy="test-lehrgang-lp-circle-fahrzeug-lc-handlungsfeld-fahrzeug-checkbox"]'
+      "[data-cy=\"test-lehrgang-lp-circle-fahrzeug-lc-handlungsfeld-fahrzeug-checkbox\"]"
     ).should("have.class", "cy-checked");
   });
 
   it("continue button works", () => {
-    cy.get('[data-cy="ls-continue-button"]').should("contain", "Los geht's");
-    cy.get('[data-cy="ls-continue-button"]').click();
+    cy.get("[data-cy=\"ls-continue-button\"]").should("contain", "Los geht's");
+    cy.get("[data-cy=\"ls-continue-button\"]").click();
 
-    cy.get('[data-cy="lc-title"]').should(
+    cy.get("[data-cy=\"lc-title\"]").should(
       "contain",
       "Verschaffe dir einen Überblick"
     );
-    cy.get('[data-cy="complete-and-continue"]').click({ force: true });
+    cy.get("[data-cy=\"complete-and-continue\"]").click({ force: true });
 
-    cy.get('[data-cy="ls-continue-button"]').should("contain", "Weiter geht's");
-    cy.get('[data-cy="ls-continue-button"]').click();
-    cy.get('[data-cy="lc-title"]').should(
+    cy.get("[data-cy=\"ls-continue-button\"]").should("contain", "Weiter geht's");
+    cy.get("[data-cy=\"ls-continue-button\"]").click();
+    cy.get("[data-cy=\"lc-title\"]").should(
       "contain",
       "Handlungsfeld «Fahrzeug»"
     );
@@ -81,43 +81,43 @@ describe("circle.cy.js", () => {
 
   it("can open learning content by url", () => {
     cy.visit("/course/test-lehrgang/learn/fahrzeug/handlungsfeld-fahrzeug");
-    cy.get('[data-cy="lc-title"]').should(
+    cy.get("[data-cy=\"lc-title\"]").should(
       "contain",
       "Handlungsfeld «Fahrzeug»"
     );
 
-    cy.get('[data-cy="close-learning-content"]').click();
-    cy.get('[data-cy="circle-title"]').should("contain", "Fahrzeug");
+    cy.get("[data-cy=\"close-learning-content\"]").click();
+    cy.get("[data-cy=\"circle-title\"]").should("contain", "Fahrzeug");
   });
 
   it("checks number of sequences and contents", () => {
-    cy.get('[data-cy="lp-learning-sequence"]').should("have.length", 3);
-    cy.get('[data-cy="lp-learning-sequence"]')
+    cy.get("[data-cy=\"lp-learning-sequence\"]").should("have.length", 3);
+    cy.get("[data-cy=\"lp-learning-sequence\"]")
       .first()
       .should("contain", "Vorbereitung");
-    cy.get('[data-cy="lp-learning-sequence"]')
+    cy.get("[data-cy=\"lp-learning-sequence\"]")
       .eq(1)
       .should("contain", "Training");
-    cy.get('[data-cy="lp-learning-sequence"]')
+    cy.get("[data-cy=\"lp-learning-sequence\"]")
       .last()
       .should("contain", "Transfer");
 
-    cy.get('[data-cy="lp-learning-content"]').should("have.length", 10);
-    cy.get('[data-cy="lp-learning-content"]')
+    cy.get("[data-cy=\"lp-learning-content\"]").should("have.length", 10);
+    cy.get("[data-cy=\"lp-learning-content\"]")
       .first()
       .should("contain", "Verschaffe dir einen Überblick");
-    cy.get('[data-cy="lp-learning-content"]')
+    cy.get("[data-cy=\"lp-learning-content\"]")
       .eq(4)
       .should("contain", "Präsenzkurs Fahrzeug");
-    cy.get('[data-cy="lp-learning-content"]')
+    cy.get("[data-cy=\"lp-learning-content\"]")
       .eq(7)
       .should("contain", "Reflexion");
-    cy.get('[data-cy="lp-learning-content"]')
+    cy.get("[data-cy=\"lp-learning-content\"]")
       .last()
       .should("contain", "Feedback");
 
     cy.visit("/course/test-lehrgang/learn/reisen");
-    cy.get('[data-cy="lp-learning-sequence"]').should("have.length", 3);
-    cy.get('[data-cy="lp-learning-content"]').should("have.length", 9);
+    cy.get("[data-cy=\"lp-learning-sequence\"]").should("have.length", 3);
+    cy.get("[data-cy=\"lp-learning-content\"]").should("have.length", 9);
   });
 });

From 07b3a4e9d5edde9f52531b5d18db182201d33f78 Mon Sep 17 00:00:00 2001
From: Reto Aebersold <aeby@substyle.ch>
Date: Tue, 23 Jan 2024 10:01:22 +0100
Subject: [PATCH 20/24] feat: add proper permission

---
 server/vbv_lernwelt/course/views.py    | 13 +++----------
 server/vbv_lernwelt/iam/permissions.py | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/server/vbv_lernwelt/course/views.py b/server/vbv_lernwelt/course/views.py
index d6e8afe6..6c2db3ee 100644
--- a/server/vbv_lernwelt/course/views.py
+++ b/server/vbv_lernwelt/course/views.py
@@ -18,12 +18,11 @@ from vbv_lernwelt.course_session_group.models import CourseSessionGroup
 from vbv_lernwelt.files.models import UploadFile
 from vbv_lernwelt.files.services import FileDirectUploadService
 from vbv_lernwelt.iam.permissions import (
+    can_view_course_completions,
     course_sessions_for_user_qs,
     has_course_access,
     has_course_access_by_page_request,
     is_circle_expert,
-    is_course_session_expert,
-    is_user_mentor,
 )
 from vbv_lernwelt.learning_mentor.models import LearningMentor
 
@@ -77,14 +76,8 @@ def request_course_completion(request, course_session_id):
 
 @api_view(["GET"])
 def request_course_completion_for_user(request, course_session_id, user_id):
-    if (
-        request.user.id == user_id
-        or is_course_session_expert(request.user, course_session_id)
-        or is_user_mentor(
-            mentor=request.user,
-            participant_user_id=user_id,
-            course_session_id=course_session_id,
-        )
+    if can_view_course_completions(
+        user=request.user, course_session_id=course_session_id, target_user_id=user_id
     ):
         return _request_course_completion(course_session_id, user_id)
     raise PermissionDenied()
diff --git a/server/vbv_lernwelt/iam/permissions.py b/server/vbv_lernwelt/iam/permissions.py
index 5a1d7cec..110be65f 100644
--- a/server/vbv_lernwelt/iam/permissions.py
+++ b/server/vbv_lernwelt/iam/permissions.py
@@ -193,3 +193,17 @@ def can_view_profile(user: User, profile_user: CourseSessionUser) -> bool:
         return True
 
     return False
+
+
+def can_view_course_completions(
+    user: User, course_session_id: int, target_user_id: str
+) -> bool:
+    return (
+        user.id == target_user_id
+        or is_course_session_expert(user=user, course_session_id=course_session_id)
+        or is_user_mentor(
+            mentor=user,
+            participant_user_id=target_user_id,
+            course_session_id=course_session_id,
+        )
+    )

From da3b1f03af5ac50000e0dbe3b717e84a1a0b278d Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Mon, 22 Jan 2024 11:24:57 +0100
Subject: [PATCH 21/24] Add new Lehrgang

---
 server/vbv_lernwelt/course/consts.py          |  1 +
 .../creators/versicherungsvermittlerin.py     |  3 ++
 .../commands/create_default_courses.py        | 33 +++++++++++++++++++
 .../commands/create_vermittler_pruefung.py    | 23 +++++++++++++
 .../learnpath/create_vv_new_learning_path.py  | 20 +++++++++++
 5 files changed, 80 insertions(+)
 create mode 100644 server/vbv_lernwelt/course/management/commands/create_vermittler_pruefung.py

diff --git a/server/vbv_lernwelt/course/consts.py b/server/vbv_lernwelt/course/consts.py
index 5b3b30ab..39fc79c9 100644
--- a/server/vbv_lernwelt/course/consts.py
+++ b/server/vbv_lernwelt/course/consts.py
@@ -8,3 +8,4 @@ COURSE_UK_IT = -8
 COURSE_UK_TRAINING_IT = -9
 COURSE_VERSICHERUNGSVERMITTLERIN_FR_ID = -10
 COURSE_VERSICHERUNGSVERMITTLERIN_IT_ID = -11
+COURSE_VERSICHERUNGSVERMITTLERIN_PRUEFUNG_ID = -12
diff --git a/server/vbv_lernwelt/course/creators/versicherungsvermittlerin.py b/server/vbv_lernwelt/course/creators/versicherungsvermittlerin.py
index 48fa0bc6..2ad76a87 100644
--- a/server/vbv_lernwelt/course/creators/versicherungsvermittlerin.py
+++ b/server/vbv_lernwelt/course/creators/versicherungsvermittlerin.py
@@ -1,5 +1,6 @@
 from vbv_lernwelt.course.consts import COURSE_VERSICHERUNGSVERMITTLERIN_ID
 from vbv_lernwelt.course.factories import CoursePageFactory
+from vbv_lernwelt.course.models import CircleContactType
 from vbv_lernwelt.course.utils import get_wagtail_default_site
 
 
@@ -20,6 +21,8 @@ def create_versicherungsvermittlerin_with_categories(
         id=course_id,
         title=title,
         category_name="Handlungsfeld",
+        enable_circle_documents=False,
+        circle_contact_type=CircleContactType.LEARNING_MENTOR.value,
     )
 
     CourseCategory.objects.get_or_create(course=course, title="Allgemein", general=True)
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 ac931c2d..af21c29e 100644
--- a/server/vbv_lernwelt/course/management/commands/create_default_courses.py
+++ b/server/vbv_lernwelt/course/management/commands/create_default_courses.py
@@ -59,6 +59,7 @@ from vbv_lernwelt.course.consts import (
     COURSE_VERSICHERUNGSVERMITTLERIN_FR_ID,
     COURSE_VERSICHERUNGSVERMITTLERIN_ID,
     COURSE_VERSICHERUNGSVERMITTLERIN_IT_ID,
+    COURSE_VERSICHERUNGSVERMITTLERIN_PRUEFUNG_ID,
 )
 from vbv_lernwelt.course.creators.test_course import (
     create_edoniq_test_assignment,
@@ -95,6 +96,7 @@ from vbv_lernwelt.importer.services import (
 from vbv_lernwelt.learning_mentor.models import LearningMentor
 from vbv_lernwelt.learnpath.create_vv_new_learning_path import (
     create_vv_new_learning_path,
+    create_vv_pruefung_learning_path,
 )
 from vbv_lernwelt.learnpath.models import (
     Circle,
@@ -153,6 +155,9 @@ def command(course):
             course_id=COURSE_VERSICHERUNGSVERMITTLERIN_IT_ID, language="it"
         )
 
+    if COURSE_VERSICHERUNGSVERMITTLERIN_PRUEFUNG_ID in course:
+        create_versicherungsvermittlerin_pruefung_course()
+
     if COURSE_UK in course:
         create_course_uk_de()
         create_course_uk_de_course_sessions()
@@ -276,6 +281,34 @@ def create_versicherungsvermittlerin_course(
             )
 
 
+def create_versicherungsvermittlerin_pruefung_course(
+    course_id=COURSE_VERSICHERUNGSVERMITTLERIN_PRUEFUNG_ID, language="de"
+):
+    names = {
+        "de": "Versicherungsvermittler/-in VBV Prüfung",
+        "fr": "Intermédiaire d’assurance AFA Examen",
+        "it": "Intermediario/a assicurativo/a AFA Esame",
+    }
+    # Versicherungsvermittler/in mit neuen Circles
+    course = create_versicherungsvermittlerin_with_categories(
+        course_id=course_id,
+        title=names[language],
+    )
+
+    # assignments create assignments parent page
+    _assignment_list_page = AssignmentListPageFactory(
+        parent=course.coursepage,
+    )
+
+    create_vv_new_competence_profile(course_id=course_id)
+    create_default_media_library(course_id=course_id)
+    create_vv_reflection(course_id=course_id)
+
+    CourseSession.objects.create(course_id=course_id, title=names[language])
+
+    create_vv_pruefung_learning_path(course_id=course_id)
+
+
 def create_course_uk_de(course_id=COURSE_UK, lang="de"):
     names = {
         "de": "Überbetriebliche Kurse",
diff --git a/server/vbv_lernwelt/course/management/commands/create_vermittler_pruefung.py b/server/vbv_lernwelt/course/management/commands/create_vermittler_pruefung.py
new file mode 100644
index 00000000..c227d1b0
--- /dev/null
+++ b/server/vbv_lernwelt/course/management/commands/create_vermittler_pruefung.py
@@ -0,0 +1,23 @@
+import djclick as click
+
+from vbv_lernwelt.course.consts import COURSE_VERSICHERUNGSVERMITTLERIN_PRUEFUNG_ID
+from vbv_lernwelt.course.management.commands.create_default_courses import (
+    create_versicherungsvermittlerin_pruefung_course,
+)
+from vbv_lernwelt.course.models import Course
+
+ADMIN_EMAILS = ["info@iterativ.ch", "admin"]
+
+
+@click.command()
+def command():
+    print(
+        "Creating Vermittler Prüfung course",
+        COURSE_VERSICHERUNGSVERMITTLERIN_PRUEFUNG_ID,
+    )
+
+    if Course.objects.filter(id=COURSE_VERSICHERUNGSVERMITTLERIN_PRUEFUNG_ID).exists():
+        print("Course already exists, skipping")
+        return
+
+    create_versicherungsvermittlerin_pruefung_course()
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 915b2239..29eee41e 100644
--- a/server/vbv_lernwelt/learnpath/create_vv_new_learning_path.py
+++ b/server/vbv_lernwelt/learnpath/create_vv_new_learning_path.py
@@ -83,6 +83,26 @@ def create_vv_new_learning_path(
     Page.objects.update(owner=user)
 
 
+def create_vv_pruefung_learning_path(
+    course_id=COURSE_VERSICHERUNGSVERMITTLERIN_ID, user=None
+):
+    if user is None:
+        user = User.objects.get(username="info@iterativ.ch")
+
+    course_page = CoursePage.objects.get(course_id=course_id)
+    lp = LearningPathFactory(
+        title="Lernpfad",
+        parent=course_page,
+    )
+
+    TopicFactory(title="Prüfung", parent=lp)
+    create_circle_pruefungsvorbereitung(lp)
+    create_circle_pruefung(lp)
+
+    # all pages belong to 'admin' by default
+    Page.objects.update(owner=user)
+
+
 def create_circle_basis(lp, title="Basis"):
     circle = CircleFactory(
         title=title,

From 58213bcb90f115be4621ddc38ba095e123f6126a Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Wed, 24 Jan 2024 09:58:34 +0100
Subject: [PATCH 22/24] Add lehrgang on startup

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

diff --git a/compose/django/docker_start.sh b/compose/django/docker_start.sh
index 8da059c4..4e30ebbe 100644
--- a/compose/django/docker_start.sh
+++ b/compose/django/docker_start.sh
@@ -21,5 +21,8 @@ fi
 #    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
 
+# Create Prüfungslehrgang
+python /app/manage.py create_vermittler_pruefung
+
 # Set the command to run supervisord
 /home/django/.local/bin/supervisord -c /app/supervisord.conf

From 978136fba046af95d6548d68c7b4e42063715fec Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Wed, 24 Jan 2024 15:17:59 +0100
Subject: [PATCH 23/24] Don't create date if none is present

---
 .../assignmentEvaluationPage/EvaluationContainer.vue   |  4 +++-
 .../assignmentEvaluationPage/EvaluationIntro.vue       | 10 ++++++++--
 cypress/e2e/assignment/assignmentTrainer.cy.js         |  5 ++++-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationContainer.vue b/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationContainer.vue
index 04af049c..b04fdaef 100644
--- a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationContainer.vue
+++ b/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationContainer.vue
@@ -65,7 +65,9 @@ const assignmentDetail = computed(() => {
 });
 
 const dueDate = computed(() =>
-  dayjs(assignmentDetail.value?.evaluation_deadline?.start)
+  assignmentDetail.value?.evaluation_deadline?.start
+    ? dayjs(assignmentDetail.value?.evaluation_deadline?.start)
+    : undefined
 );
 
 const inEvaluationTask = computed(
diff --git a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationIntro.vue b/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationIntro.vue
index 931fb4ba..445e2245 100644
--- a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationIntro.vue
+++ b/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationIntro.vue
@@ -11,7 +11,7 @@ const props = defineProps<{
   assignmentUser: CourseSessionUser;
   assignment: Assignment;
   assignmentCompletion: AssignmentCompletion;
-  dueDate?: Dayjs;
+  dueDate?: Dayjs | undefined;
 }>();
 
 const emit = defineEmits(["startEvaluation"]);
@@ -101,7 +101,13 @@ async function startEvaluation() {
     </p>
 
     <p class="my-4" data-cy="instruction">
-      {{ $t(text.evaluationInstruction) }}
+      {{
+        $t(text.evaluationInstruction, {
+          name: `${
+            props.assignmentUser.first_name + " " + props.assignmentUser.last_name
+          }`,
+        })
+      }}
     </p>
 
     <p v-if="props.assignment.assignment_type === 'CASEWORK'" class="my-4">
diff --git a/cypress/e2e/assignment/assignmentTrainer.cy.js b/cypress/e2e/assignment/assignmentTrainer.cy.js
index 5902ff3d..905d05c4 100644
--- a/cypress/e2e/assignment/assignmentTrainer.cy.js
+++ b/cypress/e2e/assignment/assignmentTrainer.cy.js
@@ -218,7 +218,10 @@ describe("assignmentTrainer.cy.js", () => {
 
       cy.get('[data-cy="title"]').should("contain", "Feedback");
       cy.get('[data-cy="evaluation-duedate]"').should("not.exist");
-      cy.get('[data-cy="instruction"]').should("contain", "Intro für Feedback");
+      cy.get('[data-cy="instruction"]').should(
+        "contain",
+        "Bitte unterstütze Test Student1 und gib Feedback zum Auftrag."
+      );
       cy.get('[data-cy="start-evaluation"]').click();
       cy.get('[data-cy="evaluation-task"]').should("contain", "Feedback 1 / 5");
 

From ccbeb9725fd3262ea8caa2b120fde11fb57c4459 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Mon, 29 Jan 2024 13:14:49 +0100
Subject: [PATCH 24/24] Use different verbs for different types of assignments

---
 server/vbv_lernwelt/notify/services.py        |  42 ++++-
 ...ers.py => test_assigment_notifications.py} | 171 +++++++++++++++++-
 2 files changed, 202 insertions(+), 11 deletions(-)
 rename server/vbv_lernwelt/notify/tests/{test_assigment_reminders.py => test_assigment_notifications.py} (61%)

diff --git a/server/vbv_lernwelt/notify/services.py b/server/vbv_lernwelt/notify/services.py
index 84102609..aadde5aa 100644
--- a/server/vbv_lernwelt/notify/services.py
+++ b/server/vbv_lernwelt/notify/services.py
@@ -40,11 +40,22 @@ class NotificationService:
     def send_assignment_submitted_notification(
         cls, recipient: User, sender: User, assignment_completion: AssignmentCompletion
     ):
-        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».",
-        }
+        if (
+            assignment_completion.assignment.assignment_type
+            == AssignmentType.PRAXIS_ASSIGNMENT.value
+        ):
+            texts = {
+                "de": "%(sender)s hat den Praxisauftrag «%(assignment_title)s» abgegeben.",
+                "fr": "%(sender)s a soumis la mission pratique «%(assignment_title)s».",
+                "it": "%(sender)s ha consegnato l'incarico pratico «%(assignment_title)s».",
+            }
+        # this was the default case before the praxis assignment was introduced
+        else:
+            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,
@@ -70,11 +81,22 @@ class NotificationService:
         assignment_completion: AssignmentCompletion,
         target_url: str,
     ):
-        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».",
-        }
+        if (
+            assignment_completion.assignment.assignment_type
+            == AssignmentType.PRAXIS_ASSIGNMENT.value
+        ):
+            texts = {
+                "de": "%(sender)s hat den Praxisauftrag «%(assignment_title)s» bewertet.",
+                "fr": "%(sender)s a évalué la mission pratique «%(assignment_title)s».",
+                "it": "%(sender)s ha valutato l'incarico pratico «%(assignment_title)s».",
+            }
+        # this was the default case before the praxis assignment was introduced
+        else:
+            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,
diff --git a/server/vbv_lernwelt/notify/tests/test_assigment_reminders.py b/server/vbv_lernwelt/notify/tests/test_assigment_notifications.py
similarity index 61%
rename from server/vbv_lernwelt/notify/tests/test_assigment_reminders.py
rename to server/vbv_lernwelt/notify/tests/test_assigment_notifications.py
index 7c912559..d83fb977 100644
--- a/server/vbv_lernwelt/notify/tests/test_assigment_reminders.py
+++ b/server/vbv_lernwelt/notify/tests/test_assigment_notifications.py
@@ -6,7 +6,13 @@ from django.test import TestCase
 from django.utils import timezone
 from freezegun import freeze_time
 
-from vbv_lernwelt.assignment.models import AssignmentType
+from vbv_lernwelt.assignment.models import (
+    Assignment,
+    AssignmentCompletion,
+    AssignmentCompletionStatus,
+    AssignmentType,
+)
+from vbv_lernwelt.core.admin import User
 from vbv_lernwelt.core.constants import TEST_COURSE_SESSION_BERN_ID
 from vbv_lernwelt.core.create_default_users import create_default_users
 from vbv_lernwelt.course.creators.test_course import create_test_course
@@ -24,6 +30,7 @@ from vbv_lernwelt.notify.email.reminders.assigment import (
     send_assignment_reminder_notifications,
 )
 from vbv_lernwelt.notify.models import Notification
+from vbv_lernwelt.notify.services import NotificationService
 
 EXPECTED_MEMBER_VERB = "Erinnerung: Bald ist ein Abgabetermin"
 EXPECTED_EXPERT_VERB = "Erinnerung: Bald ist ein Bewertungstermin"
@@ -40,6 +47,7 @@ ASSIGNMENT_TYPE_LEARNING_CONTENT_LOOKUP: Dict[AssignmentType, str] = {
     AssignmentType.PREP_ASSIGNMENT: "test-lehrgang-lp-circle-fahrzeug-lc-fahrzeug-mein-erstes-auto",
     AssignmentType.REFLECTION: "test-lehrgang-lp-circle-fahrzeug-lc-reflexion",
     AssignmentType.CASEWORK: "test-lehrgang-lp-circle-fahrzeug-lc-überprüfen-einer-motorfahrzeug-versicherungspolice",
+    AssignmentType.PRAXIS_ASSIGNMENT: "test-lehrgang-lp-circle-reisen-lc-mein-kundenstamm",
 }
 
 
@@ -284,3 +292,164 @@ class TestAssignmentCourseRemindersTest(TestCase):
 
         with self.assertRaises(Notification.DoesNotExist):
             Notification.objects.get(recipient__username=RECIPIENT_TRAINER)
+
+
+class TestAssignmentCourseUpdateTest(TestCase):
+    def setUp(self):
+        create_default_users()
+        create_test_course(with_sessions=True)
+
+        CourseSessionAssignment.objects.all().delete()
+        Notification.objects.all().delete()
+
+        self.student = User.objects.get(email=RECIPIENT_STUDENTS[0])
+        self.trainer = User.objects.get(email=RECIPIENT_TRAINER)
+
+    @freeze_time("2023-01-01")
+    def test_notification_title_casework_for_experts(self):
+        # GIVEN
+        casework = create_assignment(
+            assignment_type=AssignmentType.CASEWORK,
+            submission_deadline=timezone.make_aware(datetime(2022, 12, 12)),
+            evaluation_deadline=timezone.make_aware(datetime(2023, 1, 2)),
+        )
+        assignment = Assignment.objects.get(
+            slug="test-lehrgang-assignment-überprüfen-einer-motorfahrzeugs-versicherungspolice"
+        )
+
+        ac = AssignmentCompletion.objects.create(
+            completion_status=AssignmentCompletionStatus.SUBMITTED.value,
+            assignment_user=self.student,
+            assignment=assignment,
+            evaluation_passed=True,
+            course_session=casework.course_session,
+            completion_data={},
+            evaluation_max_points=10,
+            evaluation_points=10,
+            evaluation_user=self.trainer,
+        )
+
+        # WHEN
+        NotificationService.send_assignment_submitted_notification(
+            recipient=self.trainer,
+            sender=ac.assignment_user,
+            assignment_completion=ac,
+        )
+
+        # THEN
+        self.assertEqual(1, len(Notification.objects.all()))
+
+        notification = Notification.objects.get(recipient__username=RECIPIENT_TRAINER)
+        self.assertEqual("USER_INTERACTION", notification.notification_category)
+        self.assertIn("hat die geleitete Fallarbeit", notification.verb)
+
+    def test_notification_title_praxis_assignment_for_experts(self):
+        # GIVEN.
+        casework = create_assignment(
+            assignment_type=AssignmentType.PRAXIS_ASSIGNMENT,
+        )
+        assignment = Assignment.objects.get(
+            slug="test-lehrgang-assignment-mein-kundenstamm"
+        )
+
+        ac = AssignmentCompletion.objects.create(
+            completion_status=AssignmentCompletionStatus.SUBMITTED.value,
+            assignment_user=self.student,
+            assignment=assignment,
+            evaluation_passed=True,
+            course_session=casework.course_session,
+            completion_data={},
+            evaluation_max_points=10,
+            evaluation_points=10,
+            evaluation_user=self.trainer,
+        )
+
+        # WHEN
+        NotificationService.send_assignment_submitted_notification(
+            recipient=self.trainer,
+            sender=ac.assignment_user,
+            assignment_completion=ac,
+        )
+
+        # THEN
+        self.assertEqual(1, len(Notification.objects.all()))
+
+        notification = Notification.objects.get(recipient__username=RECIPIENT_TRAINER)
+        self.assertEqual("USER_INTERACTION", notification.notification_category)
+        self.assertIn("hat den Praxisauftrag", notification.verb)
+
+    @freeze_time("2023-01-01")
+    def test_notification_title_casework_for_student(self):
+        # GIVEN
+        casework = create_assignment(
+            assignment_type=AssignmentType.CASEWORK,
+            submission_deadline=timezone.make_aware(datetime(2022, 12, 12)),
+            evaluation_deadline=timezone.make_aware(datetime(2023, 1, 2)),
+        )
+        assignment = Assignment.objects.get(
+            slug="test-lehrgang-assignment-überprüfen-einer-motorfahrzeugs-versicherungspolice"
+        )
+
+        ac = AssignmentCompletion.objects.create(
+            completion_status=AssignmentCompletionStatus.EVALUATION_SUBMITTED.value,
+            assignment_user=self.student,
+            assignment=assignment,
+            evaluation_passed=True,
+            course_session=casework.course_session,
+            completion_data={},
+            evaluation_max_points=10,
+            evaluation_points=10,
+            evaluation_user=self.trainer,
+        )
+
+        # WHEN
+        NotificationService.send_assignment_evaluated_notification(
+            recipient=ac.assignment_user,
+            sender=self.trainer,
+            assignment_completion=ac,
+            target_url="/some/url",
+        )
+
+        # THEN
+        self.assertEqual(1, len(Notification.objects.all()))
+
+        notification = Notification.objects.get(recipient__username=self.student.email)
+        self.assertEqual("USER_INTERACTION", notification.notification_category)
+        self.assertIn("hat die geleitete Fallarbeit", notification.verb)
+
+    @freeze_time("2023-01-01")
+    def test_notification_title_praxis_assignment_for_student(self):
+        # GIVEN
+        casework = create_assignment(
+            assignment_type=AssignmentType.PRAXIS_ASSIGNMENT,
+        )
+        assignment = Assignment.objects.get(
+            slug="test-lehrgang-assignment-mein-kundenstamm"
+        )
+
+        ac = AssignmentCompletion.objects.create(
+            completion_status=AssignmentCompletionStatus.EVALUATION_SUBMITTED.value,
+            assignment_user=self.student,
+            assignment=assignment,
+            evaluation_passed=True,
+            course_session=casework.course_session,
+            completion_data={},
+            evaluation_max_points=10,
+            evaluation_points=10,
+            evaluation_user=self.trainer,
+        )
+
+        # WHEN
+        NotificationService.send_assignment_evaluated_notification(
+            recipient=ac.assignment_user,
+            sender=self.trainer,
+            assignment_completion=ac,
+            target_url="/some/url",
+        )
+
+        # THEN
+        self.assertEqual(1, len(Notification.objects.all()))
+
+        notification = Notification.objects.get(recipient__username=self.student.email)
+        self.assertEqual("USER_INTERACTION", notification.notification_category)
+        self.assertIn("hat den Praxisauftrag", notification.verb)