From af2b63b15fcf9ea85313d29aff20d45d3c837806 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Wed, 17 Jul 2024 18:50:22 +0200
Subject: [PATCH 01/40] =?UTF-8?q?Add=20cypress=20test=20for=20"Fremdeinsch?=
 =?UTF-8?q?=C3=A4tzung"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/dashboard/CoursePanel.vue  |  6 ++-
 .../dashboard/MentorMenteeCount.vue           |  2 +-
 .../dashboard/MentorOpenTasksCount.vue        |  2 +-
 .../components/header/AccountMenuContent.vue  |  7 ++-
 .../components/header/MainNavigationBar.vue   |  6 ++-
 .../FeedbackProviderRankCriteria.vue          |  2 +
 .../FeedbackProviderReleaseOverview.vue       |  7 ++-
 ...orSelfEvaluationFeedbackAssignmentPage.vue |  1 +
 .../SelfEvaluationRequestFeedbackPage.vue     |  1 +
 .../fremdeinschätzung/fremdeinschätzung.cy.js | 54 +++++++++++++++++++
 cypress/support/commands.js                   | 27 ++++++----
 11 files changed, 98 insertions(+), 17 deletions(-)
 create mode 100644 cypress/e2e/learning_mentor/fremdeinschätzung/fremdeinschätzung.cy.js

diff --git a/client/src/components/dashboard/CoursePanel.vue b/client/src/components/dashboard/CoursePanel.vue
index dca6810d..1724372c 100644
--- a/client/src/components/dashboard/CoursePanel.vue
+++ b/client/src/components/dashboard/CoursePanel.vue
@@ -77,7 +77,11 @@ function hasActionButton(): boolean {
 </script>
 
 <template>
-  <div v-if="courseConfig" class="mb-14 space-y-8">
+  <div
+    v-if="courseConfig"
+    class="mb-14 space-y-8"
+    :data-cy="`panel-${courseConfig.course_slug}`"
+  >
     <div class="flex flex-col space-y-8 bg-white p-6">
       <div class="border-b border-gray-300 pb-8">
         <div class="flex flex-row items-start justify-between">
diff --git a/client/src/components/dashboard/MentorMenteeCount.vue b/client/src/components/dashboard/MentorMenteeCount.vue
index 10dc86f7..d9a76479 100644
--- a/client/src/components/dashboard/MentorMenteeCount.vue
+++ b/client/src/components/dashboard/MentorMenteeCount.vue
@@ -21,7 +21,7 @@ onMounted(async () => {
   <div class="w-[325px]">
     <BaseBox
       :details-link="`/dashboard/persons?course=${props.courseId}`"
-      data-cy="dashboard.mentor.competenceSummary"
+      data-cy="dashboard.mentor.menteeCount"
     >
       <template #title>{{ $t("a.Personen") }}</template>
       <template #content>
diff --git a/client/src/components/dashboard/MentorOpenTasksCount.vue b/client/src/components/dashboard/MentorOpenTasksCount.vue
index db59374c..95014ec8 100644
--- a/client/src/components/dashboard/MentorOpenTasksCount.vue
+++ b/client/src/components/dashboard/MentorOpenTasksCount.vue
@@ -21,7 +21,7 @@ onMounted(async () => {
   <div class="w-[325px]">
     <BaseBox
       :details-link="`/course/${props.courseSlug}/learning-mentor/tasks`"
-      data-cy="dashboard.mentor.competenceSummary"
+      data-cy="dashboard.mentor.openTasksCount"
     >
       <template #title>{{ $t("Zu erledigen") }}</template>
       <template #content>
diff --git a/client/src/components/header/AccountMenuContent.vue b/client/src/components/header/AccountMenuContent.vue
index 23e3be42..a8cda83f 100644
--- a/client/src/components/header/AccountMenuContent.vue
+++ b/client/src/components/header/AccountMenuContent.vue
@@ -49,7 +49,12 @@ async function navigate(routeName: string) {
       />
     </div>
 
-    <button type="button" class="mt-6 flex items-center" @click="emit('logout')">
+    <button
+      type="button"
+      class="mt-6 flex items-center"
+      data-cy="logout-button"
+      @click="emit('logout')"
+    >
       <it-icon-logout class="inline-block" />
       <span class="ml-1">{{ $t("mainNavigation.logout") }}</span>
     </button>
diff --git a/client/src/components/header/MainNavigationBar.vue b/client/src/components/header/MainNavigationBar.vue
index ea8a002e..4e7400bd 100644
--- a/client/src/components/header/MainNavigationBar.vue
+++ b/client/src/components/header/MainNavigationBar.vue
@@ -343,7 +343,11 @@ const mentorTabTitle = computed(() =>
               </div>
 
               <div class="nav-item">
-                <div v-if="userStore.loggedIn" class="flex items-center">
+                <div
+                  v-if="userStore.loggedIn"
+                  class="flex items-center"
+                  data-cy="header-profile"
+                >
                   <Popover class="relative">
                     <PopoverButton @click="popoverClick($event)">
                       <div v-if="userStore.avatar_url">
diff --git a/client/src/components/selfEvaluationFeedback/FeedbackProviderRankCriteria.vue b/client/src/components/selfEvaluationFeedback/FeedbackProviderRankCriteria.vue
index 6374b4a0..63a32a0a 100644
--- a/client/src/components/selfEvaluationFeedback/FeedbackProviderRankCriteria.vue
+++ b/client/src/components/selfEvaluationFeedback/FeedbackProviderRankCriteria.vue
@@ -44,6 +44,7 @@ const onFailed = () => {
     <button
       class="inline-flex flex-1 items-center border-2 p-4 text-left"
       :class="currentEvaluation === 'SUCCESS' ? 'border-green-500' : 'border-gray-300'"
+      data-cy="success"
       @click="onPassed"
     >
       <it-icon-smiley-happy class="mr-4 h-16 w-16"></it-icon-smiley-happy>
@@ -54,6 +55,7 @@ const onFailed = () => {
     <button
       class="inline-flex flex-1 items-center border-2 p-4 text-left"
       :class="currentEvaluation === 'FAIL' ? 'border-orange-500' : 'border-gray-300'"
+      data-cy="fail"
       @click="onFailed"
     >
       <it-icon-smiley-thinking class="mr-4 h-16 w-16"></it-icon-smiley-thinking>
diff --git a/client/src/components/selfEvaluationFeedback/FeedbackProviderReleaseOverview.vue b/client/src/components/selfEvaluationFeedback/FeedbackProviderReleaseOverview.vue
index 96698ef3..c92dcd7c 100644
--- a/client/src/components/selfEvaluationFeedback/FeedbackProviderReleaseOverview.vue
+++ b/client/src/components/selfEvaluationFeedback/FeedbackProviderReleaseOverview.vue
@@ -24,7 +24,12 @@ const emit = defineEmits(["release"]);
           )
         }}
       </div>
-      <ItButton variant="primary" size="large" @click="emit('release')">
+      <ItButton
+        variant="primary"
+        size="large"
+        data-cy="feedback-release-button"
+        @click="emit('release')"
+      >
         {{ $t("a.Fremdeinschätzung freigeben") }}
       </ItButton>
     </template>
diff --git a/client/src/pages/learningMentor/mentor/MentorSelfEvaluationFeedbackAssignmentPage.vue b/client/src/pages/learningMentor/mentor/MentorSelfEvaluationFeedbackAssignmentPage.vue
index edc5a457..acff1ce8 100644
--- a/client/src/pages/learningMentor/mentor/MentorSelfEvaluationFeedbackAssignmentPage.vue
+++ b/client/src/pages/learningMentor/mentor/MentorSelfEvaluationFeedbackAssignmentPage.vue
@@ -51,6 +51,7 @@ const getParticipantById = (id: string): Participant | null => {
         v-for="item in selfEvaluationFeedback.completions"
         :key="item.user_id"
         class="flex flex-col items-start justify-between gap-4 border-b py-2 pl-5 pr-5 last:border-b-0 md:flex-row md:items-center md:justify-between md:gap-16"
+        :data-cy="`self-evalution-feedback-${item.user_id}`"
       >
         <!-- Left -->
         <div class="flex flex-grow flex-row items-center justify-start">
diff --git a/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluationRequestFeedbackPage.vue b/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluationRequestFeedbackPage.vue
index 615638b0..9b8407cb 100644
--- a/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluationRequestFeedbackPage.vue
+++ b/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluationRequestFeedbackPage.vue
@@ -100,6 +100,7 @@ const onRequestFeedback = async () => {
               variant="primary"
               size="large"
               :disabled="!currentSessionRequestedMentor"
+              data-cy="request-feedback-button"
               @click="onRequestFeedback"
             >
               <p v-if="!currentSessionRequestedMentor">
diff --git a/cypress/e2e/learning_mentor/fremdeinschätzung/fremdeinschätzung.cy.js b/cypress/e2e/learning_mentor/fremdeinschätzung/fremdeinschätzung.cy.js
new file mode 100644
index 00000000..0d7bb50f
--- /dev/null
+++ b/cypress/e2e/learning_mentor/fremdeinschätzung/fremdeinschätzung.cy.js
@@ -0,0 +1,54 @@
+import { login, logout } from "../../helpers";
+import { TEST_STUDENT1_VV_USER_ID } from "../../../consts";
+
+describe("fremdeinschätzung.cy.js", () => {
+  beforeEach(() => {
+    cy.manageCommand("cypress_reset --create-learning-mentor");
+  });
+
+  it("teilnehmer macht selbsteinschätzung; begleiter kann fremdeinschätzung machen", () => {
+    // teilnehmer macht selbsteinschätzung
+    login("student-vv@eiger-versicherungen.ch", "test");
+    cy.visit(
+      "/course/versicherungsvermittler-in/learn/basis/evaluate/mein-neuer-job-arbeitstechnik-soziale-medien-datenschutz-und-beratungspflichten",
+    );
+    cy.makeSelfEvaluation([true, false, true], false);
+
+    cy.get('[data-cy="dropdown-select"]').click();
+    cy.get('[data-cy="dropdown-select-option-Micheala Weber-Mentor"]').click();
+    cy.get('[data-cy="request-feedback-button"]').click();
+    cy.get('[data-cy="complete-and-continue"]').click({ force: true });
+    cy.visit("/");
+    cy.get('[data-cy="header-profile"]').click();
+    cy.get('[data-cy="logout-button"]').click();
+    cy.wait(1000);
+
+    // fremdeinschätzung vornehmen
+    login("test-mentor1@example.com", "test");
+    cy.visit("/");
+
+    cy.get(
+      '[data-cy="panel-versicherungsvermittler-in"] [data-cy="dashboard.mentor.openTasksCount"]',
+    ).should("contain", "1");
+    cy.get(
+      '[data-cy="panel-versicherungsvermittler-in"] [data-cy="dashboard.mentor.openTasksCount"] [data-cy="basebox.detailsLink"]',
+    ).click();
+
+    cy.contains("Fremdeinschätzung vornehmen").click();
+
+    // viktor vollgas auswählen
+    cy.get(
+      `[data-cy="self-evalution-feedback-${TEST_STUDENT1_VV_USER_ID}"]`,
+    ).should("contain", "Selbsteinschätzung geteilt");
+    cy.contains("Fremdeinschätzung vornehmen").click();
+    cy.makeSelfEvaluation([true, true, true], false);
+
+    cy.get('[data-cy="feedback-release-button"]').click();
+    cy.get('[data-cy="complete-and-continue"]').click({ force: true });
+
+    cy.visit("/");
+    cy.get(
+      '[data-cy="panel-versicherungsvermittler-in"] [data-cy="dashboard.mentor.openTasksCount"]',
+    ).should("contain", "0");
+  });
+});
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
index 3564a74c..b1aab6a0 100644
--- a/cypress/support/commands.js
+++ b/cypress/support/commands.js
@@ -87,13 +87,13 @@ function loadObjectJson(
   value,
   djangoModelPath,
   serializerModelPath,
-  valueAsString = false
+  valueAsString = false,
 ) {
   const djangoModel = _.last(djangoModelPath.split("."));
   const djangoModelImportPath = _.initial(djangoModelPath.split(".")).join(".");
   const serializerModel = _.last(serializerModelPath.split("."));
   const serializerModelImportPath = _.initial(
-    serializerModelPath.split(".")
+    serializerModelPath.split("."),
   ).join(".");
 
   let filterPart = `${key}=${value}`;
@@ -134,7 +134,7 @@ Cypress.Commands.add("loadAssignmentCompletion", (key, value) => {
     value,
     "vbv_lernwelt.assignment.models.AssignmentCompletion",
     "vbv_lernwelt.assignment.serializers.CypressAssignmentCompletionSerializer",
-    true
+    true,
   );
 });
 
@@ -144,7 +144,7 @@ Cypress.Commands.add("loadSecurityRequestResponseLog", (key, value) => {
     value,
     "vbv_lernwelt.core.models.SecurityRequestResponseLog",
     "vbv_lernwelt.core.serializers.CypressSecurityRequestResponseLogSerializer",
-    true
+    true,
   );
 });
 
@@ -154,7 +154,7 @@ Cypress.Commands.add("loadExternalApiRequestLog", (key, value) => {
     value,
     "vbv_lernwelt.core.models.ExternalApiRequestLog",
     "vbv_lernwelt.core.serializers.CypressExternalApiRequestLogSerializer",
-    true
+    true,
   );
 });
 
@@ -164,7 +164,7 @@ Cypress.Commands.add("loadFeedbackResponse", (key, value) => {
     value,
     "vbv_lernwelt.feedback.models.FeedbackResponse",
     "vbv_lernwelt.feedback.serializers.CypressFeedbackResponseSerializer",
-    true
+    true,
   );
 });
 
@@ -174,7 +174,7 @@ Cypress.Commands.add("loadCheckoutInformation", (key, value) => {
     value,
     "vbv_lernwelt.shop.models.CheckoutInformation",
     "vbv_lernwelt.shop.serializers.CypressCheckoutInformationSerializer",
-    true
+    true,
   );
 });
 
@@ -189,7 +189,7 @@ Cypress.Commands.add("loadUser", (key, value) => {
 });
 
 
-Cypress.Commands.add("makeSelfEvaluation", (answers) => {
+Cypress.Commands.add("makeSelfEvaluation", (answers, withCompletion = true) => {
   for (let i = 0; i < answers.length; i++) {
     const answer = answers[i];
     if (answer) {
@@ -197,10 +197,15 @@ Cypress.Commands.add("makeSelfEvaluation", (answers) => {
     } else {
       cy.get('[data-cy="fail"]').click();
     }
-    if (i < answers.length - 1) {
-      cy.get('[data-cy="next-step"]').click({ force: true });
+
+    if (withCompletion) {
+      if (i < answers.length - 1) {
+        cy.get('[data-cy="next-step"]').click({ force: true });
+      } else {
+        cy.get('[data-cy="complete-and-continue"]').click({ force: true });
+      }
     } else {
-      cy.get('[data-cy="complete-and-continue"]').click({ force: true });
+      cy.get('[data-cy="next-step"]').click({ force: true });
     }
   }
 });

From f1507512190c4faeb136350cbd68758a7ec1fecf Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Wed, 17 Jul 2024 19:24:14 +0200
Subject: [PATCH 02/40] Add cypress test for "Feedback Praxisauftrag"

---
 client/src/components/ui/ItTextarea.vue       |   2 +-
 .../mentor/MentorPraxisAssignmentPage.vue     |   1 +
 .../README.md                                 |   0
 .../constants.js                              |   0
 .../mentorTasks}/fremdeinschätzung.cy.js      |   0
 .../mentorTasks/praxisauftrag.cy.js           | 111 ++++++++++++++++++
 .../overview/memberOnly.cy.js                 |   0
 .../overview/mentorAndMember.cy.js            |   0
 .../overview/mentorOnly.cy.js                 |   0
 9 files changed, 113 insertions(+), 1 deletion(-)
 rename cypress/e2e/{learning_mentor => learningMentor}/README.md (100%)
 rename cypress/e2e/{learning_mentor => learningMentor}/constants.js (100%)
 rename cypress/e2e/{learning_mentor/fremdeinschätzung => learningMentor/mentorTasks}/fremdeinschätzung.cy.js (100%)
 create mode 100644 cypress/e2e/learningMentor/mentorTasks/praxisauftrag.cy.js
 rename cypress/e2e/{learning_mentor => learningMentor}/overview/memberOnly.cy.js (100%)
 rename cypress/e2e/{learning_mentor => learningMentor}/overview/mentorAndMember.cy.js (100%)
 rename cypress/e2e/{learning_mentor => learningMentor}/overview/mentorOnly.cy.js (100%)

diff --git a/client/src/components/ui/ItTextarea.vue b/client/src/components/ui/ItTextarea.vue
index a296c6b5..53ddd792 100644
--- a/client/src/components/ui/ItTextarea.vue
+++ b/client/src/components/ui/ItTextarea.vue
@@ -23,7 +23,7 @@ export interface Props {
 
 withDefaults(defineProps<Props>(), {
   label: undefined,
-  cyKey: "",
+  cyKey: "default",
   placeholder: "",
 });
 const emit = defineEmits(["update:modelValue"]);
diff --git a/client/src/pages/learningMentor/mentor/MentorPraxisAssignmentPage.vue b/client/src/pages/learningMentor/mentor/MentorPraxisAssignmentPage.vue
index 31bdf905..2203454f 100644
--- a/client/src/pages/learningMentor/mentor/MentorPraxisAssignmentPage.vue
+++ b/client/src/pages/learningMentor/mentor/MentorPraxisAssignmentPage.vue
@@ -47,6 +47,7 @@ onMounted(() => {
         v-for="item in praxisAssignment.completions"
         :key="item.user_id"
         class="flex flex-col items-start justify-between gap-4 border-b py-2 pl-5 pr-5 last:border-b-0 md:flex-row md:items-center md:justify-between md:gap-16"
+        :data-cy="`praxis-assignment-feedback-${item.user_id}`"
       >
         <!-- Left -->
         <div class="flex flex-grow flex-row items-center justify-start">
diff --git a/cypress/e2e/learning_mentor/README.md b/cypress/e2e/learningMentor/README.md
similarity index 100%
rename from cypress/e2e/learning_mentor/README.md
rename to cypress/e2e/learningMentor/README.md
diff --git a/cypress/e2e/learning_mentor/constants.js b/cypress/e2e/learningMentor/constants.js
similarity index 100%
rename from cypress/e2e/learning_mentor/constants.js
rename to cypress/e2e/learningMentor/constants.js
diff --git a/cypress/e2e/learning_mentor/fremdeinschätzung/fremdeinschätzung.cy.js b/cypress/e2e/learningMentor/mentorTasks/fremdeinschätzung.cy.js
similarity index 100%
rename from cypress/e2e/learning_mentor/fremdeinschätzung/fremdeinschätzung.cy.js
rename to cypress/e2e/learningMentor/mentorTasks/fremdeinschätzung.cy.js
diff --git a/cypress/e2e/learningMentor/mentorTasks/praxisauftrag.cy.js b/cypress/e2e/learningMentor/mentorTasks/praxisauftrag.cy.js
new file mode 100644
index 00000000..ec6fcb1c
--- /dev/null
+++ b/cypress/e2e/learningMentor/mentorTasks/praxisauftrag.cy.js
@@ -0,0 +1,111 @@
+import { login, logout } from "../../helpers";
+import { TEST_STUDENT1_VV_USER_ID } from "../../../consts";
+
+describe("praxisauftrag.cy.js", () => {
+  beforeEach(() => {
+    cy.manageCommand("cypress_reset --create-learning-mentor");
+  });
+
+  it("Teilnehmer macht Praxisauftrag; Begleiter kann Feedback geben", () => {
+    // teilnehmer macht selbsteinschätzung
+    login("student-vv@eiger-versicherungen.ch", "test");
+    cy.visit(
+      "/course/versicherungsvermittler-in/learn/gewinnen/mein-kundenstamm",
+    );
+
+    cy.learningContentMultiLayoutNextStep();
+    cy.get('[data-cy="it-textarea-user-text-input-1"]')
+      .clear()
+      .type("Hallo Teilaufgabe 1");
+    // wait because of input debounce
+    cy.wait(550);
+    cy.learningContentMultiLayoutNextStep();
+
+    cy.get('[data-cy="it-textarea-user-text-input-1"]')
+      .clear()
+      .type("Hallo Teilaufgabe 2.1");
+    cy.wait(550);
+    cy.learningContentMultiLayoutNextStep();
+
+    cy.get('[data-cy="it-textarea-user-text-input-1"]')
+      .clear()
+      .type("Hallo Teilaufgabe 3.1");
+    // wait because of input debounce
+    cy.wait(550);
+    cy.learningContentMultiLayoutNextStep();
+
+    cy.get('[data-cy="it-textarea-user-text-input-0"]')
+      .clear()
+      .type("Hallo Teilaufgabe 4.1");
+    // wait because of input debounce
+    cy.wait(550);
+    cy.learningContentMultiLayoutNextStep();
+
+    cy.get('[data-cy="it-textarea-user-text-input-0"]')
+      .clear()
+      .type("Hallo Teilaufgabe 5.1");
+    // wait because of input debounce
+    cy.wait(550);
+    cy.learningContentMultiLayoutNextStep();
+
+    cy.get('[data-cy="confirm-submit-person"]').click();
+    cy.get('[data-cy="select-learning-mentor"]').select(
+      "Micheala Weber-Mentor",
+    );
+    cy.get('[data-cy="submit-assignment"]').click();
+
+    cy.visit("/");
+    cy.get('[data-cy="header-profile"]').click();
+    cy.get('[data-cy="logout-button"]').click();
+    cy.wait(1000);
+
+    // mentor feedback geben
+    login("test-mentor1@example.com", "test");
+    cy.visit("/");
+
+    cy.get(
+      '[data-cy="panel-versicherungsvermittler-in"] [data-cy="dashboard.mentor.openTasksCount"]',
+    ).should("contain", "1");
+    cy.get(
+      '[data-cy="panel-versicherungsvermittler-in"] [data-cy="dashboard.mentor.openTasksCount"] [data-cy="basebox.detailsLink"]',
+    ).click();
+
+    cy.contains("Feedback geben").click();
+
+    // viktor vollgas auswählen
+    cy.get(
+      `[data-cy="praxis-assignment-feedback-${TEST_STUDENT1_VV_USER_ID}"]`,
+    ).should("contain", "Ergebnisse abgegeben");
+    cy.contains("Feedback geben").click();
+
+    cy.get('[data-cy="start-evaluation"]').click();
+    cy.get('[data-cy="it-textarea-default"]').clear().type("Hallo Feedback 1");
+    cy.wait(550);
+    cy.get('[data-cy="next-step"]').click();
+
+    cy.get('[data-cy="it-textarea-default"]').clear().type("Hallo Feedback 2");
+    cy.wait(550);
+    cy.get('[data-cy="next-step"]').click();
+
+    cy.get('[data-cy="it-textarea-default"]').clear().type("Hallo Feedback 3");
+    cy.wait(550);
+    cy.get('[data-cy="next-step"]').click();
+
+    cy.get('[data-cy="it-textarea-default"]').clear().type("Hallo Feedback 4");
+    cy.wait(550);
+    cy.get('[data-cy="next-step"]').click();
+
+    cy.get('[data-cy="it-textarea-default"]').clear().type("Hallo Feedback 5");
+    cy.wait(550);
+    cy.get('[data-cy="next-step"]').click();
+
+    cy.get('[data-cy="submit-evaluation"]').click();
+    cy.get('[data-cy="next-step"]').click();
+
+    cy.visit("/");
+
+    cy.get(
+      '[data-cy="panel-versicherungsvermittler-in"] [data-cy="dashboard.mentor.openTasksCount"]',
+    ).should("contain", "0");
+  });
+});
diff --git a/cypress/e2e/learning_mentor/overview/memberOnly.cy.js b/cypress/e2e/learningMentor/overview/memberOnly.cy.js
similarity index 100%
rename from cypress/e2e/learning_mentor/overview/memberOnly.cy.js
rename to cypress/e2e/learningMentor/overview/memberOnly.cy.js
diff --git a/cypress/e2e/learning_mentor/overview/mentorAndMember.cy.js b/cypress/e2e/learningMentor/overview/mentorAndMember.cy.js
similarity index 100%
rename from cypress/e2e/learning_mentor/overview/mentorAndMember.cy.js
rename to cypress/e2e/learningMentor/overview/mentorAndMember.cy.js
diff --git a/cypress/e2e/learning_mentor/overview/mentorOnly.cy.js b/cypress/e2e/learningMentor/overview/mentorOnly.cy.js
similarity index 100%
rename from cypress/e2e/learning_mentor/overview/mentorOnly.cy.js
rename to cypress/e2e/learningMentor/overview/mentorOnly.cy.js

From 3f02fd254a5a61402fb1057c67c0c2584a7ff862 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Thu, 18 Jul 2024 09:56:44 +0200
Subject: [PATCH 03/40] Add cypress test for mentor invitation

---
 .../components/learningMentor/MyMentors.vue   |    4 +-
 .../learningMentor/InvitationAcceptPage.vue   |   52 +-
 client/src/pages/onboarding/AccountSetup.vue  |    2 +-
 client/vite.config.ts                         |    3 +-
 cypress.config.js => cypress.config.mjs       |    9 +-
 .../e2e/learningMentor/mentorInvitation.cy.js |   57 +
 cypress/plugins/index.js                      |   22 -
 cypress/plugins/index.mjs                     |    9 +
 cypress/plugins/tasks.mjs                     |   18 +
 package-lock.json                             | 1061 +++++++++++++----
 package.json                                  |    5 +-
 .../core/management/commands/cypress_reset.py |    3 +-
 server/vbv_lernwelt/learning_mentor/admin.py  |    2 +-
 .../0007_mentorinvitation_target_url.py       |   17 +
 server/vbv_lernwelt/learning_mentor/models.py |    1 +
 server/vbv_lernwelt/learning_mentor/views.py  |    2 +
 16 files changed, 999 insertions(+), 268 deletions(-)
 rename cypress.config.js => cypress.config.mjs (68%)
 create mode 100644 cypress/e2e/learningMentor/mentorInvitation.cy.js
 delete mode 100644 cypress/plugins/index.js
 create mode 100644 cypress/plugins/index.mjs
 create mode 100644 cypress/plugins/tasks.mjs
 create mode 100644 server/vbv_lernwelt/learning_mentor/migrations/0007_mentorinvitation_target_url.py

diff --git a/client/src/components/learningMentor/MyMentors.vue b/client/src/components/learningMentor/MyMentors.vue
index 3a9f58b8..5988653b 100644
--- a/client/src/components/learningMentor/MyMentors.vue
+++ b/client/src/components/learningMentor/MyMentors.vue
@@ -104,12 +104,13 @@ const noLearningMentors = computed(() =>
       </div>
     </div>
     <div class="bg-white px-4 py-2">
-      <main>
+      <main data-cy="my-mentors-list">
         <div>
           <div
             v-for="invitation in invitations"
             :key="invitation.id"
             class="flex flex-col justify-between gap-4 border-b py-2 last:border-b-0 md:flex-row md:gap-16"
+            :data-cy="`mentor-${invitation.email}`"
           >
             <div class="flex flex-col md:flex-grow md:flex-row">
               <div class="flex items-center space-x-2">
@@ -178,6 +179,7 @@ const noLearningMentors = computed(() =>
           <button
             :disabled="!validEmail"
             class="btn-primary mt-8"
+            data-cy="invite-mentor-button"
             @click="inviteMentor()"
           >
             {{ $t("a.Einladung abschicken") }}
diff --git a/client/src/pages/learningMentor/InvitationAcceptPage.vue b/client/src/pages/learningMentor/InvitationAcceptPage.vue
index e92481a1..8604e24a 100644
--- a/client/src/pages/learningMentor/InvitationAcceptPage.vue
+++ b/client/src/pages/learningMentor/InvitationAcceptPage.vue
@@ -1,25 +1,36 @@
 <script setup lang="ts">
-import { useCSRFFetch } from "@/fetchHelpers";
+import { itPost } from "@/fetchHelpers";
 import { getLearningMentorUrl } from "@/utils/utils";
+import { onMounted, ref } from "vue";
 
 const props = defineProps<{
   courseId: string;
   invitationId: string;
 }>();
 
-const { data, error } = useCSRFFetch(
-  `/api/mentor/${props.courseId}/invitations/accept`,
-  {
-    onFetchError(ctx) {
-      ctx.error = ctx.data;
-      return ctx;
-    },
-  }
-)
-  .post({
+const loaded = ref<boolean>(false);
+const responseData = ref<any>(null);
+const hasError = ref<boolean>(false);
+const errorMessage = ref<string>("");
+
+onMounted(async () => {
+  const url = `/api/mentor/${props.courseId}/invitations/accept`;
+  itPost(url, {
     invitation_id: props.invitationId,
   })
-  .json();
+    .then((data) => {
+      responseData.value = data;
+    })
+    .catch((error) => {
+      hasError.value = true;
+      if (error.toString().includes("404")) {
+        errorMessage.value = "Einladung bereits akzeptiert";
+      }
+    })
+    .finally(() => {
+      loaded.value = true;
+    });
+});
 </script>
 
 <template>
@@ -28,9 +39,9 @@ const { data, error } = useCSRFFetch(
       <header class="mb-8 mt-12">
         <h1 class="mb-8">{{ $t("a.Einladung") }}</h1>
       </header>
-      <main>
+      <main v-if="loaded">
         <div class="bg-white p-6">
-          <template v-if="error">
+          <template v-if="hasError">
             {{
               $t(
                 "a.Die Einladung konnte nicht akzeptiert werden. Bitte melde dich beim Support."
@@ -50,8 +61,8 @@ const { data, error } = useCSRFFetch(
                 </a>
               </li>
             </ul>
-            <div v-if="error.message" class="my-4">
-              {{ $t("a.Fehlermeldung") }}: {{ error.message }}
+            <div v-if="errorMessage" class="my-4">
+              {{ $t("a.Fehlermeldung") }}: {{ errorMessage }}
             </div>
           </template>
           <template v-else>
@@ -61,11 +72,16 @@ const { data, error } = useCSRFFetch(
               "
             >
               <template #name>
-                <b>{{ data.user.first_name }} {{ data.user.last_name }}</b>
+                <b>
+                  {{ responseData.user.first_name }} {{ responseData.user.last_name }}
+                </b>
               </template>
             </i18next>
             <div class="mt-4">
-              <a class="underline" :href="getLearningMentorUrl(data.course_slug)">
+              <a
+                class="underline"
+                :href="getLearningMentorUrl(responseData.course_slug)"
+              >
                 {{ $t("a.Übersicht anschauen") }}
               </a>
             </div>
diff --git a/client/src/pages/onboarding/AccountSetup.vue b/client/src/pages/onboarding/AccountSetup.vue
index 5a05c313..2f7a69b7 100644
--- a/client/src/pages/onboarding/AccountSetup.vue
+++ b/client/src/pages/onboarding/AccountSetup.vue
@@ -46,7 +46,7 @@ const signUpURL = computed(() => getSignUpURL(constructParams()));
       </a>
 
       <p class="mb-4 mt-12">{{ $t("a.Hast du schon ein Konto?") }}</p>
-      <a :href="loginURL" class="btn-secondary">
+      <a :href="loginURL" class="btn-secondary" data-cy="login-button">
         {{ $t("a.Anmelden") }}
       </a>
     </template>
diff --git a/client/vite.config.ts b/client/vite.config.ts
index 2f4cc761..5dc6e119 100644
--- a/client/vite.config.ts
+++ b/client/vite.config.ts
@@ -23,8 +23,9 @@ export default defineConfig(({ mode }) => {
     ],
     define: {},
     server: {
+      host: true,
       port: 5173,
-      hmr: { port: 5173 },
+      strictPort: true,
     },
     resolve: {
       alias: {
diff --git a/cypress.config.js b/cypress.config.mjs
similarity index 68%
rename from cypress.config.js
rename to cypress.config.mjs
index 0f911cb1..cf7c3dcc 100644
--- a/cypress.config.js
+++ b/cypress.config.mjs
@@ -1,8 +1,10 @@
-const { defineConfig } = require("cypress");
-const { cloudPlugin } = require("cypress-cloud/plugin");
+import { defineConfig } from "cypress";
+import { cloudPlugin } from "cypress-cloud/plugin";
+import tasks from "./cypress/plugins/index.mjs";
 
-module.exports = defineConfig({
+export default defineConfig({
   projectId: "RVEZS1",
+  chromeWebSecurity: false,
   watchForFileChanges: false,
   video: true,
   viewportWidth: 1280,
@@ -19,6 +21,7 @@ module.exports = defineConfig({
   e2e: {
     // experimentalSessionAndOrigin: true,
     setupNodeEvents(on, config) {
+      tasks(on, config);
       return cloudPlugin(on, config);
     },
     baseUrl: "http://localhost:8001",
diff --git a/cypress/e2e/learningMentor/mentorInvitation.cy.js b/cypress/e2e/learningMentor/mentorInvitation.cy.js
new file mode 100644
index 00000000..52e0c59e
--- /dev/null
+++ b/cypress/e2e/learningMentor/mentorInvitation.cy.js
@@ -0,0 +1,57 @@
+import { login } from "../helpers";
+import { TEST_STUDENT1_VV_USER_ID } from "../../consts";
+
+describe("mentorInvitation.cy.js", () => {
+  beforeEach(() => {
+    cy.manageCommand("cypress_reset");
+  });
+
+  it("Teilnehmer macht lädt Lernbegleitung ein; Lernbegleitung akzeptiert Einladung", () => {
+    login("student-vv@eiger-versicherungen.ch", "test");
+    cy.visit("/course/versicherungsvermittler-in/learn");
+    cy.get("[data-cy=navigation-learning-mentor-link]").click();
+    cy.get('[data-cy="lm-invite-mentor-button"]').click();
+    cy.get("#mentor-email").type("empty@example.com");
+    cy.get('[data-cy="invite-mentor-button"]').click();
+
+    cy.get('[data-cy="mentor-empty@example.com"]').should(
+      "contain",
+      "Die Einladung wurde noch nicht angenommen.",
+    );
+
+    cy.task(
+      "runSql",
+      "select target_url from learning_mentor_mentorinvitation where email = 'empty@example.com'",
+    ).then((res) => {
+      const invitationUrl = res.rows[0].target_url;
+      console.log(invitationUrl);
+
+      cy.visit("/");
+      cy.get('[data-cy="header-profile"]').click();
+      cy.get('[data-cy="logout-button"]').click();
+      cy.wait(1000);
+
+      // try to accept invitation
+      cy.visit(invitationUrl);
+      cy.get('[data-cy="login-button"]').click();
+      cy.get("#username").type("empty@example.com");
+      cy.get("#password").type("test");
+      cy.get('[data-cy="login-button"]').click();
+
+      cy.get(".bg-white").should(
+        "contain",
+        "Du hast die Einladung von Viktor Vollgas erfolgreich akzeptiert.",
+      );
+      cy.contains("Übersicht anschauen").click();
+
+      cy.get('[data-cy="lm-my-mentees"]').should(
+        "contain",
+        "Personen, die du begleitest",
+      );
+      cy.get('[data-cy="lm-my-mentees"]').should(
+        "contain",
+        "student-vv@eiger-versicherungen.ch",
+      );
+    });
+  });
+});
diff --git a/cypress/plugins/index.js b/cypress/plugins/index.js
deleted file mode 100644
index 59b2bab6..00000000
--- a/cypress/plugins/index.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/// <reference types="cypress" />
-// ***********************************************************
-// This example plugins/index.js can be used to load plugins
-//
-// You can change the location of this file or turn off loading
-// the plugins file with the 'pluginsFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/plugins-guide
-// ***********************************************************
-
-// This function is called when a project is opened or re-opened (e.g. due to
-// the project's config changing)
-
-/**
- * @type {Cypress.PluginConfig}
- */
-// eslint-disable-next-line no-unused-vars
-module.exports = (on, config) => {
-  // `on` is used to hook into various events Cypress emits
-  // `config` is the resolved Cypress config
-}
diff --git a/cypress/plugins/index.mjs b/cypress/plugins/index.mjs
new file mode 100644
index 00000000..8f468872
--- /dev/null
+++ b/cypress/plugins/index.mjs
@@ -0,0 +1,9 @@
+import { runSql } from "./tasks.mjs";
+
+export default (on, config) => {
+  on("task", {
+    runSql,
+  });
+
+  return config;
+};
diff --git a/cypress/plugins/tasks.mjs b/cypress/plugins/tasks.mjs
new file mode 100644
index 00000000..dd872338
--- /dev/null
+++ b/cypress/plugins/tasks.mjs
@@ -0,0 +1,18 @@
+import pg from "pg";
+
+const cypressDatabaseUrl = process.env?.CYPRESS_DATABASE_URL || "postgres://postgres@localhost:5432/vbv_lernwelt_cypress";
+
+if(!cypressDatabaseUrl) {
+  throw new Error(
+    "CYPRESS_DATABASE_URL must be set"
+  );
+}
+
+export async function runSql(sqlString) {
+  // I could not make postgres.js make work, so I use pg directly
+  const client = new pg.Client(cypressDatabaseUrl);
+  await client.connect();
+  const res = await client.query(sqlString);
+  await client.end();
+  return res;
+}
diff --git a/package-lock.json b/package-lock.json
index e60640a6..7cf0350a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,8 +8,9 @@
       "name": "vbv_lernwelt_cypress",
       "version": "1.0.0",
       "devDependencies": {
-        "cypress": "^12.15.0",
-        "cypress-cloud": "^1.7.4"
+        "cypress": "^12.17.4",
+        "cypress-cloud": "^1.10.2",
+        "pg": "^8.12.0"
       }
     },
     "node_modules/@babel/runtime": {
@@ -34,15 +35,15 @@
         "node": ">=0.1.90"
       }
     },
-    "node_modules/@cypress/commit-info": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@cypress/commit-info/-/commit-info-2.2.0.tgz",
-      "integrity": "sha512-A7CYS0Iqp/u52JTnSWlDFjWMKx7rIfd+mk0Fdksrcs4Wdf5HXPsoZO475VJ+xL7LPhJrjKhgyl/TPKO3worZyQ==",
+    "node_modules/@currents/commit-info": {
+      "version": "1.0.1-beta.0",
+      "resolved": "https://registry.npmjs.org/@currents/commit-info/-/commit-info-1.0.1-beta.0.tgz",
+      "integrity": "sha512-gkn8E3UC+F4/fCla7QAGMGgGPzxZUL9bU9+4I+KZf9PtCU3DdQCdy7a+er2eg4ewfUzZ2Ic1HcfnHuPkuLPKIw==",
       "dev": true,
       "dependencies": {
         "bluebird": "3.5.5",
         "check-more-types": "2.24.0",
-        "debug": "4.1.1",
+        "debug": "4.3.4",
         "execa": "1.0.0",
         "lazy-ass": "1.6.0",
         "ramda": "0.26.1"
@@ -51,13 +52,13 @@
         "node": ">=6"
       }
     },
-    "node_modules/@cypress/commit-info/node_modules/bluebird": {
+    "node_modules/@currents/commit-info/node_modules/bluebird": {
       "version": "3.5.5",
       "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz",
       "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==",
       "dev": true
     },
-    "node_modules/@cypress/commit-info/node_modules/cross-spawn": {
+    "node_modules/@currents/commit-info/node_modules/cross-spawn": {
       "version": "6.0.5",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
       "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
@@ -73,17 +74,7 @@
         "node": ">=4.8"
       }
     },
-    "node_modules/@cypress/commit-info/node_modules/debug": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-      "deprecated": "Debug versions >=3.2.0 <3.2.7 || >=4 <4.3.1 have a low-severity ReDos regression when used in a Node.js environment. It is recommended you upgrade to 3.2.7 or 4.3.1. (https://github.com/visionmedia/debug/issues/797)",
-      "dev": true,
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/@cypress/commit-info/node_modules/execa": {
+    "node_modules/@currents/commit-info/node_modules/execa": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
       "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
@@ -101,7 +92,7 @@
         "node": ">=6"
       }
     },
-    "node_modules/@cypress/commit-info/node_modules/get-stream": {
+    "node_modules/@currents/commit-info/node_modules/get-stream": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
       "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
@@ -113,7 +104,7 @@
         "node": ">=6"
       }
     },
-    "node_modules/@cypress/commit-info/node_modules/is-stream": {
+    "node_modules/@currents/commit-info/node_modules/is-stream": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
       "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
@@ -122,7 +113,7 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/@cypress/commit-info/node_modules/npm-run-path": {
+    "node_modules/@currents/commit-info/node_modules/npm-run-path": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
       "integrity": "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==",
@@ -134,7 +125,7 @@
         "node": ">=4"
       }
     },
-    "node_modules/@cypress/commit-info/node_modules/path-key": {
+    "node_modules/@currents/commit-info/node_modules/path-key": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
       "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
@@ -143,16 +134,16 @@
         "node": ">=4"
       }
     },
-    "node_modules/@cypress/commit-info/node_modules/semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+    "node_modules/@currents/commit-info/node_modules/semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
       "dev": true,
       "bin": {
         "semver": "bin/semver"
       }
     },
-    "node_modules/@cypress/commit-info/node_modules/shebang-command": {
+    "node_modules/@currents/commit-info/node_modules/shebang-command": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
       "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
@@ -164,7 +155,7 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/@cypress/commit-info/node_modules/shebang-regex": {
+    "node_modules/@currents/commit-info/node_modules/shebang-regex": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
       "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
@@ -173,7 +164,7 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/@cypress/commit-info/node_modules/which": {
+    "node_modules/@currents/commit-info/node_modules/which": {
       "version": "1.3.1",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
       "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
@@ -186,9 +177,9 @@
       }
     },
     "node_modules/@cypress/request": {
-      "version": "2.88.11",
-      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.11.tgz",
-      "integrity": "sha512-M83/wfQ1EkspjkE2lNWNV5ui2Cv7UCv1swW1DqljahbzLVWltcsexQh8jYtuS/vzFXP+HySntGM83ZXA9fn17w==",
+      "version": "2.88.12",
+      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.12.tgz",
+      "integrity": "sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA==",
       "dev": true,
       "dependencies": {
         "aws-sign2": "~0.7.0",
@@ -206,7 +197,7 @@
         "performance-now": "^2.1.0",
         "qs": "~6.10.3",
         "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.5.0",
+        "tough-cookie": "^4.1.3",
         "tunnel-agent": "^0.6.0",
         "uuid": "^8.3.2"
       },
@@ -269,9 +260,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "14.18.46",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.46.tgz",
-      "integrity": "sha512-n4yVT5FuY5NCcGHCosQSGvvCT74HhowymPN2OEcsHPw6U1NuxV9dvxWbrM2dnBukWjdMYzig1WfIkWdTTQJqng==",
+      "version": "16.18.102",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.102.tgz",
+      "integrity": "sha512-eSe2YwGCcRjqPidxfm20IAq02krERWcIIJW4FNPkU0zQLbc4L9pvhsmB0p6UJecjEf0j/E2ERHsKq7madvthKw==",
       "dev": true
     },
     "node_modules/@types/sinonjs__fake-timers": {
@@ -478,9 +469,9 @@
       }
     },
     "node_modules/aws4": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz",
-      "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==",
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.13.0.tgz",
+      "integrity": "sha512-3AungXC4I8kKsS9PuS4JH2nc+0bVY/mjgrephHTIi8fpEeGsTHBUJeosp0Wc1myYMElmD0B3Oc4XL/HVJ4PV2g==",
       "dev": true
     },
     "node_modules/axios": {
@@ -642,13 +633,19 @@
       }
     },
     "node_modules/call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
       "dev": true,
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -872,15 +869,15 @@
       }
     },
     "node_modules/cypress": {
-      "version": "12.15.0",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.15.0.tgz",
-      "integrity": "sha512-FqGbxsH+QgjStuTO9onXMIeF44eOrgVwPvlcvuzLIaePQMkl72YgBvpuHlBGRcrw3Q4SvqKfajN8iV5XWShAiQ==",
+      "version": "12.17.4",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.17.4.tgz",
+      "integrity": "sha512-gAN8Pmns9MA5eCDFSDJXWKUpaL3IDd89N9TtIupjYnzLSmlpVr+ZR+vb4U/qaMp+lB6tBvAmt7504c3Z4RU5KQ==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
-        "@cypress/request": "^2.88.10",
+        "@cypress/request": "2.88.12",
         "@cypress/xvfb": "^1.2.4",
-        "@types/node": "^14.14.31",
+        "@types/node": "^16.18.39",
         "@types/sinonjs__fake-timers": "8.1.1",
         "@types/sizzle": "^2.3.2",
         "arch": "^2.2.0",
@@ -913,9 +910,10 @@
         "minimist": "^1.2.8",
         "ospath": "^1.2.2",
         "pretty-bytes": "^5.6.0",
+        "process": "^0.11.10",
         "proxy-from-env": "1.0.0",
         "request-progress": "^3.0.0",
-        "semver": "^7.3.2",
+        "semver": "^7.5.3",
         "supports-color": "^8.1.1",
         "tmp": "~0.2.1",
         "untildify": "^4.0.0",
@@ -929,12 +927,12 @@
       }
     },
     "node_modules/cypress-cloud": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/cypress-cloud/-/cypress-cloud-1.7.4.tgz",
-      "integrity": "sha512-YnJEJLwTSEnIDnctKQg5v7g1caPxvzb0EBowwYI550KNNQyOOaVpHZ5zxjoJyT3BPZDXtnhti9h7Drv549FtTg==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/cypress-cloud/-/cypress-cloud-1.10.2.tgz",
+      "integrity": "sha512-KR0HCtmAncMO/duLQ0eK+Aq34DSnnuWlsKCW83tPzz2boNGJdrqcLzC2xHNJeUxq8TH/vva7LI4TvZBkPeZa3Q==",
       "dev": true,
       "dependencies": {
-        "@cypress/commit-info": "^2.2.0",
+        "@currents/commit-info": "1.0.1-beta.0",
         "axios": "^1.2.0",
         "axios-retry": "^3.4.0",
         "bluebird": "^3.7.2",
@@ -946,22 +944,23 @@
         "execa": "^5.1.1",
         "getos": "^3.2.1",
         "globby": "^11.1.0",
+        "is-absolute": "^1.0.0",
+        "lil-http-terminator": "^1.2.3",
         "lodash": "^4.17.21",
         "nanoid": "^3.3.4",
+        "plur": "^4.0.0",
         "pretty-ms": "^7.0.1",
         "source-map-support": "^0.5.21",
         "table": "^6.8.1",
         "tmp-promise": "^3.0.3",
-        "ws": "^8.12.1"
+        "ts-pattern": "^4.3.0",
+        "ws": "^8.13.0"
       },
       "bin": {
         "cypress-cloud": "bin/cli.js"
       },
       "engines": {
         "node": ">=14.7.0"
-      },
-      "peerDependencies": {
-        "cypress": ">=10.0.0"
       }
     },
     "node_modules/cypress-cloud/node_modules/commander": {
@@ -1058,6 +1057,23 @@
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
       "dev": true
     },
+    "node_modules/define-data-property": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+      "dev": true,
+      "dependencies": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -1116,6 +1132,27 @@
         "node": ">=8.6"
       }
     },
+    "node_modules/es-define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.2.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
@@ -1392,20 +1429,28 @@
       "dev": true
     },
     "node_modules/function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz",
-      "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
       "dev": true,
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.3"
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -1511,24 +1556,24 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/gopd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/graceful-fs": {
       "version": "4.2.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
       "dev": true
     },
-    "node_modules/has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "dependencies": {
-        "function-bind": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
     "node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -1538,6 +1583,30 @@
         "node": ">=8"
       }
     },
+    "node_modules/has-property-descriptors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+      "dev": true,
+      "dependencies": {
+        "es-define-property": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-proto": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
+      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/has-symbols": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
@@ -1550,6 +1619,18 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/http-signature": {
       "version": "1.3.6",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.3.6.tgz",
@@ -1636,6 +1717,28 @@
         "node": ">=10"
       }
     },
+    "node_modules/irregular-plurals": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-3.5.0.tgz",
+      "integrity": "sha512-1ANGLZ+Nkv1ptFb2pa8oG8Lem4krflKuX/gINiHJHjJUKaJHk/SXk5x6K3J+39/p0h1RQ2saROclJJ+QLvETCQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-absolute": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
+      "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
+      "dev": true,
+      "dependencies": {
+        "is-relative": "^1.0.0",
+        "is-windows": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/is-ci": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz",
@@ -1712,6 +1815,18 @@
         "node": ">=8"
       }
     },
+    "node_modules/is-relative": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
+      "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
+      "dev": true,
+      "dependencies": {
+        "is-unc-path": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/is-retry-allowed": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-2.2.0.tgz",
@@ -1742,6 +1857,18 @@
       "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
       "dev": true
     },
+    "node_modules/is-unc-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
+      "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
+      "dev": true,
+      "dependencies": {
+        "unc-path-regex": "^0.1.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/is-unicode-supported": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
@@ -1754,6 +1881,15 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
@@ -1851,6 +1987,15 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/lil-http-terminator": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/lil-http-terminator/-/lil-http-terminator-1.2.3.tgz",
+      "integrity": "sha512-vQcHSwAFq/kTR2cG6peOVS7SjgksGgSPeH0G2lkw+buue33thE/FCHdn10wJXXshc5RswFy0Iaz48qA2Busw5Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/listr2": {
       "version": "3.14.0",
       "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.14.0.tgz",
@@ -1961,18 +2106,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/merge-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
@@ -2157,10 +2290,13 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.12.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
+      "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==",
       "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -2284,6 +2420,95 @@
       "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
       "dev": true
     },
+    "node_modules/pg": {
+      "version": "8.12.0",
+      "resolved": "https://registry.npmjs.org/pg/-/pg-8.12.0.tgz",
+      "integrity": "sha512-A+LHUSnwnxrnL/tZ+OLfqR1SxLN3c/pgDztZ47Rpbsd4jUytsTtwQo/TLPRzPJMp/1pbhYVhH9cuSZLAajNfjQ==",
+      "dev": true,
+      "dependencies": {
+        "pg-connection-string": "^2.6.4",
+        "pg-pool": "^3.6.2",
+        "pg-protocol": "^1.6.1",
+        "pg-types": "^2.1.0",
+        "pgpass": "1.x"
+      },
+      "engines": {
+        "node": ">= 8.0.0"
+      },
+      "optionalDependencies": {
+        "pg-cloudflare": "^1.1.1"
+      },
+      "peerDependencies": {
+        "pg-native": ">=3.0.1"
+      },
+      "peerDependenciesMeta": {
+        "pg-native": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/pg-cloudflare": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/pg-cloudflare/-/pg-cloudflare-1.1.1.tgz",
+      "integrity": "sha512-xWPagP/4B6BgFO+EKz3JONXv3YDgvkbVrGw2mTo3D6tVDQRh1e7cqVGvyR3BE+eQgAvx1XhW/iEASj4/jCWl3Q==",
+      "dev": true,
+      "optional": true
+    },
+    "node_modules/pg-connection-string": {
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.6.4.tgz",
+      "integrity": "sha512-v+Z7W/0EO707aNMaAEfiGnGL9sxxumwLl2fJvCQtMn9Fxsg+lPpPkdcyBSv/KFgpGdYkMfn+EI1Or2EHjpgLCA==",
+      "dev": true
+    },
+    "node_modules/pg-int8": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz",
+      "integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==",
+      "dev": true,
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/pg-pool": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.6.2.tgz",
+      "integrity": "sha512-Htjbg8BlwXqSBQ9V8Vjtc+vzf/6fVUuak/3/XXKA9oxZprwW3IMDQTGHP+KDmVL7rtd+R1QjbnCFPuTHm3G4hg==",
+      "dev": true,
+      "peerDependencies": {
+        "pg": ">=8.0"
+      }
+    },
+    "node_modules/pg-protocol": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.6.1.tgz",
+      "integrity": "sha512-jPIlvgoD63hrEuihvIg+tJhoGjUsLPn6poJY9N5CnlPd91c2T18T/9zBtLxZSb1EhYxBRoZJtzScCaWlYLtktg==",
+      "dev": true
+    },
+    "node_modules/pg-types": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz",
+      "integrity": "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==",
+      "dev": true,
+      "dependencies": {
+        "pg-int8": "1.0.1",
+        "postgres-array": "~2.0.0",
+        "postgres-bytea": "~1.0.0",
+        "postgres-date": "~1.0.4",
+        "postgres-interval": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/pgpass": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.5.tgz",
+      "integrity": "sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==",
+      "dev": true,
+      "dependencies": {
+        "split2": "^4.1.0"
+      }
+    },
     "node_modules/picomatch": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
@@ -2305,6 +2530,60 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/plur": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/plur/-/plur-4.0.0.tgz",
+      "integrity": "sha512-4UGewrYgqDFw9vV6zNV+ADmPAUAfJPKtGvb/VdpQAx25X5f3xXdGdyOEVFwkl8Hl/tl7+xbeHqSEM+D5/TirUg==",
+      "dev": true,
+      "dependencies": {
+        "irregular-plurals": "^3.2.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/postgres-array": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
+      "integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/postgres-bytea": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz",
+      "integrity": "sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postgres-date": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz",
+      "integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/postgres-interval": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz",
+      "integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==",
+      "dev": true,
+      "dependencies": {
+        "xtend": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/prelude-ls": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
@@ -2341,6 +2620,15 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
     "node_modules/proxy-from-env": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz",
@@ -2387,6 +2675,12 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/querystringify": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
+      "dev": true
+    },
     "node_modules/queue-microtask": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
@@ -2437,6 +2731,12 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+      "dev": true
+    },
     "node_modules/restore-cursor": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
@@ -2540,13 +2840,10 @@
       "dev": true
     },
     "node_modules/semver": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz",
-      "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==",
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
       "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -2554,6 +2851,23 @@
         "node": ">=10"
       }
     },
+    "node_modules/set-function-length": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+      "dev": true,
+      "dependencies": {
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -2576,14 +2890,18 @@
       }
     },
     "node_modules/side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
+      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4",
+        "object-inspect": "^1.13.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -2637,10 +2955,19 @@
         "source-map": "^0.6.0"
       }
     },
+    "node_modules/split2": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz",
+      "integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 10.x"
+      }
+    },
     "node_modules/sshpk": {
-      "version": "1.17.0",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz",
-      "integrity": "sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==",
+      "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz",
+      "integrity": "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==",
       "dev": true,
       "dependencies": {
         "asn1": "~0.2.3",
@@ -2800,18 +3127,35 @@
       }
     },
     "node_modules/tough-cookie": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz",
+      "integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==",
       "dev": true,
       "dependencies": {
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.2.0",
+        "url-parse": "^1.5.3"
       },
       "engines": {
-        "node": ">=0.8"
+        "node": ">=6"
       }
     },
+    "node_modules/tough-cookie/node_modules/universalify": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+      "dev": true,
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/ts-pattern": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ts-pattern/-/ts-pattern-4.3.0.tgz",
+      "integrity": "sha512-pefrkcd4lmIVR0LA49Imjf9DYLK8vtWhqBPA3Ya1ir8xCW0O2yjL9dsCVvI7pCodLC5q7smNpEtDR2yVulQxOg==",
+      "dev": true
+    },
     "node_modules/tslib": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
@@ -2860,6 +3204,15 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/unc-path-regex": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
+      "integrity": "sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/universalify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
@@ -2887,6 +3240,16 @@
         "punycode": "^2.1.0"
       }
     },
+    "node_modules/url-parse": {
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+      "dev": true,
+      "dependencies": {
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
+      }
+    },
     "node_modules/uuid": {
       "version": "8.3.2",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
@@ -2978,11 +3341,14 @@
         }
       }
     },
-    "node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
+    "node_modules/xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4"
+      }
     },
     "node_modules/yauzl": {
       "version": "2.10.0",
@@ -3012,15 +3378,15 @@
       "dev": true,
       "optional": true
     },
-    "@cypress/commit-info": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/@cypress/commit-info/-/commit-info-2.2.0.tgz",
-      "integrity": "sha512-A7CYS0Iqp/u52JTnSWlDFjWMKx7rIfd+mk0Fdksrcs4Wdf5HXPsoZO475VJ+xL7LPhJrjKhgyl/TPKO3worZyQ==",
+    "@currents/commit-info": {
+      "version": "1.0.1-beta.0",
+      "resolved": "https://registry.npmjs.org/@currents/commit-info/-/commit-info-1.0.1-beta.0.tgz",
+      "integrity": "sha512-gkn8E3UC+F4/fCla7QAGMGgGPzxZUL9bU9+4I+KZf9PtCU3DdQCdy7a+er2eg4ewfUzZ2Ic1HcfnHuPkuLPKIw==",
       "dev": true,
       "requires": {
         "bluebird": "3.5.5",
         "check-more-types": "2.24.0",
-        "debug": "4.1.1",
+        "debug": "4.3.4",
         "execa": "1.0.0",
         "lazy-ass": "1.6.0",
         "ramda": "0.26.1"
@@ -3045,15 +3411,6 @@
             "which": "^1.2.9"
           }
         },
-        "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
         "execa": {
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
@@ -3100,9 +3457,9 @@
           "dev": true
         },
         "semver": {
-          "version": "5.7.1",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-          "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+          "version": "5.7.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+          "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
           "dev": true
         },
         "shebang-command": {
@@ -3132,9 +3489,9 @@
       }
     },
     "@cypress/request": {
-      "version": "2.88.11",
-      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.11.tgz",
-      "integrity": "sha512-M83/wfQ1EkspjkE2lNWNV5ui2Cv7UCv1swW1DqljahbzLVWltcsexQh8jYtuS/vzFXP+HySntGM83ZXA9fn17w==",
+      "version": "2.88.12",
+      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.12.tgz",
+      "integrity": "sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA==",
       "dev": true,
       "requires": {
         "aws-sign2": "~0.7.0",
@@ -3152,7 +3509,7 @@
         "performance-now": "^2.1.0",
         "qs": "~6.10.3",
         "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.5.0",
+        "tough-cookie": "^4.1.3",
         "tunnel-agent": "^0.6.0",
         "uuid": "^8.3.2"
       }
@@ -3205,9 +3562,9 @@
       }
     },
     "@types/node": {
-      "version": "14.18.46",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.46.tgz",
-      "integrity": "sha512-n4yVT5FuY5NCcGHCosQSGvvCT74HhowymPN2OEcsHPw6U1NuxV9dvxWbrM2dnBukWjdMYzig1WfIkWdTTQJqng==",
+      "version": "16.18.102",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.102.tgz",
+      "integrity": "sha512-eSe2YwGCcRjqPidxfm20IAq02krERWcIIJW4FNPkU0zQLbc4L9pvhsmB0p6UJecjEf0j/E2ERHsKq7madvthKw==",
       "dev": true
     },
     "@types/sinonjs__fake-timers": {
@@ -3354,9 +3711,9 @@
       "dev": true
     },
     "aws4": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz",
-      "integrity": "sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==",
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.13.0.tgz",
+      "integrity": "sha512-3AungXC4I8kKsS9PuS4JH2nc+0bVY/mjgrephHTIi8fpEeGsTHBUJeosp0Wc1myYMElmD0B3Oc4XL/HVJ4PV2g==",
       "dev": true
     },
     "axios": {
@@ -3480,13 +3837,16 @@
       "dev": true
     },
     "call-bind": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz",
+      "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==",
       "dev": true,
       "requires": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "set-function-length": "^1.2.1"
       }
     },
     "caseless": {
@@ -3650,14 +4010,14 @@
       }
     },
     "cypress": {
-      "version": "12.15.0",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.15.0.tgz",
-      "integrity": "sha512-FqGbxsH+QgjStuTO9onXMIeF44eOrgVwPvlcvuzLIaePQMkl72YgBvpuHlBGRcrw3Q4SvqKfajN8iV5XWShAiQ==",
+      "version": "12.17.4",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.17.4.tgz",
+      "integrity": "sha512-gAN8Pmns9MA5eCDFSDJXWKUpaL3IDd89N9TtIupjYnzLSmlpVr+ZR+vb4U/qaMp+lB6tBvAmt7504c3Z4RU5KQ==",
       "dev": true,
       "requires": {
-        "@cypress/request": "^2.88.10",
+        "@cypress/request": "2.88.12",
         "@cypress/xvfb": "^1.2.4",
-        "@types/node": "^14.14.31",
+        "@types/node": "^16.18.39",
         "@types/sinonjs__fake-timers": "8.1.1",
         "@types/sizzle": "^2.3.2",
         "arch": "^2.2.0",
@@ -3690,9 +4050,10 @@
         "minimist": "^1.2.8",
         "ospath": "^1.2.2",
         "pretty-bytes": "^5.6.0",
+        "process": "^0.11.10",
         "proxy-from-env": "1.0.0",
         "request-progress": "^3.0.0",
-        "semver": "^7.3.2",
+        "semver": "^7.5.3",
         "supports-color": "^8.1.1",
         "tmp": "~0.2.1",
         "untildify": "^4.0.0",
@@ -3700,12 +4061,12 @@
       }
     },
     "cypress-cloud": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npmjs.org/cypress-cloud/-/cypress-cloud-1.7.4.tgz",
-      "integrity": "sha512-YnJEJLwTSEnIDnctKQg5v7g1caPxvzb0EBowwYI550KNNQyOOaVpHZ5zxjoJyT3BPZDXtnhti9h7Drv549FtTg==",
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/cypress-cloud/-/cypress-cloud-1.10.2.tgz",
+      "integrity": "sha512-KR0HCtmAncMO/duLQ0eK+Aq34DSnnuWlsKCW83tPzz2boNGJdrqcLzC2xHNJeUxq8TH/vva7LI4TvZBkPeZa3Q==",
       "dev": true,
       "requires": {
-        "@cypress/commit-info": "^2.2.0",
+        "@currents/commit-info": "1.0.1-beta.0",
         "axios": "^1.2.0",
         "axios-retry": "^3.4.0",
         "bluebird": "^3.7.2",
@@ -3717,13 +4078,17 @@
         "execa": "^5.1.1",
         "getos": "^3.2.1",
         "globby": "^11.1.0",
+        "is-absolute": "^1.0.0",
+        "lil-http-terminator": "^1.2.3",
         "lodash": "^4.17.21",
         "nanoid": "^3.3.4",
+        "plur": "^4.0.0",
         "pretty-ms": "^7.0.1",
         "source-map-support": "^0.5.21",
         "table": "^6.8.1",
         "tmp-promise": "^3.0.3",
-        "ws": "^8.12.1"
+        "ts-pattern": "^4.3.0",
+        "ws": "^8.13.0"
       },
       "dependencies": {
         "commander": {
@@ -3793,6 +4158,17 @@
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
       "dev": true
     },
+    "define-data-property": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+      "dev": true,
+      "requires": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
+      }
+    },
     "delayed-stream": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
@@ -3842,6 +4218,21 @@
         "ansi-colors": "^4.1.1"
       }
     },
+    "es-define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz",
+      "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==",
+      "dev": true,
+      "requires": {
+        "get-intrinsic": "^1.2.4"
+      }
+    },
+    "es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "dev": true
+    },
     "escape-string-regexp": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
@@ -4038,20 +4429,22 @@
       "dev": true
     },
     "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
       "dev": true
     },
     "get-intrinsic": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz",
-      "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==",
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz",
+      "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==",
       "dev": true,
       "requires": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
-        "has-symbols": "^1.0.3"
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "has-proto": "^1.0.1",
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0"
       }
     },
     "get-stream": {
@@ -4127,33 +4520,57 @@
         "slash": "^3.0.0"
       }
     },
+    "gopd": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "dev": true,
+      "requires": {
+        "get-intrinsic": "^1.1.3"
+      }
+    },
     "graceful-fs": {
       "version": "4.2.11",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
       "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
       "dev": true
     },
-    "has": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-      "dev": true,
-      "requires": {
-        "function-bind": "^1.1.1"
-      }
-    },
     "has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true
     },
+    "has-property-descriptors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+      "dev": true,
+      "requires": {
+        "es-define-property": "^1.0.0"
+      }
+    },
+    "has-proto": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz",
+      "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==",
+      "dev": true
+    },
     "has-symbols": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
       "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
       "dev": true
     },
+    "hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.2"
+      }
+    },
     "http-signature": {
       "version": "1.3.6",
       "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.3.6.tgz",
@@ -4211,6 +4628,22 @@
       "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==",
       "dev": true
     },
+    "irregular-plurals": {
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-3.5.0.tgz",
+      "integrity": "sha512-1ANGLZ+Nkv1ptFb2pa8oG8Lem4krflKuX/gINiHJHjJUKaJHk/SXk5x6K3J+39/p0h1RQ2saROclJJ+QLvETCQ==",
+      "dev": true
+    },
+    "is-absolute": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
+      "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
+      "dev": true,
+      "requires": {
+        "is-relative": "^1.0.0",
+        "is-windows": "^1.0.1"
+      }
+    },
     "is-ci": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz",
@@ -4263,6 +4696,15 @@
       "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
       "dev": true
     },
+    "is-relative": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
+      "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
+      "dev": true,
+      "requires": {
+        "is-unc-path": "^1.0.0"
+      }
+    },
     "is-retry-allowed": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-2.2.0.tgz",
@@ -4281,12 +4723,27 @@
       "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
       "dev": true
     },
+    "is-unc-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
+      "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
+      "dev": true,
+      "requires": {
+        "unc-path-regex": "^0.1.2"
+      }
+    },
     "is-unicode-supported": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
       "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
       "dev": true
     },
+    "is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+      "dev": true
+    },
     "isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
@@ -4370,6 +4827,12 @@
         "type-check": "~0.3.2"
       }
     },
+    "lil-http-terminator": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/lil-http-terminator/-/lil-http-terminator-1.2.3.tgz",
+      "integrity": "sha512-vQcHSwAFq/kTR2cG6peOVS7SjgksGgSPeH0G2lkw+buue33thE/FCHdn10wJXXshc5RswFy0Iaz48qA2Busw5Q==",
+      "dev": true
+    },
     "listr2": {
       "version": "3.14.0",
       "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.14.0.tgz",
@@ -4450,15 +4913,6 @@
         }
       }
     },
-    "lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "requires": {
-        "yallist": "^4.0.0"
-      }
-    },
     "merge-stream": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
@@ -4593,9 +5047,9 @@
       }
     },
     "object-inspect": {
-      "version": "1.12.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
-      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
+      "version": "1.13.2",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz",
+      "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==",
       "dev": true
     },
     "once": {
@@ -4687,6 +5141,73 @@
       "integrity": "sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==",
       "dev": true
     },
+    "pg": {
+      "version": "8.12.0",
+      "resolved": "https://registry.npmjs.org/pg/-/pg-8.12.0.tgz",
+      "integrity": "sha512-A+LHUSnwnxrnL/tZ+OLfqR1SxLN3c/pgDztZ47Rpbsd4jUytsTtwQo/TLPRzPJMp/1pbhYVhH9cuSZLAajNfjQ==",
+      "dev": true,
+      "requires": {
+        "pg-cloudflare": "^1.1.1",
+        "pg-connection-string": "^2.6.4",
+        "pg-pool": "^3.6.2",
+        "pg-protocol": "^1.6.1",
+        "pg-types": "^2.1.0",
+        "pgpass": "1.x"
+      }
+    },
+    "pg-cloudflare": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/pg-cloudflare/-/pg-cloudflare-1.1.1.tgz",
+      "integrity": "sha512-xWPagP/4B6BgFO+EKz3JONXv3YDgvkbVrGw2mTo3D6tVDQRh1e7cqVGvyR3BE+eQgAvx1XhW/iEASj4/jCWl3Q==",
+      "dev": true,
+      "optional": true
+    },
+    "pg-connection-string": {
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.6.4.tgz",
+      "integrity": "sha512-v+Z7W/0EO707aNMaAEfiGnGL9sxxumwLl2fJvCQtMn9Fxsg+lPpPkdcyBSv/KFgpGdYkMfn+EI1Or2EHjpgLCA==",
+      "dev": true
+    },
+    "pg-int8": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz",
+      "integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==",
+      "dev": true
+    },
+    "pg-pool": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.6.2.tgz",
+      "integrity": "sha512-Htjbg8BlwXqSBQ9V8Vjtc+vzf/6fVUuak/3/XXKA9oxZprwW3IMDQTGHP+KDmVL7rtd+R1QjbnCFPuTHm3G4hg==",
+      "dev": true
+    },
+    "pg-protocol": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.6.1.tgz",
+      "integrity": "sha512-jPIlvgoD63hrEuihvIg+tJhoGjUsLPn6poJY9N5CnlPd91c2T18T/9zBtLxZSb1EhYxBRoZJtzScCaWlYLtktg==",
+      "dev": true
+    },
+    "pg-types": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/pg-types/-/pg-types-2.2.0.tgz",
+      "integrity": "sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==",
+      "dev": true,
+      "requires": {
+        "pg-int8": "1.0.1",
+        "postgres-array": "~2.0.0",
+        "postgres-bytea": "~1.0.0",
+        "postgres-date": "~1.0.4",
+        "postgres-interval": "^1.1.0"
+      }
+    },
+    "pgpass": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.5.tgz",
+      "integrity": "sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==",
+      "dev": true,
+      "requires": {
+        "split2": "^4.1.0"
+      }
+    },
     "picomatch": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
@@ -4699,6 +5220,42 @@
       "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
       "dev": true
     },
+    "plur": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/plur/-/plur-4.0.0.tgz",
+      "integrity": "sha512-4UGewrYgqDFw9vV6zNV+ADmPAUAfJPKtGvb/VdpQAx25X5f3xXdGdyOEVFwkl8Hl/tl7+xbeHqSEM+D5/TirUg==",
+      "dev": true,
+      "requires": {
+        "irregular-plurals": "^3.2.0"
+      }
+    },
+    "postgres-array": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/postgres-array/-/postgres-array-2.0.0.tgz",
+      "integrity": "sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==",
+      "dev": true
+    },
+    "postgres-bytea": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/postgres-bytea/-/postgres-bytea-1.0.0.tgz",
+      "integrity": "sha512-xy3pmLuQqRBZBXDULy7KbaitYqLcmxigw14Q5sj8QBVLqEwXfeybIKVWiqAXTlcvdvb0+xkOtDbfQMOf4lST1w==",
+      "dev": true
+    },
+    "postgres-date": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.7.tgz",
+      "integrity": "sha512-suDmjLVQg78nMK2UZ454hAG+OAW+HQPZ6n++TNDUX+L0+uUlLywnoxJKDou51Zm+zTCjrCl0Nq6J9C5hP9vK/Q==",
+      "dev": true
+    },
+    "postgres-interval": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/postgres-interval/-/postgres-interval-1.2.0.tgz",
+      "integrity": "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ==",
+      "dev": true,
+      "requires": {
+        "xtend": "^4.0.0"
+      }
+    },
     "prelude-ls": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
@@ -4720,6 +5277,12 @@
         "parse-ms": "^2.1.0"
       }
     },
+    "process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
+      "dev": true
+    },
     "proxy-from-env": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz",
@@ -4757,6 +5320,12 @@
         "side-channel": "^1.0.4"
       }
     },
+    "querystringify": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
+      "dev": true
+    },
     "queue-microtask": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
@@ -4790,6 +5359,12 @@
       "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
       "dev": true
     },
+    "requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+      "dev": true
+    },
     "restore-cursor": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
@@ -4852,12 +5427,23 @@
       "dev": true
     },
     "semver": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz",
-      "integrity": "sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==",
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "dev": true
+    },
+    "set-function-length": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
+      "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
       "dev": true,
       "requires": {
-        "lru-cache": "^6.0.0"
+        "define-data-property": "^1.1.4",
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.4",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.2"
       }
     },
     "shebang-command": {
@@ -4876,14 +5462,15 @@
       "dev": true
     },
     "side-channel": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
-      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz",
+      "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==",
       "dev": true,
       "requires": {
-        "call-bind": "^1.0.0",
-        "get-intrinsic": "^1.0.2",
-        "object-inspect": "^1.9.0"
+        "call-bind": "^1.0.7",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.4",
+        "object-inspect": "^1.13.1"
       }
     },
     "signal-exit": {
@@ -4925,10 +5512,16 @@
         "source-map": "^0.6.0"
       }
     },
+    "split2": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz",
+      "integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==",
+      "dev": true
+    },
     "sshpk": {
-      "version": "1.17.0",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.17.0.tgz",
-      "integrity": "sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ==",
+      "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.18.0.tgz",
+      "integrity": "sha512-2p2KJZTSqQ/I3+HX42EpYOa2l3f8Erv8MWKsy2I9uf4wA7yFIkXRffYdsx86y6z4vHtV8u7g+pPlr8/4ouAxsQ==",
       "dev": true,
       "requires": {
         "asn1": "~0.2.3",
@@ -5049,15 +5642,31 @@
       }
     },
     "tough-cookie": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
-      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz",
+      "integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==",
       "dev": true,
       "requires": {
-        "psl": "^1.1.28",
-        "punycode": "^2.1.1"
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.2.0",
+        "url-parse": "^1.5.3"
+      },
+      "dependencies": {
+        "universalify": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+          "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+          "dev": true
+        }
       }
     },
+    "ts-pattern": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ts-pattern/-/ts-pattern-4.3.0.tgz",
+      "integrity": "sha512-pefrkcd4lmIVR0LA49Imjf9DYLK8vtWhqBPA3Ya1ir8xCW0O2yjL9dsCVvI7pCodLC5q7smNpEtDR2yVulQxOg==",
+      "dev": true
+    },
     "tslib": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz",
@@ -5094,6 +5703,12 @@
       "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
       "dev": true
     },
+    "unc-path-regex": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
+      "integrity": "sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==",
+      "dev": true
+    },
     "universalify": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
@@ -5115,6 +5730,16 @@
         "punycode": "^2.1.0"
       }
     },
+    "url-parse": {
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+      "dev": true,
+      "requires": {
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
+      }
+    },
     "uuid": {
       "version": "8.3.2",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
@@ -5170,10 +5795,10 @@
       "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
       "dev": true
     },
-    "yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+    "xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
       "dev": true
     },
     "yauzl": {
diff --git a/package.json b/package.json
index 7bb460e9..b0bd1099 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,8 @@
     "prettier": "npm run prettier --prefix client"
   },
   "devDependencies": {
-    "cypress": "^12.15.0",
-    "cypress-cloud": "^1.7.4"
+    "cypress": "^12.17.4",
+    "cypress-cloud": "^1.10.2",
+    "pg": "^8.12.0"
   }
 }
diff --git a/server/vbv_lernwelt/core/management/commands/cypress_reset.py b/server/vbv_lernwelt/core/management/commands/cypress_reset.py
index 1a02a343..eb46bc5c 100644
--- a/server/vbv_lernwelt/core/management/commands/cypress_reset.py
+++ b/server/vbv_lernwelt/core/management/commands/cypress_reset.py
@@ -43,7 +43,7 @@ from vbv_lernwelt.course.services import mark_course_completion
 from vbv_lernwelt.course_session.models import CourseSessionAttendanceCourse
 from vbv_lernwelt.course_session.services.attendance import AttendanceUserStatus
 from vbv_lernwelt.feedback.models import FeedbackResponse
-from vbv_lernwelt.learning_mentor.models import LearningMentor
+from vbv_lernwelt.learning_mentor.models import LearningMentor, MentorInvitation
 from vbv_lernwelt.learnpath.models import (
     LearningContentAttendanceCourse,
     LearningContentFeedbackUK,
@@ -145,6 +145,7 @@ def command(
     CourseCompletionFeedback.objects.all().delete()
 
     LearningMentor.objects.all().delete()
+    MentorInvitation.objects.all().delete()
     User.objects.all().update(organisation=Organisation.objects.first())
     User.objects.all().update(language="de")
     User.objects.all().update(additional_json_data={})
diff --git a/server/vbv_lernwelt/learning_mentor/admin.py b/server/vbv_lernwelt/learning_mentor/admin.py
index 5501638f..8834dd95 100644
--- a/server/vbv_lernwelt/learning_mentor/admin.py
+++ b/server/vbv_lernwelt/learning_mentor/admin.py
@@ -34,5 +34,5 @@ class LearningMentorAdmin(admin.ModelAdmin):
 @admin.register(MentorInvitation)
 class MentorInvitationAdmin(admin.ModelAdmin):
     list_display = ["id", "email", "participant", "created"]
-    readonly_fields = ["id", "created"]
+    readonly_fields = ["id", "created", "email", "participant"]
     search_fields = ["email"]
diff --git a/server/vbv_lernwelt/learning_mentor/migrations/0007_mentorinvitation_target_url.py b/server/vbv_lernwelt/learning_mentor/migrations/0007_mentorinvitation_target_url.py
new file mode 100644
index 00000000..41b2c72a
--- /dev/null
+++ b/server/vbv_lernwelt/learning_mentor/migrations/0007_mentorinvitation_target_url.py
@@ -0,0 +1,17 @@
+# Generated by Django 3.2.20 on 2024-07-18 08:56
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("learning_mentor", "0006_auto_20240319_1058"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="mentorinvitation",
+            name="target_url",
+            field=models.CharField(blank=True, default="", max_length=255),
+        ),
+    ]
diff --git a/server/vbv_lernwelt/learning_mentor/models.py b/server/vbv_lernwelt/learning_mentor/models.py
index d317965d..fa84b108 100644
--- a/server/vbv_lernwelt/learning_mentor/models.py
+++ b/server/vbv_lernwelt/learning_mentor/models.py
@@ -34,6 +34,7 @@ class MentorInvitation(TimeStampedModel):
     id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
     email = models.EmailField()
     participant = models.ForeignKey(CourseSessionUser, on_delete=models.CASCADE)
+    target_url = models.CharField(max_length=255, blank=True, default="")
 
     def __str__(self):
         return f"{self.email} ({self.participant})"
diff --git a/server/vbv_lernwelt/learning_mentor/views.py b/server/vbv_lernwelt/learning_mentor/views.py
index 52ffe1ad..4eaf517c 100644
--- a/server/vbv_lernwelt/learning_mentor/views.py
+++ b/server/vbv_lernwelt/learning_mentor/views.py
@@ -143,6 +143,8 @@ def create_invitation(request, course_session_id: int):
 
     invitation = serializer.save()
     target_url = f"/lernbegleitung/{course_session_id}/invitation/{invitation.id}"
+    invitation.target_url = target_url
+    invitation.save()
 
     if course_session.course.configuration.is_uk:
         template = EmailTemplate.PRAXISBILDNER_INVITATION

From cdfb9d2c5b2c075068ba71d90103b09795349a5b Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Sun, 21 Jul 2024 15:44:58 +0200
Subject: [PATCH 04/40] Refactor `LearningMentor` model to flat
 `AgentParticipantRelation` model

---
 .../components/learningMentor/MyMentees.vue   |  30 ++--
 .../components/learningMentor/MyMentors.vue   |  16 +-
 .../assignment/PraxisAssignmentSubmit.vue     |   4 +-
 client/src/composables.ts                     |   4 +-
 .../mentor/MentorPraxisAssignmentPage.vue     |  11 +-
 ...orSelfEvaluationFeedbackAssignmentPage.vue |  16 +-
 .../SelfEvaluationRequestFeedbackPage.vue     |   4 +-
 client/src/services/learningMentees.ts        |  17 +-
 client/src/types.ts                           |   7 +-
 scripts/send_sendgrid_email.py                |   4 +-
 .../core/management/commands/cypress_reset.py |  70 ++++----
 .../commands/reset_iterativ_test_sessions.py  |  38 ++--
 server/vbv_lernwelt/core/serializers.py       |  14 ++
 .../course/creators/test_utils.py             |  17 +-
 .../commands/create_default_courses.py        |  35 +---
 ...lter_coursecompletion_completion_status.py |  27 +++
 server/vbv_lernwelt/course/views.py           |   9 +-
 .../vbv_lernwelt/dashboard/graphql/queries.py |  52 +++---
 .../dashboard/tests/graphql/test_dashboard.py |  37 ++--
 .../tests/graphql/test_mentor_statistics.py   |  26 +--
 .../dashboard/tests/test_views.py             |  69 ++++++--
 server/vbv_lernwelt/dashboard/views.py        |  66 ++++---
 server/vbv_lernwelt/iam/permissions.py        |  26 +--
 server/vbv_lernwelt/iam/tests/test_actions.py |   8 +-
 server/vbv_lernwelt/iam/tests/test_roles.py   |  21 +--
 .../tests/test_import_course_sessions.py      |   4 +-
 server/vbv_lernwelt/learning_mentor/admin.py  |  43 ++---
 server/vbv_lernwelt/learning_mentor/apps.py   |   6 +-
 .../0008_agentparticipantrelation.py          |  57 ++++++
 .../migrations/0009_auto_20240718_1533.py     |  25 +++
 server/vbv_lernwelt/learning_mentor/models.py |  21 +++
 .../learning_mentor/serializers.py            |  29 +++-
 .../vbv_lernwelt/learning_mentor/signals.py   |  18 --
 .../learning_mentor/tests/test_invitation.py  |  21 ++-
 .../learning_mentor/tests/test_mentor.py      | 164 ++++++++++--------
 server/vbv_lernwelt/learning_mentor/urls.py   |   6 +-
 server/vbv_lernwelt/learning_mentor/views.py  |  60 +++----
 server/vbv_lernwelt/media_files/views.py      |  30 +++-
 .../tests/test_api.py                         |   9 +-
 .../self_evaluation_feedback/views.py         |   9 +-
 .../0016_alter_checkoutinformation_refno2.py  |  17 ++
 server/vbv_lernwelt/sso/admin.py              |  25 +--
 server/vbv_lernwelt/sso/role_sync/services.py |   4 +-
 server/vbv_lernwelt/sso/signals.py            |  41 +++--
 server/vbv_lernwelt/sso/tests/test_signals.py |  27 ++-
 45 files changed, 761 insertions(+), 483 deletions(-)
 create mode 100644 server/vbv_lernwelt/course/migrations/0009_alter_coursecompletion_completion_status.py
 create mode 100644 server/vbv_lernwelt/learning_mentor/migrations/0008_agentparticipantrelation.py
 create mode 100644 server/vbv_lernwelt/learning_mentor/migrations/0009_auto_20240718_1533.py
 delete mode 100644 server/vbv_lernwelt/learning_mentor/signals.py
 create mode 100644 server/vbv_lernwelt/shop/migrations/0016_alter_checkoutinformation_refno2.py

diff --git a/client/src/components/learningMentor/MyMentees.vue b/client/src/components/learningMentor/MyMentees.vue
index 5f22d2cc..c90a57ce 100644
--- a/client/src/components/learningMentor/MyMentees.vue
+++ b/client/src/components/learningMentor/MyMentees.vue
@@ -8,9 +8,9 @@ import LoadingSpinner from "@/components/ui/LoadingSpinner.vue";
 const courseSession = useCurrentCourseSession();
 const { isLoading, summary, fetchData } = useLearningMentees(courseSession.value.id);
 
-const removeMyMentee = async (menteeId: string) => {
+const removeMyMentee = async (relationId: string) => {
   await useCSRFFetch(
-    `/api/mentor/${courseSession.value.id}/mentors/${summary.value?.mentor_id}/remove/${menteeId}`
+    `/api/mentor/${courseSession.value.id}/mentors/${relationId}/delete`
   ).delete();
   fetchData();
 };
@@ -28,25 +28,31 @@ const noMenteesText = computed(() =>
   </div>
   <div v-else>
     <h2 class="heading-2 py-6">{{ $t("a.Personen, die du begleitest") }}</h2>
-    <div v-if="(summary?.participants?.length ?? 0) > 0" class="bg-white px-4 py-2">
+    <div
+      v-if="(summary?.participant_relations.length ?? 0) > 0"
+      class="bg-white px-4 py-2"
+    >
       <div
-        v-for="participant in summary?.participants ?? []"
-        :key="participant.id"
+        v-for="relation in summary?.participant_relations ?? []"
+        :key="relation.id"
         data-cy="lm-my-mentee-list-item"
         class="flex flex-col items-start justify-between gap-4 border-b py-2 last:border-b-0 md:flex-row md:items-center md:gap-16"
       >
         <div class="flex items-center space-x-2">
           <img
-            :alt="participant.last_name"
+            :alt="relation.participant_user.last_name"
             class="h-11 w-11 rounded-full"
-            :src="participant.avatar_url || '/static/avatars/myvbv-default-avatar.png'"
+            :src="
+              relation.participant_user.avatar_url ||
+              '/static/avatars/myvbv-default-avatar.png'
+            "
           />
           <div>
             <div class="text-bold">
-              {{ participant.first_name }}
-              {{ participant.last_name }}
+              {{ relation.participant_user.first_name }}
+              {{ relation.participant_user.last_name }}
             </div>
-            {{ participant.email }}
+            {{ relation.participant_user.email }}
           </div>
         </div>
         <div class="space-x-5">
@@ -55,7 +61,7 @@ const noMenteesText = computed(() =>
             :to="{
               name: 'profileLearningPath',
               params: {
-                userId: participant.id,
+                userId: relation.participant_user.id,
                 courseSlug: courseSession.course.slug,
               },
             }"
@@ -66,7 +72,7 @@ const noMenteesText = computed(() =>
           <button
             class="underline"
             data-cy="lm-my-mentee-remove"
-            @click="removeMyMentee(participant.id)"
+            @click="removeMyMentee(relation.id)"
           >
             {{ $t("a.Entfernen") }}
           </button>
diff --git a/client/src/components/learningMentor/MyMentors.vue b/client/src/components/learningMentor/MyMentors.vue
index 5988653b..85941cc6 100644
--- a/client/src/components/learningMentor/MyMentors.vue
+++ b/client/src/components/learningMentor/MyMentors.vue
@@ -51,11 +51,9 @@ const removeInvitation = async (invitationId: string) => {
   await refreshInvitations();
 };
 
-const userStore = useUserStore();
-
-const removeMyMentor = async (mentorId: string) => {
+const removeMyMentor = async (relationId: string) => {
   await useCSRFFetch(
-    `/api/mentor/${courseSession.value.id}/mentors/${mentorId}/remove/${userStore.id}`
+    `/api/mentor/${courseSession.value.id}/mentors/${relationId}/delete`
   ).delete();
   await refreshMentors();
 };
@@ -138,16 +136,16 @@ const noLearningMentors = computed(() =>
           >
             <div class="flex items-center space-x-2">
               <img
-                :alt="learningMentor.mentor.last_name"
+                :alt="learningMentor.agent.last_name"
                 class="h-11 w-11 rounded-full"
-                :src="learningMentor.mentor.avatar_url"
+                :src="learningMentor.agent.avatar_url"
               />
               <div>
                 <div class="text-bold">
-                  {{ learningMentor.mentor.first_name }}
-                  {{ learningMentor.mentor.last_name }}
+                  {{ learningMentor.agent.first_name }}
+                  {{ learningMentor.agent.last_name }}
                 </div>
-                {{ learningMentor.mentor.email }}
+                {{ learningMentor.agent.email }}
               </div>
             </div>
             <button
diff --git a/client/src/components/learningPath/assignment/PraxisAssignmentSubmit.vue b/client/src/components/learningPath/assignment/PraxisAssignmentSubmit.vue
index c53358f9..65486a0c 100644
--- a/client/src/components/learningPath/assignment/PraxisAssignmentSubmit.vue
+++ b/client/src/components/learningPath/assignment/PraxisAssignmentSubmit.vue
@@ -74,9 +74,9 @@ const onSubmit = async () => {
           <option
             v-for="learningMentor in learningMentors"
             :key="learningMentor.id"
-            :value="learningMentor.mentor.id"
+            :value="learningMentor.agent.id"
           >
-            {{ learningMentor.mentor.first_name }} {{ learningMentor.mentor.last_name }}
+            {{ learningMentor.agent.first_name }} {{ learningMentor.agent.last_name }}
           </option>
         </select>
       </div>
diff --git a/client/src/composables.ts b/client/src/composables.ts
index 15ecb645..284ed4fa 100644
--- a/client/src/composables.ts
+++ b/client/src/composables.ts
@@ -39,7 +39,7 @@ import type {
   CourseSessionDetail,
   DashboardPersonsPageMode,
   LearningContentWithCompletion,
-  LearningMentor,
+  AgentParticipantRelation,
   LearningPathType,
   LearningUnitPerformanceCriteria,
   PerformanceCriteria,
@@ -489,7 +489,7 @@ export function useFileUpload() {
 }
 
 export function useMyLearningMentors() {
-  const learningMentors = ref<LearningMentor[]>([]);
+  const learningMentors = ref<AgentParticipantRelation[]>([]);
   const currentCourseSessionId = useCurrentCourseSession().value.id;
   const loading = ref(false);
 
diff --git a/client/src/pages/learningMentor/mentor/MentorPraxisAssignmentPage.vue b/client/src/pages/learningMentor/mentor/MentorPraxisAssignmentPage.vue
index 2203454f..306b351c 100644
--- a/client/src/pages/learningMentor/mentor/MentorPraxisAssignmentPage.vue
+++ b/client/src/pages/learningMentor/mentor/MentorPraxisAssignmentPage.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { Assignment, Participant } from "@/services/learningMentees";
+import type { Assignment, UserShort } from "@/services/learningMentees";
 import { useLearningMentees } from "@/services/learningMentees";
 import { computed, onMounted, type Ref } from "vue";
 import { useCurrentCourseSession } from "@/composables";
@@ -11,13 +11,16 @@ const props = defineProps<{
 
 const courseSession = useCurrentCourseSession();
 const learningMentees = useLearningMentees(courseSession.value.id);
-const participants = computed(() => learningMentees.summary.value?.participants);
 const praxisAssignment: Ref<Assignment | null> = computed(() =>
   learningMentees.getAssignmentById(props.praxisAssignmentId)
 );
 
-const getParticipantById = (id: string): Participant | null => {
-  return participants.value?.find((participant) => participant.id === id) || null;
+const getParticipantById = (id: string): UserShort | undefined => {
+  return (learningMentees.summary.value?.participant_relations ?? [])
+    .map((rel) => {
+      return rel.participant_user;
+    })
+    .find((user) => user.id === id);
 };
 
 onMounted(() => {
diff --git a/client/src/pages/learningMentor/mentor/MentorSelfEvaluationFeedbackAssignmentPage.vue b/client/src/pages/learningMentor/mentor/MentorSelfEvaluationFeedbackAssignmentPage.vue
index acff1ce8..3f9dd9ea 100644
--- a/client/src/pages/learningMentor/mentor/MentorSelfEvaluationFeedbackAssignmentPage.vue
+++ b/client/src/pages/learningMentor/mentor/MentorSelfEvaluationFeedbackAssignmentPage.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { Assignment, Participant } from "@/services/learningMentees";
+import type { Assignment, UserShort } from "@/services/learningMentees";
 import { useLearningMentees } from "@/services/learningMentees";
 import { computed, type Ref } from "vue";
 import { useCurrentCourseSession } from "@/composables";
@@ -15,14 +15,12 @@ const selfEvaluationFeedback: Ref<Assignment | null> = computed(() =>
   learningMentees.getAssignmentById(props.learningUnitId)
 );
 
-const getParticipantById = (id: string): Participant | null => {
-  if (learningMentees.summary.value?.participants) {
-    const found = learningMentees.summary.value.participants.find(
-      (item) => item.id === id
-    );
-    return found || null;
-  }
-  return null;
+const getParticipantById = (id: string): UserShort | undefined => {
+  return (learningMentees.summary.value?.participant_relations ?? [])
+    .map((rel) => {
+      return rel.participant_user;
+    })
+    .find((user) => user.id === id);
 };
 </script>
 
diff --git a/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluationRequestFeedbackPage.vue b/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluationRequestFeedbackPage.vue
index 9b8407cb..1c05a0df 100644
--- a/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluationRequestFeedbackPage.vue
+++ b/client/src/pages/learningPath/selfEvaluationPage/SelfEvaluationRequestFeedbackPage.vue
@@ -29,8 +29,8 @@ const isMentorsLoading = computed(() => learningMentors.loading.value);
 
 const mentors = computed(() => {
   return learningMentors.learningMentors.value.map((mentor) => ({
-    id: mentor.mentor.id,
-    name: `${mentor.mentor.first_name} ${mentor.mentor.last_name}`,
+    id: mentor.agent.id,
+    name: `${mentor.agent.first_name} ${mentor.agent.last_name}`,
   }));
 });
 
diff --git a/client/src/services/learningMentees.ts b/client/src/services/learningMentees.ts
index 6550056f..0809fdba 100644
--- a/client/src/services/learningMentees.ts
+++ b/client/src/services/learningMentees.ts
@@ -2,7 +2,7 @@ import { itGet } from "@/fetchHelpers";
 import type { Ref } from "vue";
 import { ref, watchEffect } from "vue";
 
-export interface Participant {
+export interface UserShort {
   id: string;
   first_name: string;
   last_name: string;
@@ -12,6 +12,14 @@ export interface Participant {
   language: string;
 }
 
+export interface AgentParticipantRelation {
+  id: string;
+  role: "LEARNING_MENTOR";
+  course_session_id: number;
+  agent: UserShort;
+  participant_user: UserShort;
+}
+
 interface Circle {
   id: number;
   title: string;
@@ -40,9 +48,8 @@ export interface Assignment {
   type: string;
 }
 
-export interface Summary {
-  mentor_id: string;
-  participants: Participant[];
+export interface LearningMentorSummary {
+  participant_relations: AgentParticipantRelation[];
   circles: Circle[];
   assignments: Assignment[];
 }
@@ -51,7 +58,7 @@ export const useLearningMentees = (
   courseSessionId: string | Ref<string> | (() => string)
 ) => {
   const isLoading = ref(false);
-  const summary: Ref<Summary | null> = ref(null);
+  const summary: Ref<LearningMentorSummary | null> = ref(null);
   const error = ref(null);
 
   const getAssignmentById = (id: string): Assignment | null => {
diff --git a/client/src/types.ts b/client/src/types.ts
index afdf8556..f37d93c7 100644
--- a/client/src/types.ts
+++ b/client/src/types.ts
@@ -468,15 +468,16 @@ export interface ExpertSessionUser extends CourseSessionUser {
   role: "EXPERT";
 }
 
-export interface Mentor {
+export interface Agent {
   id: number;
   first_name: string;
   last_name: string;
 }
 
-export interface LearningMentor {
+export interface AgentParticipantRelation {
   id: number;
-  mentor: Mentor;
+  role: "LEARNING_MENTOR";
+  agent: Agent;
 }
 
 export type CourseSessionDetail = CourseSessionObjectType;
diff --git a/scripts/send_sendgrid_email.py b/scripts/send_sendgrid_email.py
index 012ea5f8..07c5dbc9 100644
--- a/scripts/send_sendgrid_email.py
+++ b/scripts/send_sendgrid_email.py
@@ -39,9 +39,9 @@ def send_learning_mentor_invitation():
         recipient_email="daniel.egger+sendgrid@gmail.com",
         template=EmailTemplate.LEARNING_MENTOR_INVITATION,
         template_data={
-            "inviter_name": f"Daniel Egger",
+            "inviter_name": "Daniel Egger",
             "inviter_email": "daniel.egger@example.com",
-            "target_url": f"https://stage.vbv-afa.ch/foobar",
+            "target_url": "https://stage.vbv-afa.ch/foobar",
         },
         template_language="de",
         fail_silently=True,
diff --git a/server/vbv_lernwelt/core/management/commands/cypress_reset.py b/server/vbv_lernwelt/core/management/commands/cypress_reset.py
index eb46bc5c..0c47aba5 100644
--- a/server/vbv_lernwelt/core/management/commands/cypress_reset.py
+++ b/server/vbv_lernwelt/core/management/commands/cypress_reset.py
@@ -43,7 +43,10 @@ from vbv_lernwelt.course.services import mark_course_completion
 from vbv_lernwelt.course_session.models import CourseSessionAttendanceCourse
 from vbv_lernwelt.course_session.services.attendance import AttendanceUserStatus
 from vbv_lernwelt.feedback.models import FeedbackResponse
-from vbv_lernwelt.learning_mentor.models import LearningMentor, MentorInvitation
+from vbv_lernwelt.learning_mentor.models import (
+    AgentParticipantRelation,
+    MentorInvitation,
+)
 from vbv_lernwelt.learnpath.models import (
     LearningContentAttendanceCourse,
     LearningContentFeedbackUK,
@@ -144,7 +147,8 @@ def command(
     SelfEvaluationFeedback.objects.all().delete()
     CourseCompletionFeedback.objects.all().delete()
 
-    LearningMentor.objects.all().delete()
+    AgentParticipantRelation.objects.all().delete()
+    # LearningMentor.objects.all().delete()
     MentorInvitation.objects.all().delete()
     User.objects.all().update(organisation=Organisation.objects.first())
     User.objects.all().update(language="de")
@@ -414,48 +418,40 @@ def command(
 
     if create_learning_mentor:
         cs_bern = CourseSession.objects.get(id=TEST_COURSE_SESSION_BERN_ID)
-
-        uk_mentor = LearningMentor.objects.create(
-            mentor=User.objects.get(id=TEST_MENTOR1_USER_ID),
-            course_session=cs_bern,
-        )
-        uk_mentor.participants.add(
-            CourseSessionUser.objects.get(
-                user__id=TEST_STUDENT1_USER_ID,
-                course_session=cs_bern,
-            )
+        AgentParticipantRelation.objects.create(
+            agent=User.objects.get(id=TEST_MENTOR1_USER_ID),
+            participant=CourseSessionUser.objects.get(
+                user__id=TEST_STUDENT1_USER_ID, course_session=cs_bern
+            ),
+            role="LEARNING_MENTOR",
         )
 
         vv_course = Course.objects.get(id=COURSE_VERSICHERUNGSVERMITTLERIN_ID)
         vv_course_session = CourseSession.objects.get(course=vv_course)
-        vv_mentor = LearningMentor.objects.create(
-            mentor=User.objects.get(id=TEST_MENTOR1_USER_ID),
-            course_session=vv_course_session,
-        )
 
-        vv_mentor.participants.add(
-            CourseSessionUser.objects.get(
-                user__id=TEST_STUDENT1_VV_USER_ID, course_session=vv_course_session
-            )
-        )
-
-        vv_mentor.participants.add(
-            CourseSessionUser.objects.get(
-                user__id=TEST_STUDENT2_VV_AND_VV_MENTOR_USER_ID,
-                course_session=vv_course_session,
-            )
-        )
-
-        vv_student_and_mentor = LearningMentor.objects.create(
-            mentor=User.objects.get(id=TEST_STUDENT2_VV_AND_VV_MENTOR_USER_ID),
-            course_session=vv_course_session,
-        )
-
-        vv_student_and_mentor.participants.add(
-            CourseSessionUser.objects.get(
+        AgentParticipantRelation.objects.create(
+            agent=User.objects.get(id=TEST_MENTOR1_USER_ID),
+            participant=CourseSessionUser.objects.get(
                 user__id=TEST_STUDENT1_VV_USER_ID,
                 course_session=vv_course_session,
-            )
+            ),
+            role="LEARNING_MENTOR",
+        )
+        AgentParticipantRelation.objects.create(
+            agent=User.objects.get(id=TEST_MENTOR1_USER_ID),
+            participant=CourseSessionUser.objects.get(
+                user__id=TEST_STUDENT2_VV_AND_VV_MENTOR_USER_ID,
+                course_session=vv_course_session,
+            ),
+            role="LEARNING_MENTOR",
+        )
+        AgentParticipantRelation.objects.create(
+            agent=User.objects.get(id=TEST_STUDENT2_VV_AND_VV_MENTOR_USER_ID),
+            participant=CourseSessionUser.objects.get(
+                user__id=TEST_STUDENT1_VV_USER_ID,
+                course_session=vv_course_session,
+            ),
+            role="LEARNING_MENTOR",
         )
 
     course = Course.objects.get(id=COURSE_TEST_ID)
diff --git a/server/vbv_lernwelt/core/management/commands/reset_iterativ_test_sessions.py b/server/vbv_lernwelt/core/management/commands/reset_iterativ_test_sessions.py
index d9afab70..ce007a79 100644
--- a/server/vbv_lernwelt/core/management/commands/reset_iterativ_test_sessions.py
+++ b/server/vbv_lernwelt/core/management/commands/reset_iterativ_test_sessions.py
@@ -24,7 +24,10 @@ from vbv_lernwelt.course_session.models import (
 )
 from vbv_lernwelt.course_session_group.models import CourseSessionGroup
 from vbv_lernwelt.feedback.models import FeedbackResponse
-from vbv_lernwelt.learning_mentor.models import LearningMentor
+from vbv_lernwelt.learning_mentor.models import (
+    AgentParticipantRelation,
+    AgentParticipantRoleType,
+)
 from vbv_lernwelt.learnpath.models import Circle
 from vbv_lernwelt.notify.models import Notification
 
@@ -71,7 +74,7 @@ def create_or_update_uk(language="de"):
     cs = CourseSession.objects.get(import_id=data["ID"])
 
     members, trainer, regionenleiter = get_or_create_users_uk()
-    delete_cs_data(cs, members + [trainer, regionenleiter])
+    delete_cs_data(cs)
 
     add_to_course_session(cs, members)
     add_trainers_to_course_session(cs, [trainer], uk_circle_keys, language)
@@ -89,13 +92,13 @@ def create_or_update_vv(language="de"):
 
     create_or_update_assignment_course_session(cs)
     members, member_with_mentor, mentor = get_or_create_users_vv()
-    delete_cs_data(cs, members + [member_with_mentor, mentor])
+    delete_cs_data(cs)
 
     add_to_course_session(cs, members + [member_with_mentor])
     add_mentor_to_course_session(cs, [(mentor, member_with_mentor)])
 
 
-def delete_cs_data(cs: CourseSession, users: list[User]):
+def delete_cs_data(cs: CourseSession):
     if cs:
         CourseCompletion.objects.filter(course_session=cs).delete()
         Notification.objects.filter(course_session=cs).delete()
@@ -105,16 +108,8 @@ def delete_cs_data(cs: CourseSession, users: list[User]):
         )
         CourseSessionEdoniqTest.objects.filter(course_session=cs).delete()
         CourseSessionUser.objects.filter(course_session=cs).delete()
-        learning_mentor_ids = (
-            LearningMentor.objects.filter(participants__course_session=cs)
-            .values_list("id", flat=True)
-            .distinct()
-            | LearningMentor.objects.filter(mentor__in=users)
-            .values_list("id", flat=True)
-            .distinct()
-        )
-        # cannot call delete on distinct objects
-        LearningMentor.objects.filter(id__in=list(learning_mentor_ids)).delete()
+
+        AgentParticipantRelation.objects.filter(course_session=cs).delete()
     else:
         logger.info("no_course_session_found", import_id=cs.import_id)
 
@@ -138,15 +133,12 @@ def add_mentor_to_course_session(
     course_session: CourseSession, mentor_mentee_pairs: list[tuple[User, User]]
 ):
     for mentor, mentee in mentor_mentee_pairs:
-        lm = LearningMentor.objects.create(
-            course_session=course_session,
-            mentor=mentor,
-        )
-        lm.participants.add(
-            CourseSessionUser.objects.get(
-                user__id=mentee.id,
-                course_session=course_session,
-            )
+        AgentParticipantRelation.objects.create(
+            agent=mentor,
+            participant=CourseSessionUser.objects.get(
+                user__id=mentee.id, course_session=course_session
+            ),
+            role=AgentParticipantRoleType.LEARNING_MENTOR.value,
         )
 
 
diff --git a/server/vbv_lernwelt/core/serializers.py b/server/vbv_lernwelt/core/serializers.py
index 31965017..5aea54d8 100644
--- a/server/vbv_lernwelt/core/serializers.py
+++ b/server/vbv_lernwelt/core/serializers.py
@@ -131,6 +131,20 @@ class UserSerializer(serializers.ModelSerializer):
         return instance
 
 
+class UserShortSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = User
+        fields = [
+            "id",
+            "first_name",
+            "last_name",
+            "email",
+            "username",
+            "avatar_url",
+            "language",
+        ]
+
+
 class CypressUserSerializer(serializers.ModelSerializer):
     class Meta:
         model = User
diff --git a/server/vbv_lernwelt/course/creators/test_utils.py b/server/vbv_lernwelt/course/creators/test_utils.py
index d5c65682..6b2e6238 100644
--- a/server/vbv_lernwelt/course/creators/test_utils.py
+++ b/server/vbv_lernwelt/course/creators/test_utils.py
@@ -41,7 +41,10 @@ from vbv_lernwelt.course_session.models import (
 )
 from vbv_lernwelt.course_session_group.models import CourseSessionGroup
 from vbv_lernwelt.duedate.models import DueDate
-from vbv_lernwelt.learning_mentor.models import LearningMentor
+from vbv_lernwelt.learning_mentor.models import (
+    AgentParticipantRelation,
+    AgentParticipantRoleType,
+)
 from vbv_lernwelt.learnpath.models import (
     Circle,
     LearningContentAssignment,
@@ -101,13 +104,13 @@ def create_course_session(
 
 
 def add_learning_mentor(
-    course_session: CourseSession, mentor: User, mentee: CourseSessionUser
-) -> LearningMentor:
-    learning_mentor = LearningMentor.objects.create(
-        course_session=course_session, mentor=mentor
+    mentor: User, mentee: CourseSessionUser
+) -> AgentParticipantRelation:
+    return AgentParticipantRelation.objects.create(
+        agent=mentor,
+        participant=mentee,
+        role=AgentParticipantRoleType.LEARNING_MENTOR.value,
     )
-    learning_mentor.participants.add(mentee)
-    return learning_mentor
 
 
 def add_course_session_user(
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 2798f21e..8ebfc82d 100644
--- a/server/vbv_lernwelt/course/management/commands/create_default_courses.py
+++ b/server/vbv_lernwelt/course/management/commands/create_default_courses.py
@@ -45,10 +45,7 @@ from vbv_lernwelt.competence.create_vv_new_competence_profile import (
     create_vv_new_competence_profile,
 )
 from vbv_lernwelt.competence.models import PerformanceCriteria
-from vbv_lernwelt.core.constants import (
-    TEST_MENTOR1_USER_ID,
-    TEST_STUDENT2_VV_AND_VV_MENTOR_USER_ID,
-)
+from vbv_lernwelt.core.constants import TEST_STUDENT2_VV_AND_VV_MENTOR_USER_ID
 from vbv_lernwelt.core.create_default_users import default_users
 from vbv_lernwelt.core.models import User
 from vbv_lernwelt.course.consts import (
@@ -95,7 +92,6 @@ from vbv_lernwelt.importer.services import (
     import_students_from_excel,
     import_trainers_from_excel_for_training,
 )
-from vbv_lernwelt.learning_mentor.models import LearningMentor
 from vbv_lernwelt.learnpath.create_vv_new_learning_path import (
     create_vv_motorfahrzeug_pruefung_learning_path,
     create_vv_new_learning_path,
@@ -243,6 +239,11 @@ def create_versicherungsvermittlerin_course(
             course_session=cs,
             user=User.objects.get(username="student-vv@eiger-versicherungen.ch"),
         )
+        mentor_and_student_2_learning_csu = CourseSessionUser.objects.create(
+            course_session=cs,
+            user=User.objects.get(id=TEST_STUDENT2_VV_AND_VV_MENTOR_USER_ID),
+            role=CourseSessionUser.Role.MEMBER,
+        )
 
         CourseSessionUser.objects.create(
             course_session=cs,
@@ -262,30 +263,6 @@ def create_versicherungsvermittlerin_course(
             role=CourseSessionUser.Role.EXPERT,
         )
 
-        mentor_and_student_2_learning_csu = CourseSessionUser.objects.create(
-            course_session=cs,
-            user=User.objects.get(id=TEST_STUDENT2_VV_AND_VV_MENTOR_USER_ID),
-            role=CourseSessionUser.Role.MEMBER,
-        )
-
-        # TEST_MENTOR1_USER_ID is only mentor
-        just_mentor = LearningMentor.objects.create(
-            mentor=User.objects.get(id=TEST_MENTOR1_USER_ID),
-            course_session=cs,
-        )
-
-        just_mentor.participants.add(student_1_csu)
-        just_mentor.participants.add(mentor_and_student_2_learning_csu)
-
-        # TEST_STUDENT2_VV_AND_VV_MENTOR_USER_ID is both student and mentor
-
-        mentor_and_student_learning_mentor = LearningMentor.objects.create(
-            mentor=User.objects.get(id=TEST_STUDENT2_VV_AND_VV_MENTOR_USER_ID),
-            course_session=cs,
-        )
-
-        mentor_and_student_learning_mentor.participants.add(student_1_csu)
-
         for admin_email in ADMIN_EMAILS:
             CourseSessionUser.objects.create(
                 course_session=cs,
diff --git a/server/vbv_lernwelt/course/migrations/0009_alter_coursecompletion_completion_status.py b/server/vbv_lernwelt/course/migrations/0009_alter_coursecompletion_completion_status.py
new file mode 100644
index 00000000..2c3fcb8f
--- /dev/null
+++ b/server/vbv_lernwelt/course/migrations/0009_alter_coursecompletion_completion_status.py
@@ -0,0 +1,27 @@
+# Generated by Django 3.2.25 on 2024-07-17 14:53
+
+from django.db import migrations, models
+
+import vbv_lernwelt.course.models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("course", "0008_auto_20240403_1132"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="coursecompletion",
+            name="completion_status",
+            field=models.CharField(
+                choices=[
+                    ("SUCCESS", "Success"),
+                    ("FAIL", "Fail"),
+                    ("UNKNOWN", "Unknown"),
+                ],
+                default=vbv_lernwelt.course.models.CourseCompletionStatus["UNKNOWN"],
+                max_length=255,
+            ),
+        ),
+    ]
diff --git a/server/vbv_lernwelt/course/views.py b/server/vbv_lernwelt/course/views.py
index 6d1a9791..090b5c1e 100644
--- a/server/vbv_lernwelt/course/views.py
+++ b/server/vbv_lernwelt/course/views.py
@@ -27,7 +27,7 @@ from vbv_lernwelt.iam.permissions import (
     has_course_access_by_page_request,
     is_circle_expert,
 )
-from vbv_lernwelt.learning_mentor.models import LearningMentor
+from vbv_lernwelt.learning_mentor.models import AgentParticipantRelation
 
 logger = structlog.get_logger(__name__)
 
@@ -155,9 +155,10 @@ def get_course_sessions(request):
 
         # enrich with mentor course sessions
         mentor_course_sessions = CourseSession.objects.filter(
-            id__in=LearningMentor.objects.filter(mentor=request.user).values_list(
-                "course_session", flat=True
-            )
+            id__in=[
+                rel.participant.course_session_id
+                for rel in AgentParticipantRelation.objects.filter(agent=request.user)
+            ]
         ).prefetch_related("course")
 
         all_to_serialize = (
diff --git a/server/vbv_lernwelt/dashboard/graphql/queries.py b/server/vbv_lernwelt/dashboard/graphql/queries.py
index e508fb8c..330c39a8 100644
--- a/server/vbv_lernwelt/dashboard/graphql/queries.py
+++ b/server/vbv_lernwelt/dashboard/graphql/queries.py
@@ -25,7 +25,10 @@ from vbv_lernwelt.iam.permissions import (
     can_view_course_session_group_statistics,
     can_view_course_session_progress,
 )
-from vbv_lernwelt.learning_mentor.models import LearningMentor
+from vbv_lernwelt.learning_mentor.models import (
+    AgentParticipantRelation,
+    AgentParticipantRoleType,
+)
 from vbv_lernwelt.learnpath.models import Circle
 
 
@@ -95,12 +98,15 @@ class DashboardQuery(graphene.ObjectType):
         mentees_ids = set()
         course_session_ids = set()
 
-        mentees = CourseSessionUser.objects.filter(
-            participants__mentor=user, course_session__course=course
-        ).values_list("user", "course_session")
-        for user_id, course_session_id in mentees:
-            mentees_ids.add(user_id)
-            course_session_ids.add(course_session_id)
+        relations_qs = AgentParticipantRelation.objects.filter(
+            agent=user,
+            role=AgentParticipantRoleType.LEARNING_MENTOR.value,
+            participant__course_session__course=course,
+        )
+
+        for relation in relations_qs:
+            mentees_ids.add(relation.participant.user_id)
+            course_session_ids.add(relation.participant.course_session_id)
 
         return CourseStatisticsType(
             _id=f"mentor:{course.id}",  # noqa
@@ -249,29 +255,31 @@ def get_user_statistics_dashboards(user: User) -> Tuple[List[Dict[str, str]], Se
 def get_learning_mentor_dashboards(
     user: User, exclude_course_ids: Set[int]
 ) -> Tuple[List[Dict[str, str]], Set[int]]:
-    learning_mentor = LearningMentor.objects.filter(mentor=user).exclude(
-        course_session__course__id__in=exclude_course_ids
-    )
+    learning_mentor_relation_qs = AgentParticipantRelation.objects.filter(
+        agent=user, role=AgentParticipantRoleType.LEARNING_MENTOR.value
+    ).exclude(participant__course_session__course__id__in=exclude_course_ids)
 
     dashboards = []
     course_ids = set()
 
-    for mentor in learning_mentor:
-        course = mentor.course_session.course
-        course_ids.add(course.id)
+    for rel in learning_mentor_relation_qs:
+        course = rel.participant.course_session.course
         if course.id in UK_COURSE_IDS:
             dashboard_type = DashboardType.PRAXISBILDNER_DASHBOARD
         else:
             dashboard_type = DashboardType.MENTOR_DASHBOARD
-        dashboards.append(
-            {
-                "id": str(course.id),
-                "name": course.title,
-                "slug": course.slug,
-                "dashboard_type": dashboard_type,
-                "course_configuration": course.configuration,
-            }
-        )
+
+        if course.id not in course_ids:
+            course_ids.add(course.id)
+            dashboards.append(
+                {
+                    "id": str(course.id),
+                    "name": course.title,
+                    "slug": course.slug,
+                    "dashboard_type": dashboard_type,
+                    "course_configuration": course.configuration,
+                }
+            )
 
     return dashboards, course_ids
 
diff --git a/server/vbv_lernwelt/dashboard/tests/graphql/test_dashboard.py b/server/vbv_lernwelt/dashboard/tests/graphql/test_dashboard.py
index 6373eea3..2f9631d5 100644
--- a/server/vbv_lernwelt/dashboard/tests/graphql/test_dashboard.py
+++ b/server/vbv_lernwelt/dashboard/tests/graphql/test_dashboard.py
@@ -110,22 +110,22 @@ class DashboardTestCase(GraphQLTestCase):
 
         self.client.force_login(member)
 
-        query = f"""query($course_id: ID!) {{
-            course_progress(course_id: $course_id) {{
+        query = """query($course_id: ID!) {
+            course_progress(course_id: $course_id) {
                 course_id
                 session_to_continue_id
-                competence {{
+                competence {
                     total_count
                     success_count
                     fail_count
-                }}
-                assignment {{
+                }
+                assignment {
                     total_count
                     points_max_count
                     points_achieved_count
-                }}
-            }}
-        }}
+                }
+            }
+        }
         """
 
         variables = {"course_id": str(course.id)}
@@ -268,7 +268,7 @@ class DashboardTestCase(GraphQLTestCase):
             role=CourseSessionUser.Role.MEMBER,
         )
 
-        add_learning_mentor(course_session=cs_1, mentor=mentor, mentee=csu)
+        add_learning_mentor(mentor=mentor, mentee=csu)
 
         self.client.force_login(mentor)
 
@@ -287,6 +287,7 @@ class DashboardTestCase(GraphQLTestCase):
 
         # THEN
         self.assertResponseNoErrors(response)
+        print(response.json())
 
         self.assertEqual(len(response.json()["data"]["dashboard_config"]), 1)
         self.assertEqual(
@@ -314,7 +315,7 @@ class DashboardTestCase(GraphQLTestCase):
             role=CourseSessionUser.Role.MEMBER,
         )
 
-        add_learning_mentor(course_session=cs, mentor=mentor_and_member, mentee=mentee)
+        add_learning_mentor(mentor=mentor_and_member, mentee=mentee)
 
         # WHEN
         self.client.force_login(mentor_and_member)
@@ -350,11 +351,11 @@ class DashboardTestCase(GraphQLTestCase):
 
         self.client.force_login(disallowed_user)
 
-        query = f"""query($course_id: ID!) {{
-            course_statistics(course_id: $course_id) {{
+        query = """query($course_id: ID!) {
+            course_statistics(course_id: $course_id) {
                 course_id
-            }}
-        }}
+            }
+        }
         """
         variables = {"course_id": str(course.id)}
 
@@ -384,13 +385,13 @@ class DashboardTestCase(GraphQLTestCase):
 
         self.client.force_login(supervisor)
 
-        query = f"""query($course_id: ID!) {{
-            course_statistics(course_id: $course_id) {{
+        query = """query($course_id: ID!) {
+            course_statistics(course_id: $course_id) {
                 course_id
                 course_title
                 course_slug
-            }}
-        }}
+            }
+        }
         """
         variables = {"course_id": str(course_2.id)}
 
diff --git a/server/vbv_lernwelt/dashboard/tests/graphql/test_mentor_statistics.py b/server/vbv_lernwelt/dashboard/tests/graphql/test_mentor_statistics.py
index 823fdd09..31947f5b 100644
--- a/server/vbv_lernwelt/dashboard/tests/graphql/test_mentor_statistics.py
+++ b/server/vbv_lernwelt/dashboard/tests/graphql/test_mentor_statistics.py
@@ -7,7 +7,7 @@ from vbv_lernwelt.assignment.models import (
 from vbv_lernwelt.course.creators.test_utils import add_course_session_user, create_user
 from vbv_lernwelt.course.models import CourseSessionUser
 from vbv_lernwelt.dashboard.tests.test_views import BaseMentorAssignmentTestCase
-from vbv_lernwelt.learning_mentor.models import LearningMentor
+from vbv_lernwelt.learning_mentor.models import AgentParticipantRelation
 
 
 class MentorStatisticsTestCase(BaseMentorAssignmentTestCase, GraphQLTestCase):
@@ -19,15 +19,13 @@ class MentorStatisticsTestCase(BaseMentorAssignmentTestCase, GraphQLTestCase):
         self.course.configuration.save()
 
         self.mentor = create_user("mentor")
-        self.lm = LearningMentor.objects.create(
-            mentor=self.mentor, course_session=self.course_session
-        )
         self.participants = [create_user(f"participant{i}") for i in range(4)]
 
     def test_assignment_statistics(self):
         # WHEN
         has_lb = [True, True, True, False]
         has_passed = [True, False, True, False]
+
         for i in range(4):
             csu = add_course_session_user(
                 self.course_session,
@@ -35,7 +33,9 @@ class MentorStatisticsTestCase(BaseMentorAssignmentTestCase, GraphQLTestCase):
                 role=CourseSessionUser.Role.MEMBER,
             )
             if has_lb[i]:
-                self.lm.participants.add(csu)
+                AgentParticipantRelation.objects.create(
+                    agent=self.mentor, participant=csu, role="LEARNING_MENTOR"
+                )
 
             AssignmentCompletion.objects.create(
                 course_session=self.course_session,
@@ -47,22 +47,22 @@ class MentorStatisticsTestCase(BaseMentorAssignmentTestCase, GraphQLTestCase):
             )
         # THEN
         # WHEN
-        query = f"""query ($courseId: ID!) {{
-            mentor_course_statistics(course_id: $courseId) {{
+        query = """query ($courseId: ID!) {
+            mentor_course_statistics(course_id: $courseId) {
               course_session_selection_ids
               user_selection_ids
-              assignments {{
+              assignments {
                 _id
-                summary {{
+                summary {
                   _id
                   completed_count
                   average_passed
                   total_passed
                   total_failed
-                }}
-              }}
-            }}
-          }}"""
+                }
+              }
+            }
+          }"""
 
         # THEN
         variables = {"courseId": str(self.course.id)}
diff --git a/server/vbv_lernwelt/dashboard/tests/test_views.py b/server/vbv_lernwelt/dashboard/tests/test_views.py
index 277bbf5b..629b5b6d 100644
--- a/server/vbv_lernwelt/dashboard/tests/test_views.py
+++ b/server/vbv_lernwelt/dashboard/tests/test_views.py
@@ -37,7 +37,7 @@ from vbv_lernwelt.dashboard.views import (
     get_course_config,
     get_course_sessions_with_roles_for_user,
 )
-from vbv_lernwelt.learning_mentor.models import LearningMentor
+from vbv_lernwelt.learning_mentor.models import AgentParticipantRelation
 from vbv_lernwelt.learnpath.models import Circle, LearningUnit
 from vbv_lernwelt.self_evaluation_feedback.models import SelfEvaluationFeedback
 
@@ -98,14 +98,16 @@ class GetCourseSessionsForUserTestCase(TestCase):
 
     def test_learning_mentor_get_sessions(self):
         mentor = create_user("mentor")
-        LearningMentor.objects.create(mentor=mentor, course_session=self.course_session)
 
         participant = create_user("participant")
-        add_course_session_user(
+        csu = add_course_session_user(
             self.course_session,
             participant,
             role=CourseSessionUser.Role.MEMBER,
         )
+        AgentParticipantRelation.objects.create(
+            agent=mentor, participant=csu, role="LEARNING_MENTOR"
+        )
 
         sessions = get_course_sessions_with_roles_for_user(mentor)
 
@@ -187,7 +189,16 @@ class GetDashboardConfig(TestCase):
     def test_mentor_uk_get_config(self):
         # GIVEN
         mentor = create_user("mentor")
-        LearningMentor.objects.create(mentor=mentor, course_session=self.course_session)
+
+        participant = create_user("participant")
+        csu = add_course_session_user(
+            self.course_session,
+            participant,
+            role=CourseSessionUser.Role.MEMBER,
+        )
+        AgentParticipantRelation.objects.create(
+            agent=mentor, participant=csu, role="LEARNING_MENTOR"
+        )
 
         self.course.configuration.is_uk = True
         self.course.configuration.save()
@@ -205,7 +216,15 @@ class GetDashboardConfig(TestCase):
     def test_mentor_vv_get_config(self):
         # GIVEN
         mentor = create_user("mentor")
-        LearningMentor.objects.create(mentor=mentor, course_session=self.course_session)
+        participant = create_user("participant")
+        csu = add_course_session_user(
+            self.course_session,
+            participant,
+            role=CourseSessionUser.Role.MEMBER,
+        )
+        AgentParticipantRelation.objects.create(
+            agent=mentor, participant=csu, role="LEARNING_MENTOR"
+        )
 
         self.course.configuration.is_vv = True
         self.course.configuration.save()
@@ -228,7 +247,16 @@ class GetDashboardConfig(TestCase):
             mentor,
             role=CourseSessionUser.Role.MEMBER,
         )
-        LearningMentor.objects.create(mentor=mentor, course_session=self.course_session)
+
+        participant = create_user("participant")
+        csu = add_course_session_user(
+            self.course_session,
+            participant,
+            role=CourseSessionUser.Role.MEMBER,
+        )
+        AgentParticipantRelation.objects.create(
+            agent=mentor, participant=csu, role="LEARNING_MENTOR"
+        )
 
         self.course.configuration.is_vv = True
         self.course.configuration.save()
@@ -264,9 +292,6 @@ class GetMenteeCountTestCase(TestCase):
         participants_with_mentor = [create_user(f"participant{i}") for i in range(2)]
         participant = create_user("participant")
         mentor = create_user("mentor")
-        lm = LearningMentor.objects.create(
-            mentor=mentor, course_session=self.course_session
-        )
 
         # WHEN
         for p in participants_with_mentor:
@@ -275,7 +300,9 @@ class GetMenteeCountTestCase(TestCase):
                 p,
                 role=CourseSessionUser.Role.MEMBER,
             )
-            lm.participants.add(csu)
+            AgentParticipantRelation.objects.create(
+                agent=mentor, participant=csu, role="LEARNING_MENTOR"
+            )
 
         add_course_session_user(
             self.course_session,
@@ -305,9 +332,6 @@ class GetMentorOpenTasksTestCase(BaseMentorAssignmentTestCase):
         self.course.configuration.save()
 
         self.mentor = create_user("mentor")
-        self.lm = LearningMentor.objects.create(
-            mentor=self.mentor, course_session=self.course_session
-        )
         self.participants = [create_user(f"participant{i}") for i in range(2)]
 
     def create_and_test_count(
@@ -337,7 +361,10 @@ class GetMentorOpenTasksTestCase(BaseMentorAssignmentTestCase):
             self.participants[0],
             role=CourseSessionUser.Role.MEMBER,
         )
-        self.lm.participants.add(csu)
+
+        AgentParticipantRelation.objects.create(
+            agent=self.mentor, participant=csu, role="LEARNING_MENTOR"
+        )
 
         add_course_session_user(
             self.course_session,
@@ -367,7 +394,9 @@ class GetMentorOpenTasksTestCase(BaseMentorAssignmentTestCase):
             self.participants[0],
             role=CourseSessionUser.Role.MEMBER,
         )
-        self.lm.participants.add(csu)
+        AgentParticipantRelation.objects.create(
+            agent=self.mentor, participant=csu, role="LEARNING_MENTOR"
+        )
 
         add_course_session_user(
             self.course_session,
@@ -389,8 +418,9 @@ class GetMentorOpenTasksTestCase(BaseMentorAssignmentTestCase):
             self.participants[0],
             role=CourseSessionUser.Role.MEMBER,
         )
-        self.lm.participants.add(csu)
-
+        AgentParticipantRelation.objects.create(
+            agent=self.mentor, participant=csu, role="LEARNING_MENTOR"
+        )
         SelfEvaluationFeedback.objects.create(
             feedback_submitted=False,
             feedback_requester_user=self.participants[0],
@@ -411,8 +441,9 @@ class GetMentorOpenTasksTestCase(BaseMentorAssignmentTestCase):
             self.participants[0],
             role=CourseSessionUser.Role.MEMBER,
         )
-        self.lm.participants.add(csu)
-
+        AgentParticipantRelation.objects.create(
+            agent=self.mentor, participant=csu, role="LEARNING_MENTOR"
+        )
         SelfEvaluationFeedback.objects.create(
             feedback_submitted=True,
             feedback_requester_user=self.participants[0],
diff --git a/server/vbv_lernwelt/dashboard/views.py b/server/vbv_lernwelt/dashboard/views.py
index 1cdf533a..186da2ae 100644
--- a/server/vbv_lernwelt/dashboard/views.py
+++ b/server/vbv_lernwelt/dashboard/views.py
@@ -42,7 +42,10 @@ from vbv_lernwelt.feedback.export import (
     export_feedback_with_circle_restriction,
     FEEDBACK_EXPORT_FILE_NAME,
 )
-from vbv_lernwelt.learning_mentor.models import LearningMentor
+from vbv_lernwelt.learning_mentor.models import (
+    AgentParticipantRelation,
+    AgentParticipantRoleType,
+)
 from vbv_lernwelt.learnpath.models import Circle
 from vbv_lernwelt.self_evaluation_feedback.models import SelfEvaluationFeedback
 
@@ -118,15 +121,15 @@ def get_course_sessions_with_roles_for_user(user: User) -> List[CourseSessionWit
             result_course_sessions[cs.id] = cs
 
     # enrich with mentor course sessions
-    lm_qs = LearningMentor.objects.filter(mentor=user).prefetch_related(
-        "course_session", "course_session__course"
+    lm_qs = AgentParticipantRelation.objects.filter(agent=user).prefetch_related(
+        "participant__course_session", "participant__course_session__course"
     )
     for lm in lm_qs:
-        cs = lm.course_session
+        cs = lm.participant.course_session
         cs.roles = set()
         cs = result_course_sessions.get(cs.id, cs)
 
-        cs.roles.add("LEARNING_MENTOR")
+        cs.roles.add(lm.role)
         result_course_sessions[cs.id] = cs
 
     return [
@@ -197,46 +200,46 @@ def _create_person_list_with_roles(user):
     # add persons where request.user is mentor
     for cs in course_sessions:
         if "LEARNING_MENTOR" in cs.roles:
-            lm = LearningMentor.objects.filter(
-                mentor=user, course_session=cs.id
-            ).first()
-
-            for participant in lm.participants.all():
+            for relation in AgentParticipantRelation.objects.filter(
+                agent=user, participant__course_session_id=cs.id
+            ):
                 course_session_entry = _create_course_session_dict(
                     cs,
                     "LEARNING_MENTOR",
                     "LEARNING_MENTEE",
                 )
+                participant_user = relation.participant.user
 
-                if participant.user.id not in result_persons:
-                    person_data = create_user_dict(participant.user)
+                if participant_user.id not in result_persons:
+                    person_data = create_user_dict(participant_user)
                     person_data["course_sessions"] = [course_session_entry]
-                    result_persons[participant.user.id] = person_data
+                    result_persons[participant_user] = person_data
                 else:
                     # user is already in result_persons
-                    result_persons[participant.user.id]["course_sessions"].append(
+                    result_persons[participant_user]["course_sessions"].append(
                         course_session_entry
                     )
 
     # add persons where request.user is mentee
-    mentor_relation_qs = LearningMentor.objects.filter(
-        participants__user=user
-    ).prefetch_related("mentor", "course_session")
+    mentor_relation_qs = AgentParticipantRelation.objects.filter(
+        participant__user=user,
+        role=AgentParticipantRoleType.LEARNING_MENTOR.value,
+    ).prefetch_related("agent")
     for mentor_relation in mentor_relation_qs:
-        cs = mentor_relation.course_session
+        cs = mentor_relation.participant.course_session
         course_session_entry = _create_course_session_dict(
             cs,
             "LEARNING_MENTEE",
             "LEARNING_MENTOR",
         )
 
-        if mentor_relation.mentor.id not in result_persons:
-            person_data = create_user_dict(mentor_relation.mentor)
+        if mentor_relation.agent.id not in result_persons:
+            person_data = create_user_dict(mentor_relation.agent)
             person_data["course_sessions"] = [course_session_entry]
-            result_persons[mentor_relation.mentor.id] = person_data
+            result_persons[mentor_relation.agent.id] = person_data
         else:
             # user is already in result_persons
-            result_persons[mentor_relation.mentor.id]["course_sessions"].append(
+            result_persons[mentor_relation.agent.id]["course_sessions"].append(
                 course_session_entry
             )
 
@@ -495,8 +498,10 @@ def get_mentee_count(request, course_id: str):
 
 
 def _get_mentee_count(course_id: str, mentor: User) -> int:
-    return CourseSessionUser.objects.filter(
-        participants__mentor=mentor, course_session__course__id=course_id
+    return AgentParticipantRelation.objects.filter(
+        agent=mentor,
+        participant__course_session__course_id=course_id,
+        role=AgentParticipantRoleType.LEARNING_MENTOR.value,
     ).count()
 
 
@@ -524,17 +529,26 @@ def _get_mentor_open_tasks_count(course_id: str, mentor: User) -> int:
 
     course_configuration = CourseConfiguration.objects.get(course_id=course_id)
 
+    learning_meentee_ids = [
+        str(relation.participant.user_id)
+        for relation in AgentParticipantRelation.objects.filter(
+            agent=mentor,
+            participant__course_session__course_id=course_id,
+            role=AgentParticipantRoleType.LEARNING_MENTOR.value,
+        ).prefetch_related("participant")
+    ]
+
     if course_configuration.is_vv:
         open_assigment_count = AssignmentCompletion.objects.filter(
             course_session__course__id=course_id,
             completion_status=AssignmentCompletionStatus.SUBMITTED.value,
             evaluation_user=mentor,  # noqa
-            assignment_user__coursesessionuser__participants__mentor=mentor,
+            assignment_user_id__in=learning_meentee_ids,
         ).count()
 
         open_feedback_qs = SelfEvaluationFeedback.objects.filter(
             feedback_provider_user=mentor,  # noqa
-            feedback_requester_user__coursesessionuser__participants__mentor=mentor,
+            feedback_requester_user_id__in=learning_meentee_ids,
             feedback_submitted=False,
         )
         # filter open feedbacks for course_id (-> not possible with queryset)
diff --git a/server/vbv_lernwelt/iam/permissions.py b/server/vbv_lernwelt/iam/permissions.py
index b9b141b0..1820b9ad 100644
--- a/server/vbv_lernwelt/iam/permissions.py
+++ b/server/vbv_lernwelt/iam/permissions.py
@@ -1,7 +1,10 @@
 from vbv_lernwelt.core.models import User
 from vbv_lernwelt.course.models import Course, CourseSession, CourseSessionUser
 from vbv_lernwelt.course_session_group.models import CourseSessionGroup
-from vbv_lernwelt.learning_mentor.models import LearningMentor
+from vbv_lernwelt.learning_mentor.models import (
+    AgentParticipantRelation,
+    AgentParticipantRoleType,
+)
 from vbv_lernwelt.learnpath.models import LearningSequence
 
 
@@ -22,8 +25,8 @@ def has_course_access(user, course_id):
     ).exists():
         return True
 
-    if LearningMentor.objects.filter(
-        course_session__course_id=course_id, mentor=user
+    if AgentParticipantRelation.objects.filter(
+        agent=user, participant__course_session__course_id=course_id
     ).exists():
         return True
 
@@ -72,8 +75,9 @@ def is_course_session_learning_mentor(mentor: User, course_session_id: int):
     if course_session is None:
         return False
 
-    return LearningMentor.objects.filter(
-        mentor=mentor, course_session=course_session
+    return AgentParticipantRelation.objects.filter(
+        agent=mentor,
+        role=AgentParticipantRoleType.LEARNING_MENTOR.value,
     ).exists()
 
 
@@ -87,9 +91,11 @@ def is_learning_mentor_for_user(
     if csu is None:
         return False
 
-    return LearningMentor.objects.filter(
-        course_session_id=course_session_id, mentor=mentor, participants=csu
-    ).exists()
+    return AgentParticipantRelation.objects.filter(
+        agent=mentor,
+        participant=csu,
+        role=AgentParticipantRoleType.LEARNING_MENTOR.value,
+    )
 
 
 def is_course_session_supervisor(user, course_session_id: int):
@@ -222,8 +228,8 @@ def has_role_in_course(user: User, course: Course) -> bool:
     ).exists():
         return True
 
-    if LearningMentor.objects.filter(
-        course_session__course=course, mentor=user
+    if AgentParticipantRelation.objects.filter(
+        agent=user, participant__course_session__course=course
     ).exists():
         return True
 
diff --git a/server/vbv_lernwelt/iam/tests/test_actions.py b/server/vbv_lernwelt/iam/tests/test_actions.py
index 84d70e5e..c2991ec0 100644
--- a/server/vbv_lernwelt/iam/tests/test_actions.py
+++ b/server/vbv_lernwelt/iam/tests/test_actions.py
@@ -8,7 +8,7 @@ from vbv_lernwelt.course.creators.test_utils import (
 )
 from vbv_lernwelt.course.models import CourseSessionUser
 from vbv_lernwelt.iam.permissions import course_session_permissions
-from vbv_lernwelt.learning_mentor.models import LearningMentor
+from vbv_lernwelt.learning_mentor.models import AgentParticipantRelation
 
 
 class ActionTestCase(TestCase):
@@ -21,14 +21,16 @@ class ActionTestCase(TestCase):
     def test_course_session_permissions(self):
         # GIVEN
         lm = create_user("mentor")
-        LearningMentor.objects.create(mentor=lm, course_session=self.course_session)
 
         participant = create_user("participant")
-        add_course_session_user(
+        csu = add_course_session_user(
             self.course_session,
             participant,
             role=CourseSessionUser.Role.MEMBER,
         )
+        AgentParticipantRelation.objects.create(
+            agent=lm, participant=csu, role="LEARNING_MENTOR"
+        )
 
         trainer = create_user("trainer")
         add_course_session_user(
diff --git a/server/vbv_lernwelt/iam/tests/test_roles.py b/server/vbv_lernwelt/iam/tests/test_roles.py
index 92ae9b20..94e48dbe 100644
--- a/server/vbv_lernwelt/iam/tests/test_roles.py
+++ b/server/vbv_lernwelt/iam/tests/test_roles.py
@@ -9,7 +9,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, is_learning_mentor_for_user
-from vbv_lernwelt.learning_mentor.models import LearningMentor
+from vbv_lernwelt.learning_mentor.models import AgentParticipantRelation
 
 
 class RoleTestCase(TestCase):
@@ -48,9 +48,14 @@ class RoleTestCase(TestCase):
 
     def test_has_role_mentor(self):
         # GIVEN
-        LearningMentor.objects.create(
-            mentor=self.user,
-            course_session=self.course_session,
+        participant = create_user("participant")
+        csu = add_course_session_user(
+            self.course_session,
+            participant,
+            role=CourseSessionUser.Role.MEMBER,
+        )
+        AgentParticipantRelation.objects.create(
+            agent=self.user, participant=csu, role="LEARNING_MENTOR"
         )
 
         # WHEN
@@ -73,14 +78,10 @@ class RoleTestCase(TestCase):
             role=CourseSessionUser.Role.MEMBER,
         )
 
-        learning_mentor = LearningMentor.objects.create(
-            mentor=mentor,
-            course_session=course_session,
+        AgentParticipantRelation.objects.create(
+            agent=mentor, participant=member_csu, role="LEARNING_MENTOR"
         )
 
-        learning_mentor.participants.add(member_csu)
-        learning_mentor.save()
-
         # WHEN
         is_mentor = is_learning_mentor_for_user(
             mentor=mentor,
diff --git a/server/vbv_lernwelt/importer/tests/test_import_course_sessions.py b/server/vbv_lernwelt/importer/tests/test_import_course_sessions.py
index bda1ac8b..9b6f1fda 100644
--- a/server/vbv_lernwelt/importer/tests/test_import_course_sessions.py
+++ b/server/vbv_lernwelt/importer/tests/test_import_course_sessions.py
@@ -101,7 +101,7 @@ class CreateOrUpdateCourseSessionTestCase(TestCase):
             attendance_course.due_date.end.isoformat(), "2023-06-06T13:00:00+00:00"
         )
         self.assertEqual(
-            f"E64, HKV Aarau, Bahnhofstrasse 460, 5001, Aarau",
+            "E64, HKV Aarau, Bahnhofstrasse 460, 5001, Aarau",
             attendance_course.location,
         )
         self.assertEqual("", attendance_course.trainer)
@@ -183,7 +183,7 @@ class CreateOrUpdateCourseSessionTestCase(TestCase):
             attendance_course.due_date.end.isoformat(), "2023-06-06T15:00:00+00:00"
         )
         self.assertEqual(
-            f"E666, HKV Aarau2, Bahnhofstrasse 460, 5002, Aarau",
+            "E666, HKV Aarau2, Bahnhofstrasse 460, 5002, Aarau",
             attendance_course.location,
         )
         self.assertEqual(
diff --git a/server/vbv_lernwelt/learning_mentor/admin.py b/server/vbv_lernwelt/learning_mentor/admin.py
index 8834dd95..dc55ffd1 100644
--- a/server/vbv_lernwelt/learning_mentor/admin.py
+++ b/server/vbv_lernwelt/learning_mentor/admin.py
@@ -1,34 +1,29 @@
 from django.contrib import admin
 
-from vbv_lernwelt.course.models import CourseSessionUser
-from vbv_lernwelt.learning_mentor.models import LearningMentor, MentorInvitation
+from vbv_lernwelt.learning_mentor.models import (
+    AgentParticipantRelation,
+    MentorInvitation,
+)
 
 
-@admin.register(LearningMentor)
-class LearningMentorAdmin(admin.ModelAdmin):
-    def participant_count(self, obj):
-        return obj.participants.count()
+@admin.register(AgentParticipantRelation)
+class TrainerParticipantRelationAdmin(admin.ModelAdmin):
+    list_display = ["agent", "participant", "role"]
 
-    participant_count.short_description = "Participants"
-
-    list_display = ["mentor", "course_session", "participant_count"]
-
-    search_fields = ["mentor__email"]
-
-    raw_id_fields = [
-        "mentor",
-        "course_session",
+    search_fields = [
+        "agent__email",
+        "agent__first_name",
+        "agent__last_name",
+        "participant__user__email",
+        "participant__user__first_name",
+        "participant__user__last_name",
     ]
 
-    def formfield_for_manytomany(self, db_field, request, **kwargs):
-        if db_field.name == "participants":
-            if request.resolver_match.kwargs.get("object_id"):
-                object_id = str(request.resolver_match.kwargs.get("object_id"))
-                lm = LearningMentor.objects.get(id=object_id)
-                kwargs["queryset"] = CourseSessionUser.objects.filter(
-                    course_session=lm.course_session
-                )
-        return super().formfield_for_manytomany(db_field, request, **kwargs)
+    raw_id_fields = [
+        "agent",
+        "participant",
+        # "course_session",
+    ]
 
 
 @admin.register(MentorInvitation)
diff --git a/server/vbv_lernwelt/learning_mentor/apps.py b/server/vbv_lernwelt/learning_mentor/apps.py
index 1580676b..ec958470 100644
--- a/server/vbv_lernwelt/learning_mentor/apps.py
+++ b/server/vbv_lernwelt/learning_mentor/apps.py
@@ -6,4 +6,8 @@ class LearningMentorConfig(AppConfig):
     name = "vbv_lernwelt.learning_mentor"
 
     def ready(self):
-        import vbv_lernwelt.learning_mentor.signals  # noqa F401
+        try:
+            # pylint: disable=unused-import,import-outside-toplevel
+            import vbv_lernwelt.learning_mentor.signals  # noqa F401
+        except ImportError:
+            pass
diff --git a/server/vbv_lernwelt/learning_mentor/migrations/0008_agentparticipantrelation.py b/server/vbv_lernwelt/learning_mentor/migrations/0008_agentparticipantrelation.py
new file mode 100644
index 00000000..d340f670
--- /dev/null
+++ b/server/vbv_lernwelt/learning_mentor/migrations/0008_agentparticipantrelation.py
@@ -0,0 +1,57 @@
+# Generated by Django 3.2.20 on 2024-07-18 13:33
+
+import uuid
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("course", "0009_alter_coursecompletion_completion_status"),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ("learning_mentor", "0007_mentorinvitation_target_url"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="AgentParticipantRelation",
+            fields=[
+                (
+                    "id",
+                    models.UUIDField(
+                        default=uuid.uuid4,
+                        editable=False,
+                        primary_key=True,
+                        serialize=False,
+                    ),
+                ),
+                (
+                    "role",
+                    models.CharField(
+                        choices=[("LEARNING_MENTOR", "LEARNING_MENTOR")],
+                        default="LEARNING_MENTOR",
+                        max_length=255,
+                    ),
+                ),
+                (
+                    "agent",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+                (
+                    "participant",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to="course.coursesessionuser",
+                    ),
+                ),
+            ],
+            options={
+                "unique_together": {("agent", "participant")},
+            },
+        ),
+    ]
diff --git a/server/vbv_lernwelt/learning_mentor/migrations/0009_auto_20240718_1533.py b/server/vbv_lernwelt/learning_mentor/migrations/0009_auto_20240718_1533.py
new file mode 100644
index 00000000..7265067a
--- /dev/null
+++ b/server/vbv_lernwelt/learning_mentor/migrations/0009_auto_20240718_1533.py
@@ -0,0 +1,25 @@
+# Generated by Django 3.2.20 on 2024-07-18 13:33
+from django.db import migrations
+from django.db.migrations import RunPython
+
+
+def refactor_mentor_to_agent_participant(apps=None, schema_editor=None):
+    LearningMentor = apps.get_model("learning_mentor", "LearningMentor")
+    AgentParticipantRelation = apps.get_model(
+        "learning_mentor", "AgentParticipantRelation"
+    )
+
+    for mentor in LearningMentor.objects.all():
+        for participant in mentor.participants.all():
+            AgentParticipantRelation.objects.create(
+                agent=mentor.mentor,
+                participant=participant,
+            )
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("learning_mentor", "0008_agentparticipantrelation"),
+    ]
+
+    operations = [RunPython(refactor_mentor_to_agent_participant)]
diff --git a/server/vbv_lernwelt/learning_mentor/models.py b/server/vbv_lernwelt/learning_mentor/models.py
index fa84b108..1db96576 100644
--- a/server/vbv_lernwelt/learning_mentor/models.py
+++ b/server/vbv_lernwelt/learning_mentor/models.py
@@ -1,4 +1,5 @@
 import uuid
+from enum import Enum
 
 from django.db import models
 from django_extensions.db.models import TimeStampedModel
@@ -30,6 +31,26 @@ class LearningMentor(models.Model):
         return self.participants.values_list("course_session", flat=True).distinct()
 
 
+class AgentParticipantRoleType(Enum):
+    LEARNING_MENTOR = "LEARNING_MENTOR"  # Lernbegleiter
+
+
+class AgentParticipantRelation(models.Model):
+    id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
+
+    agent = models.ForeignKey(User, on_delete=models.CASCADE)
+    participant = models.ForeignKey(CourseSessionUser, on_delete=models.CASCADE)
+
+    role = models.CharField(
+        max_length=255,
+        choices=[(t.value, t.value) for t in AgentParticipantRoleType],
+        default=AgentParticipantRoleType.LEARNING_MENTOR.value,
+    )
+
+    class Meta:
+        unique_together = [("agent", "participant")]
+
+
 class MentorInvitation(TimeStampedModel):
     id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
     email = models.EmailField()
diff --git a/server/vbv_lernwelt/learning_mentor/serializers.py b/server/vbv_lernwelt/learning_mentor/serializers.py
index a644d3cd..35d4bb23 100644
--- a/server/vbv_lernwelt/learning_mentor/serializers.py
+++ b/server/vbv_lernwelt/learning_mentor/serializers.py
@@ -1,7 +1,10 @@
 from rest_framework import serializers
 
-from vbv_lernwelt.core.serializers import UserSerializer
-from vbv_lernwelt.learning_mentor.models import LearningMentor, MentorInvitation
+from vbv_lernwelt.core.serializers import UserShortSerializer
+from vbv_lernwelt.learning_mentor.models import (
+    AgentParticipantRelation,
+    MentorInvitation,
+)
 
 
 class MentorAssignmentCompletionSerializer(serializers.Serializer):
@@ -39,10 +42,24 @@ class InvitationSerializer(serializers.ModelSerializer):
         return invitation
 
 
-class MentorSerializer(serializers.ModelSerializer):
-    mentor = UserSerializer(read_only=True)
+class AgentParticipantRelationSerializer(serializers.ModelSerializer):
+    agent = UserShortSerializer(read_only=True)
+    participant_user = serializers.SerializerMethodField()
+    course_session_id = serializers.SerializerMethodField()
+
+    def get_participant_user(self, obj):
+        return UserShortSerializer(obj.participant.user).data
+
+    def get_course_session_id(self, obj):
+        return obj.participant.course_session_id
 
     class Meta:
-        model = LearningMentor
-        fields = ["id", "mentor"]
+        model = AgentParticipantRelation
+        fields = [
+            "id",
+            "role",
+            "course_session_id",
+            "agent",
+            "participant_user",
+        ]
         read_only_fields = ["id"]
diff --git a/server/vbv_lernwelt/learning_mentor/signals.py b/server/vbv_lernwelt/learning_mentor/signals.py
deleted file mode 100644
index 32cb5c72..00000000
--- a/server/vbv_lernwelt/learning_mentor/signals.py
+++ /dev/null
@@ -1,18 +0,0 @@
-from django.core.exceptions import ValidationError
-from django.db.models.signals import m2m_changed
-from django.dispatch import receiver
-
-from .models import LearningMentor
-
-
-@receiver(m2m_changed, sender=LearningMentor.participants.through)
-def validate_student(sender, instance, action, reverse, model, pk_set, **kwargs):
-    if action == "pre_add":
-        participants = model.objects.filter(pk__in=pk_set)
-        for participant in participants:
-            if participant.course_session != instance.course_session:
-                raise ValidationError(
-                    "Participant (CourseSessionUser) does not match the course for this mentor."
-                )
-            if participant.user == instance.mentor:
-                raise ValidationError("You cannot mentor yourself.")
diff --git a/server/vbv_lernwelt/learning_mentor/tests/test_invitation.py b/server/vbv_lernwelt/learning_mentor/tests/test_invitation.py
index 6c56c29a..0584c2ee 100644
--- a/server/vbv_lernwelt/learning_mentor/tests/test_invitation.py
+++ b/server/vbv_lernwelt/learning_mentor/tests/test_invitation.py
@@ -11,7 +11,11 @@ from vbv_lernwelt.course.creators.test_utils import (
     create_user,
 )
 from vbv_lernwelt.course.models import CourseSessionUser
-from vbv_lernwelt.learning_mentor.models import LearningMentor, MentorInvitation
+from vbv_lernwelt.learning_mentor.models import (
+    AgentParticipantRelation,
+    AgentParticipantRoleType,
+    MentorInvitation,
+)
 from vbv_lernwelt.notify.email.email_services import EmailTemplate
 
 
@@ -254,13 +258,14 @@ class LearningMentorInvitationTest(APITestCase):
         # THEN
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertFalse(MentorInvitation.objects.filter(id=invitation.id).exists())
-        self.assertTrue(
-            LearningMentor.objects.filter(
-                mentor=invitee,
-                course_session=self.course_session,
-                participants=participant_cs_user,
-            ).exists()
-        )
+
+        relation_qs = AgentParticipantRelation.objects.all()
+        self.assertEqual(relation_qs.count(), 1)
+        relation = relation_qs.first()
+        self.assertEqual(relation.agent, invitee)
+        self.assertEqual(relation.participant, participant_cs_user)
+        self.assertEqual(relation.participant.course_session, self.course_session)
+        self.assertEqual(relation.role, AgentParticipantRoleType.LEARNING_MENTOR.value)
 
         user = response.data["user"]
         self.assertEqual(user["id"], str(self.participant.id))
diff --git a/server/vbv_lernwelt/learning_mentor/tests/test_mentor.py b/server/vbv_lernwelt/learning_mentor/tests/test_mentor.py
index 41ce64b6..e32f0b84 100644
--- a/server/vbv_lernwelt/learning_mentor/tests/test_mentor.py
+++ b/server/vbv_lernwelt/learning_mentor/tests/test_mentor.py
@@ -22,7 +22,10 @@ from vbv_lernwelt.course.creators.test_utils import (
     create_user,
 )
 from vbv_lernwelt.course.models import CourseSessionUser
-from vbv_lernwelt.learning_mentor.models import LearningMentor
+from vbv_lernwelt.learning_mentor.models import (
+    AgentParticipantRelation,
+    AgentParticipantRoleType,
+)
 from vbv_lernwelt.self_evaluation_feedback.models import SelfEvaluationFeedback
 
 
@@ -71,63 +74,56 @@ class LearningMentorAPITest(APITestCase):
         response = self.client.get(self.url)
 
         # THEN
+        print(response.data)
         self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
 
     def test_api_no_participants(self) -> None:
         # GIVEN
         self.client.force_login(self.mentor)
-        LearningMentor.objects.create(
-            mentor=self.mentor, course_session=self.course_session
-        )
 
         # WHEN
         response = self.client.get(self.url)
 
         # THEN
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(response.data["participants"], [])
-        self.assertEqual(response.data["assignments"], [])
+        print(response.data)
+        self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
 
     def test_api_participants(self) -> None:
         # GIVEN
         participants = [self.participant_1, self.participant_2, self.participant_3]
-        self.client.force_login(self.mentor)
-        mentor = LearningMentor.objects.create(
-            mentor=self.mentor, course_session=self.course_session
-        )
-        mentor.participants.set(participants)
+
+        for participant in participants:
+            AgentParticipantRelation.objects.create(
+                agent=self.mentor,
+                participant=participant,
+                role=AgentParticipantRoleType.LEARNING_MENTOR.value,
+            )
 
         # WHEN
+        self.client.force_login(self.mentor)
         response = self.client.get(self.url)
 
         # THEN
+        print(response.data)
         self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(len(response.data["participants"]), len(participants))
+        self.assertEqual(len(response.data["participant_relations"]), len(participants))
 
-        participant_1 = [
-            p
-            for p in response.data["participants"]
-            if p["id"] == str(self.participant_1.user.id)
-        ][0]
-        self.assertEqual(participant_1["email"], "participant_1@example.com")
-        self.assertEqual(participant_1["first_name"], "Test")
-        self.assertEqual(participant_1["last_name"], "Participant_1")
+        rel1 = AgentParticipantRelation.objects.get(participant=self.participant_1)
 
-        self.assertEqual(
-            response.data["mentor_id"],
-            mentor.id,
-        )
+        self.assertEqual(rel1.participant.user.email, "participant_1@example.com")
+        self.assertEqual(rel1.participant.user.first_name, "Test")
+        self.assertEqual(rel1.participant.user.last_name, "Participant_1")
 
     def test_api_self_evaluation_feedback(self) -> None:
         # GIVEN
         participants = [self.participant_1, self.participant_2, self.participant_3]
-        self.client.force_login(self.mentor)
 
-        mentor = LearningMentor.objects.create(
-            mentor=self.mentor, course_session=self.course_session
-        )
-
-        mentor.participants.set(participants)
+        for participant in participants:
+            AgentParticipantRelation.objects.create(
+                agent=self.mentor,
+                participant=participant,
+                role=AgentParticipantRoleType.LEARNING_MENTOR.value,
+            )
 
         learning_unit = create_learning_unit(
             circle=self.circle,
@@ -154,6 +150,7 @@ class LearningMentorAPITest(APITestCase):
         # ...
 
         # WHEN
+        self.client.force_login(self.mentor)
         response = self.client.get(self.url)
 
         # THEN
@@ -194,7 +191,6 @@ class LearningMentorAPITest(APITestCase):
 
     def test_api_praxis_assignments(self) -> None:
         # GIVEN
-        self.client.force_login(self.mentor)
 
         assignment = create_assignment(
             course=self.course, assignment_type=AssignmentType.PRAXIS_ASSIGNMENT
@@ -205,13 +201,13 @@ class LearningMentorAPITest(APITestCase):
             course_session=self.course_session, learning_content_assignment=lca
         )
 
-        mentor = LearningMentor.objects.create(
-            mentor=self.mentor,
-            course_session=self.course_session,
-        )
-
         participants = [self.participant_1, self.participant_2, self.participant_3]
-        mentor.participants.set(participants)
+        for participant in participants:
+            AgentParticipantRelation.objects.create(
+                agent=self.mentor,
+                participant=participant,
+                role=AgentParticipantRoleType.LEARNING_MENTOR.value,
+            )
 
         AssignmentCompletion.objects.create(
             assignment_user=self.participant_1.user,
@@ -230,6 +226,7 @@ class LearningMentorAPITest(APITestCase):
         )
 
         # WHEN
+        self.client.force_login(self.mentor)
         response = self.client.get(self.url)
 
         # THEN
@@ -267,12 +264,12 @@ class LearningMentorAPITest(APITestCase):
             role=CourseSessionUser.Role.MEMBER,
         )
 
-        learning_mentor = LearningMentor.objects.create(
-            mentor=self.mentor, course_session=self.course_session
+        db_relation = AgentParticipantRelation.objects.create(
+            agent=self.mentor,
+            participant=participant_cs_user,
+            role=AgentParticipantRoleType.LEARNING_MENTOR.value,
         )
 
-        learning_mentor.participants.add(participant_cs_user)
-
         list_url = reverse(
             "list_user_mentors", kwargs={"course_session_id": self.course_session.id}
         )
@@ -281,12 +278,13 @@ class LearningMentorAPITest(APITestCase):
         response = self.client.get(list_url)
 
         # THEN
+        print(response.data)
         self.assertEqual(response.status_code, status.HTTP_200_OK)
 
-        mentor = response.data[0]
-        self.assertEqual(mentor["id"], learning_mentor.id)
+        mentor_relation = response.data[0]
+        self.assertEqual(mentor_relation["id"], str(db_relation.id))
 
-        mentor_user = mentor["mentor"]
+        mentor_user = mentor_relation["agent"]
         self.assertEqual(mentor_user["email"], self.mentor.email)
         self.assertEqual(mentor_user["id"], str(self.mentor.id))
 
@@ -300,18 +298,17 @@ class LearningMentorAPITest(APITestCase):
             role=CourseSessionUser.Role.MEMBER,
         )
 
-        learning_mentor = LearningMentor.objects.create(
-            mentor=self.mentor, course_session=self.course_session
+        relation = AgentParticipantRelation.objects.create(
+            agent=self.mentor,
+            participant=participant_cs_user,
+            role=AgentParticipantRoleType.LEARNING_MENTOR.value,
         )
 
-        learning_mentor.participants.add(participant_cs_user)
-
         remove_url = reverse(
-            "remove_participant_from_mentor",
+            "delete_agent_participant_relation",
             kwargs={
                 "course_session_id": self.course_session.id,
-                "mentor_id": learning_mentor.id,
-                "participant_user_id": participant_cs_user.user.id,
+                "relation_id": relation.id,
             },
         )
 
@@ -320,9 +317,7 @@ class LearningMentorAPITest(APITestCase):
 
         # THEN
         self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)
-        self.assertFalse(
-            LearningMentor.objects.filter(participants=participant_cs_user).exists()
-        )
+        self.assertEqual(AgentParticipantRelation.objects.count(), 0)
 
     def test_remove_myself_from_mentor(self) -> None:
         # GIVEN
@@ -335,18 +330,17 @@ class LearningMentorAPITest(APITestCase):
             role=CourseSessionUser.Role.MEMBER,
         )
 
-        learning_mentor = LearningMentor.objects.create(
-            mentor=self.mentor, course_session=self.course_session
+        relation = AgentParticipantRelation.objects.create(
+            agent=self.mentor,
+            participant=participant_cs_user,
+            role=AgentParticipantRoleType.LEARNING_MENTOR.value,
         )
 
-        learning_mentor.participants.add(participant_cs_user)
-
         remove_url = reverse(
-            "remove_participant_from_mentor",
+            "delete_agent_participant_relation",
             kwargs={
                 "course_session_id": self.course_session.id,
-                "mentor_id": learning_mentor.id,
-                "participant_user_id": participant_cs_user.user.id,
+                "relation_id": relation.id,
             },
         )
 
@@ -355,26 +349,54 @@ class LearningMentorAPITest(APITestCase):
 
         # THEN
         self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)
-        self.assertFalse(
-            LearningMentor.objects.filter(participants=participant_cs_user).exists()
-        )
+        self.assertEqual(AgentParticipantRelation.objects.count(), 0)
 
     def test_mentor_multiple_courses(self) -> None:
         # GIVEN
         course_a, _ = create_course("Course A")
         course_session_a = create_course_session(course=course_a, title="Test A")
+        participant_a = create_user("participant_a")
+        participant_course_session_a = add_course_session_user(
+            course_session_a,
+            participant_a,
+            role=CourseSessionUser.Role.MEMBER,
+        )
 
         course_b, _ = create_course("Course B")
         course_session_b = create_course_session(course=course_b, title="Test B")
+        participant_b = create_user("participant_b")
+        participant_course_session_b = add_course_session_user(
+            course_session_b,
+            participant_b,
+            role=CourseSessionUser.Role.MEMBER,
+        )
 
         # WHEN
-        LearningMentor.objects.create(
-            mentor=self.mentor, course_session=course_session_a
+        relation_a = AgentParticipantRelation.objects.create(
+            agent=self.mentor,
+            participant=participant_course_session_a,
+            role=AgentParticipantRoleType.LEARNING_MENTOR.value,
+        )
+        relation_b = AgentParticipantRelation.objects.create(
+            agent=self.mentor,
+            participant=participant_course_session_b,
+            role=AgentParticipantRoleType.LEARNING_MENTOR.value,
         )
 
-        LearningMentor.objects.create(
-            mentor=self.mentor, course_session=course_session_b
+        self.client.force_login(self.mentor)
+
+        response_a = self.client.get(
+            reverse("mentor_summary", kwargs={"course_session_id": course_session_a.id})
+        )
+        self.assertEqual(len(response_a.data["participant_relations"]), 1)
+        self.assertEqual(
+            response_a.data["participant_relations"][0]["id"], str(relation_a.id)
         )
 
-        # THEN
-        self.assertEqual(LearningMentor.objects.count(), 2)
+        response_b = self.client.get(
+            reverse("mentor_summary", kwargs={"course_session_id": course_session_b.id})
+        )
+        self.assertEqual(len(response_b.data["participant_relations"]), 1)
+        self.assertEqual(
+            response_b.data["participant_relations"][0]["id"], str(relation_b.id)
+        )
diff --git a/server/vbv_lernwelt/learning_mentor/urls.py b/server/vbv_lernwelt/learning_mentor/urls.py
index b64ccd4e..47fd479d 100644
--- a/server/vbv_lernwelt/learning_mentor/urls.py
+++ b/server/vbv_lernwelt/learning_mentor/urls.py
@@ -6,9 +6,9 @@ urlpatterns = [
     path("summary", views.mentor_summary, name="mentor_summary"),
     path("mentors", views.list_user_mentors, name="list_user_mentors"),
     path(
-        "mentors/<int:mentor_id>/remove/<uuid:participant_user_id>",
-        views.remove_participant_from_mentor,
-        name="remove_participant_from_mentor",
+        "mentors/<uuid:relation_id>/delete",
+        views.delete_agent_participant_relation,
+        name="delete_agent_participant_relation",
     ),
     path("invitations", views.list_invitations, name="list_invitations"),
     path("invitations/create", views.create_invitation, name="create_invitation"),
diff --git a/server/vbv_lernwelt/learning_mentor/views.py b/server/vbv_lernwelt/learning_mentor/views.py
index 4eaf517c..f2c27705 100644
--- a/server/vbv_lernwelt/learning_mentor/views.py
+++ b/server/vbv_lernwelt/learning_mentor/views.py
@@ -16,11 +16,15 @@ from vbv_lernwelt.learning_mentor.content.praxis_assignment import (
 from vbv_lernwelt.learning_mentor.content.self_evaluation_feedback import (
     get_self_feedback_evaluation,
 )
-from vbv_lernwelt.learning_mentor.models import LearningMentor, MentorInvitation
+from vbv_lernwelt.learning_mentor.models import (
+    AgentParticipantRelation,
+    AgentParticipantRoleType,
+    MentorInvitation,
+)
 from vbv_lernwelt.learning_mentor.serializers import (
+    AgentParticipantRelationSerializer,
     InvitationSerializer,
     MentorAssignmentStatusSerializer,
-    MentorSerializer,
 )
 from vbv_lernwelt.learnpath.models import Circle
 from vbv_lernwelt.notify.email.email_services import EmailTemplate, send_email
@@ -31,12 +35,16 @@ from vbv_lernwelt.notify.email.email_services import EmailTemplate, send_email
 def mentor_summary(request, course_session_id: int):
     course_session = CourseSession.objects.get(id=course_session_id)
 
-    mentor = get_object_or_404(
-        LearningMentor, mentor=request.user, course_session=course_session
+    participant_qs = AgentParticipantRelation.objects.filter(
+        agent=request.user,
+        participant__course_session=course_session,
+        role=AgentParticipantRoleType.LEARNING_MENTOR.value,
     )
 
-    participants = mentor.participants.filter(course_session=course_session)
-    users = [p.user for p in participants]
+    if participant_qs.count() == 0:
+        return Response(status=status.HTTP_404_NOT_FOUND)
+
+    users = [p.participant.user for p in participant_qs]
 
     assignments = []
     circle_ids = set()
@@ -71,8 +79,9 @@ def mentor_summary(request, course_session_id: int):
     )
     return Response(
         {
-            "mentor_id": mentor.id,
-            "participants": [UserSerializer(user).data for user in users],
+            "participant_relations": AgentParticipantRelationSerializer(
+                participant_qs, many=True
+            ).data,
             "circles": list(
                 Circle.objects.filter(id__in=circle_ids).values("id", "title")
             ),
@@ -176,27 +185,24 @@ def list_user_mentors(request, course_session_id: int):
         CourseSessionUser, user=request.user, course_session=course_session
     )
 
-    mentors = LearningMentor.objects.filter(
-        course_session=course_session, participants=course_session_user
+    mentors = AgentParticipantRelation.objects.filter(
+        participant=course_session_user,
+        role=AgentParticipantRoleType.LEARNING_MENTOR.value,
     )
 
-    return Response(MentorSerializer(mentors, many=True).data)
+    return Response(AgentParticipantRelationSerializer(mentors, many=True).data)
 
 
 @api_view(["DELETE"])
 @permission_classes([IsAuthenticated])
-def remove_participant_from_mentor(
-    request, course_session_id: int, mentor_id: int, participant_user_id: uuid.UUID
+def delete_agent_participant_relation(
+    request, course_session_id: int, relation_id: uuid.UUID
 ):
     requester_user = request.user
-    mentor = get_object_or_404(
-        LearningMentor, id=mentor_id, course_session_id=course_session_id
-    )
+    relation = get_object_or_404(AgentParticipantRelation, id=relation_id)
 
-    is_requester_mentor = requester_user.id == mentor.mentor_id
-    is_requester_participant = mentor.participants.filter(
-        user=requester_user, course_session_id=course_session_id
-    ).exists()
+    is_requester_mentor = requester_user.id == relation.agent.id
+    is_requester_participant = requester_user.id == relation.participant.user.id
 
     if not is_requester_mentor and not is_requester_participant:
         return Response(
@@ -204,12 +210,7 @@ def remove_participant_from_mentor(
             status=status.HTTP_403_FORBIDDEN,
         )
 
-    course_session = get_object_or_404(CourseSession, id=course_session_id)
-    course_session_user = get_object_or_404(
-        CourseSessionUser, user=participant_user_id, course_session=course_session
-    )
-
-    mentor.participants.remove(course_session_user)
+    relation.delete()
 
     return Response(status=status.HTTP_204_NO_CONTENT)
 
@@ -228,11 +229,12 @@ def accept_invitation(request, course_session_id: int):
             status=status.HTTP_400_BAD_REQUEST,
         )
 
-    mentor, _ = LearningMentor.objects.get_or_create(
-        mentor=request.user, course_session=course_session
+    AgentParticipantRelation.objects.get_or_create(
+        agent=request.user,
+        participant=invitation.participant,
+        role=AgentParticipantRoleType.LEARNING_MENTOR.value,
     )
 
-    mentor.participants.add(invitation.participant)
     invitation.delete()
 
     return Response(
diff --git a/server/vbv_lernwelt/media_files/views.py b/server/vbv_lernwelt/media_files/views.py
index 55f37610..1d9abb95 100644
--- a/server/vbv_lernwelt/media_files/views.py
+++ b/server/vbv_lernwelt/media_files/views.py
@@ -2,6 +2,7 @@ import imghdr
 from wsgiref.util import FileWrapper
 
 import structlog
+from django.conf import settings
 from django.contrib.auth.decorators import login_required
 from django.http import HttpResponse, StreamingHttpResponse
 from django.shortcuts import get_object_or_404
@@ -21,6 +22,16 @@ def user_image(request, image_id):
 
     try:
         rendition = image.get_rendition(filter_spec)
+
+        rendition.file.open("rb")
+        image_format = imghdr.what(rendition.file)
+
+        return StreamingHttpResponse(
+            FileWrapper(rendition.file),
+            content_type=(
+                f"image/{image_format}" if image_format else "binary/octet-stream"
+            ),
+        )
     except SourceImageIOError:
         return HttpResponse(
             "Source image file not found", content_type="text/plain", status=410
@@ -31,11 +42,14 @@ def user_image(request, image_id):
             content_type="text/plain",
             status=400,
         )
-
-    rendition.file.open("rb")
-    image_format = imghdr.what(rendition.file)
-
-    return StreamingHttpResponse(
-        FileWrapper(rendition.file),
-        content_type=f"image/{image_format}" if image_format else "binary/octet-stream",
-    )
+    except Exception:
+        if settings.APP_ENVIRONMENT.startswith("local"):
+            # do not spam the console
+            logger.warning("Error while serving image")
+        else:
+            logger.exception(
+                "Error while serving image", exc_info=True, label="s3_mediafiles"
+            )
+        return HttpResponse(
+            "Error while serving image", content_type="text/plain", status=400
+        )
diff --git a/server/vbv_lernwelt/self_evaluation_feedback/tests/test_api.py b/server/vbv_lernwelt/self_evaluation_feedback/tests/test_api.py
index adb22c0b..d95de0c8 100644
--- a/server/vbv_lernwelt/self_evaluation_feedback/tests/test_api.py
+++ b/server/vbv_lernwelt/self_evaluation_feedback/tests/test_api.py
@@ -14,7 +14,7 @@ from vbv_lernwelt.course.creators.test_utils import (
 )
 from vbv_lernwelt.course.models import CourseCompletionStatus, CourseSessionUser
 from vbv_lernwelt.course.services import mark_course_completion
-from vbv_lernwelt.learning_mentor.models import LearningMentor
+from vbv_lernwelt.learning_mentor.models import AgentParticipantRelation
 from vbv_lernwelt.self_evaluation_feedback.models import (
     CourseCompletionFeedback,
     SelfEvaluationFeedback,
@@ -51,13 +51,10 @@ class SelfEvaluationFeedbackAPI(APITestCase):
             title="Test Circle", course_page=self.course_page
         )
 
-        learning_mentor = LearningMentor.objects.create(
-            mentor=self.mentor,
-            course_session=self.course_session,
+        AgentParticipantRelation.objects.create(
+            agent=self.mentor, participant=member_csu, role="LEARNING_MENTOR"
         )
 
-        learning_mentor.participants.add(member_csu)
-
     @patch(
         "vbv_lernwelt.notify.services.NotificationService.send_self_evaluation_feedback_request_feedback_notification"
     )
diff --git a/server/vbv_lernwelt/self_evaluation_feedback/views.py b/server/vbv_lernwelt/self_evaluation_feedback/views.py
index f725273c..bb75d116 100644
--- a/server/vbv_lernwelt/self_evaluation_feedback/views.py
+++ b/server/vbv_lernwelt/self_evaluation_feedback/views.py
@@ -11,7 +11,7 @@ from vbv_lernwelt.core.models import User
 from vbv_lernwelt.core.serializers import UserSerializer
 from vbv_lernwelt.course.models import CourseCompletion, CourseSession
 from vbv_lernwelt.iam.permissions import can_view_course_completions
-from vbv_lernwelt.learning_mentor.models import LearningMentor
+from vbv_lernwelt.learning_mentor.models import AgentParticipantRelation
 from vbv_lernwelt.learnpath.models import Circle, LearningUnit
 from vbv_lernwelt.notify.services import NotificationService
 from vbv_lernwelt.self_evaluation_feedback.models import (
@@ -38,10 +38,9 @@ def start_self_evaluation_feedback(request, learning_unit_id):
     learning_unit = get_object_or_404(LearningUnit, id=learning_unit_id)
     feedback_provider_user = get_object_or_404(User, id=feedback_provider_user_id)
 
-    if not LearningMentor.objects.filter(
-        course_session__course=learning_unit.get_course(),
-        mentor=feedback_provider_user,
-        participants__user=request.user,
+    if not AgentParticipantRelation.objects.filter(
+        agent=feedback_provider_user,
+        participant__user=request.user,
     ).exists():
         raise PermissionDenied()
 
diff --git a/server/vbv_lernwelt/shop/migrations/0016_alter_checkoutinformation_refno2.py b/server/vbv_lernwelt/shop/migrations/0016_alter_checkoutinformation_refno2.py
new file mode 100644
index 00000000..23520b90
--- /dev/null
+++ b/server/vbv_lernwelt/shop/migrations/0016_alter_checkoutinformation_refno2.py
@@ -0,0 +1,17 @@
+# Generated by Django 3.2.25 on 2024-07-17 14:53
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("shop", "0015_cembra_fields"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="checkoutinformation",
+            name="refno2",
+            field=models.CharField(max_length=255),
+        ),
+    ]
diff --git a/server/vbv_lernwelt/sso/admin.py b/server/vbv_lernwelt/sso/admin.py
index afd9b3aa..42dabe9c 100644
--- a/server/vbv_lernwelt/sso/admin.py
+++ b/server/vbv_lernwelt/sso/admin.py
@@ -5,7 +5,10 @@ from keycloak.exceptions import KeycloakDeleteError, KeycloakPostError
 
 from vbv_lernwelt.course.models import CourseSessionUser
 from vbv_lernwelt.course_session_group.models import CourseSessionGroup
-from vbv_lernwelt.learning_mentor.models import LearningMentor
+from vbv_lernwelt.learning_mentor.models import (
+    AgentParticipantRelation,
+    AgentParticipantRoleType,
+)
 from vbv_lernwelt.sso.models import SsoSyncError, SsoUser
 from vbv_lernwelt.sso.role_sync.services import (
     create_and_update_user,
@@ -20,7 +23,7 @@ def create_sso_user_from_admin(user: User, request):
         create_and_update_user(user)  # noqa
         user.save()
         messages.add_message(
-            request, messages.SUCCESS, f"Der Bentuzer wurde in Keycloak erstellt."
+            request, messages.SUCCESS, "Der Bentuzer wurde in Keycloak erstellt."
         )
     except KeycloakPostError as e:
         messages.add_message(
@@ -31,24 +34,26 @@ def create_sso_user_from_admin(user: User, request):
 
 
 def sync_sso_roles_from_admin(user: User, request):
-    course_roles = [
+    course_roles = {
         (csu.course_session.course.slug, csu.role)
         for csu in CourseSessionUser.objects.filter(user=user)
-    ]
+    }
 
-    course_roles += [
-        (lm.course_session.course.slug, "LEARNING_MENTOR")
-        for lm in LearningMentor.objects.filter(mentor=user)
-    ]
+    course_roles += {
+        (relation.participant.course_session.course.slug, "LEARNING_MENTOR")
+        for relation in AgentParticipantRelation.objects.filter(
+            agent=user, role=AgentParticipantRoleType.LEARNING_MENTOR.value
+        )
+    }
 
     for csg in CourseSessionGroup.objects.filter(supervisor=user):
         for course_session in csg.course_session.all():
-            course_roles.append((course_session.course.slug, "SUPERVISOR"))
+            course_roles.add((course_session.course.slug, "SUPERVISOR"))
 
     try:
         sync_roles_for_user(user, course_roles)
         messages.add_message(
-            request, messages.SUCCESS, f"Die Daten wurden mit Keycloak synchronisiert."
+            request, messages.SUCCESS, "Die Daten wurden mit Keycloak synchronisiert."
         )
     except KeycloakDeleteError as e:
         messages.add_message(
diff --git a/server/vbv_lernwelt/sso/role_sync/services.py b/server/vbv_lernwelt/sso/role_sync/services.py
index f3c2c563..706c63ba 100644
--- a/server/vbv_lernwelt/sso/role_sync/services.py
+++ b/server/vbv_lernwelt/sso/role_sync/services.py
@@ -1,5 +1,5 @@
 import unicodedata
-from typing import Dict, List, Tuple
+from typing import Dict, List, Set, Tuple
 
 import structlog
 from django.conf import settings
@@ -12,7 +12,7 @@ from vbv_lernwelt.sso.role_sync.roles import ROLE_IDS, SSO_ROLES
 
 logger = structlog.get_logger(__name__)
 
-CourseRolesType = List[Tuple[str, str]]
+CourseRolesType = Set[Tuple[str, str]]
 KeyCloakRolesType = List[Dict[str, str]]
 
 keycloak_admin = None  # Needed for pytest
diff --git a/server/vbv_lernwelt/sso/signals.py b/server/vbv_lernwelt/sso/signals.py
index 56f4f83e..ec44ee59 100644
--- a/server/vbv_lernwelt/sso/signals.py
+++ b/server/vbv_lernwelt/sso/signals.py
@@ -6,7 +6,10 @@ from keycloak.exceptions import KeycloakDeleteError, KeycloakError, KeycloakPost
 from vbv_lernwelt.core.models import User
 from vbv_lernwelt.course.models import CourseSessionUser
 from vbv_lernwelt.course_session_group.models import CourseSessionGroup
-from vbv_lernwelt.learning_mentor.models import LearningMentor
+from vbv_lernwelt.learning_mentor.models import (
+    AgentParticipantRelation,
+    AgentParticipantRoleType,
+)
 from vbv_lernwelt.sso.role_sync.services import (
     add_roles_to_user,
     remove_roles_from_user,
@@ -78,21 +81,39 @@ def update_sso_roles_in_csg(sender, instance, action, reverse, model, pk_set, **
 
 
 # LearningMentor
-@receiver(post_delete, sender=LearningMentor, dispatch_uid="delete_sso_roles_in_lm")
-def remove_sso_roles_in_lm(sender, instance: LearningMentor, **kwargs):
-    if not LearningMentor.objects.filter(
-        mentor=instance.mentor, course_session__course=instance.course_session.course
+@receiver(
+    post_delete, sender=AgentParticipantRelation, dispatch_uid="delete_sso_roles_in_lm"
+)
+def remove_sso_roles_in_lm(sender, instance: AgentParticipantRelation, **kwargs):
+    if not AgentParticipantRelation.objects.filter(
+        agent=instance.agent,
+        participant__course_session__course=instance.participant.course_session.course,
+        role=AgentParticipantRoleType.LEARNING_MENTOR.value,
     ).exists():
         _remove_sso_role(
-            instance.mentor, instance.course_session.course.slug, "LEARNING_MENTOR"
+            instance.agent,
+            instance.participant.course_session.course.slug,
+            "LEARNING_MENTOR",
         )
 
 
-@receiver(pre_save, sender=LearningMentor, dispatch_uid="update_sso_roles_in_lm")
-def update_sso_roles_in_lm(sender, instance: LearningMentor, **kwargs):
-    if not instance.pk:
+@receiver(
+    pre_save, sender=AgentParticipantRelation, dispatch_uid="update_sso_roles_in_lm"
+)
+def update_sso_roles_in_lm(sender, instance: AgentParticipantRelation, **kwargs):
+    if (
+        instance.role == AgentParticipantRoleType.LEARNING_MENTOR.value
+        and AgentParticipantRelation.objects.filter(
+            agent=instance.agent,
+            participant__course_session__course=instance.participant.course_session.course,
+            role=AgentParticipantRoleType.LEARNING_MENTOR.value,
+        ).count()
+        == 0
+    ):
         _add_sso_role(
-            instance.mentor, instance.course_session.course.slug, "LEARNING_MENTOR"
+            instance.agent,
+            instance.participant.course_session.course.slug,
+            "LEARNING_MENTOR",
         )
 
 
diff --git a/server/vbv_lernwelt/sso/tests/test_signals.py b/server/vbv_lernwelt/sso/tests/test_signals.py
index 70697ee7..dfa30a1c 100644
--- a/server/vbv_lernwelt/sso/tests/test_signals.py
+++ b/server/vbv_lernwelt/sso/tests/test_signals.py
@@ -24,7 +24,7 @@ from vbv_lernwelt.course.creators.test_utils import (
 )
 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.learning_mentor.models import AgentParticipantRelation
 from vbv_lernwelt.sso.signals import update_sso_roles_in_cs
 
 
@@ -217,10 +217,16 @@ class LearningMentorTests(TestCase):
     def setUp(self):
         self.course, self.course_page = create_course("Test Course")
         self.course_session = create_course_session(course=self.course, title="Test VV")
-
         self.user = create_user("mentor")
-        self.mentor = LearningMentor.objects.create(
-            mentor=self.user, course_session=self.course_session
+
+        participant = create_user("participant")
+        self.csu = add_course_session_user(
+            self.course_session,
+            participant,
+            role=CourseSessionUser.Role.MEMBER,
+        )
+        self.relation = AgentParticipantRelation.objects.create(
+            agent=self.user, participant=self.csu, role="LEARNING_MENTOR"
         )
 
     @patch("vbv_lernwelt.sso.signals.remove_roles_from_user")
@@ -229,7 +235,7 @@ class LearningMentorTests(TestCase):
     ):
         mock_remove_roles_from_user.return_value = None
 
-        self.mentor.delete()
+        self.relation.delete()
 
         self.assertEqual(mock_remove_roles_from_user.call_count, 1)
 
@@ -240,10 +246,10 @@ class LearningMentorTests(TestCase):
     @patch("vbv_lernwelt.sso.signals.add_roles_to_user")
     def test_add_roles_for_learning_mentor_on_create(self, mock_add_roles_from_user):
         mock_add_roles_from_user.return_value = None
-        self.mentor.delete()
+        self.relation.delete()
 
-        LearningMentor.objects.create(
-            mentor=self.user, course_session=self.course_session
+        AgentParticipantRelation.objects.create(
+            agent=self.user, participant=self.csu, role="LEARNING_MENTOR"
         )
 
         self.assertEqual(mock_add_roles_from_user.call_count, 1)
@@ -263,5 +269,8 @@ class LearningMentorTests(TestCase):
         )
 
         mock_add_roles_from_user.reset_mock()
-        self.mentor.participants.set([participant_1])
+
+        AgentParticipantRelation.objects.create(
+            agent=self.user, participant=participant_1, role="LEARNING_MENTOR"
+        )
         self.assertEqual(mock_add_roles_from_user.call_count, 0)

From 57384fcf5d70f146f33c10dcc8e22a0b7b0b8bef Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Sun, 21 Jul 2024 16:13:59 +0200
Subject: [PATCH 05/40] Add initial script to create
 `berufsbildner-mobi@example.com`

---
 scripts/create_berufsbilnder_mobi.py          | 46 +++++++++++++++++++
 server/vbv_lernwelt/learning_mentor/admin.py  |  2 +
 ...010_alter_agentparticipantrelation_role.py | 24 ++++++++++
 server/vbv_lernwelt/learning_mentor/models.py |  1 +
 4 files changed, 73 insertions(+)
 create mode 100644 scripts/create_berufsbilnder_mobi.py
 create mode 100644 server/vbv_lernwelt/learning_mentor/migrations/0010_alter_agentparticipantrelation_role.py

diff --git a/scripts/create_berufsbilnder_mobi.py b/scripts/create_berufsbilnder_mobi.py
new file mode 100644
index 00000000..c784eed5
--- /dev/null
+++ b/scripts/create_berufsbilnder_mobi.py
@@ -0,0 +1,46 @@
+import os
+import sys
+
+import django
+from django.contrib.auth.hashers import make_password
+
+sys.path.append("../server")
+
+os.environ.setdefault("IT_APP_ENVIRONMENT", "local")
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.base")
+django.setup()
+
+from vbv_lernwelt.course.models import CourseSessionUser
+from vbv_lernwelt.core.admin import User
+from vbv_lernwelt.learning_mentor.models import (
+    AgentParticipantRelation,
+    AgentParticipantRoleType,
+)
+
+
+def main():
+    berufsbildner, _ = User.objects.get_or_create(
+        id="5f984be9-3024-4169-9c7b-c9e827c18fd8"
+    )
+    berufsbildner.username = "berufsbildner-mobi@example.com"
+    berufsbildner.email = "berufsbildner-mobi@example.com"
+    berufsbildner.language = "de"
+    berufsbildner.first_name = "Berufsbildner"
+    berufsbildner.last_name = "Mobi"
+    berufsbildner.password = make_password("test")
+    berufsbildner.save()
+
+    for csu in (
+        CourseSessionUser.objects.filter(user__username__contains="@mobi")
+        .filter(course_session__course__configuration__is_uk=True)
+        .exclude(course_session_id__in=[4, 5, 6])
+    ):
+        AgentParticipantRelation.objects.get_or_create(
+            agent=berufsbildner,
+            participant=csu,
+            role=AgentParticipantRoleType.BERUFSBILDNER.value,
+        )
+
+
+if __name__ == "__main__":
+    main()
diff --git a/server/vbv_lernwelt/learning_mentor/admin.py b/server/vbv_lernwelt/learning_mentor/admin.py
index dc55ffd1..86cf4fb0 100644
--- a/server/vbv_lernwelt/learning_mentor/admin.py
+++ b/server/vbv_lernwelt/learning_mentor/admin.py
@@ -25,6 +25,8 @@ class TrainerParticipantRelationAdmin(admin.ModelAdmin):
         # "course_session",
     ]
 
+    list_filter = ["role"]
+
 
 @admin.register(MentorInvitation)
 class MentorInvitationAdmin(admin.ModelAdmin):
diff --git a/server/vbv_lernwelt/learning_mentor/migrations/0010_alter_agentparticipantrelation_role.py b/server/vbv_lernwelt/learning_mentor/migrations/0010_alter_agentparticipantrelation_role.py
new file mode 100644
index 00000000..557c50e3
--- /dev/null
+++ b/server/vbv_lernwelt/learning_mentor/migrations/0010_alter_agentparticipantrelation_role.py
@@ -0,0 +1,24 @@
+# Generated by Django 3.2.25 on 2024-07-21 14:08
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("learning_mentor", "0009_auto_20240718_1533"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="agentparticipantrelation",
+            name="role",
+            field=models.CharField(
+                choices=[
+                    ("LEARNING_MENTOR", "LEARNING_MENTOR"),
+                    ("BERUFSBILDNER", "BERUFSBILDNER"),
+                ],
+                default="LEARNING_MENTOR",
+                max_length=255,
+            ),
+        ),
+    ]
diff --git a/server/vbv_lernwelt/learning_mentor/models.py b/server/vbv_lernwelt/learning_mentor/models.py
index 1db96576..d23e2b48 100644
--- a/server/vbv_lernwelt/learning_mentor/models.py
+++ b/server/vbv_lernwelt/learning_mentor/models.py
@@ -33,6 +33,7 @@ class LearningMentor(models.Model):
 
 class AgentParticipantRoleType(Enum):
     LEARNING_MENTOR = "LEARNING_MENTOR"  # Lernbegleiter
+    BERUFSBILDNER = "BERUFSBILDNER"  # Lernbegleiter
 
 
 class AgentParticipantRelation(models.Model):

From b6590c0b86328ea119ae602bedd95b43ce4b13f7 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Sun, 21 Jul 2024 21:20:13 +0200
Subject: [PATCH 06/40] Add `BERUFSBILDNER`-role

---
 server/vbv_lernwelt/dashboard/views.py | 28 ++++++++++++--------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/server/vbv_lernwelt/dashboard/views.py b/server/vbv_lernwelt/dashboard/views.py
index 186da2ae..69cba624 100644
--- a/server/vbv_lernwelt/dashboard/views.py
+++ b/server/vbv_lernwelt/dashboard/views.py
@@ -66,6 +66,7 @@ class RoleKeyType(Enum):
     MENTOR_UK = "MentorUK"
     SUPERVISOR = "Supervisor"
     TRAINER = "Trainer"
+    BERUFSBILDNER = "Berufsbildner"
 
 
 @dataclass(frozen=True)
@@ -89,7 +90,6 @@ class CourseConfig:
     role_key: str
     is_uk: bool
     is_vv: bool
-    is_mentor: bool
     widgets: List[str]
     has_preview: bool
     session_to_continue_id: str | None
@@ -121,15 +121,15 @@ def get_course_sessions_with_roles_for_user(user: User) -> List[CourseSessionWit
             result_course_sessions[cs.id] = cs
 
     # enrich with mentor course sessions
-    lm_qs = AgentParticipantRelation.objects.filter(agent=user).prefetch_related(
+    agent_qs = AgentParticipantRelation.objects.filter(agent=user).prefetch_related(
         "participant__course_session", "participant__course_session__course"
     )
-    for lm in lm_qs:
-        cs = lm.participant.course_session
+    for agent_relation in agent_qs:
+        cs = agent_relation.participant.course_session
         cs.roles = set()
         cs = result_course_sessions.get(cs.id, cs)
 
-        cs.roles.add(lm.role)
+        cs.roles.add(agent_relation.role)
         result_course_sessions[cs.id] = cs
 
     return [
@@ -358,7 +358,7 @@ def get_dashboard_due_dates(request):
 
 
 def get_widgets_for_course(
-    role_key: RoleKeyType, is_uk: bool, is_vv: bool, is_mentor: bool
+    role_key: RoleKeyType, is_uk: bool, is_vv: bool
 ) -> List[str]:
     widgets = []
 
@@ -371,7 +371,7 @@ def get_widgets_for_course(
     if role_key in [RoleKeyType.SUPERVISOR, RoleKeyType.TRAINER] and is_uk:
         widgets.append(WidgetType.UK_STATISTICS_WIDGET.value)
 
-    if is_mentor:
+    if role_key in [RoleKeyType.MENTOR_UK, RoleKeyType.MENTOR_VV]:
         widgets.append(WidgetType.MENTOR_PERSON_WIDGET.value)
         if is_uk:
             widgets.append(WidgetType.MENTOR_COMPETENCE_WIDGET.value)
@@ -400,9 +400,10 @@ def get_role_key_and_mentor(
             role = RoleKeyType.MENTOR_UK
         elif is_vv:
             role = RoleKeyType.MENTOR_VV
+    elif "BERUFSBILDNER" in roles:
+        role = RoleKeyType.BERUFSBILDNER
 
-    is_mentor = "LEARNING_MENTOR" in roles
-    return role, is_mentor
+    return role
 
 
 def collect_course_sessions_by_course(
@@ -444,7 +445,7 @@ def get_course_config(
     for _id, cs_in_course in cs_by_course.items():
         is_uk = cs_in_course[0].course.configuration.is_uk
         is_vv = cs_in_course[0].course.configuration.is_vv
-        role_key, is_mentor = get_role_key_and_mentor(cs_in_course, is_uk, is_vv)
+        role_key = get_role_key_and_mentor(cs_in_course, is_uk, is_vv)
         session_to_continue = get_newest_cs(cs_in_course)
         course_configs.append(
             CourseConfig(
@@ -454,8 +455,7 @@ def get_course_config(
                 role_key=role_key.value,
                 is_uk=is_uk,
                 is_vv=is_vv,
-                is_mentor=is_mentor,
-                widgets=get_widgets_for_course(role_key, is_uk, is_vv, is_mentor),
+                widgets=get_widgets_for_course(role_key, is_uk, is_vv),
                 has_preview=has_preview(role_key),
                 session_to_continue_id=(
                     str(session_to_continue.id) if session_to_continue else None
@@ -511,9 +511,7 @@ def get_mentor_open_tasks_count(request, course_id: str):
         return Response(
             status=200,
             data={
-                "open_task_count": _get_mentor_open_tasks_count(
-                    course_id, request.user
-                )  # noqa
+                "open_task_count": _get_mentor_open_tasks_count(course_id, request.user)  # noqa
             },
         )
     except PermissionDenied as e:

From 1f79693e590cf8d1d273470d0d02e33a13afe11f Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Sun, 21 Jul 2024 21:46:43 +0200
Subject: [PATCH 07/40] Show (wrong) competence dashboard widget for
 `BERUFSBILDNER`

---
 .../src/components/dashboard/CoursePanel.vue  |  1 +
 .../dashboard/MentorCompetenceSummary.vue     |  8 ++-
 client/src/gql/gql.ts                         |  4 +-
 client/src/gql/graphql.ts                     |  4 +-
 client/src/gql/schema.graphql                 |  2 +-
 client/src/graphql/queries.ts                 |  4 +-
 client/src/services/dashboard.ts              | 19 ++++++-
 .../vbv_lernwelt/dashboard/graphql/queries.py | 55 +++++++++++--------
 server/vbv_lernwelt/dashboard/views.py        |  3 +
 9 files changed, 66 insertions(+), 34 deletions(-)

diff --git a/client/src/components/dashboard/CoursePanel.vue b/client/src/components/dashboard/CoursePanel.vue
index 1724372c..241ec339 100644
--- a/client/src/components/dashboard/CoursePanel.vue
+++ b/client/src/components/dashboard/CoursePanel.vue
@@ -167,6 +167,7 @@ function hasActionButton(): boolean {
         <MentorCompetenceSummary
           v-if="hasWidget('MentorCompetenceWidget')"
           :course-id="courseConfig.course_id"
+          :agent-role="courseConfig.role_key"
         />
       </div>
     </div>
diff --git a/client/src/components/dashboard/MentorCompetenceSummary.vue b/client/src/components/dashboard/MentorCompetenceSummary.vue
index d4bd0669..8bd8d902 100644
--- a/client/src/components/dashboard/MentorCompetenceSummary.vue
+++ b/client/src/components/dashboard/MentorCompetenceSummary.vue
@@ -1,18 +1,22 @@
 <script setup lang="ts">
 import type { Ref } from "vue";
 import { onMounted, ref } from "vue";
-import { fetchMentorCompetenceSummary } from "@/services/dashboard";
+import {
+  type DashboardRoleKeyType,
+  fetchMentorCompetenceSummary,
+} from "@/services/dashboard";
 import type { AssignmentsStatisticsType } from "@/gql/graphql";
 import BaseBox from "@/components/dashboard/BaseBox.vue";
 
 const props = defineProps<{
   courseId: string;
+  agentRole: DashboardRoleKeyType;
 }>();
 
 const summary: Ref<AssignmentsStatisticsType | null> = ref(null);
 
 onMounted(async () => {
-  summary.value = await fetchMentorCompetenceSummary(props.courseId);
+  summary.value = await fetchMentorCompetenceSummary(props.courseId, props.agentRole);
   console.log(summary.value);
 });
 </script>
diff --git a/client/src/gql/gql.ts b/client/src/gql/gql.ts
index a159d573..6c090bac 100644
--- a/client/src/gql/gql.ts
+++ b/client/src/gql/gql.ts
@@ -26,7 +26,7 @@ const documents = {
     "\n  query dashboardProgress($courseId: ID!) {\n    course_progress(course_id: $courseId) {\n      _id\n      course_id\n      session_to_continue_id\n      competence {\n        _id\n        total_count\n        success_count\n        fail_count\n      }\n      assignment {\n        _id\n        total_count\n        points_max_count\n        points_achieved_count\n      }\n    }\n  }\n": types.DashboardProgressDocument,
     "\n  query dashboardCourseData($courseId: ID!) {\n    course_progress(course_id: $courseId) {\n      _id\n      course_id\n      session_to_continue_id\n    }\n  }\n": types.DashboardCourseDataDocument,
     "\n  query courseStatistics($courseId: ID!) {\n    course_statistics(course_id: $courseId) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      course_session_selection_ids\n      course_session_selection_metrics {\n        _id\n        session_count\n        participant_count\n        expert_count\n      }\n      attendance_day_presences {\n        _id\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          due_date\n          participants_present\n          participants_total\n          details_url\n        }\n        summary {\n          _id\n          days_completed\n          participants_present\n        }\n      }\n      feedback_responses {\n        _id\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          experts\n          satisfaction_average\n          satisfaction_max\n          details_url\n        }\n        summary {\n          _id\n          satisfaction_average\n          satisfaction_max\n          total_responses\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          details_url\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_passed\n          }\n        }\n      }\n      competences {\n        _id\n        summary {\n          _id\n          success_total\n          fail_total\n        }\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          title\n          success_count\n          fail_count\n          details_url\n        }\n      }\n    }\n  }\n": types.CourseStatisticsDocument,
-    "\n  query mentorCourseStatistics($courseId: ID!) {\n    mentor_course_statistics(course_id: $courseId) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_selection_ids\n      user_selection_ids\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          details_url\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_passed\n          }\n        }\n      }\n    }\n  }\n": types.MentorCourseStatisticsDocument,
+    "\n  query mentorCourseStatistics($courseId: ID!, $agentRole: String!) {\n    mentor_course_statistics(course_id: $courseId, agent_role: $agentRole) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_selection_ids\n      user_selection_ids\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          details_url\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_passed\n          }\n        }\n      }\n    }\n  }\n": types.MentorCourseStatisticsDocument,
     "\n  mutation SendFeedbackMutation(\n    $courseSessionId: ID!\n    $learningContentId: ID!\n    $learningContentType: String!\n    $data: GenericScalar!\n    $submitted: Boolean\n  ) {\n    send_feedback(\n      course_session_id: $courseSessionId\n      learning_content_page_id: $learningContentId\n      learning_content_type: $learningContentType\n      data: $data\n      submitted: $submitted\n    ) {\n      feedback_response {\n        id\n        data\n        submitted\n      }\n      errors {\n        field\n        messages\n      }\n    }\n  }\n": types.SendFeedbackMutationDocument,
 };
 
@@ -99,7 +99,7 @@ export function graphql(source: "\n  query courseStatistics($courseId: ID!) {\n
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  query mentorCourseStatistics($courseId: ID!) {\n    mentor_course_statistics(course_id: $courseId) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_selection_ids\n      user_selection_ids\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          details_url\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_passed\n          }\n        }\n      }\n    }\n  }\n"): (typeof documents)["\n  query mentorCourseStatistics($courseId: ID!) {\n    mentor_course_statistics(course_id: $courseId) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_selection_ids\n      user_selection_ids\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          details_url\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_passed\n          }\n        }\n      }\n    }\n  }\n"];
+export function graphql(source: "\n  query mentorCourseStatistics($courseId: ID!, $agentRole: String!) {\n    mentor_course_statistics(course_id: $courseId, agent_role: $agentRole) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_selection_ids\n      user_selection_ids\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          details_url\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_passed\n          }\n        }\n      }\n    }\n  }\n"): (typeof documents)["\n  query mentorCourseStatistics($courseId: ID!, $agentRole: String!) {\n    mentor_course_statistics(course_id: $courseId, agent_role: $agentRole) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_selection_ids\n      user_selection_ids\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          details_url\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_passed\n          }\n        }\n      }\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
diff --git a/client/src/gql/graphql.ts b/client/src/gql/graphql.ts
index beb6b10f..1018cdf0 100644
--- a/client/src/gql/graphql.ts
+++ b/client/src/gql/graphql.ts
@@ -1020,6 +1020,7 @@ export type QueryLearningPathArgs = {
 
 
 export type QueryMentorCourseStatisticsArgs = {
+  agent_role: Scalars['String']['input'];
   course_id: Scalars['ID']['input'];
 };
 
@@ -1388,6 +1389,7 @@ export type CourseStatisticsQuery = { __typename?: 'Query', course_statistics?:
 
 export type MentorCourseStatisticsQueryVariables = Exact<{
   courseId: Scalars['ID']['input'];
+  agentRole: Scalars['String']['input'];
 }>;
 
 
@@ -1417,5 +1419,5 @@ export const DashboardConfigDocument = {"kind":"Document","definitions":[{"kind"
 export const DashboardProgressDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"dashboardProgress"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course_progress"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_id"}},{"kind":"Field","name":{"kind":"Name","value":"session_to_continue_id"}},{"kind":"Field","name":{"kind":"Name","value":"competence"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"total_count"}},{"kind":"Field","name":{"kind":"Name","value":"success_count"}},{"kind":"Field","name":{"kind":"Name","value":"fail_count"}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignment"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"total_count"}},{"kind":"Field","name":{"kind":"Name","value":"points_max_count"}},{"kind":"Field","name":{"kind":"Name","value":"points_achieved_count"}}]}}]}}]}}]} as unknown as DocumentNode<DashboardProgressQuery, DashboardProgressQueryVariables>;
 export const DashboardCourseDataDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"dashboardCourseData"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course_progress"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_id"}},{"kind":"Field","name":{"kind":"Name","value":"session_to_continue_id"}}]}}]}}]} as unknown as DocumentNode<DashboardCourseDataQuery, DashboardCourseDataQueryVariables>;
 export const CourseStatisticsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"courseStatistics"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course_statistics"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_title"}},{"kind":"Field","name":{"kind":"Name","value":"course_slug"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_properties"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"sessions"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"generations"}},{"kind":"Field","name":{"kind":"Name","value":"circles"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"course_session_selection_ids"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_selection_metrics"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"session_count"}},{"kind":"Field","name":{"kind":"Name","value":"participant_count"}},{"kind":"Field","name":{"kind":"Name","value":"expert_count"}}]}},{"kind":"Field","name":{"kind":"Name","value":"attendance_day_presences"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"due_date"}},{"kind":"Field","name":{"kind":"Name","value":"participants_present"}},{"kind":"Field","name":{"kind":"Name","value":"participants_total"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}}]}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"days_completed"}},{"kind":"Field","name":{"kind":"Name","value":"participants_present"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"feedback_responses"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"experts"}},{"kind":"Field","name":{"kind":"Name","value":"satisfaction_average"}},{"kind":"Field","name":{"kind":"Name","value":"satisfaction_max"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}}]}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"satisfaction_average"}},{"kind":"Field","name":{"kind":"Name","value":"satisfaction_max"}},{"kind":"Field","name":{"kind":"Name","value":"total_responses"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignments"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"completed_count"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_failed"}}]}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_assignment_id"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_title"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type_translation_key"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}},{"kind":"Field","name":{"kind":"Name","value":"deadline"}},{"kind":"Field","name":{"kind":"Name","value":"metrics"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"passed_count"}},{"kind":"Field","name":{"kind":"Name","value":"failed_count"}},{"kind":"Field","name":{"kind":"Name","value":"unranked_count"}},{"kind":"Field","name":{"kind":"Name","value":"ranking_completed"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"competences"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"success_total"}},{"kind":"Field","name":{"kind":"Name","value":"fail_total"}}]}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"success_count"}},{"kind":"Field","name":{"kind":"Name","value":"fail_count"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}}]}}]}}]}}]}}]} as unknown as DocumentNode<CourseStatisticsQuery, CourseStatisticsQueryVariables>;
-export const MentorCourseStatisticsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"mentorCourseStatistics"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"mentor_course_statistics"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_title"}},{"kind":"Field","name":{"kind":"Name","value":"course_slug"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_selection_ids"}},{"kind":"Field","name":{"kind":"Name","value":"user_selection_ids"}},{"kind":"Field","name":{"kind":"Name","value":"assignments"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"completed_count"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_failed"}}]}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_assignment_id"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_title"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type_translation_key"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}},{"kind":"Field","name":{"kind":"Name","value":"deadline"}},{"kind":"Field","name":{"kind":"Name","value":"metrics"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"passed_count"}},{"kind":"Field","name":{"kind":"Name","value":"failed_count"}},{"kind":"Field","name":{"kind":"Name","value":"unranked_count"}},{"kind":"Field","name":{"kind":"Name","value":"ranking_completed"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}}]}}]}}]}}]}}]}}]} as unknown as DocumentNode<MentorCourseStatisticsQuery, MentorCourseStatisticsQueryVariables>;
+export const MentorCourseStatisticsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"mentorCourseStatistics"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"agentRole"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"mentor_course_statistics"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}},{"kind":"Argument","name":{"kind":"Name","value":"agent_role"},"value":{"kind":"Variable","name":{"kind":"Name","value":"agentRole"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_title"}},{"kind":"Field","name":{"kind":"Name","value":"course_slug"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_selection_ids"}},{"kind":"Field","name":{"kind":"Name","value":"user_selection_ids"}},{"kind":"Field","name":{"kind":"Name","value":"assignments"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"completed_count"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_failed"}}]}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_assignment_id"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_title"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type_translation_key"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}},{"kind":"Field","name":{"kind":"Name","value":"deadline"}},{"kind":"Field","name":{"kind":"Name","value":"metrics"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"passed_count"}},{"kind":"Field","name":{"kind":"Name","value":"failed_count"}},{"kind":"Field","name":{"kind":"Name","value":"unranked_count"}},{"kind":"Field","name":{"kind":"Name","value":"ranking_completed"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}}]}}]}}]}}]}}]}}]} as unknown as DocumentNode<MentorCourseStatisticsQuery, MentorCourseStatisticsQueryVariables>;
 export const SendFeedbackMutationDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"SendFeedbackMutation"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"learningContentId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"learningContentType"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"data"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"GenericScalar"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"submitted"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Boolean"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"send_feedback"},"arguments":[{"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":"learning_content_type"},"value":{"kind":"Variable","name":{"kind":"Name","value":"learningContentType"}}},{"kind":"Argument","name":{"kind":"Name","value":"data"},"value":{"kind":"Variable","name":{"kind":"Name","value":"data"}}},{"kind":"Argument","name":{"kind":"Name","value":"submitted"},"value":{"kind":"Variable","name":{"kind":"Name","value":"submitted"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"feedback_response"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"data"}},{"kind":"Field","name":{"kind":"Name","value":"submitted"}}]}},{"kind":"Field","name":{"kind":"Name","value":"errors"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"field"}},{"kind":"Field","name":{"kind":"Name","value":"messages"}}]}}]}}]}}]} as unknown as DocumentNode<SendFeedbackMutationMutation, SendFeedbackMutationMutationVariables>;
\ No newline at end of file
diff --git a/client/src/gql/schema.graphql b/client/src/gql/schema.graphql
index af9a73ac..07be4c64 100644
--- a/client/src/gql/schema.graphql
+++ b/client/src/gql/schema.graphql
@@ -1,6 +1,6 @@
 type Query {
   course_statistics(course_id: ID!): CourseStatisticsType
-  mentor_course_statistics(course_id: ID!): BaseStatisticsType
+  mentor_course_statistics(course_id: ID!, agent_role: String!): BaseStatisticsType
   course_progress(course_id: ID!): CourseProgressType
   dashboard_config: [DashboardConfigType!]!
   learning_path(id: ID, slug: String, course_id: ID, course_slug: String): LearningPathObjectType
diff --git a/client/src/graphql/queries.ts b/client/src/graphql/queries.ts
index c1ef08ac..65359f45 100644
--- a/client/src/graphql/queries.ts
+++ b/client/src/graphql/queries.ts
@@ -504,8 +504,8 @@ export const DASHBOARD_COURSE_STATISTICS = graphql(`
 `);
 
 export const DASHBOARD_MENTOR_COMPETENCE_SUMMARY = graphql(`
-  query mentorCourseStatistics($courseId: ID!) {
-    mentor_course_statistics(course_id: $courseId) {
+  query mentorCourseStatistics($courseId: ID!, $agentRole: String!) {
+    mentor_course_statistics(course_id: $courseId, agent_role: $agentRole) {
       _id
       course_id
       course_title
diff --git a/client/src/services/dashboard.ts b/client/src/services/dashboard.ts
index 422bf2dc..b6c427a9 100644
--- a/client/src/services/dashboard.ts
+++ b/client/src/services/dashboard.ts
@@ -32,7 +32,8 @@ export type DashboardRoleKeyType =
   | "Trainer"
   | "Member"
   | "MentorUK"
-  | "MentorVV";
+  | "MentorVV"
+  | "Berufsbildner";
 
 export type WidgetType =
   | "ProgressWidget"
@@ -149,11 +150,25 @@ export const fetchDashboardConfig = async (): Promise<DashboardConfigType[] | nu
 };
 
 export const fetchMentorCompetenceSummary = async (
-  courseId: string
+  courseId: string,
+  roleKey: DashboardRoleKeyType
 ): Promise<AssignmentsStatisticsType | null> => {
+  let agentRole = "";
+  if (["MentorUK", "MentorVV"].includes(roleKey)) {
+    agentRole = "LEARNING_MENTOR";
+  } else if (roleKey === "Berufsbildner") {
+    agentRole = "BERUFSBILDNER";
+  }
+
+  if (!agentRole) {
+    console.error(`Invalid role key for competence summary: ${roleKey}`);
+    return null;
+  }
+
   try {
     const res = await graphqlClient.query(DASHBOARD_MENTOR_COMPETENCE_SUMMARY, {
       courseId,
+      agentRole,
     });
 
     if (res.error) {
diff --git a/server/vbv_lernwelt/dashboard/graphql/queries.py b/server/vbv_lernwelt/dashboard/graphql/queries.py
index 330c39a8..90e179cf 100644
--- a/server/vbv_lernwelt/dashboard/graphql/queries.py
+++ b/server/vbv_lernwelt/dashboard/graphql/queries.py
@@ -32,13 +32,41 @@ from vbv_lernwelt.learning_mentor.models import (
 from vbv_lernwelt.learnpath.models import Circle
 
 
+def _agent_course_statistics(user, course_id: str, role: str):
+    course = Course.objects.get(id=course_id)
+
+    participant_ids = set()
+    course_session_ids = set()
+
+    relations_qs = AgentParticipantRelation.objects.filter(
+        agent=user,
+        role=role,
+        participant__course_session__course=course,
+    )
+
+    for relation in relations_qs:
+        participant_ids.add(relation.participant.user_id)
+        course_session_ids.add(relation.participant.course_session_id)
+
+    return CourseStatisticsType(
+        _id=f"{role}:{course.id}",  # noqa
+        course_id=course.id,  # noqa
+        course_title=course.title,  # noqa
+        course_slug=course.slug,  # noqa
+        course_session_selection_ids=list(course_session_ids),  # noqa
+        user_selection_ids=list(participant_ids),  # noqa
+    )
+
+
 class DashboardQuery(graphene.ObjectType):
     course_statistics = graphene.Field(
         CourseStatisticsType, course_id=graphene.ID(required=True)
     )
 
     mentor_course_statistics = graphene.Field(
-        BaseStatisticsType, course_id=graphene.ID(required=True)
+        BaseStatisticsType,
+        course_id=graphene.ID(required=True),
+        agent_role=graphene.String(required=True),
     )
 
     course_progress = graphene.Field(
@@ -91,31 +119,10 @@ class DashboardQuery(graphene.ObjectType):
             course_session_selection_ids=list(course_session_ids),  # noqa
         )
 
-    def resolve_mentor_course_statistics(root, info, course_id: str):  # noqa
+    def resolve_mentor_course_statistics(root, info, course_id: str, agent_role: str):  # noqa
         user = info.context.user
-        course = Course.objects.get(id=course_id)
 
-        mentees_ids = set()
-        course_session_ids = set()
-
-        relations_qs = AgentParticipantRelation.objects.filter(
-            agent=user,
-            role=AgentParticipantRoleType.LEARNING_MENTOR.value,
-            participant__course_session__course=course,
-        )
-
-        for relation in relations_qs:
-            mentees_ids.add(relation.participant.user_id)
-            course_session_ids.add(relation.participant.course_session_id)
-
-        return CourseStatisticsType(
-            _id=f"mentor:{course.id}",  # noqa
-            course_id=course.id,  # noqa
-            course_title=course.title,  # noqa
-            course_slug=course.slug,  # noqa
-            course_session_selection_ids=list(course_session_ids),  # noqa
-            user_selection_ids=list(mentees_ids),  # noqa
-        )
+        return _agent_course_statistics(user, course_id, role=agent_role)
 
     def resolve_dashboard_config(root, info):  # noqa
         user = info.context.user
diff --git a/server/vbv_lernwelt/dashboard/views.py b/server/vbv_lernwelt/dashboard/views.py
index 69cba624..bf19fe4a 100644
--- a/server/vbv_lernwelt/dashboard/views.py
+++ b/server/vbv_lernwelt/dashboard/views.py
@@ -378,6 +378,9 @@ def get_widgets_for_course(
         if is_vv:
             widgets.append(WidgetType.MENTOR_TASKS_WIDGET.value)
 
+    if role_key in [RoleKeyType.BERUFSBILDNER]:
+        widgets.append(WidgetType.MENTOR_COMPETENCE_WIDGET.value)
+
     return widgets
 
 

From 0581f3d820c55b859c096e958d151dab48e4a41b Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Sun, 21 Jul 2024 22:46:16 +0200
Subject: [PATCH 08/40] Add `average_evaluation_percent` to assignment metrics

---
 client/package-lock.json                      | 412 ++++++++++++++++++
 client/package.json                           |   1 +
 .../src/components/dashboard/UkStatistics.vue |   2 +-
 client/src/gql/gql.ts                         |   8 +-
 client/src/gql/graphql.ts                     |  11 +-
 client/src/gql/schema.graphql                 |   3 +
 client/src/graphql/queries.ts                 |   6 +
 client/src/stores/dashboard.ts                |   7 -
 .../dashboard/graphql/types/assignment.py     |  28 +-
 9 files changed, 457 insertions(+), 21 deletions(-)

diff --git a/client/package-lock.json b/client/package-lock.json
index 2e2cb333..5ce4098f 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -36,6 +36,7 @@
       "devDependencies": {
         "@graphql-codegen/cli": "^5.0.2",
         "@graphql-codegen/client-preset": "^4.3.2",
+        "@parcel/watcher": "^2.4.1",
         "@rushstack/eslint-patch": "^1.8.0",
         "@savvywombat/tailwindcss-grid-areas": "^4.0.0",
         "@tailwindcss/forms": "^0.5.7",
@@ -3008,6 +3009,279 @@
       "integrity": "sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==",
       "dev": true
     },
+    "node_modules/@parcel/watcher": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.4.1.tgz",
+      "integrity": "sha512-HNjmfLQEVRZmHRET336f20H/8kOozUGwk7yajvsonjNxbj2wBTK1WsQuHkD5yYh9RxFGL2EyDHryOihOwUoKDA==",
+      "dev": true,
+      "dependencies": {
+        "detect-libc": "^1.0.3",
+        "is-glob": "^4.0.3",
+        "micromatch": "^4.0.5",
+        "node-addon-api": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      },
+      "optionalDependencies": {
+        "@parcel/watcher-android-arm64": "2.4.1",
+        "@parcel/watcher-darwin-arm64": "2.4.1",
+        "@parcel/watcher-darwin-x64": "2.4.1",
+        "@parcel/watcher-freebsd-x64": "2.4.1",
+        "@parcel/watcher-linux-arm-glibc": "2.4.1",
+        "@parcel/watcher-linux-arm64-glibc": "2.4.1",
+        "@parcel/watcher-linux-arm64-musl": "2.4.1",
+        "@parcel/watcher-linux-x64-glibc": "2.4.1",
+        "@parcel/watcher-linux-x64-musl": "2.4.1",
+        "@parcel/watcher-win32-arm64": "2.4.1",
+        "@parcel/watcher-win32-ia32": "2.4.1",
+        "@parcel/watcher-win32-x64": "2.4.1"
+      }
+    },
+    "node_modules/@parcel/watcher-android-arm64": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.4.1.tgz",
+      "integrity": "sha512-LOi/WTbbh3aTn2RYddrO8pnapixAziFl6SMxHM69r3tvdSm94JtCenaKgk1GRg5FJ5wpMCpHeW+7yqPlvZv7kg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-darwin-arm64": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.4.1.tgz",
+      "integrity": "sha512-ln41eihm5YXIY043vBrrHfn94SIBlqOWmoROhsMVTSXGh0QahKGy77tfEywQ7v3NywyxBBkGIfrWRHm0hsKtzA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-darwin-x64": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.4.1.tgz",
+      "integrity": "sha512-yrw81BRLjjtHyDu7J61oPuSoeYWR3lDElcPGJyOvIXmor6DEo7/G2u1o7I38cwlcoBHQFULqF6nesIX3tsEXMg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-freebsd-x64": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.4.1.tgz",
+      "integrity": "sha512-TJa3Pex/gX3CWIx/Co8k+ykNdDCLx+TuZj3f3h7eOjgpdKM+Mnix37RYsYU4LHhiYJz3DK5nFCCra81p6g050w==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm-glibc": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.4.1.tgz",
+      "integrity": "sha512-4rVYDlsMEYfa537BRXxJ5UF4ddNwnr2/1O4MHM5PjI9cvV2qymvhwZSFgXqbS8YoTk5i/JR0L0JDs69BUn45YA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm64-glibc": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.4.1.tgz",
+      "integrity": "sha512-BJ7mH985OADVLpbrzCLgrJ3TOpiZggE9FMblfO65PlOCdG++xJpKUJ0Aol74ZUIYfb8WsRlUdgrZxKkz3zXWYA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-arm64-musl": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.4.1.tgz",
+      "integrity": "sha512-p4Xb7JGq3MLgAfYhslU2SjoV9G0kI0Xry0kuxeG/41UfpjHGOhv7UoUDAz/jb1u2elbhazy4rRBL8PegPJFBhA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-x64-glibc": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.4.1.tgz",
+      "integrity": "sha512-s9O3fByZ/2pyYDPoLM6zt92yu6P4E39a03zvO0qCHOTjxmt3GHRMLuRZEWhWLASTMSrrnVNWdVI/+pUElJBBBg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-linux-x64-musl": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.4.1.tgz",
+      "integrity": "sha512-L2nZTYR1myLNST0O632g0Dx9LyMNHrn6TOt76sYxWLdff3cB22/GZX2UPtJnaqQPdCRoszoY5rcOj4oMTtp5fQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-arm64": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.4.1.tgz",
+      "integrity": "sha512-Uq2BPp5GWhrq/lcuItCHoqxjULU1QYEcyjSO5jqqOK8RNFDBQnenMMx4gAl3v8GiWa59E9+uDM7yZ6LxwUIfRg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-ia32": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.4.1.tgz",
+      "integrity": "sha512-maNRit5QQV2kgHFSYwftmPBxiuK5u4DXjbXx7q6eKjq5dsLXZ4FJiVvlcw35QXzk0KrUecJmuVFbj4uV9oYrcw==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/@parcel/watcher-win32-x64": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.4.1.tgz",
+      "integrity": "sha512-+DvS92F9ezicfswqrvIRM2njcYJbd5mb9CUgtrHCHmvn7pPPa+nMDRu1o1bYYz/l5IB2NVGNJWiH7h1E58IF2A==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
     "node_modules/@peculiar/asn1-schema": {
       "version": "2.3.6",
       "resolved": "https://registry.npmjs.org/@peculiar/asn1-schema/-/asn1-schema-2.3.6.tgz",
@@ -6982,6 +7256,18 @@
         "node": ">=8"
       }
     },
+    "node_modules/detect-libc": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
+      "dev": true,
+      "bin": {
+        "detect-libc": "bin/detect-libc.js"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
     "node_modules/didyoumean": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",
@@ -10212,6 +10498,12 @@
         "tslib": "^2.0.3"
       }
     },
+    "node_modules/node-addon-api": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
+      "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
+      "dev": true
+    },
     "node_modules/node-fetch": {
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
@@ -16593,6 +16885,114 @@
       "integrity": "sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==",
       "dev": true
     },
+    "@parcel/watcher": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.4.1.tgz",
+      "integrity": "sha512-HNjmfLQEVRZmHRET336f20H/8kOozUGwk7yajvsonjNxbj2wBTK1WsQuHkD5yYh9RxFGL2EyDHryOihOwUoKDA==",
+      "dev": true,
+      "requires": {
+        "@parcel/watcher-android-arm64": "2.4.1",
+        "@parcel/watcher-darwin-arm64": "2.4.1",
+        "@parcel/watcher-darwin-x64": "2.4.1",
+        "@parcel/watcher-freebsd-x64": "2.4.1",
+        "@parcel/watcher-linux-arm-glibc": "2.4.1",
+        "@parcel/watcher-linux-arm64-glibc": "2.4.1",
+        "@parcel/watcher-linux-arm64-musl": "2.4.1",
+        "@parcel/watcher-linux-x64-glibc": "2.4.1",
+        "@parcel/watcher-linux-x64-musl": "2.4.1",
+        "@parcel/watcher-win32-arm64": "2.4.1",
+        "@parcel/watcher-win32-ia32": "2.4.1",
+        "@parcel/watcher-win32-x64": "2.4.1",
+        "detect-libc": "^1.0.3",
+        "is-glob": "^4.0.3",
+        "micromatch": "^4.0.5",
+        "node-addon-api": "^7.0.0"
+      }
+    },
+    "@parcel/watcher-android-arm64": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.4.1.tgz",
+      "integrity": "sha512-LOi/WTbbh3aTn2RYddrO8pnapixAziFl6SMxHM69r3tvdSm94JtCenaKgk1GRg5FJ5wpMCpHeW+7yqPlvZv7kg==",
+      "dev": true,
+      "optional": true
+    },
+    "@parcel/watcher-darwin-arm64": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.4.1.tgz",
+      "integrity": "sha512-ln41eihm5YXIY043vBrrHfn94SIBlqOWmoROhsMVTSXGh0QahKGy77tfEywQ7v3NywyxBBkGIfrWRHm0hsKtzA==",
+      "dev": true,
+      "optional": true
+    },
+    "@parcel/watcher-darwin-x64": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.4.1.tgz",
+      "integrity": "sha512-yrw81BRLjjtHyDu7J61oPuSoeYWR3lDElcPGJyOvIXmor6DEo7/G2u1o7I38cwlcoBHQFULqF6nesIX3tsEXMg==",
+      "dev": true,
+      "optional": true
+    },
+    "@parcel/watcher-freebsd-x64": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.4.1.tgz",
+      "integrity": "sha512-TJa3Pex/gX3CWIx/Co8k+ykNdDCLx+TuZj3f3h7eOjgpdKM+Mnix37RYsYU4LHhiYJz3DK5nFCCra81p6g050w==",
+      "dev": true,
+      "optional": true
+    },
+    "@parcel/watcher-linux-arm-glibc": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.4.1.tgz",
+      "integrity": "sha512-4rVYDlsMEYfa537BRXxJ5UF4ddNwnr2/1O4MHM5PjI9cvV2qymvhwZSFgXqbS8YoTk5i/JR0L0JDs69BUn45YA==",
+      "dev": true,
+      "optional": true
+    },
+    "@parcel/watcher-linux-arm64-glibc": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.4.1.tgz",
+      "integrity": "sha512-BJ7mH985OADVLpbrzCLgrJ3TOpiZggE9FMblfO65PlOCdG++xJpKUJ0Aol74ZUIYfb8WsRlUdgrZxKkz3zXWYA==",
+      "dev": true,
+      "optional": true
+    },
+    "@parcel/watcher-linux-arm64-musl": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.4.1.tgz",
+      "integrity": "sha512-p4Xb7JGq3MLgAfYhslU2SjoV9G0kI0Xry0kuxeG/41UfpjHGOhv7UoUDAz/jb1u2elbhazy4rRBL8PegPJFBhA==",
+      "dev": true,
+      "optional": true
+    },
+    "@parcel/watcher-linux-x64-glibc": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.4.1.tgz",
+      "integrity": "sha512-s9O3fByZ/2pyYDPoLM6zt92yu6P4E39a03zvO0qCHOTjxmt3GHRMLuRZEWhWLASTMSrrnVNWdVI/+pUElJBBBg==",
+      "dev": true,
+      "optional": true
+    },
+    "@parcel/watcher-linux-x64-musl": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.4.1.tgz",
+      "integrity": "sha512-L2nZTYR1myLNST0O632g0Dx9LyMNHrn6TOt76sYxWLdff3cB22/GZX2UPtJnaqQPdCRoszoY5rcOj4oMTtp5fQ==",
+      "dev": true,
+      "optional": true
+    },
+    "@parcel/watcher-win32-arm64": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.4.1.tgz",
+      "integrity": "sha512-Uq2BPp5GWhrq/lcuItCHoqxjULU1QYEcyjSO5jqqOK8RNFDBQnenMMx4gAl3v8GiWa59E9+uDM7yZ6LxwUIfRg==",
+      "dev": true,
+      "optional": true
+    },
+    "@parcel/watcher-win32-ia32": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.4.1.tgz",
+      "integrity": "sha512-maNRit5QQV2kgHFSYwftmPBxiuK5u4DXjbXx7q6eKjq5dsLXZ4FJiVvlcw35QXzk0KrUecJmuVFbj4uV9oYrcw==",
+      "dev": true,
+      "optional": true
+    },
+    "@parcel/watcher-win32-x64": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.4.1.tgz",
+      "integrity": "sha512-+DvS92F9ezicfswqrvIRM2njcYJbd5mb9CUgtrHCHmvn7pPPa+nMDRu1o1bYYz/l5IB2NVGNJWiH7h1E58IF2A==",
+      "dev": true,
+      "optional": true
+    },
     "@peculiar/asn1-schema": {
       "version": "2.3.6",
       "resolved": "https://registry.npmjs.org/@peculiar/asn1-schema/-/asn1-schema-2.3.6.tgz",
@@ -19508,6 +19908,12 @@
       "integrity": "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==",
       "dev": true
     },
+    "detect-libc": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
+      "dev": true
+    },
     "didyoumean": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",
@@ -21884,6 +22290,12 @@
         "tslib": "^2.0.3"
       }
     },
+    "node-addon-api": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
+      "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
+      "dev": true
+    },
     "node-fetch": {
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
diff --git a/client/package.json b/client/package.json
index 6b1d177e..d8bc6fb9 100644
--- a/client/package.json
+++ b/client/package.json
@@ -46,6 +46,7 @@
   "devDependencies": {
     "@graphql-codegen/cli": "^5.0.2",
     "@graphql-codegen/client-preset": "^4.3.2",
+    "@parcel/watcher": "^2.4.1",
     "@rushstack/eslint-patch": "^1.8.0",
     "@savvywombat/tailwindcss-grid-areas": "^4.0.0",
     "@tailwindcss/forms": "^0.5.7",
diff --git a/client/src/components/dashboard/UkStatistics.vue b/client/src/components/dashboard/UkStatistics.vue
index 720ce3e2..2afd5e48 100644
--- a/client/src/components/dashboard/UkStatistics.vue
+++ b/client/src/components/dashboard/UkStatistics.vue
@@ -57,7 +57,7 @@ const feebackSummary = computed(() => {
 });
 
 onMounted(async () => {
-  statistics.value = await dashboardStore.loadStatisticsDatav2(props.courseId);
+  statistics.value = await dashboardStore.loadStatisticsData(props.courseId);
 });
 </script>
 
diff --git a/client/src/gql/gql.ts b/client/src/gql/gql.ts
index 6c090bac..a4fa70e0 100644
--- a/client/src/gql/gql.ts
+++ b/client/src/gql/gql.ts
@@ -25,8 +25,8 @@ const documents = {
     "\n  query dashboardConfig {\n    dashboard_config {\n      id\n      slug\n      name\n      dashboard_type\n      course_configuration {\n        id\n        enable_circle_documents\n        enable_learning_mentor\n        enable_competence_certificates\n        is_uk\n      }\n    }\n  }\n": types.DashboardConfigDocument,
     "\n  query dashboardProgress($courseId: ID!) {\n    course_progress(course_id: $courseId) {\n      _id\n      course_id\n      session_to_continue_id\n      competence {\n        _id\n        total_count\n        success_count\n        fail_count\n      }\n      assignment {\n        _id\n        total_count\n        points_max_count\n        points_achieved_count\n      }\n    }\n  }\n": types.DashboardProgressDocument,
     "\n  query dashboardCourseData($courseId: ID!) {\n    course_progress(course_id: $courseId) {\n      _id\n      course_id\n      session_to_continue_id\n    }\n  }\n": types.DashboardCourseDataDocument,
-    "\n  query courseStatistics($courseId: ID!) {\n    course_statistics(course_id: $courseId) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      course_session_selection_ids\n      course_session_selection_metrics {\n        _id\n        session_count\n        participant_count\n        expert_count\n      }\n      attendance_day_presences {\n        _id\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          due_date\n          participants_present\n          participants_total\n          details_url\n        }\n        summary {\n          _id\n          days_completed\n          participants_present\n        }\n      }\n      feedback_responses {\n        _id\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          experts\n          satisfaction_average\n          satisfaction_max\n          details_url\n        }\n        summary {\n          _id\n          satisfaction_average\n          satisfaction_max\n          total_responses\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          details_url\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_passed\n          }\n        }\n      }\n      competences {\n        _id\n        summary {\n          _id\n          success_total\n          fail_total\n        }\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          title\n          success_count\n          fail_count\n          details_url\n        }\n      }\n    }\n  }\n": types.CourseStatisticsDocument,
-    "\n  query mentorCourseStatistics($courseId: ID!, $agentRole: String!) {\n    mentor_course_statistics(course_id: $courseId, agent_role: $agentRole) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_selection_ids\n      user_selection_ids\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          details_url\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_passed\n          }\n        }\n      }\n    }\n  }\n": types.MentorCourseStatisticsDocument,
+    "\n  query courseStatistics($courseId: ID!) {\n    course_statistics(course_id: $courseId) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      course_session_selection_ids\n      course_session_selection_metrics {\n        _id\n        session_count\n        participant_count\n        expert_count\n      }\n      attendance_day_presences {\n        _id\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          due_date\n          participants_present\n          participants_total\n          details_url\n        }\n        summary {\n          _id\n          days_completed\n          participants_present\n        }\n      }\n      feedback_responses {\n        _id\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          experts\n          satisfaction_average\n          satisfaction_max\n          details_url\n        }\n        summary {\n          _id\n          satisfaction_average\n          satisfaction_max\n          total_responses\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_title\n          competence_certificate_id\n          details_url\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_evaluation_percent\n            average_passed\n          }\n        }\n      }\n      competences {\n        _id\n        summary {\n          _id\n          success_total\n          fail_total\n        }\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          title\n          success_count\n          fail_count\n          details_url\n        }\n      }\n    }\n  }\n": types.CourseStatisticsDocument,
+    "\n  query mentorCourseStatistics($courseId: ID!, $agentRole: String!) {\n    mentor_course_statistics(course_id: $courseId, agent_role: $agentRole) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_selection_ids\n      user_selection_ids\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_id\n          competence_certificate_title\n          details_url\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_evaluation_percent\n            average_passed\n          }\n        }\n      }\n    }\n  }\n": types.MentorCourseStatisticsDocument,
     "\n  mutation SendFeedbackMutation(\n    $courseSessionId: ID!\n    $learningContentId: ID!\n    $learningContentType: String!\n    $data: GenericScalar!\n    $submitted: Boolean\n  ) {\n    send_feedback(\n      course_session_id: $courseSessionId\n      learning_content_page_id: $learningContentId\n      learning_content_type: $learningContentType\n      data: $data\n      submitted: $submitted\n    ) {\n      feedback_response {\n        id\n        data\n        submitted\n      }\n      errors {\n        field\n        messages\n      }\n    }\n  }\n": types.SendFeedbackMutationDocument,
 };
 
@@ -95,11 +95,11 @@ export function graphql(source: "\n  query dashboardCourseData($courseId: ID!) {
 /**
  * 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 courseStatistics($courseId: ID!) {\n    course_statistics(course_id: $courseId) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      course_session_selection_ids\n      course_session_selection_metrics {\n        _id\n        session_count\n        participant_count\n        expert_count\n      }\n      attendance_day_presences {\n        _id\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          due_date\n          participants_present\n          participants_total\n          details_url\n        }\n        summary {\n          _id\n          days_completed\n          participants_present\n        }\n      }\n      feedback_responses {\n        _id\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          experts\n          satisfaction_average\n          satisfaction_max\n          details_url\n        }\n        summary {\n          _id\n          satisfaction_average\n          satisfaction_max\n          total_responses\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          details_url\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_passed\n          }\n        }\n      }\n      competences {\n        _id\n        summary {\n          _id\n          success_total\n          fail_total\n        }\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          title\n          success_count\n          fail_count\n          details_url\n        }\n      }\n    }\n  }\n"): (typeof documents)["\n  query courseStatistics($courseId: ID!) {\n    course_statistics(course_id: $courseId) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      course_session_selection_ids\n      course_session_selection_metrics {\n        _id\n        session_count\n        participant_count\n        expert_count\n      }\n      attendance_day_presences {\n        _id\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          due_date\n          participants_present\n          participants_total\n          details_url\n        }\n        summary {\n          _id\n          days_completed\n          participants_present\n        }\n      }\n      feedback_responses {\n        _id\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          experts\n          satisfaction_average\n          satisfaction_max\n          details_url\n        }\n        summary {\n          _id\n          satisfaction_average\n          satisfaction_max\n          total_responses\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          details_url\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_passed\n          }\n        }\n      }\n      competences {\n        _id\n        summary {\n          _id\n          success_total\n          fail_total\n        }\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          title\n          success_count\n          fail_count\n          details_url\n        }\n      }\n    }\n  }\n"];
+export function graphql(source: "\n  query courseStatistics($courseId: ID!) {\n    course_statistics(course_id: $courseId) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      course_session_selection_ids\n      course_session_selection_metrics {\n        _id\n        session_count\n        participant_count\n        expert_count\n      }\n      attendance_day_presences {\n        _id\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          due_date\n          participants_present\n          participants_total\n          details_url\n        }\n        summary {\n          _id\n          days_completed\n          participants_present\n        }\n      }\n      feedback_responses {\n        _id\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          experts\n          satisfaction_average\n          satisfaction_max\n          details_url\n        }\n        summary {\n          _id\n          satisfaction_average\n          satisfaction_max\n          total_responses\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_title\n          competence_certificate_id\n          details_url\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_evaluation_percent\n            average_passed\n          }\n        }\n      }\n      competences {\n        _id\n        summary {\n          _id\n          success_total\n          fail_total\n        }\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          title\n          success_count\n          fail_count\n          details_url\n        }\n      }\n    }\n  }\n"): (typeof documents)["\n  query courseStatistics($courseId: ID!) {\n    course_statistics(course_id: $courseId) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      course_session_selection_ids\n      course_session_selection_metrics {\n        _id\n        session_count\n        participant_count\n        expert_count\n      }\n      attendance_day_presences {\n        _id\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          due_date\n          participants_present\n          participants_total\n          details_url\n        }\n        summary {\n          _id\n          days_completed\n          participants_present\n        }\n      }\n      feedback_responses {\n        _id\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          experts\n          satisfaction_average\n          satisfaction_max\n          details_url\n        }\n        summary {\n          _id\n          satisfaction_average\n          satisfaction_max\n          total_responses\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_title\n          competence_certificate_id\n          details_url\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_evaluation_percent\n            average_passed\n          }\n        }\n      }\n      competences {\n        _id\n        summary {\n          _id\n          success_total\n          fail_total\n        }\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          title\n          success_count\n          fail_count\n          details_url\n        }\n      }\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  query mentorCourseStatistics($courseId: ID!, $agentRole: String!) {\n    mentor_course_statistics(course_id: $courseId, agent_role: $agentRole) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_selection_ids\n      user_selection_ids\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          details_url\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_passed\n          }\n        }\n      }\n    }\n  }\n"): (typeof documents)["\n  query mentorCourseStatistics($courseId: ID!, $agentRole: String!) {\n    mentor_course_statistics(course_id: $courseId, agent_role: $agentRole) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_selection_ids\n      user_selection_ids\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          details_url\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_passed\n          }\n        }\n      }\n    }\n  }\n"];
+export function graphql(source: "\n  query mentorCourseStatistics($courseId: ID!, $agentRole: String!) {\n    mentor_course_statistics(course_id: $courseId, agent_role: $agentRole) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_selection_ids\n      user_selection_ids\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_id\n          competence_certificate_title\n          details_url\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_evaluation_percent\n            average_passed\n          }\n        }\n      }\n    }\n  }\n"): (typeof documents)["\n  query mentorCourseStatistics($courseId: ID!, $agentRole: String!) {\n    mentor_course_statistics(course_id: $courseId, agent_role: $agentRole) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_selection_ids\n      user_selection_ids\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_id\n          competence_certificate_title\n          details_url\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_evaluation_percent\n            average_passed\n          }\n        }\n      }\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
diff --git a/client/src/gql/graphql.ts b/client/src/gql/graphql.ts
index 1018cdf0..571f0d96 100644
--- a/client/src/gql/graphql.ts
+++ b/client/src/gql/graphql.ts
@@ -90,6 +90,7 @@ export type AssignmentAssignmentCompletionCompletionStatusChoices =
 export type AssignmentCompletionMetricsType = {
   __typename?: 'AssignmentCompletionMetricsType';
   _id: Scalars['ID']['output'];
+  average_evaluation_percent?: Maybe<Scalars['Float']['output']>;
   average_passed: Scalars['Float']['output'];
   failed_count: Scalars['Int']['output'];
   passed_count: Scalars['Int']['output'];
@@ -180,6 +181,8 @@ export type AssignmentStatisticsRecordType = {
   assignment_title: Scalars['String']['output'];
   assignment_type_translation_key: Scalars['String']['output'];
   circle_id: Scalars['ID']['output'];
+  competence_certificate_id?: Maybe<Scalars['ID']['output']>;
+  competence_certificate_title?: Maybe<Scalars['String']['output']>;
   course_session_assignment_id: Scalars['ID']['output'];
   course_session_id: Scalars['ID']['output'];
   deadline: Scalars['DateTime']['output'];
@@ -1385,7 +1388,7 @@ export type CourseStatisticsQueryVariables = Exact<{
 }>;
 
 
-export type CourseStatisticsQuery = { __typename?: 'Query', course_statistics?: { __typename?: 'CourseStatisticsType', _id: string, course_id: string, course_title: string, course_slug: string, course_session_selection_ids: Array<string | null>, course_session_properties: { __typename?: 'StatisticsCourseSessionPropertiesType', _id: string, generations: Array<string>, sessions: Array<{ __typename?: 'StatisticsCourseSessionDataType', id: string, name: string }>, circles: Array<{ __typename?: 'StatisticsCircleDataType', id: string, name: string }> }, course_session_selection_metrics: { __typename?: 'StatisticsCourseSessionsSelectionMetricType', _id: string, session_count: number, participant_count: number, expert_count: number }, attendance_day_presences: { __typename?: 'AttendanceDayPresencesStatisticsType', _id: string, records: Array<{ __typename?: 'PresenceRecordStatisticsType', _id: string, course_session_id: string, generation: string, circle_id: string, due_date: string, participants_present: number, participants_total: number, details_url: string }>, summary: { __typename?: 'AttendanceSummaryStatisticsType', _id: string, days_completed: number, participants_present: number } }, feedback_responses: { __typename?: 'FeedbackStatisticsResponsesType', _id: string, records: Array<{ __typename?: 'FeedbackStatisticsRecordType', _id: string, course_session_id: string, generation: string, circle_id: string, experts: string, satisfaction_average: number, satisfaction_max: number, details_url: string }>, summary: { __typename?: 'FeedbackStatisticsSummaryType', _id: string, satisfaction_average: number, satisfaction_max: number, total_responses: number } }, assignments: { __typename?: 'AssignmentsStatisticsType', _id: string, summary: { __typename?: 'AssignmentStatisticsSummaryType', _id: string, completed_count: number, average_passed: number, total_passed: number, total_failed: number }, records: Array<{ __typename?: 'AssignmentStatisticsRecordType', _id: string, course_session_id: string, course_session_assignment_id: string, circle_id: string, generation: string, assignment_title: string, assignment_type_translation_key: string, details_url: string, deadline: string, metrics: { __typename?: 'AssignmentCompletionMetricsType', _id: string, passed_count: number, failed_count: number, unranked_count: number, ranking_completed: boolean, average_passed: number } }> }, competences: { __typename?: 'CompetencesStatisticsType', _id: string, summary: { __typename?: 'CompetencePerformanceStatisticsSummaryType', _id: string, success_total: number, fail_total: number }, records: Array<{ __typename?: 'CompetenceRecordStatisticsType', _id: string, course_session_id: string, generation: string, circle_id: string, title: string, success_count: number, fail_count: number, details_url: string }> } } | null };
+export type CourseStatisticsQuery = { __typename?: 'Query', course_statistics?: { __typename?: 'CourseStatisticsType', _id: string, course_id: string, course_title: string, course_slug: string, course_session_selection_ids: Array<string | null>, course_session_properties: { __typename?: 'StatisticsCourseSessionPropertiesType', _id: string, generations: Array<string>, sessions: Array<{ __typename?: 'StatisticsCourseSessionDataType', id: string, name: string }>, circles: Array<{ __typename?: 'StatisticsCircleDataType', id: string, name: string }> }, course_session_selection_metrics: { __typename?: 'StatisticsCourseSessionsSelectionMetricType', _id: string, session_count: number, participant_count: number, expert_count: number }, attendance_day_presences: { __typename?: 'AttendanceDayPresencesStatisticsType', _id: string, records: Array<{ __typename?: 'PresenceRecordStatisticsType', _id: string, course_session_id: string, generation: string, circle_id: string, due_date: string, participants_present: number, participants_total: number, details_url: string }>, summary: { __typename?: 'AttendanceSummaryStatisticsType', _id: string, days_completed: number, participants_present: number } }, feedback_responses: { __typename?: 'FeedbackStatisticsResponsesType', _id: string, records: Array<{ __typename?: 'FeedbackStatisticsRecordType', _id: string, course_session_id: string, generation: string, circle_id: string, experts: string, satisfaction_average: number, satisfaction_max: number, details_url: string }>, summary: { __typename?: 'FeedbackStatisticsSummaryType', _id: string, satisfaction_average: number, satisfaction_max: number, total_responses: number } }, assignments: { __typename?: 'AssignmentsStatisticsType', _id: string, summary: { __typename?: 'AssignmentStatisticsSummaryType', _id: string, completed_count: number, average_passed: number, total_passed: number, total_failed: number }, records: Array<{ __typename?: 'AssignmentStatisticsRecordType', _id: string, course_session_id: string, course_session_assignment_id: string, circle_id: string, generation: string, assignment_title: string, assignment_type_translation_key: string, competence_certificate_title?: string | null, competence_certificate_id?: string | null, details_url: string, deadline: string, metrics: { __typename?: 'AssignmentCompletionMetricsType', _id: string, passed_count: number, failed_count: number, unranked_count: number, ranking_completed: boolean, average_evaluation_percent?: number | null, average_passed: number } }> }, competences: { __typename?: 'CompetencesStatisticsType', _id: string, summary: { __typename?: 'CompetencePerformanceStatisticsSummaryType', _id: string, success_total: number, fail_total: number }, records: Array<{ __typename?: 'CompetenceRecordStatisticsType', _id: string, course_session_id: string, generation: string, circle_id: string, title: string, success_count: number, fail_count: number, details_url: string }> } } | null };
 
 export type MentorCourseStatisticsQueryVariables = Exact<{
   courseId: Scalars['ID']['input'];
@@ -1393,7 +1396,7 @@ export type MentorCourseStatisticsQueryVariables = Exact<{
 }>;
 
 
-export type MentorCourseStatisticsQuery = { __typename?: 'Query', mentor_course_statistics?: { __typename?: 'BaseStatisticsType', _id: string, course_id: string, course_title: string, course_slug: string, course_session_selection_ids: Array<string | null>, user_selection_ids?: Array<string | null> | null, assignments: { __typename?: 'AssignmentsStatisticsType', _id: string, summary: { __typename?: 'AssignmentStatisticsSummaryType', _id: string, completed_count: number, average_passed: number, total_passed: number, total_failed: number }, records: Array<{ __typename?: 'AssignmentStatisticsRecordType', _id: string, course_session_id: string, course_session_assignment_id: string, circle_id: string, generation: string, assignment_title: string, assignment_type_translation_key: string, details_url: string, deadline: string, metrics: { __typename?: 'AssignmentCompletionMetricsType', _id: string, passed_count: number, failed_count: number, unranked_count: number, ranking_completed: boolean, average_passed: number } }> } } | null };
+export type MentorCourseStatisticsQuery = { __typename?: 'Query', mentor_course_statistics?: { __typename?: 'BaseStatisticsType', _id: string, course_id: string, course_title: string, course_slug: string, course_session_selection_ids: Array<string | null>, user_selection_ids?: Array<string | null> | null, assignments: { __typename?: 'AssignmentsStatisticsType', _id: string, summary: { __typename?: 'AssignmentStatisticsSummaryType', _id: string, completed_count: number, average_passed: number, total_passed: number, total_failed: number }, records: Array<{ __typename?: 'AssignmentStatisticsRecordType', _id: string, course_session_id: string, course_session_assignment_id: string, circle_id: string, generation: string, assignment_title: string, assignment_type_translation_key: string, competence_certificate_id?: string | null, competence_certificate_title?: string | null, details_url: string, deadline: string, metrics: { __typename?: 'AssignmentCompletionMetricsType', _id: string, passed_count: number, failed_count: number, unranked_count: number, ranking_completed: boolean, average_evaluation_percent?: number | null, average_passed: number } }> } } | null };
 
 export type SendFeedbackMutationMutationVariables = Exact<{
   courseSessionId: Scalars['ID']['input'];
@@ -1418,6 +1421,6 @@ export const CourseQueryDocument = {"kind":"Document","definitions":[{"kind":"Op
 export const DashboardConfigDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"dashboardConfig"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"dashboard_config"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"dashboard_type"}},{"kind":"Field","name":{"kind":"Name","value":"course_configuration"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"enable_circle_documents"}},{"kind":"Field","name":{"kind":"Name","value":"enable_learning_mentor"}},{"kind":"Field","name":{"kind":"Name","value":"enable_competence_certificates"}},{"kind":"Field","name":{"kind":"Name","value":"is_uk"}}]}}]}}]}}]} as unknown as DocumentNode<DashboardConfigQuery, DashboardConfigQueryVariables>;
 export const DashboardProgressDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"dashboardProgress"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course_progress"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_id"}},{"kind":"Field","name":{"kind":"Name","value":"session_to_continue_id"}},{"kind":"Field","name":{"kind":"Name","value":"competence"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"total_count"}},{"kind":"Field","name":{"kind":"Name","value":"success_count"}},{"kind":"Field","name":{"kind":"Name","value":"fail_count"}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignment"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"total_count"}},{"kind":"Field","name":{"kind":"Name","value":"points_max_count"}},{"kind":"Field","name":{"kind":"Name","value":"points_achieved_count"}}]}}]}}]}}]} as unknown as DocumentNode<DashboardProgressQuery, DashboardProgressQueryVariables>;
 export const DashboardCourseDataDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"dashboardCourseData"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course_progress"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_id"}},{"kind":"Field","name":{"kind":"Name","value":"session_to_continue_id"}}]}}]}}]} as unknown as DocumentNode<DashboardCourseDataQuery, DashboardCourseDataQueryVariables>;
-export const CourseStatisticsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"courseStatistics"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course_statistics"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_title"}},{"kind":"Field","name":{"kind":"Name","value":"course_slug"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_properties"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"sessions"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"generations"}},{"kind":"Field","name":{"kind":"Name","value":"circles"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"course_session_selection_ids"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_selection_metrics"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"session_count"}},{"kind":"Field","name":{"kind":"Name","value":"participant_count"}},{"kind":"Field","name":{"kind":"Name","value":"expert_count"}}]}},{"kind":"Field","name":{"kind":"Name","value":"attendance_day_presences"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"due_date"}},{"kind":"Field","name":{"kind":"Name","value":"participants_present"}},{"kind":"Field","name":{"kind":"Name","value":"participants_total"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}}]}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"days_completed"}},{"kind":"Field","name":{"kind":"Name","value":"participants_present"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"feedback_responses"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"experts"}},{"kind":"Field","name":{"kind":"Name","value":"satisfaction_average"}},{"kind":"Field","name":{"kind":"Name","value":"satisfaction_max"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}}]}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"satisfaction_average"}},{"kind":"Field","name":{"kind":"Name","value":"satisfaction_max"}},{"kind":"Field","name":{"kind":"Name","value":"total_responses"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignments"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"completed_count"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_failed"}}]}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_assignment_id"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_title"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type_translation_key"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}},{"kind":"Field","name":{"kind":"Name","value":"deadline"}},{"kind":"Field","name":{"kind":"Name","value":"metrics"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"passed_count"}},{"kind":"Field","name":{"kind":"Name","value":"failed_count"}},{"kind":"Field","name":{"kind":"Name","value":"unranked_count"}},{"kind":"Field","name":{"kind":"Name","value":"ranking_completed"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"competences"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"success_total"}},{"kind":"Field","name":{"kind":"Name","value":"fail_total"}}]}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"success_count"}},{"kind":"Field","name":{"kind":"Name","value":"fail_count"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}}]}}]}}]}}]}}]} as unknown as DocumentNode<CourseStatisticsQuery, CourseStatisticsQueryVariables>;
-export const MentorCourseStatisticsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"mentorCourseStatistics"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"agentRole"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"mentor_course_statistics"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}},{"kind":"Argument","name":{"kind":"Name","value":"agent_role"},"value":{"kind":"Variable","name":{"kind":"Name","value":"agentRole"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_title"}},{"kind":"Field","name":{"kind":"Name","value":"course_slug"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_selection_ids"}},{"kind":"Field","name":{"kind":"Name","value":"user_selection_ids"}},{"kind":"Field","name":{"kind":"Name","value":"assignments"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"completed_count"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_failed"}}]}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_assignment_id"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_title"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type_translation_key"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}},{"kind":"Field","name":{"kind":"Name","value":"deadline"}},{"kind":"Field","name":{"kind":"Name","value":"metrics"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"passed_count"}},{"kind":"Field","name":{"kind":"Name","value":"failed_count"}},{"kind":"Field","name":{"kind":"Name","value":"unranked_count"}},{"kind":"Field","name":{"kind":"Name","value":"ranking_completed"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}}]}}]}}]}}]}}]}}]} as unknown as DocumentNode<MentorCourseStatisticsQuery, MentorCourseStatisticsQueryVariables>;
+export const CourseStatisticsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"courseStatistics"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course_statistics"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_title"}},{"kind":"Field","name":{"kind":"Name","value":"course_slug"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_properties"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"sessions"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"generations"}},{"kind":"Field","name":{"kind":"Name","value":"circles"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"course_session_selection_ids"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_selection_metrics"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"session_count"}},{"kind":"Field","name":{"kind":"Name","value":"participant_count"}},{"kind":"Field","name":{"kind":"Name","value":"expert_count"}}]}},{"kind":"Field","name":{"kind":"Name","value":"attendance_day_presences"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"due_date"}},{"kind":"Field","name":{"kind":"Name","value":"participants_present"}},{"kind":"Field","name":{"kind":"Name","value":"participants_total"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}}]}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"days_completed"}},{"kind":"Field","name":{"kind":"Name","value":"participants_present"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"feedback_responses"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"experts"}},{"kind":"Field","name":{"kind":"Name","value":"satisfaction_average"}},{"kind":"Field","name":{"kind":"Name","value":"satisfaction_max"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}}]}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"satisfaction_average"}},{"kind":"Field","name":{"kind":"Name","value":"satisfaction_max"}},{"kind":"Field","name":{"kind":"Name","value":"total_responses"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignments"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"completed_count"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_failed"}}]}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_assignment_id"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_title"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type_translation_key"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_title"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_id"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}},{"kind":"Field","name":{"kind":"Name","value":"deadline"}},{"kind":"Field","name":{"kind":"Name","value":"metrics"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"passed_count"}},{"kind":"Field","name":{"kind":"Name","value":"failed_count"}},{"kind":"Field","name":{"kind":"Name","value":"unranked_count"}},{"kind":"Field","name":{"kind":"Name","value":"ranking_completed"}},{"kind":"Field","name":{"kind":"Name","value":"average_evaluation_percent"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"competences"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"success_total"}},{"kind":"Field","name":{"kind":"Name","value":"fail_total"}}]}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"success_count"}},{"kind":"Field","name":{"kind":"Name","value":"fail_count"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}}]}}]}}]}}]}}]} as unknown as DocumentNode<CourseStatisticsQuery, CourseStatisticsQueryVariables>;
+export const MentorCourseStatisticsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"mentorCourseStatistics"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"agentRole"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"mentor_course_statistics"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}},{"kind":"Argument","name":{"kind":"Name","value":"agent_role"},"value":{"kind":"Variable","name":{"kind":"Name","value":"agentRole"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_title"}},{"kind":"Field","name":{"kind":"Name","value":"course_slug"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_selection_ids"}},{"kind":"Field","name":{"kind":"Name","value":"user_selection_ids"}},{"kind":"Field","name":{"kind":"Name","value":"assignments"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"completed_count"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_failed"}}]}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_assignment_id"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_title"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type_translation_key"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_id"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_title"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}},{"kind":"Field","name":{"kind":"Name","value":"deadline"}},{"kind":"Field","name":{"kind":"Name","value":"metrics"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"passed_count"}},{"kind":"Field","name":{"kind":"Name","value":"failed_count"}},{"kind":"Field","name":{"kind":"Name","value":"unranked_count"}},{"kind":"Field","name":{"kind":"Name","value":"ranking_completed"}},{"kind":"Field","name":{"kind":"Name","value":"average_evaluation_percent"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}}]}}]}}]}}]}}]}}]} as unknown as DocumentNode<MentorCourseStatisticsQuery, MentorCourseStatisticsQueryVariables>;
 export const SendFeedbackMutationDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"SendFeedbackMutation"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"learningContentId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"learningContentType"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"data"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"GenericScalar"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"submitted"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Boolean"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"send_feedback"},"arguments":[{"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":"learning_content_type"},"value":{"kind":"Variable","name":{"kind":"Name","value":"learningContentType"}}},{"kind":"Argument","name":{"kind":"Name","value":"data"},"value":{"kind":"Variable","name":{"kind":"Name","value":"data"}}},{"kind":"Argument","name":{"kind":"Name","value":"submitted"},"value":{"kind":"Variable","name":{"kind":"Name","value":"submitted"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"feedback_response"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"data"}},{"kind":"Field","name":{"kind":"Name","value":"submitted"}}]}},{"kind":"Field","name":{"kind":"Name","value":"errors"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"field"}},{"kind":"Field","name":{"kind":"Name","value":"messages"}}]}}]}}]}}]} as unknown as DocumentNode<SendFeedbackMutationMutation, SendFeedbackMutationMutationVariables>;
\ No newline at end of file
diff --git a/client/src/gql/schema.graphql b/client/src/gql/schema.graphql
index 07be4c64..8158c73e 100644
--- a/client/src/gql/schema.graphql
+++ b/client/src/gql/schema.graphql
@@ -56,6 +56,8 @@ type AssignmentStatisticsRecordType {
   assignment_type_translation_key: String!
   assignment_title: String!
   deadline: DateTime!
+  competence_certificate_id: ID
+  competence_certificate_title: String
   metrics: AssignmentCompletionMetricsType!
   details_url: String!
 }
@@ -74,6 +76,7 @@ type AssignmentCompletionMetricsType {
   unranked_count: Int!
   ranking_completed: Boolean!
   average_passed: Float!
+  average_evaluation_percent: Float
 }
 
 type AssignmentStatisticsSummaryType {
diff --git a/client/src/graphql/queries.ts b/client/src/graphql/queries.ts
index 65359f45..7d33f4ff 100644
--- a/client/src/graphql/queries.ts
+++ b/client/src/graphql/queries.ts
@@ -469,6 +469,8 @@ export const DASHBOARD_COURSE_STATISTICS = graphql(`
           generation
           assignment_title
           assignment_type_translation_key
+          competence_certificate_title
+          competence_certificate_id
           details_url
           deadline
           metrics {
@@ -477,6 +479,7 @@ export const DASHBOARD_COURSE_STATISTICS = graphql(`
             failed_count
             unranked_count
             ranking_completed
+            average_evaluation_percent
             average_passed
           }
         }
@@ -529,6 +532,8 @@ export const DASHBOARD_MENTOR_COMPETENCE_SUMMARY = graphql(`
           generation
           assignment_title
           assignment_type_translation_key
+          competence_certificate_id
+          competence_certificate_title
           details_url
           deadline
           metrics {
@@ -537,6 +542,7 @@ export const DASHBOARD_MENTOR_COMPETENCE_SUMMARY = graphql(`
             failed_count
             unranked_count
             ranking_completed
+            average_evaluation_percent
             average_passed
           }
         }
diff --git a/client/src/stores/dashboard.ts b/client/src/stores/dashboard.ts
index 69be8744..fe19032c 100644
--- a/client/src/stores/dashboard.ts
+++ b/client/src/stores/dashboard.ts
@@ -47,12 +47,6 @@ export const useDashboardStore = defineStore("dashboard", () => {
   };
 
   const loadStatisticsData = async (id: string) => {
-    const data = await fetchStatisticData(id);
-    dashBoardDataCache[id] = data;
-    currentDashBoardData.value = data;
-  };
-
-  const loadStatisticsDatav2 = async (id: string) => {
     const data = await fetchStatisticData(id);
     dashBoardDataCache[id] = data;
     return data;
@@ -68,6 +62,5 @@ export const useDashboardStore = defineStore("dashboard", () => {
     currentDashBoardData,
     loading,
     loadStatisticsData,
-    loadStatisticsDatav2,
   };
 });
diff --git a/server/vbv_lernwelt/dashboard/graphql/types/assignment.py b/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
index 8199bc72..d5f3c50b 100644
--- a/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
+++ b/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
@@ -7,7 +7,6 @@ import vbv_lernwelt.assignment.models
 from vbv_lernwelt.assignment.models import (
     AssignmentCompletion,
     AssignmentCompletionStatus,
-    AssignmentType,
 )
 from vbv_lernwelt.competence.services import (
     query_competence_course_session_assignments,
@@ -27,6 +26,7 @@ class AssignmentCompletionMetricsType(graphene.ObjectType):
     unranked_count = graphene.Int(required=True)
     ranking_completed = graphene.Boolean(required=True)
     average_passed = graphene.Float(required=True)
+    average_evaluation_percent = graphene.Float()
 
 
 class AssignmentStatisticsRecordType(graphene.ObjectType):
@@ -38,6 +38,8 @@ class AssignmentStatisticsRecordType(graphene.ObjectType):
     assignment_type_translation_key = graphene.String(required=True)
     assignment_title = graphene.String(required=True)
     deadline = graphene.DateTime(required=True)
+    competence_certificate_id = graphene.ID()
+    competence_certificate_title = graphene.String()
     metrics = graphene.Field(AssignmentCompletionMetricsType, required=True)
     details_url = graphene.String(required=True)
 
@@ -107,15 +109,16 @@ def get_assignment_completion_metrics(
             role=CourseSessionUser.Role.MEMBER,
         ).values_list("user", flat=True)
 
-    evaluation_results = AssignmentCompletion.objects.filter(
+    assignment_completions = AssignmentCompletion.objects.filter(
         completion_status=AssignmentCompletionStatus.EVALUATION_SUBMITTED.value,
         assignment_user__in=course_session_users,
         course_session=course_session,
         assignment=assignment,
-    ).values_list("evaluation_passed", flat=True)
+    )
+    evaluation_passed_results = [ac.evaluation_passed for ac in assignment_completions]
 
-    passed_count = len([passed for passed in evaluation_results if passed])
-    failed_count = len(evaluation_results) - passed_count
+    passed_count = len([passed for passed in evaluation_passed_results if passed])
+    failed_count = len(evaluation_passed_results) - passed_count
 
     participants_count = len(course_session_users)
     unranked_count = participants_count - passed_count - failed_count
@@ -125,6 +128,17 @@ def get_assignment_completion_metrics(
     else:
         average_passed = math.ceil(passed_count / participants_count * 100)
 
+    # calculate average points in percent
+    evaluation_percent_results = [
+        (ac.evaluation_points_final / ac.evaluation_max_points)
+        for ac in assignment_completions
+    ]
+    average_evaluation_percent = (
+        sum(evaluation_percent_results) / len(evaluation_percent_results)
+        if evaluation_percent_results
+        else 0
+    )
+
     return AssignmentCompletionMetricsType(
         _id=f"{course_session.id}-{assignment.id}@{urql_id_postfix}",  # noqa
         passed_count=passed_count,  # noqa
@@ -132,6 +146,7 @@ def get_assignment_completion_metrics(
         unranked_count=unranked_count,  # noqa
         ranking_completed=(passed_count > 0 or failed_count > 0),  # noqa
         average_passed=average_passed,  # noqa
+        average_evaluation_percent=average_evaluation_percent,  # noqa
     )
 
 
@@ -146,6 +161,7 @@ def create_record(
         due_date = course_session_assignment.deadline
 
     learning_content = course_session_assignment.learning_content
+    competence_certificate = learning_content.content_assignment.competence_certificate
 
     return AssignmentStatisticsRecordType(
         # make sure it's unique, across all types of assignments!
@@ -156,6 +172,8 @@ def create_record(
         course_session_assignment_id=str(course_session_assignment.id),  # noqa
         generation=course_session_assignment.course_session.generation,  # noqa
         assignment_type_translation_key=due_date.assignment_type_translation_key,
+        competence_certificate_id=str(competence_certificate.id),  # noqa
+        competence_certificate_title=competence_certificate.title,  # noqa
         # noqa
         assignment_title=learning_content.content_assignment.title,  # noqa
         metrics=get_assignment_completion_metrics(  # noqa

From 40ff65ad2d5766e1f0c62c064c1aad7e4bd880b0 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Mon, 22 Jul 2024 10:44:10 +0200
Subject: [PATCH 09/40] Add `UK_BERUFSBILDNER_STATISTICS_WIDGET`

---
 .../dashboard/BerufsbildnerStatistics.vue     |  49 +++++
 .../src/components/dashboard/CoursePanel.vue  |  16 ++
 .../dashboard/MentorCompetenceSummary.vue     |  17 +-
 client/src/gql/graphql.ts                     |   1 +
 client/src/gql/schema.graphql                 |   1 +
 .../statistic/AgentStatisticParentPage.vue    |  30 +++
 client/src/services/dashboard.ts              |  11 +-
 scripts/create_berufsbilnder_mobi.py          |   1 +
 .../dashboard/graphql/types/dashboard.py      | 174 +++++++++---------
 server/vbv_lernwelt/dashboard/views.py        |   3 +-
 10 files changed, 205 insertions(+), 98 deletions(-)
 create mode 100644 client/src/components/dashboard/BerufsbildnerStatistics.vue
 create mode 100644 client/src/pages/dashboard/statistic/AgentStatisticParentPage.vue

diff --git a/client/src/components/dashboard/BerufsbildnerStatistics.vue b/client/src/components/dashboard/BerufsbildnerStatistics.vue
new file mode 100644
index 00000000..5fc5cad4
--- /dev/null
+++ b/client/src/components/dashboard/BerufsbildnerStatistics.vue
@@ -0,0 +1,49 @@
+<script setup lang="ts">
+import { computed, onMounted, type Ref, ref } from "vue";
+import {
+  type DashboardRoleKeyType,
+  fetchMentorCompetenceSummary,
+} from "@/services/dashboard";
+import type { AssignmentsStatisticsType, BaseStatisticsType } from "@/gql/graphql";
+import LoadingSpinner from "@/components/ui/LoadingSpinner.vue";
+import AssignmentSummaryBox from "@/components/dashboard/AssignmentSummaryBox.vue";
+
+const props = defineProps<{
+  courseSlug: string;
+  courseId: string;
+  agentRole: DashboardRoleKeyType;
+}>();
+
+const mentorData = ref<BaseStatisticsType | null>(null);
+const loading = ref(true);
+
+const assignmentStats = computed(() => {
+  return mentorData.value?.assignments ?? null;
+});
+
+onMounted(async () => {
+  mentorData.value = await fetchMentorCompetenceSummary(
+    props.courseId,
+    props.agentRole
+  );
+  loading.value = false;
+});
+</script>
+
+<template>
+  <div v-if="loading" class="m-8 flex justify-center">
+    <LoadingSpinner />
+  </div>
+  <div v-if="assignmentStats" class="space-y-8">
+    <div
+      class="flex flex-col flex-wrap justify-between gap-x-5 border-b border-gray-300 pb-8 last:border-0 md:flex-row"
+    >
+      <AssignmentSummaryBox
+        class="flex-grow"
+        :assignments-completed="assignmentStats.summary.completed_count"
+        :avg-passed="assignmentStats.summary.average_passed"
+        :course-slug="props.courseSlug"
+      />
+    </div>
+  </div>
+</template>
diff --git a/client/src/components/dashboard/CoursePanel.vue b/client/src/components/dashboard/CoursePanel.vue
index 241ec339..d97a6d02 100644
--- a/client/src/components/dashboard/CoursePanel.vue
+++ b/client/src/components/dashboard/CoursePanel.vue
@@ -9,6 +9,7 @@ import MentorMenteeCount from "@/components/dashboard/MentorMenteeCount.vue";
 import MentorCompetenceSummary from "@/components/dashboard/MentorCompetenceSummary.vue";
 import { getCockpitUrl, getLearningMentorUrl, getLearningPathUrl } from "@/utils/utils";
 import UkStatistics from "@/components/dashboard/UkStatistics.vue";
+import BerufsbildnerStatistics from "@/components/dashboard/BerufsbildnerStatistics.vue";
 
 const mentorWidgets = [
   "MentorTasksWidget",
@@ -112,6 +113,7 @@ function hasActionButton(): boolean {
           </router-link>
         </p>
       </div>
+
       <div
         v-if="
           hasWidget('ProgressWidget') &&
@@ -127,6 +129,7 @@ function hasActionButton(): boolean {
           diagram-type="horizontal"
         ></LearningPathDiagram>
       </div>
+
       <div
         v-if="numberOfProgressWidgets"
         class="flex flex-col flex-wrap gap-x-[60px] border-b border-gray-300 pb-8 last:border-0 md:flex-row"
@@ -144,12 +147,25 @@ function hasActionButton(): boolean {
           :course-id="courseConfig.course_id"
         ></CompetenceSummary>
       </div>
+
       <div
         v-if="hasWidget('UKStatisticsWidget')"
         class="flex flex-col flex-wrap gap-x-[60px] border-b border-gray-300 pb-8 last:border-0 md:flex-row"
       >
         <UkStatistics :course-slug="courseSlug" :course-id="courseConfig.course_id" />
       </div>
+
+      <div
+        v-if="hasWidget('UKBerufsbildnerStatisticsWidget')"
+        class="flex flex-col flex-wrap gap-x-[60px] border-b border-gray-300 pb-8 last:border-0 md:flex-row"
+      >
+        <BerufsbildnerStatistics
+          :course-slug="courseSlug"
+          :course-id="courseConfig.course_id"
+          :agent-role="courseConfig.role_key"
+        />
+      </div>
+
       <div
         v-if="numberOfMentorWidgets > 0"
         class="flex flex-col flex-wrap items-stretch md:flex-row"
diff --git a/client/src/components/dashboard/MentorCompetenceSummary.vue b/client/src/components/dashboard/MentorCompetenceSummary.vue
index 8bd8d902..c515a27d 100644
--- a/client/src/components/dashboard/MentorCompetenceSummary.vue
+++ b/client/src/components/dashboard/MentorCompetenceSummary.vue
@@ -1,11 +1,10 @@
 <script setup lang="ts">
-import type { Ref } from "vue";
-import { onMounted, ref } from "vue";
+import { computed, onMounted, ref } from "vue";
 import {
   type DashboardRoleKeyType,
   fetchMentorCompetenceSummary,
 } from "@/services/dashboard";
-import type { AssignmentsStatisticsType } from "@/gql/graphql";
+import type { BaseStatisticsType } from "@/gql/graphql";
 import BaseBox from "@/components/dashboard/BaseBox.vue";
 
 const props = defineProps<{
@@ -13,11 +12,17 @@ const props = defineProps<{
   agentRole: DashboardRoleKeyType;
 }>();
 
-const summary: Ref<AssignmentsStatisticsType | null> = ref(null);
+const mentorAssignmentData = ref<BaseStatisticsType | null>(null);
+
+const summary = computed(() => {
+  return mentorAssignmentData.value?.assignments ?? null;
+});
 
 onMounted(async () => {
-  summary.value = await fetchMentorCompetenceSummary(props.courseId, props.agentRole);
-  console.log(summary.value);
+  mentorAssignmentData.value = await fetchMentorCompetenceSummary(
+    props.courseId,
+    props.agentRole
+  );
 });
 </script>
 
diff --git a/client/src/gql/graphql.ts b/client/src/gql/graphql.ts
index 571f0d96..a21a54a7 100644
--- a/client/src/gql/graphql.ts
+++ b/client/src/gql/graphql.ts
@@ -250,6 +250,7 @@ export type BaseStatisticsType = {
   _id: Scalars['ID']['output'];
   assignments: AssignmentsStatisticsType;
   course_id: Scalars['ID']['output'];
+  course_session_properties: StatisticsCourseSessionPropertiesType;
   course_session_selection_ids: Array<Maybe<Scalars['ID']['output']>>;
   course_slug: Scalars['String']['output'];
   course_title: Scalars['String']['output'];
diff --git a/client/src/gql/schema.graphql b/client/src/gql/schema.graphql
index 8158c73e..701273cc 100644
--- a/client/src/gql/schema.graphql
+++ b/client/src/gql/schema.graphql
@@ -189,6 +189,7 @@ type BaseStatisticsType {
   course_session_selection_ids: [ID]!
   user_selection_ids: [ID]
   assignments: AssignmentsStatisticsType!
+  course_session_properties: StatisticsCourseSessionPropertiesType!
 }
 
 type CourseProgressType {
diff --git a/client/src/pages/dashboard/statistic/AgentStatisticParentPage.vue b/client/src/pages/dashboard/statistic/AgentStatisticParentPage.vue
new file mode 100644
index 00000000..29f2dd4c
--- /dev/null
+++ b/client/src/pages/dashboard/statistic/AgentStatisticParentPage.vue
@@ -0,0 +1,30 @@
+<script setup lang="ts">
+import LoadingSpinner from "@/components/ui/LoadingSpinner.vue";
+import { useCourseStatisticsv2 } from "@/composables";
+
+const props = defineProps<{
+  courseSlug: string;
+}>();
+
+const { courseStatistics, loading, courseSessionName, circleMeta } =
+  useCourseStatisticsv2(props.courseSlug);
+</script>
+
+<template>
+  <div class="bg-gray-200">
+    <div v-if="loading" class="m-8 flex justify-center">
+      <LoadingSpinner />
+    </div>
+    <div v-else class="container-large flex flex-col space-y-8">
+      <router-link class="btn-text inline-flex items-center pl-0" to="/">
+        <it-icon-arrow-left />
+        <span>{{ $t("general.back") }}</span>
+      </router-link>
+      <router-view
+        :course-statistics="courseStatistics"
+        :course-session-name="courseSessionName"
+        :circle-meta="circleMeta"
+      ></router-view>
+    </div>
+  </div>
+</template>
diff --git a/client/src/services/dashboard.ts b/client/src/services/dashboard.ts
index b6c427a9..5a93ab0c 100644
--- a/client/src/services/dashboard.ts
+++ b/client/src/services/dashboard.ts
@@ -8,10 +8,10 @@ import {
 
 import { itGetCached, itPost } from "@/fetchHelpers";
 import type {
-  AssignmentsStatisticsType,
+  AssignmentsStatisticsType, BaseStatisticsType,
   CourseProgressType,
   CourseStatisticsType,
-  DashboardConfigType,
+  DashboardConfigType
 } from "@/gql/graphql";
 import type {
   DashboardPersonsPageMode,
@@ -42,7 +42,8 @@ export type WidgetType =
   | "MentorPersonWidget"
   | "MentorCompetenceWidget"
   | "CompetenceCertificateWidget"
-  | "UKStatisticsWidget";
+  | "UKStatisticsWidget"
+  | "UKBerufsbildnerStatisticsWidget";
 
 export type DashboardPersonCourseSessionType = {
   id: string;
@@ -152,7 +153,7 @@ export const fetchDashboardConfig = async (): Promise<DashboardConfigType[] | nu
 export const fetchMentorCompetenceSummary = async (
   courseId: string,
   roleKey: DashboardRoleKeyType
-): Promise<AssignmentsStatisticsType | null> => {
+): Promise<BaseStatisticsType | null> => {
   let agentRole = "";
   if (["MentorUK", "MentorVV"].includes(roleKey)) {
     agentRole = "LEARNING_MENTOR";
@@ -174,7 +175,7 @@ export const fetchMentorCompetenceSummary = async (
     if (res.error) {
       console.error("Error fetching data for course ID:", courseId, res.error);
     }
-    return res.data?.mentor_course_statistics?.assignments || null;
+    return res.data?.mentor_course_statistics || null;
   } catch (error) {
     console.error(`Error fetching data for course ID: ${courseId}`, error);
     return null;
diff --git a/scripts/create_berufsbilnder_mobi.py b/scripts/create_berufsbilnder_mobi.py
index c784eed5..85eaeccd 100644
--- a/scripts/create_berufsbilnder_mobi.py
+++ b/scripts/create_berufsbilnder_mobi.py
@@ -33,6 +33,7 @@ def main():
     for csu in (
         CourseSessionUser.objects.filter(user__username__contains="@mobi")
         .filter(course_session__course__configuration__is_uk=True)
+        .filter(role=CourseSessionUser.Role.MEMBER.value)
         .exclude(course_session_id__in=[4, 5, 6])
     ):
         AgentParticipantRelation.objects.get_or_create(
diff --git a/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py b/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py
index d5701eb8..24544451 100644
--- a/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py
+++ b/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py
@@ -96,6 +96,10 @@ class BaseStatisticsType(graphene.ObjectType):
     user_selection_ids = graphene.List(graphene.ID, required=False)
     assignments = graphene.Field(AssignmentsStatisticsType, required=True)
 
+    course_session_properties = graphene.Field(
+        StatisticsCourseSessionPropertiesType, required=True
+    )
+
     def resolve_assignments(root, _info) -> AssignmentsStatisticsType:
         user_selection_ids = (
             [str(user) for user in root.user_selection_ids]
@@ -110,92 +114,6 @@ class BaseStatisticsType(graphene.ObjectType):
             urql_id=str(root._id),
         )
 
-    def get_circle_ids(self, info):
-        return getattr(info.context, "circle_ids", None)
-
-
-class CourseStatisticsType(BaseStatisticsType):
-    course_session_properties = graphene.Field(
-        StatisticsCourseSessionPropertiesType, required=True
-    )
-    course_session_selection_metrics = graphene.Field(
-        StatisticsCourseSessionsSelectionMetricType, required=True
-    )
-    attendance_day_presences = graphene.Field(
-        AttendanceDayPresencesStatisticsType, required=True
-    )
-    feedback_responses = graphene.Field(FeedbackStatisticsResponsesType, required=True)
-    competences = graphene.Field(CompetencesStatisticsType, required=True)
-
-    def resolve_attendance_day_presences(
-        root, info
-    ) -> AttendanceDayPresencesStatisticsType:
-        return attendance_day_presences(
-            course_id=root.course_id,
-            course_session_selection_ids=root.course_session_selection_ids,
-            circle_ids=root.get_circle_ids(info),
-            urql_id=str(root._id),
-        )
-
-    def resolve_feedback_responses(root, info) -> FeedbackStatisticsResponsesType:
-        return feedback_responses(
-            course_session_selection_ids=root.course_session_selection_ids,
-            course_id=root.course_id,
-            course_slug=root.course_slug,
-            circle_ids=root.get_circle_ids(info),
-            urql_id=str(root._id),
-        )
-
-    def resolve_competences(root, info) -> CompetencesStatisticsType:
-        user_selection_ids = (
-            [str(user) for user in root.user_selection_ids]
-            if root.user_selection_ids
-            else None
-        )  # noqa
-        records, success_total, fail_total = competences(
-            course_slug=str(root.course_slug),
-            course_session_selection_ids=[
-                str(cs) for cs in root.course_session_selection_ids  # noqa
-            ],
-            user_selection_ids=user_selection_ids,  # noqa
-            circle_ids=root.get_circle_ids(info),  # noqa
-            urql_id_postfix=str(root._id),  # noqa
-        )
-        return CompetencesStatisticsType(
-            _id=root._id,  # noqa
-            records=records,  # noqa
-            summary=CompetencePerformanceStatisticsSummaryType(  # noqa
-                _id=root._id,  # noqa
-                success_total=success_total,  # noqa
-                fail_total=fail_total,  # noqa
-            ),
-        )
-
-    def resolve_course_session_selection_metrics(
-        root, info
-    ) -> StatisticsCourseSessionsSelectionMetricType:
-        course_session_count = CourseSession.objects.filter(
-            id__in=root.course_session_selection_ids,
-            course_id=root.course_id,
-        ).count()
-
-        expert_count = CourseSessionUser.objects.filter(
-            course_session_id__in=root.course_session_selection_ids,
-            role=CourseSessionUser.Role.EXPERT,
-        ).count()
-
-        participant_count = CourseSessionUser.objects.filter(
-            course_session_id__in=root.course_session_selection_ids,
-            role=CourseSessionUser.Role.MEMBER,
-        ).count()
-
-        return StatisticsCourseSessionsSelectionMetricType(
-            _id=root._id,  # noqa
-            session_count=course_session_count,  # noqa
-            participant_count=participant_count,  # noqa
-            expert_count=expert_count,  # noqa
-        )
-
     def resolve_course_session_properties(root, info):
         course_session_data = []
         circle_data = []
@@ -238,3 +156,87 @@ class CourseStatisticsType(BaseStatisticsType):
             generations=list(generations),  # noqa
             circles=circle_data,  # noqa
         )
+
+    def get_circle_ids(self, info):
+        return getattr(info.context, "circle_ids", None)
+
+
+class CourseStatisticsType(BaseStatisticsType):
+    course_session_selection_metrics = graphene.Field(
+        StatisticsCourseSessionsSelectionMetricType, required=True
+    )
+    attendance_day_presences = graphene.Field(
+        AttendanceDayPresencesStatisticsType, required=True
+    )
+    feedback_responses = graphene.Field(FeedbackStatisticsResponsesType, required=True)
+    competences = graphene.Field(CompetencesStatisticsType, required=True)
+
+    def resolve_attendance_day_presences(
+        root, info
+    ) -> AttendanceDayPresencesStatisticsType:
+        return attendance_day_presences(
+            course_id=root.course_id,
+            course_session_selection_ids=root.course_session_selection_ids,
+            circle_ids=root.get_circle_ids(info),
+            urql_id=str(root._id),
+        )
+
+    def resolve_feedback_responses(root, info) -> FeedbackStatisticsResponsesType:
+        return feedback_responses(
+            course_session_selection_ids=root.course_session_selection_ids,
+            course_id=root.course_id,
+            course_slug=root.course_slug,
+            circle_ids=root.get_circle_ids(info),
+            urql_id=str(root._id),
+        )
+
+    def resolve_competences(root, info) -> CompetencesStatisticsType:
+        user_selection_ids = (
+            [str(user) for user in root.user_selection_ids]
+            if root.user_selection_ids
+            else None
+        )  # noqa
+        records, success_total, fail_total = competences(
+            course_slug=str(root.course_slug),
+            course_session_selection_ids=[
+                str(cs)
+                for cs in root.course_session_selection_ids  # noqa
+            ],
+            user_selection_ids=user_selection_ids,  # noqa
+            circle_ids=root.get_circle_ids(info),  # noqa
+            urql_id_postfix=str(root._id),  # noqa
+        )
+        return CompetencesStatisticsType(
+            _id=root._id,  # noqa
+            records=records,  # noqa
+            summary=CompetencePerformanceStatisticsSummaryType(  # noqa
+                _id=root._id,  # noqa
+                success_total=success_total,  # noqa
+                fail_total=fail_total,  # noqa
+            ),
+        )
+
+    def resolve_course_session_selection_metrics(
+        root, info
+    ) -> StatisticsCourseSessionsSelectionMetricType:
+        course_session_count = CourseSession.objects.filter(
+            id__in=root.course_session_selection_ids,
+            course_id=root.course_id,
+        ).count()
+
+        expert_count = CourseSessionUser.objects.filter(
+            course_session_id__in=root.course_session_selection_ids,
+            role=CourseSessionUser.Role.EXPERT,
+        ).count()
+
+        participant_count = CourseSessionUser.objects.filter(
+            course_session_id__in=root.course_session_selection_ids,
+            role=CourseSessionUser.Role.MEMBER,
+        ).count()
+
+        return StatisticsCourseSessionsSelectionMetricType(
+            _id=root._id,  # noqa
+            session_count=course_session_count,  # noqa
+            participant_count=participant_count,  # noqa
+            expert_count=expert_count,  # noqa
+        )
diff --git a/server/vbv_lernwelt/dashboard/views.py b/server/vbv_lernwelt/dashboard/views.py
index bf19fe4a..20b5a8ce 100644
--- a/server/vbv_lernwelt/dashboard/views.py
+++ b/server/vbv_lernwelt/dashboard/views.py
@@ -58,6 +58,7 @@ class WidgetType(Enum):
     MENTOR_COMPETENCE_WIDGET = "MentorCompetenceWidget"
     COMPETENCE_CERTIFICATE_WIDGET = "CompetenceCertificateWidget"
     UK_STATISTICS_WIDGET = "UKStatisticsWidget"
+    UK_BERUFSBILDNER_STATISTICS_WIDGET = "UKBerufsbildnerStatisticsWidget"
 
 
 class RoleKeyType(Enum):
@@ -379,7 +380,7 @@ def get_widgets_for_course(
             widgets.append(WidgetType.MENTOR_TASKS_WIDGET.value)
 
     if role_key in [RoleKeyType.BERUFSBILDNER]:
-        widgets.append(WidgetType.MENTOR_COMPETENCE_WIDGET.value)
+        widgets.append(WidgetType.UK_BERUFSBILDNER_STATISTICS_WIDGET.value)
 
     return widgets
 

From 89152ce7295502ce5a941c073a485d1cfe30dafc Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Mon, 22 Jul 2024 11:58:25 +0200
Subject: [PATCH 10/40] Make AssignmentList work for Berufsbildner

---
 client/src/composables.ts                     | 22 -------
 client/src/gql/gql.ts                         |  4 +-
 client/src/gql/graphql.ts                     |  4 +-
 client/src/graphql/queries.ts                 | 12 ++++
 .../pages/cockpit/cockpitPage/composables.ts  |  2 +-
 .../statistic/AgentStatisticParentPage.vue    | 61 +++++++++++++++++--
 .../dashboard/statistic/AssignmentList.vue    |  4 +-
 client/src/router/index.ts                    | 13 ++++
 client/src/services/dashboard.ts              | 13 ++--
 .../vbv_lernwelt/dashboard/graphql/queries.py |  4 +-
 .../dashboard/graphql/types/dashboard.py      |  3 +-
 server/vbv_lernwelt/dashboard/views.py        |  4 +-
 server/vbv_lernwelt/iam/permissions.py        | 37 ++++++++---
 13 files changed, 131 insertions(+), 52 deletions(-)

diff --git a/client/src/composables.ts b/client/src/composables.ts
index 284ed4fa..e93464c7 100644
--- a/client/src/composables.ts
+++ b/client/src/composables.ts
@@ -439,28 +439,6 @@ export function useCourseDataWithCompletion(
   };
 }
 
-export function useCourseStatistics() {
-  const dashboardStore = useDashboardStore();
-
-  const statistics = computed(() => {
-    return dashboardStore.currentDashBoardData as CourseStatisticsType;
-  });
-
-  const courseSessionName = (courseSessionId: string) => {
-    return statistics.value.course_session_properties.sessions.find(
-      (session) => session.id === courseSessionId
-    )?.name;
-  };
-
-  const circleMeta = (circleId: string) => {
-    return statistics.value.course_session_properties.circles.find(
-      (circle) => circle.id === circleId
-    );
-  };
-
-  return { courseSessionName, circleMeta };
-}
-
 export function useFileUpload() {
   const error = ref(false);
   const loading = ref(false);
diff --git a/client/src/gql/gql.ts b/client/src/gql/gql.ts
index a4fa70e0..e7be59a0 100644
--- a/client/src/gql/gql.ts
+++ b/client/src/gql/gql.ts
@@ -26,7 +26,7 @@ const documents = {
     "\n  query dashboardProgress($courseId: ID!) {\n    course_progress(course_id: $courseId) {\n      _id\n      course_id\n      session_to_continue_id\n      competence {\n        _id\n        total_count\n        success_count\n        fail_count\n      }\n      assignment {\n        _id\n        total_count\n        points_max_count\n        points_achieved_count\n      }\n    }\n  }\n": types.DashboardProgressDocument,
     "\n  query dashboardCourseData($courseId: ID!) {\n    course_progress(course_id: $courseId) {\n      _id\n      course_id\n      session_to_continue_id\n    }\n  }\n": types.DashboardCourseDataDocument,
     "\n  query courseStatistics($courseId: ID!) {\n    course_statistics(course_id: $courseId) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      course_session_selection_ids\n      course_session_selection_metrics {\n        _id\n        session_count\n        participant_count\n        expert_count\n      }\n      attendance_day_presences {\n        _id\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          due_date\n          participants_present\n          participants_total\n          details_url\n        }\n        summary {\n          _id\n          days_completed\n          participants_present\n        }\n      }\n      feedback_responses {\n        _id\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          experts\n          satisfaction_average\n          satisfaction_max\n          details_url\n        }\n        summary {\n          _id\n          satisfaction_average\n          satisfaction_max\n          total_responses\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_title\n          competence_certificate_id\n          details_url\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_evaluation_percent\n            average_passed\n          }\n        }\n      }\n      competences {\n        _id\n        summary {\n          _id\n          success_total\n          fail_total\n        }\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          title\n          success_count\n          fail_count\n          details_url\n        }\n      }\n    }\n  }\n": types.CourseStatisticsDocument,
-    "\n  query mentorCourseStatistics($courseId: ID!, $agentRole: String!) {\n    mentor_course_statistics(course_id: $courseId, agent_role: $agentRole) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_selection_ids\n      user_selection_ids\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_id\n          competence_certificate_title\n          details_url\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_evaluation_percent\n            average_passed\n          }\n        }\n      }\n    }\n  }\n": types.MentorCourseStatisticsDocument,
+    "\n  query mentorCourseStatistics($courseId: ID!, $agentRole: String!) {\n    mentor_course_statistics(course_id: $courseId, agent_role: $agentRole) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_selection_ids\n      user_selection_ids\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_id\n          competence_certificate_title\n          details_url\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_evaluation_percent\n            average_passed\n          }\n        }\n      }\n    }\n  }\n": types.MentorCourseStatisticsDocument,
     "\n  mutation SendFeedbackMutation(\n    $courseSessionId: ID!\n    $learningContentId: ID!\n    $learningContentType: String!\n    $data: GenericScalar!\n    $submitted: Boolean\n  ) {\n    send_feedback(\n      course_session_id: $courseSessionId\n      learning_content_page_id: $learningContentId\n      learning_content_type: $learningContentType\n      data: $data\n      submitted: $submitted\n    ) {\n      feedback_response {\n        id\n        data\n        submitted\n      }\n      errors {\n        field\n        messages\n      }\n    }\n  }\n": types.SendFeedbackMutationDocument,
 };
 
@@ -99,7 +99,7 @@ export function graphql(source: "\n  query courseStatistics($courseId: ID!) {\n
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  query mentorCourseStatistics($courseId: ID!, $agentRole: String!) {\n    mentor_course_statistics(course_id: $courseId, agent_role: $agentRole) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_selection_ids\n      user_selection_ids\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_id\n          competence_certificate_title\n          details_url\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_evaluation_percent\n            average_passed\n          }\n        }\n      }\n    }\n  }\n"): (typeof documents)["\n  query mentorCourseStatistics($courseId: ID!, $agentRole: String!) {\n    mentor_course_statistics(course_id: $courseId, agent_role: $agentRole) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_selection_ids\n      user_selection_ids\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_id\n          competence_certificate_title\n          details_url\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_evaluation_percent\n            average_passed\n          }\n        }\n      }\n    }\n  }\n"];
+export function graphql(source: "\n  query mentorCourseStatistics($courseId: ID!, $agentRole: String!) {\n    mentor_course_statistics(course_id: $courseId, agent_role: $agentRole) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_selection_ids\n      user_selection_ids\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_id\n          competence_certificate_title\n          details_url\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_evaluation_percent\n            average_passed\n          }\n        }\n      }\n    }\n  }\n"): (typeof documents)["\n  query mentorCourseStatistics($courseId: ID!, $agentRole: String!) {\n    mentor_course_statistics(course_id: $courseId, agent_role: $agentRole) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_selection_ids\n      user_selection_ids\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_id\n          competence_certificate_title\n          details_url\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_evaluation_percent\n            average_passed\n          }\n        }\n      }\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
diff --git a/client/src/gql/graphql.ts b/client/src/gql/graphql.ts
index a21a54a7..3a94969b 100644
--- a/client/src/gql/graphql.ts
+++ b/client/src/gql/graphql.ts
@@ -1397,7 +1397,7 @@ export type MentorCourseStatisticsQueryVariables = Exact<{
 }>;
 
 
-export type MentorCourseStatisticsQuery = { __typename?: 'Query', mentor_course_statistics?: { __typename?: 'BaseStatisticsType', _id: string, course_id: string, course_title: string, course_slug: string, course_session_selection_ids: Array<string | null>, user_selection_ids?: Array<string | null> | null, assignments: { __typename?: 'AssignmentsStatisticsType', _id: string, summary: { __typename?: 'AssignmentStatisticsSummaryType', _id: string, completed_count: number, average_passed: number, total_passed: number, total_failed: number }, records: Array<{ __typename?: 'AssignmentStatisticsRecordType', _id: string, course_session_id: string, course_session_assignment_id: string, circle_id: string, generation: string, assignment_title: string, assignment_type_translation_key: string, competence_certificate_id?: string | null, competence_certificate_title?: string | null, details_url: string, deadline: string, metrics: { __typename?: 'AssignmentCompletionMetricsType', _id: string, passed_count: number, failed_count: number, unranked_count: number, ranking_completed: boolean, average_evaluation_percent?: number | null, average_passed: number } }> } } | null };
+export type MentorCourseStatisticsQuery = { __typename?: 'Query', mentor_course_statistics?: { __typename?: 'BaseStatisticsType', _id: string, course_id: string, course_title: string, course_slug: string, course_session_selection_ids: Array<string | null>, user_selection_ids?: Array<string | null> | null, course_session_properties: { __typename?: 'StatisticsCourseSessionPropertiesType', _id: string, generations: Array<string>, sessions: Array<{ __typename?: 'StatisticsCourseSessionDataType', id: string, name: string }>, circles: Array<{ __typename?: 'StatisticsCircleDataType', id: string, name: string }> }, assignments: { __typename?: 'AssignmentsStatisticsType', _id: string, summary: { __typename?: 'AssignmentStatisticsSummaryType', _id: string, completed_count: number, average_passed: number, total_passed: number, total_failed: number }, records: Array<{ __typename?: 'AssignmentStatisticsRecordType', _id: string, course_session_id: string, course_session_assignment_id: string, circle_id: string, generation: string, assignment_title: string, assignment_type_translation_key: string, competence_certificate_id?: string | null, competence_certificate_title?: string | null, details_url: string, deadline: string, metrics: { __typename?: 'AssignmentCompletionMetricsType', _id: string, passed_count: number, failed_count: number, unranked_count: number, ranking_completed: boolean, average_evaluation_percent?: number | null, average_passed: number } }> } } | null };
 
 export type SendFeedbackMutationMutationVariables = Exact<{
   courseSessionId: Scalars['ID']['input'];
@@ -1423,5 +1423,5 @@ export const DashboardConfigDocument = {"kind":"Document","definitions":[{"kind"
 export const DashboardProgressDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"dashboardProgress"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course_progress"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_id"}},{"kind":"Field","name":{"kind":"Name","value":"session_to_continue_id"}},{"kind":"Field","name":{"kind":"Name","value":"competence"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"total_count"}},{"kind":"Field","name":{"kind":"Name","value":"success_count"}},{"kind":"Field","name":{"kind":"Name","value":"fail_count"}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignment"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"total_count"}},{"kind":"Field","name":{"kind":"Name","value":"points_max_count"}},{"kind":"Field","name":{"kind":"Name","value":"points_achieved_count"}}]}}]}}]}}]} as unknown as DocumentNode<DashboardProgressQuery, DashboardProgressQueryVariables>;
 export const DashboardCourseDataDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"dashboardCourseData"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course_progress"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_id"}},{"kind":"Field","name":{"kind":"Name","value":"session_to_continue_id"}}]}}]}}]} as unknown as DocumentNode<DashboardCourseDataQuery, DashboardCourseDataQueryVariables>;
 export const CourseStatisticsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"courseStatistics"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course_statistics"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_title"}},{"kind":"Field","name":{"kind":"Name","value":"course_slug"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_properties"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"sessions"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"generations"}},{"kind":"Field","name":{"kind":"Name","value":"circles"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"course_session_selection_ids"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_selection_metrics"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"session_count"}},{"kind":"Field","name":{"kind":"Name","value":"participant_count"}},{"kind":"Field","name":{"kind":"Name","value":"expert_count"}}]}},{"kind":"Field","name":{"kind":"Name","value":"attendance_day_presences"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"due_date"}},{"kind":"Field","name":{"kind":"Name","value":"participants_present"}},{"kind":"Field","name":{"kind":"Name","value":"participants_total"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}}]}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"days_completed"}},{"kind":"Field","name":{"kind":"Name","value":"participants_present"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"feedback_responses"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"experts"}},{"kind":"Field","name":{"kind":"Name","value":"satisfaction_average"}},{"kind":"Field","name":{"kind":"Name","value":"satisfaction_max"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}}]}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"satisfaction_average"}},{"kind":"Field","name":{"kind":"Name","value":"satisfaction_max"}},{"kind":"Field","name":{"kind":"Name","value":"total_responses"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignments"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"completed_count"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_failed"}}]}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_assignment_id"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_title"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type_translation_key"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_title"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_id"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}},{"kind":"Field","name":{"kind":"Name","value":"deadline"}},{"kind":"Field","name":{"kind":"Name","value":"metrics"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"passed_count"}},{"kind":"Field","name":{"kind":"Name","value":"failed_count"}},{"kind":"Field","name":{"kind":"Name","value":"unranked_count"}},{"kind":"Field","name":{"kind":"Name","value":"ranking_completed"}},{"kind":"Field","name":{"kind":"Name","value":"average_evaluation_percent"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"competences"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"success_total"}},{"kind":"Field","name":{"kind":"Name","value":"fail_total"}}]}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"success_count"}},{"kind":"Field","name":{"kind":"Name","value":"fail_count"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}}]}}]}}]}}]}}]} as unknown as DocumentNode<CourseStatisticsQuery, CourseStatisticsQueryVariables>;
-export const MentorCourseStatisticsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"mentorCourseStatistics"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"agentRole"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"mentor_course_statistics"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}},{"kind":"Argument","name":{"kind":"Name","value":"agent_role"},"value":{"kind":"Variable","name":{"kind":"Name","value":"agentRole"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_title"}},{"kind":"Field","name":{"kind":"Name","value":"course_slug"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_selection_ids"}},{"kind":"Field","name":{"kind":"Name","value":"user_selection_ids"}},{"kind":"Field","name":{"kind":"Name","value":"assignments"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"completed_count"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_failed"}}]}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_assignment_id"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_title"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type_translation_key"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_id"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_title"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}},{"kind":"Field","name":{"kind":"Name","value":"deadline"}},{"kind":"Field","name":{"kind":"Name","value":"metrics"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"passed_count"}},{"kind":"Field","name":{"kind":"Name","value":"failed_count"}},{"kind":"Field","name":{"kind":"Name","value":"unranked_count"}},{"kind":"Field","name":{"kind":"Name","value":"ranking_completed"}},{"kind":"Field","name":{"kind":"Name","value":"average_evaluation_percent"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}}]}}]}}]}}]}}]}}]} as unknown as DocumentNode<MentorCourseStatisticsQuery, MentorCourseStatisticsQueryVariables>;
+export const MentorCourseStatisticsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"mentorCourseStatistics"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"agentRole"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"mentor_course_statistics"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}},{"kind":"Argument","name":{"kind":"Name","value":"agent_role"},"value":{"kind":"Variable","name":{"kind":"Name","value":"agentRole"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_title"}},{"kind":"Field","name":{"kind":"Name","value":"course_slug"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_selection_ids"}},{"kind":"Field","name":{"kind":"Name","value":"user_selection_ids"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_properties"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"sessions"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"generations"}},{"kind":"Field","name":{"kind":"Name","value":"circles"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignments"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"completed_count"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_failed"}}]}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_assignment_id"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_title"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type_translation_key"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_id"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_title"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}},{"kind":"Field","name":{"kind":"Name","value":"deadline"}},{"kind":"Field","name":{"kind":"Name","value":"metrics"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"passed_count"}},{"kind":"Field","name":{"kind":"Name","value":"failed_count"}},{"kind":"Field","name":{"kind":"Name","value":"unranked_count"}},{"kind":"Field","name":{"kind":"Name","value":"ranking_completed"}},{"kind":"Field","name":{"kind":"Name","value":"average_evaluation_percent"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}}]}}]}}]}}]}}]}}]} as unknown as DocumentNode<MentorCourseStatisticsQuery, MentorCourseStatisticsQueryVariables>;
 export const SendFeedbackMutationDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"SendFeedbackMutation"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"learningContentId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"learningContentType"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"data"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"GenericScalar"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"submitted"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Boolean"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"send_feedback"},"arguments":[{"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":"learning_content_type"},"value":{"kind":"Variable","name":{"kind":"Name","value":"learningContentType"}}},{"kind":"Argument","name":{"kind":"Name","value":"data"},"value":{"kind":"Variable","name":{"kind":"Name","value":"data"}}},{"kind":"Argument","name":{"kind":"Name","value":"submitted"},"value":{"kind":"Variable","name":{"kind":"Name","value":"submitted"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"feedback_response"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"data"}},{"kind":"Field","name":{"kind":"Name","value":"submitted"}}]}},{"kind":"Field","name":{"kind":"Name","value":"errors"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"field"}},{"kind":"Field","name":{"kind":"Name","value":"messages"}}]}}]}}]}}]} as unknown as DocumentNode<SendFeedbackMutationMutation, SendFeedbackMutationMutationVariables>;
\ No newline at end of file
diff --git a/client/src/graphql/queries.ts b/client/src/graphql/queries.ts
index 7d33f4ff..06d6ad6e 100644
--- a/client/src/graphql/queries.ts
+++ b/client/src/graphql/queries.ts
@@ -515,6 +515,18 @@ export const DASHBOARD_MENTOR_COMPETENCE_SUMMARY = graphql(`
       course_slug
       course_session_selection_ids
       user_selection_ids
+      course_session_properties {
+        _id
+        sessions {
+          id
+          name
+        }
+        generations
+        circles {
+          id
+          name
+        }
+      }
       assignments {
         _id
         summary {
diff --git a/client/src/pages/cockpit/cockpitPage/composables.ts b/client/src/pages/cockpit/cockpitPage/composables.ts
index eb6c0d71..074f4033 100644
--- a/client/src/pages/cockpit/cockpitPage/composables.ts
+++ b/client/src/pages/cockpit/cockpitPage/composables.ts
@@ -20,7 +20,7 @@ export function useExpertCockpitPageData(courseSlug: string) {
     );
 
     const userDataPromises = courseSessionDetailResult.filterMembers().map((m) => {
-      const completionData = useCourseDataWithCompletion(courseSlug, m.id);
+      const completionData = useCourseDataWithCompletion(courseSlug, m.user_id);
       return completionData.resultPromise;
     });
 
diff --git a/client/src/pages/dashboard/statistic/AgentStatisticParentPage.vue b/client/src/pages/dashboard/statistic/AgentStatisticParentPage.vue
index 29f2dd4c..195ca1c1 100644
--- a/client/src/pages/dashboard/statistic/AgentStatisticParentPage.vue
+++ b/client/src/pages/dashboard/statistic/AgentStatisticParentPage.vue
@@ -1,13 +1,61 @@
 <script setup lang="ts">
+import log from "loglevel";
+import { onMounted, ref } from "vue";
+import {
+  courseIdForCourseSlug,
+  fetchMentorCompetenceSummary,
+} from "@/services/dashboard";
+import type { BaseStatisticsType } from "@/gql/graphql";
+import { useDashboardStore } from "@/stores/dashboard";
 import LoadingSpinner from "@/components/ui/LoadingSpinner.vue";
-import { useCourseStatisticsv2 } from "@/composables";
+import courseStatistics from "@/components/dashboard/CourseStatistics.vue";
+import AssignmentList from "@/pages/dashboard/statistic/AssignmentList.vue";
+
+const dashboardStore = useDashboardStore();
 
 const props = defineProps<{
+  agentRole: string;
   courseSlug: string;
 }>();
 
-const { courseStatistics, loading, courseSessionName, circleMeta } =
-  useCourseStatisticsv2(props.courseSlug);
+log.debug("AgentStatisticParentPage created", props);
+
+const loading = ref(true);
+const courseId = ref<string | undefined>(undefined);
+const agentAssignmentData = ref<BaseStatisticsType | null>(null);
+
+const courseSessionName = (courseSessionId: string) => {
+  return agentAssignmentData.value?.course_session_properties?.sessions.find(
+    (session) => session.id === courseSessionId
+  )?.name;
+};
+
+const circleMeta = (circleId: string) => {
+  return agentAssignmentData.value?.course_session_properties.circles.find(
+    (circle) => circle.id === circleId
+  );
+};
+
+onMounted(async () => {
+  await dashboardStore.loadDashboardDetails();
+  courseId.value = courseIdForCourseSlug(
+    dashboardStore.dashboardConfigsv2,
+    props.courseSlug
+  );
+
+  if (!courseId.value) {
+    log.error("CourseId not found for courseSlug", props.courseSlug);
+    return;
+  }
+
+  log.debug("courseId", courseId.value);
+  agentAssignmentData.value = await fetchMentorCompetenceSummary(
+    courseId.value,
+    props.agentRole
+  );
+
+  loading.value = false;
+});
 </script>
 
 <template>
@@ -20,11 +68,12 @@ const { courseStatistics, loading, courseSessionName, circleMeta } =
         <it-icon-arrow-left />
         <span>{{ $t("general.back") }}</span>
       </router-link>
-      <router-view
-        :course-statistics="courseStatistics"
+      <AssignmentList
+        v-if="agentAssignmentData"
+        :course-statistics="agentAssignmentData"
         :course-session-name="courseSessionName"
         :circle-meta="circleMeta"
-      ></router-view>
+      ></AssignmentList>
     </div>
   </div>
 </template>
diff --git a/client/src/pages/dashboard/statistic/AssignmentList.vue b/client/src/pages/dashboard/statistic/AssignmentList.vue
index fff3f1e8..a47ed085 100644
--- a/client/src/pages/dashboard/statistic/AssignmentList.vue
+++ b/client/src/pages/dashboard/statistic/AssignmentList.vue
@@ -2,7 +2,7 @@
 import type {
   AssignmentCompletionMetricsType,
   AssignmentStatisticsRecordType,
-  CourseStatisticsType,
+  BaseStatisticsType,
   StatisticsCircleDataType,
 } from "@/gql/graphql";
 import StatisticFilterList from "@/components/dashboard/StatisticFilterList.vue";
@@ -16,7 +16,7 @@ import { useUserStore } from "@/stores/user";
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const props = defineProps<{
-  courseStatistics: CourseStatisticsType;
+  courseStatistics: BaseStatisticsType;
   courseSessionName: (sessionId: string) => string;
   circleMeta: (circleId: string) => StatisticsCircleDataType;
 }>();
diff --git a/client/src/router/index.ts b/client/src/router/index.ts
index 1bbfcb90..c134d2a9 100644
--- a/client/src/router/index.ts
+++ b/client/src/router/index.ts
@@ -339,6 +339,19 @@ const router = createRouter({
         },
       ],
     },
+    {
+      path: "/statistic/:agentRole/:courseSlug",
+      props: true,
+      component: () =>
+        import("@/pages/dashboard/statistic/AgentStatisticParentPage.vue"),
+      children: [
+        {
+          path: "assignment",
+          props: true,
+          component: () => import("@/pages/dashboard/statistic/AssignmentList.vue"),
+        },
+      ],
+    },
     {
       path: "/shop",
       component: () => import("@/pages/ShopPage.vue"),
diff --git a/client/src/services/dashboard.ts b/client/src/services/dashboard.ts
index 5a93ab0c..cdd1a3e5 100644
--- a/client/src/services/dashboard.ts
+++ b/client/src/services/dashboard.ts
@@ -8,10 +8,11 @@ import {
 
 import { itGetCached, itPost } from "@/fetchHelpers";
 import type {
-  AssignmentsStatisticsType, BaseStatisticsType,
+  AssignmentsStatisticsType,
+  BaseStatisticsType,
   CourseProgressType,
   CourseStatisticsType,
-  DashboardConfigType
+  DashboardConfigType,
 } from "@/gql/graphql";
 import type {
   DashboardPersonsPageMode,
@@ -152,12 +153,14 @@ export const fetchDashboardConfig = async (): Promise<DashboardConfigType[] | nu
 
 export const fetchMentorCompetenceSummary = async (
   courseId: string,
-  roleKey: DashboardRoleKeyType
+  roleKey: string,
 ): Promise<BaseStatisticsType | null> => {
   let agentRole = "";
-  if (["MentorUK", "MentorVV"].includes(roleKey)) {
+  if (
+    ["MentorUK".toLowerCase(), "MentorVV".toLowerCase()].includes(roleKey.toLowerCase())
+  ) {
     agentRole = "LEARNING_MENTOR";
-  } else if (roleKey === "Berufsbildner") {
+  } else if (roleKey.toLowerCase() === "Berufsbildner".toLowerCase()) {
     agentRole = "BERUFSBILDNER";
   }
 
diff --git a/server/vbv_lernwelt/dashboard/graphql/queries.py b/server/vbv_lernwelt/dashboard/graphql/queries.py
index 90e179cf..36f3188f 100644
--- a/server/vbv_lernwelt/dashboard/graphql/queries.py
+++ b/server/vbv_lernwelt/dashboard/graphql/queries.py
@@ -119,7 +119,9 @@ class DashboardQuery(graphene.ObjectType):
             course_session_selection_ids=list(course_session_ids),  # noqa
         )
 
-    def resolve_mentor_course_statistics(root, info, course_id: str, agent_role: str):  # noqa
+    def resolve_mentor_course_statistics(
+        root, info, course_id: str, agent_role: str
+    ):  # noqa
         user = info.context.user
 
         return _agent_course_statistics(user, course_id, role=agent_role)
diff --git a/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py b/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py
index 24544451..8f9845cd 100644
--- a/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py
+++ b/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py
@@ -199,8 +199,7 @@ class CourseStatisticsType(BaseStatisticsType):
         records, success_total, fail_total = competences(
             course_slug=str(root.course_slug),
             course_session_selection_ids=[
-                str(cs)
-                for cs in root.course_session_selection_ids  # noqa
+                str(cs) for cs in root.course_session_selection_ids  # noqa
             ],
             user_selection_ids=user_selection_ids,  # noqa
             circle_ids=root.get_circle_ids(info),  # noqa
diff --git a/server/vbv_lernwelt/dashboard/views.py b/server/vbv_lernwelt/dashboard/views.py
index 20b5a8ce..be1e5f82 100644
--- a/server/vbv_lernwelt/dashboard/views.py
+++ b/server/vbv_lernwelt/dashboard/views.py
@@ -515,7 +515,9 @@ def get_mentor_open_tasks_count(request, course_id: str):
         return Response(
             status=200,
             data={
-                "open_task_count": _get_mentor_open_tasks_count(course_id, request.user)  # noqa
+                "open_task_count": _get_mentor_open_tasks_count(
+                    course_id, request.user
+                )  # noqa
             },
         )
     except PermissionDenied as e:
diff --git a/server/vbv_lernwelt/iam/permissions.py b/server/vbv_lernwelt/iam/permissions.py
index 1820b9ad..622abc6f 100644
--- a/server/vbv_lernwelt/iam/permissions.py
+++ b/server/vbv_lernwelt/iam/permissions.py
@@ -81,8 +81,11 @@ def is_course_session_learning_mentor(mentor: User, course_session_id: int):
     ).exists()
 
 
-def is_learning_mentor_for_user(
-    mentor: User, participant_user_id: str, course_session_id: int
+def is_agent_for_user(
+    agent: User,
+    participant_user_id: str,
+    course_session_id: int,
+    roles: list[str] = None,
 ):
     csu = CourseSessionUser.objects.filter(
         course_session_id=course_session_id, user_id=participant_user_id
@@ -91,12 +94,30 @@ def is_learning_mentor_for_user(
     if csu is None:
         return False
 
-    return AgentParticipantRelation.objects.filter(
-        agent=mentor,
+    qs = AgentParticipantRelation.objects.filter(
+        agent=agent,
         participant=csu,
         role=AgentParticipantRoleType.LEARNING_MENTOR.value,
     )
 
+    if roles and len(roles) > 0:
+        qs = qs.filter(role__in=roles)
+
+    return qs.exists()
+
+
+def is_learning_mentor_for_user(
+    mentor: User, participant_user_id: str, course_session_id: int
+):
+    return is_agent_for_user(
+        agent=mentor,
+        participant_user_id=participant_user_id,
+        course_session_id=course_session_id,
+        roles=[
+            AgentParticipantRoleType.LEARNING_MENTOR.value,
+        ],
+    )
+
 
 def is_course_session_supervisor(user, course_session_id: int):
     if user.is_superuser:
@@ -268,8 +289,8 @@ def can_view_profile(user: User, profile_user: CourseSessionUser) -> bool:
 
     if is_course_session_expert(
         user, profile_user.course_session.id
-    ) or is_learning_mentor_for_user(
-        mentor=user,
+    ) or is_agent_for_user(
+        agent=user,
         participant_user_id=profile_user.user.id,
         course_session_id=profile_user.course_session.id,
     ):
@@ -284,8 +305,8 @@ def can_view_course_completions(
     return (
         str(user.id) == target_user_id
         or is_course_session_expert(user=user, course_session_id=course_session_id)
-        or is_learning_mentor_for_user(
-            mentor=user,
+        or is_agent_for_user(
+            agent=user,
             participant_user_id=target_user_id,
             course_session_id=course_session_id,
         )

From 4b2fcc09ec1ee7a92bb36cfea298672061c69468 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Mon, 22 Jul 2024 16:59:27 +0200
Subject: [PATCH 11/40] AssignmentDetailPage for Berufsbildner

---
 client/src/composables.ts                     |  5 +-
 .../pages/cockpit/cockpitPage/composables.ts  | 15 +++--
 .../AgentAssignmentDetailPage.vue             | 56 +++++++++++++++++++
 .../AgentAssignmentStatisticPage.vue}         |  1 -
 client/src/router/index.ts                    | 18 +++---
 client/src/services/dashboard.ts              |  2 +-
 6 files changed, 80 insertions(+), 17 deletions(-)
 create mode 100644 client/src/pages/dashboard/agentAssignment/AgentAssignmentDetailPage.vue
 rename client/src/pages/dashboard/{statistic/AgentStatisticParentPage.vue => agentAssignment/AgentAssignmentStatisticPage.vue} (96%)

diff --git a/client/src/composables.ts b/client/src/composables.ts
index e93464c7..8a0803c7 100644
--- a/client/src/composables.ts
+++ b/client/src/composables.ts
@@ -129,8 +129,11 @@ export function useCourseSessionDetailQuery(courSessionId?: string) {
     return findUser(userId);
   }
 
-  function filterMembers() {
+  function filterMembers(userSelectionIds: string[] | null = null) {
     return (courseSessionDetail.value?.users ?? []).filter((u) => {
+      if (userSelectionIds) {
+        return userSelectionIds.includes(u.user_id) && u.role === "MEMBER";
+      }
       return u.role === "MEMBER";
     });
   }
diff --git a/client/src/pages/cockpit/cockpitPage/composables.ts b/client/src/pages/cockpit/cockpitPage/composables.ts
index 074f4033..bfaf474e 100644
--- a/client/src/pages/cockpit/cockpitPage/composables.ts
+++ b/client/src/pages/cockpit/cockpitPage/composables.ts
@@ -5,7 +5,10 @@ import {
 import { useExpertCockpitStore } from "@/stores/expertCockpit";
 import { ref } from "vue";
 
-export function useExpertCockpitPageData(courseSlug: string) {
+export function useExpertCockpitPageData(
+  courseSlug: string,
+  userSelectionIds: string[] | null = null
+) {
   const loading = ref(true);
 
   const cockpitStore = useExpertCockpitStore();
@@ -19,10 +22,12 @@ export function useExpertCockpitPageData(courseSlug: string) {
       courseSessionDetailResult.findCurrentUser()
     );
 
-    const userDataPromises = courseSessionDetailResult.filterMembers().map((m) => {
-      const completionData = useCourseDataWithCompletion(courseSlug, m.user_id);
-      return completionData.resultPromise;
-    });
+    const userDataPromises = courseSessionDetailResult
+      .filterMembers(userSelectionIds)
+      .map((m) => {
+        const completionData = useCourseDataWithCompletion(courseSlug, m.user_id);
+        return completionData.resultPromise;
+      });
 
     await Promise.all(userDataPromises);
     loading.value = false;
diff --git a/client/src/pages/dashboard/agentAssignment/AgentAssignmentDetailPage.vue b/client/src/pages/dashboard/agentAssignment/AgentAssignmentDetailPage.vue
new file mode 100644
index 00000000..0bfce4b5
--- /dev/null
+++ b/client/src/pages/dashboard/agentAssignment/AgentAssignmentDetailPage.vue
@@ -0,0 +1,56 @@
+<script setup lang="ts">
+import { useCourseData, useCurrentCourseSession } from "@/composables";
+import AssignmentDetails from "@/pages/cockpit/assignmentsPage/AssignmentDetails.vue";
+import * as log from "loglevel";
+import { computed, onMounted } from "vue";
+import type { LearningContentAssignment, LearningContentEdoniqTest } from "@/types";
+import { useExpertCockpitPageData } from "@/pages/cockpit/cockpitPage/composables";
+
+const props = defineProps<{
+  courseSlug: string;
+  assignmentId: string;
+}>();
+
+log.debug("AgentAssignmentDetailPage created", props.courseSlug);
+
+const courseSession = useCurrentCourseSession();
+const { loading } = useExpertCockpitPageData(props.courseSlug);
+
+onMounted(async () => {
+  log.debug("AgentAssignmentDetailPage mounted");
+});
+
+const lpQueryResult = useCourseData(props.courseSlug);
+
+const learningContentAssignment = computed(() => {
+  return lpQueryResult.findLearningContent(props.assignmentId);
+});
+</script>
+
+<template>
+  <div v-if="!loading" class="bg-gray-200">
+    <div 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>
+      <main>
+        <div class="bg-white p-6">
+          <!-- prettier-ignore -->
+          <AssignmentDetails
+            v-if="learningContentAssignment"
+            :course-session="courseSession"
+            :learning-content="learningContentAssignment as (LearningContentAssignment | LearningContentEdoniqTest)"
+          />
+        </div>
+      </main>
+    </div>
+  </div>
+</template>
+
+<style scoped></style>
diff --git a/client/src/pages/dashboard/statistic/AgentStatisticParentPage.vue b/client/src/pages/dashboard/agentAssignment/AgentAssignmentStatisticPage.vue
similarity index 96%
rename from client/src/pages/dashboard/statistic/AgentStatisticParentPage.vue
rename to client/src/pages/dashboard/agentAssignment/AgentAssignmentStatisticPage.vue
index 195ca1c1..8be182b5 100644
--- a/client/src/pages/dashboard/statistic/AgentStatisticParentPage.vue
+++ b/client/src/pages/dashboard/agentAssignment/AgentAssignmentStatisticPage.vue
@@ -8,7 +8,6 @@ import {
 import type { BaseStatisticsType } from "@/gql/graphql";
 import { useDashboardStore } from "@/stores/dashboard";
 import LoadingSpinner from "@/components/ui/LoadingSpinner.vue";
-import courseStatistics from "@/components/dashboard/CourseStatistics.vue";
 import AssignmentList from "@/pages/dashboard/statistic/AssignmentList.vue";
 
 const dashboardStore = useDashboardStore();
diff --git a/client/src/router/index.ts b/client/src/router/index.ts
index c134d2a9..d1fd39f0 100644
--- a/client/src/router/index.ts
+++ b/client/src/router/index.ts
@@ -340,18 +340,18 @@ const router = createRouter({
       ],
     },
     {
-      path: "/statistic/:agentRole/:courseSlug",
+      path: "/statistic/:agentRole/:courseSlug/assignment",
       props: true,
       component: () =>
-        import("@/pages/dashboard/statistic/AgentStatisticParentPage.vue"),
-      children: [
-        {
-          path: "assignment",
-          props: true,
-          component: () => import("@/pages/dashboard/statistic/AssignmentList.vue"),
-        },
-      ],
+        import("@/pages/dashboard/agentAssignment/AgentAssignmentStatisticPage.vue"),
     },
+    {
+      path: "/statistic/:agentRole/:courseSlug/assignment/:assignmentId",
+      props: true,
+      component: () =>
+        import("@/pages/dashboard/agentAssignment/AgentAssignmentDetailPage.vue"),
+    },
+
     {
       path: "/shop",
       component: () => import("@/pages/ShopPage.vue"),
diff --git a/client/src/services/dashboard.ts b/client/src/services/dashboard.ts
index cdd1a3e5..d688d7c5 100644
--- a/client/src/services/dashboard.ts
+++ b/client/src/services/dashboard.ts
@@ -153,7 +153,7 @@ export const fetchDashboardConfig = async (): Promise<DashboardConfigType[] | nu
 
 export const fetchMentorCompetenceSummary = async (
   courseId: string,
-  roleKey: string,
+  roleKey: string
 ): Promise<BaseStatisticsType | null> => {
   let agentRole = "";
   if (

From 61ee85668ea5bdc6f9936e54d166097664f4c8ff Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Mon, 22 Jul 2024 17:06:53 +0200
Subject: [PATCH 12/40] Add dashboard persons code for Berufsbildner

---
 .../AssignmentSubmissionProgress.vue          |  4 +-
 .../dashboard/AssignmentSummaryBox.vue        |  3 +-
 .../dashboard/BerufsbildnerStatistics.vue     |  5 +-
 client/src/composables.ts                     | 10 +--
 client/src/gql/gql.ts                         |  4 +-
 client/src/gql/graphql.ts                     |  5 +-
 client/src/gql/schema.graphql                 |  1 +
 client/src/graphql/queries.ts                 |  1 +
 .../assignmentsPage/AssignmentDetails.vue     | 14 +++--
 .../assignmentsPage/AssignmentsPage.vue       | 15 +++--
 .../pages/dashboard/DashboardPersonsPage.vue  |  2 +-
 .../agentAssignment/AgentAssignmentDetail.vue | 59 ++++++++++++++++++
 .../AgentAssignmentDetailPage.vue             | 61 ++++++++-----------
 .../AgentAssignmentStatisticPage.vue          |  1 +
 .../dashboard/statistic/AssignmentList.vue    | 12 +++-
 client/src/services/assignmentService.ts      | 12 ++--
 client/src/services/dashboard.ts              |  3 +-
 .../assignment/graphql/mutations.py           |  2 +-
 .../vbv_lernwelt/assignment/graphql/types.py  |  2 +-
 server/vbv_lernwelt/assignment/views.py       | 17 ++++--
 .../dashboard/graphql/types/assignment.py     | 21 ++++---
 server/vbv_lernwelt/dashboard/views.py        | 42 +++++++------
 server/vbv_lernwelt/iam/permissions.py        | 27 +++++---
 23 files changed, 215 insertions(+), 108 deletions(-)
 create mode 100644 client/src/pages/dashboard/agentAssignment/AgentAssignmentDetail.vue

diff --git a/client/src/components/assignment/AssignmentSubmissionProgress.vue b/client/src/components/assignment/AssignmentSubmissionProgress.vue
index 4dc55dec..c03d91a5 100644
--- a/client/src/components/assignment/AssignmentSubmissionProgress.vue
+++ b/client/src/components/assignment/AssignmentSubmissionProgress.vue
@@ -16,6 +16,7 @@ const props = defineProps<{
   courseSession: CourseSession;
   learningContent: LearningContentAssignment | LearningContentEdoniqTest;
   showTitle: boolean;
+  userSelectionIds?: string[];
 }>();
 
 log.debug("AssignmentSubmissionProgress created", stringifyParse(props));
@@ -35,7 +36,8 @@ onMounted(async () => {
     await loadAssignmentCompletionStatusData(
       props.learningContent.content_assignment.id,
       props.courseSession.id,
-      props.learningContent.id
+      props.learningContent.id,
+      props.userSelectionIds
     );
 
   state.submissionProgressStatusCount = {
diff --git a/client/src/components/dashboard/AssignmentSummaryBox.vue b/client/src/components/dashboard/AssignmentSummaryBox.vue
index 263bca4d..02d5c334 100644
--- a/client/src/components/dashboard/AssignmentSummaryBox.vue
+++ b/client/src/components/dashboard/AssignmentSummaryBox.vue
@@ -7,6 +7,7 @@ const props = defineProps<{
   assignmentsCompleted: number;
   avgPassed: number;
   courseSlug: string;
+  detailsLink?: string;
 }>();
 
 const progress = computed(() => {
@@ -20,7 +21,7 @@ const progress = computed(() => {
 
 <template>
   <BaseBox
-    :details-link="`/statistic/${courseSlug}/assignment`"
+    :details-link="props.detailsLink || `/statistic/${courseSlug}/assignment`"
     data-cy="dashboard.stats.assignments"
   >
     <template #title>{{ $t("a.Kompetenznachweis-Elemente") }}</template>
diff --git a/client/src/components/dashboard/BerufsbildnerStatistics.vue b/client/src/components/dashboard/BerufsbildnerStatistics.vue
index 5fc5cad4..de812067 100644
--- a/client/src/components/dashboard/BerufsbildnerStatistics.vue
+++ b/client/src/components/dashboard/BerufsbildnerStatistics.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
-import { computed, onMounted, type Ref, ref } from "vue";
+import { computed, onMounted, ref } from "vue";
 import {
   type DashboardRoleKeyType,
   fetchMentorCompetenceSummary,
 } from "@/services/dashboard";
-import type { AssignmentsStatisticsType, BaseStatisticsType } from "@/gql/graphql";
+import type { BaseStatisticsType } from "@/gql/graphql";
 import LoadingSpinner from "@/components/ui/LoadingSpinner.vue";
 import AssignmentSummaryBox from "@/components/dashboard/AssignmentSummaryBox.vue";
 
@@ -43,6 +43,7 @@ onMounted(async () => {
         :assignments-completed="assignmentStats.summary.completed_count"
         :avg-passed="assignmentStats.summary.average_passed"
         :course-slug="props.courseSlug"
+        :details-link="`/statistic/berufsbildner/${props.courseSlug}/assignment`"
       />
     </div>
   </div>
diff --git a/client/src/composables.ts b/client/src/composables.ts
index 8a0803c7..caf8a081 100644
--- a/client/src/composables.ts
+++ b/client/src/composables.ts
@@ -131,7 +131,7 @@ export function useCourseSessionDetailQuery(courSessionId?: string) {
 
   function filterMembers(userSelectionIds: string[] | null = null) {
     return (courseSessionDetail.value?.users ?? []).filter((u) => {
-      if (userSelectionIds) {
+      if (userSelectionIds && userSelectionIds.length > 0) {
         return userSelectionIds.includes(u.user_id) && u.role === "MEMBER";
       }
       return u.role === "MEMBER";
@@ -495,7 +495,7 @@ export function getVvRoleDisplay(role: DashboardPersonRoleType) {
   switch (role) {
     case "LEARNING_MENTOR":
       return t("a.Lernbegleitung");
-    case "LEARNING_MENTEE":
+    case "PARTICIPANT":
       return t("a.Teilnehmer");
     case "EXPERT":
       return t("a.Experte");
@@ -512,7 +512,7 @@ export function getUkRoleDisplay(role: DashboardPersonRoleType) {
   switch (role) {
     case "LEARNING_MENTOR":
       return t("a.Praxisbildner");
-    case "LEARNING_MENTEE":
+    case "PARTICIPANT":
       return t("a.Teilnehmer");
     case "EXPERT":
       return t("a.Trainer");
@@ -579,7 +579,7 @@ export function useDashboardPersonsDueDates(
         return refDate >= dayjs().startOf("day");
       });
 
-      // attach `LEARNING_MENTEE` to due dates for `LEARNING_MENTOR` persons
+      // attach `PARTICIPANT` to due dates for `LEARNING_MENTOR` persons
       currentDueDates.value.forEach((dueDate) => {
         if (dueDate.course_session.my_role === "LEARNING_MENTOR") {
           dueDate.persons = dashboardPersons.value.filter((person) => {
@@ -589,7 +589,7 @@ export function useDashboardPersonsDueDates(
                 .includes(dueDate.course_session.id)
             ) {
               return person.course_sessions.some(
-                (cs) => cs.user_role === "LEARNING_MENTEE"
+                (cs) => cs.user_role === "PARTICIPANT"
               );
             }
           });
diff --git a/client/src/gql/gql.ts b/client/src/gql/gql.ts
index e7be59a0..620ae0c7 100644
--- a/client/src/gql/gql.ts
+++ b/client/src/gql/gql.ts
@@ -26,7 +26,7 @@ const documents = {
     "\n  query dashboardProgress($courseId: ID!) {\n    course_progress(course_id: $courseId) {\n      _id\n      course_id\n      session_to_continue_id\n      competence {\n        _id\n        total_count\n        success_count\n        fail_count\n      }\n      assignment {\n        _id\n        total_count\n        points_max_count\n        points_achieved_count\n      }\n    }\n  }\n": types.DashboardProgressDocument,
     "\n  query dashboardCourseData($courseId: ID!) {\n    course_progress(course_id: $courseId) {\n      _id\n      course_id\n      session_to_continue_id\n    }\n  }\n": types.DashboardCourseDataDocument,
     "\n  query courseStatistics($courseId: ID!) {\n    course_statistics(course_id: $courseId) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      course_session_selection_ids\n      course_session_selection_metrics {\n        _id\n        session_count\n        participant_count\n        expert_count\n      }\n      attendance_day_presences {\n        _id\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          due_date\n          participants_present\n          participants_total\n          details_url\n        }\n        summary {\n          _id\n          days_completed\n          participants_present\n        }\n      }\n      feedback_responses {\n        _id\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          experts\n          satisfaction_average\n          satisfaction_max\n          details_url\n        }\n        summary {\n          _id\n          satisfaction_average\n          satisfaction_max\n          total_responses\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_title\n          competence_certificate_id\n          details_url\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_evaluation_percent\n            average_passed\n          }\n        }\n      }\n      competences {\n        _id\n        summary {\n          _id\n          success_total\n          fail_total\n        }\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          title\n          success_count\n          fail_count\n          details_url\n        }\n      }\n    }\n  }\n": types.CourseStatisticsDocument,
-    "\n  query mentorCourseStatistics($courseId: ID!, $agentRole: String!) {\n    mentor_course_statistics(course_id: $courseId, agent_role: $agentRole) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_selection_ids\n      user_selection_ids\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_id\n          competence_certificate_title\n          details_url\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_evaluation_percent\n            average_passed\n          }\n        }\n      }\n    }\n  }\n": types.MentorCourseStatisticsDocument,
+    "\n  query mentorCourseStatistics($courseId: ID!, $agentRole: String!) {\n    mentor_course_statistics(course_id: $courseId, agent_role: $agentRole) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_selection_ids\n      user_selection_ids\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_id\n          competence_certificate_title\n          details_url\n          learning_content_id\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_evaluation_percent\n            average_passed\n          }\n        }\n      }\n    }\n  }\n": types.MentorCourseStatisticsDocument,
     "\n  mutation SendFeedbackMutation(\n    $courseSessionId: ID!\n    $learningContentId: ID!\n    $learningContentType: String!\n    $data: GenericScalar!\n    $submitted: Boolean\n  ) {\n    send_feedback(\n      course_session_id: $courseSessionId\n      learning_content_page_id: $learningContentId\n      learning_content_type: $learningContentType\n      data: $data\n      submitted: $submitted\n    ) {\n      feedback_response {\n        id\n        data\n        submitted\n      }\n      errors {\n        field\n        messages\n      }\n    }\n  }\n": types.SendFeedbackMutationDocument,
 };
 
@@ -99,7 +99,7 @@ export function graphql(source: "\n  query courseStatistics($courseId: ID!) {\n
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  query mentorCourseStatistics($courseId: ID!, $agentRole: String!) {\n    mentor_course_statistics(course_id: $courseId, agent_role: $agentRole) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_selection_ids\n      user_selection_ids\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_id\n          competence_certificate_title\n          details_url\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_evaluation_percent\n            average_passed\n          }\n        }\n      }\n    }\n  }\n"): (typeof documents)["\n  query mentorCourseStatistics($courseId: ID!, $agentRole: String!) {\n    mentor_course_statistics(course_id: $courseId, agent_role: $agentRole) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_selection_ids\n      user_selection_ids\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_id\n          competence_certificate_title\n          details_url\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_evaluation_percent\n            average_passed\n          }\n        }\n      }\n    }\n  }\n"];
+export function graphql(source: "\n  query mentorCourseStatistics($courseId: ID!, $agentRole: String!) {\n    mentor_course_statistics(course_id: $courseId, agent_role: $agentRole) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_selection_ids\n      user_selection_ids\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_id\n          competence_certificate_title\n          details_url\n          learning_content_id\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_evaluation_percent\n            average_passed\n          }\n        }\n      }\n    }\n  }\n"): (typeof documents)["\n  query mentorCourseStatistics($courseId: ID!, $agentRole: String!) {\n    mentor_course_statistics(course_id: $courseId, agent_role: $agentRole) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_selection_ids\n      user_selection_ids\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_id\n          competence_certificate_title\n          details_url\n          learning_content_id\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_evaluation_percent\n            average_passed\n          }\n        }\n      }\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
diff --git a/client/src/gql/graphql.ts b/client/src/gql/graphql.ts
index 3a94969b..46c272f1 100644
--- a/client/src/gql/graphql.ts
+++ b/client/src/gql/graphql.ts
@@ -188,6 +188,7 @@ export type AssignmentStatisticsRecordType = {
   deadline: Scalars['DateTime']['output'];
   details_url: Scalars['String']['output'];
   generation: Scalars['String']['output'];
+  learning_content_id: Scalars['ID']['output'];
   metrics: AssignmentCompletionMetricsType;
 };
 
@@ -1397,7 +1398,7 @@ export type MentorCourseStatisticsQueryVariables = Exact<{
 }>;
 
 
-export type MentorCourseStatisticsQuery = { __typename?: 'Query', mentor_course_statistics?: { __typename?: 'BaseStatisticsType', _id: string, course_id: string, course_title: string, course_slug: string, course_session_selection_ids: Array<string | null>, user_selection_ids?: Array<string | null> | null, course_session_properties: { __typename?: 'StatisticsCourseSessionPropertiesType', _id: string, generations: Array<string>, sessions: Array<{ __typename?: 'StatisticsCourseSessionDataType', id: string, name: string }>, circles: Array<{ __typename?: 'StatisticsCircleDataType', id: string, name: string }> }, assignments: { __typename?: 'AssignmentsStatisticsType', _id: string, summary: { __typename?: 'AssignmentStatisticsSummaryType', _id: string, completed_count: number, average_passed: number, total_passed: number, total_failed: number }, records: Array<{ __typename?: 'AssignmentStatisticsRecordType', _id: string, course_session_id: string, course_session_assignment_id: string, circle_id: string, generation: string, assignment_title: string, assignment_type_translation_key: string, competence_certificate_id?: string | null, competence_certificate_title?: string | null, details_url: string, deadline: string, metrics: { __typename?: 'AssignmentCompletionMetricsType', _id: string, passed_count: number, failed_count: number, unranked_count: number, ranking_completed: boolean, average_evaluation_percent?: number | null, average_passed: number } }> } } | null };
+export type MentorCourseStatisticsQuery = { __typename?: 'Query', mentor_course_statistics?: { __typename?: 'BaseStatisticsType', _id: string, course_id: string, course_title: string, course_slug: string, course_session_selection_ids: Array<string | null>, user_selection_ids?: Array<string | null> | null, course_session_properties: { __typename?: 'StatisticsCourseSessionPropertiesType', _id: string, generations: Array<string>, sessions: Array<{ __typename?: 'StatisticsCourseSessionDataType', id: string, name: string }>, circles: Array<{ __typename?: 'StatisticsCircleDataType', id: string, name: string }> }, assignments: { __typename?: 'AssignmentsStatisticsType', _id: string, summary: { __typename?: 'AssignmentStatisticsSummaryType', _id: string, completed_count: number, average_passed: number, total_passed: number, total_failed: number }, records: Array<{ __typename?: 'AssignmentStatisticsRecordType', _id: string, course_session_id: string, course_session_assignment_id: string, circle_id: string, generation: string, assignment_title: string, assignment_type_translation_key: string, competence_certificate_id?: string | null, competence_certificate_title?: string | null, details_url: string, learning_content_id: string, deadline: string, metrics: { __typename?: 'AssignmentCompletionMetricsType', _id: string, passed_count: number, failed_count: number, unranked_count: number, ranking_completed: boolean, average_evaluation_percent?: number | null, average_passed: number } }> } } | null };
 
 export type SendFeedbackMutationMutationVariables = Exact<{
   courseSessionId: Scalars['ID']['input'];
@@ -1423,5 +1424,5 @@ export const DashboardConfigDocument = {"kind":"Document","definitions":[{"kind"
 export const DashboardProgressDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"dashboardProgress"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course_progress"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_id"}},{"kind":"Field","name":{"kind":"Name","value":"session_to_continue_id"}},{"kind":"Field","name":{"kind":"Name","value":"competence"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"total_count"}},{"kind":"Field","name":{"kind":"Name","value":"success_count"}},{"kind":"Field","name":{"kind":"Name","value":"fail_count"}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignment"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"total_count"}},{"kind":"Field","name":{"kind":"Name","value":"points_max_count"}},{"kind":"Field","name":{"kind":"Name","value":"points_achieved_count"}}]}}]}}]}}]} as unknown as DocumentNode<DashboardProgressQuery, DashboardProgressQueryVariables>;
 export const DashboardCourseDataDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"dashboardCourseData"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course_progress"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_id"}},{"kind":"Field","name":{"kind":"Name","value":"session_to_continue_id"}}]}}]}}]} as unknown as DocumentNode<DashboardCourseDataQuery, DashboardCourseDataQueryVariables>;
 export const CourseStatisticsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"courseStatistics"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course_statistics"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_title"}},{"kind":"Field","name":{"kind":"Name","value":"course_slug"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_properties"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"sessions"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"generations"}},{"kind":"Field","name":{"kind":"Name","value":"circles"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"course_session_selection_ids"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_selection_metrics"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"session_count"}},{"kind":"Field","name":{"kind":"Name","value":"participant_count"}},{"kind":"Field","name":{"kind":"Name","value":"expert_count"}}]}},{"kind":"Field","name":{"kind":"Name","value":"attendance_day_presences"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"due_date"}},{"kind":"Field","name":{"kind":"Name","value":"participants_present"}},{"kind":"Field","name":{"kind":"Name","value":"participants_total"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}}]}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"days_completed"}},{"kind":"Field","name":{"kind":"Name","value":"participants_present"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"feedback_responses"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"experts"}},{"kind":"Field","name":{"kind":"Name","value":"satisfaction_average"}},{"kind":"Field","name":{"kind":"Name","value":"satisfaction_max"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}}]}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"satisfaction_average"}},{"kind":"Field","name":{"kind":"Name","value":"satisfaction_max"}},{"kind":"Field","name":{"kind":"Name","value":"total_responses"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignments"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"completed_count"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_failed"}}]}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_assignment_id"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_title"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type_translation_key"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_title"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_id"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}},{"kind":"Field","name":{"kind":"Name","value":"deadline"}},{"kind":"Field","name":{"kind":"Name","value":"metrics"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"passed_count"}},{"kind":"Field","name":{"kind":"Name","value":"failed_count"}},{"kind":"Field","name":{"kind":"Name","value":"unranked_count"}},{"kind":"Field","name":{"kind":"Name","value":"ranking_completed"}},{"kind":"Field","name":{"kind":"Name","value":"average_evaluation_percent"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"competences"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"success_total"}},{"kind":"Field","name":{"kind":"Name","value":"fail_total"}}]}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"success_count"}},{"kind":"Field","name":{"kind":"Name","value":"fail_count"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}}]}}]}}]}}]}}]} as unknown as DocumentNode<CourseStatisticsQuery, CourseStatisticsQueryVariables>;
-export const MentorCourseStatisticsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"mentorCourseStatistics"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"agentRole"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"mentor_course_statistics"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}},{"kind":"Argument","name":{"kind":"Name","value":"agent_role"},"value":{"kind":"Variable","name":{"kind":"Name","value":"agentRole"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_title"}},{"kind":"Field","name":{"kind":"Name","value":"course_slug"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_selection_ids"}},{"kind":"Field","name":{"kind":"Name","value":"user_selection_ids"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_properties"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"sessions"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"generations"}},{"kind":"Field","name":{"kind":"Name","value":"circles"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignments"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"completed_count"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_failed"}}]}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_assignment_id"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_title"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type_translation_key"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_id"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_title"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}},{"kind":"Field","name":{"kind":"Name","value":"deadline"}},{"kind":"Field","name":{"kind":"Name","value":"metrics"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"passed_count"}},{"kind":"Field","name":{"kind":"Name","value":"failed_count"}},{"kind":"Field","name":{"kind":"Name","value":"unranked_count"}},{"kind":"Field","name":{"kind":"Name","value":"ranking_completed"}},{"kind":"Field","name":{"kind":"Name","value":"average_evaluation_percent"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}}]}}]}}]}}]}}]}}]} as unknown as DocumentNode<MentorCourseStatisticsQuery, MentorCourseStatisticsQueryVariables>;
+export const MentorCourseStatisticsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"mentorCourseStatistics"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"agentRole"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"mentor_course_statistics"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}},{"kind":"Argument","name":{"kind":"Name","value":"agent_role"},"value":{"kind":"Variable","name":{"kind":"Name","value":"agentRole"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_title"}},{"kind":"Field","name":{"kind":"Name","value":"course_slug"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_selection_ids"}},{"kind":"Field","name":{"kind":"Name","value":"user_selection_ids"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_properties"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"sessions"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"generations"}},{"kind":"Field","name":{"kind":"Name","value":"circles"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignments"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"completed_count"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_failed"}}]}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_assignment_id"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_title"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type_translation_key"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_id"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_title"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}},{"kind":"Field","name":{"kind":"Name","value":"learning_content_id"}},{"kind":"Field","name":{"kind":"Name","value":"deadline"}},{"kind":"Field","name":{"kind":"Name","value":"metrics"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"passed_count"}},{"kind":"Field","name":{"kind":"Name","value":"failed_count"}},{"kind":"Field","name":{"kind":"Name","value":"unranked_count"}},{"kind":"Field","name":{"kind":"Name","value":"ranking_completed"}},{"kind":"Field","name":{"kind":"Name","value":"average_evaluation_percent"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}}]}}]}}]}}]}}]}}]} as unknown as DocumentNode<MentorCourseStatisticsQuery, MentorCourseStatisticsQueryVariables>;
 export const SendFeedbackMutationDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"SendFeedbackMutation"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"learningContentId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"learningContentType"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"data"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"GenericScalar"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"submitted"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Boolean"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"send_feedback"},"arguments":[{"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":"learning_content_type"},"value":{"kind":"Variable","name":{"kind":"Name","value":"learningContentType"}}},{"kind":"Argument","name":{"kind":"Name","value":"data"},"value":{"kind":"Variable","name":{"kind":"Name","value":"data"}}},{"kind":"Argument","name":{"kind":"Name","value":"submitted"},"value":{"kind":"Variable","name":{"kind":"Name","value":"submitted"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"feedback_response"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"data"}},{"kind":"Field","name":{"kind":"Name","value":"submitted"}}]}},{"kind":"Field","name":{"kind":"Name","value":"errors"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"field"}},{"kind":"Field","name":{"kind":"Name","value":"messages"}}]}}]}}]}}]} as unknown as DocumentNode<SendFeedbackMutationMutation, SendFeedbackMutationMutationVariables>;
\ No newline at end of file
diff --git a/client/src/gql/schema.graphql b/client/src/gql/schema.graphql
index 701273cc..5b913f86 100644
--- a/client/src/gql/schema.graphql
+++ b/client/src/gql/schema.graphql
@@ -59,6 +59,7 @@ type AssignmentStatisticsRecordType {
   competence_certificate_id: ID
   competence_certificate_title: String
   metrics: AssignmentCompletionMetricsType!
+  learning_content_id: ID!
   details_url: String!
 }
 
diff --git a/client/src/graphql/queries.ts b/client/src/graphql/queries.ts
index 06d6ad6e..be25a989 100644
--- a/client/src/graphql/queries.ts
+++ b/client/src/graphql/queries.ts
@@ -547,6 +547,7 @@ export const DASHBOARD_MENTOR_COMPETENCE_SUMMARY = graphql(`
           competence_certificate_id
           competence_certificate_title
           details_url
+          learning_content_id
           deadline
           metrics {
             _id
diff --git a/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue b/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue
index f7b6431f..844668c0 100644
--- a/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue
+++ b/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue
@@ -19,10 +19,13 @@ import { useTranslation } from "i18next-vue";
 
 const { t } = useTranslation();
 
-const props = defineProps<{
+export interface Props {
   courseSession: CourseSession;
   learningContent: LearningContentAssignment | LearningContentEdoniqTest;
-}>();
+  userSelectionIds?: string[];
+}
+
+const props = defineProps<Props>();
 
 log.debug("AssignmentDetails created", stringifyParse(props));
 
@@ -45,11 +48,13 @@ const isPraxisAssignment = computed(() => {
 });
 
 onMounted(async () => {
+  log.debug("AssignmentDetails mounted", props.learningContent, props.userSelectionIds);
   const { gradedUsers, assignmentSubmittedUsers } =
     await loadAssignmentCompletionStatusData(
       props.learningContent.content_assignment.id,
       props.courseSession.id,
-      props.learningContent.id
+      props.learningContent.id,
+      props.userSelectionIds ?? []
     );
   state.gradedUsers = gradedUsers;
   state.assignmentSubmittedUsers = assignmentSubmittedUsers;
@@ -111,13 +116,14 @@ function findUserPointsHtml(userId: string) {
         :course-session="courseSession"
         :learning-content="learningContent"
         :show-title="false"
+        :user-selection-ids="props.userSelectionIds"
       />
     </div>
 
     <div v-if="courseSessionDetailResult.filterMembers().length" class="mt-6">
       <ul>
         <ItPersonRow
-          v-for="csu in courseSessionDetailResult.filterMembers()"
+          v-for="csu in courseSessionDetailResult.filterMembers(props.userSelectionIds)"
           :key="csu.user_id"
           :name="`${csu.first_name} ${csu.last_name}`"
           :avatar-url="csu.avatar_url"
diff --git a/client/src/pages/cockpit/assignmentsPage/AssignmentsPage.vue b/client/src/pages/cockpit/assignmentsPage/AssignmentsPage.vue
index 2e8e07c5..a4281394 100644
--- a/client/src/pages/cockpit/assignmentsPage/AssignmentsPage.vue
+++ b/client/src/pages/cockpit/assignmentsPage/AssignmentsPage.vue
@@ -5,6 +5,7 @@ import * as log from "loglevel";
 import { computed, onMounted } from "vue";
 import type { LearningContentAssignment, LearningContentEdoniqTest } from "@/types";
 import { useExpertCockpitPageData } from "@/pages/cockpit/cockpitPage/composables";
+import { getPreviousRoute } from "@/router/history";
 
 const props = defineProps<{
   courseSlug: string;
@@ -25,16 +26,22 @@ const lpQueryResult = useCourseData(props.courseSlug);
 const learningContentAssignment = computed(() => {
   return lpQueryResult.findLearningContent(props.assignmentId);
 });
+
+const previousRoute = getPreviousRoute();
+
+const backRoute = computed(() => {
+  if (previousRoute?.path.endsWith("/assignment")) {
+    return previousRoute;
+  }
+  return `/course/${props.courseSlug}/cockpit`;
+});
 </script>
 
 <template>
   <div v-if="!loading" class="bg-gray-200">
     <div 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`"
-        >
+        <router-link class="btn-text inline-flex items-center pl-0" :to="backRoute">
           <it-icon-arrow-left />
           <span>{{ $t("general.back") }}</span>
         </router-link>
diff --git a/client/src/pages/dashboard/DashboardPersonsPage.vue b/client/src/pages/dashboard/DashboardPersonsPage.vue
index 59557836..f807936f 100644
--- a/client/src/pages/dashboard/DashboardPersonsPage.vue
+++ b/client/src/pages/dashboard/DashboardPersonsPage.vue
@@ -365,7 +365,7 @@ watch(selectedRegion, () => {
                         (['SUPERVISOR', 'EXPERT'].includes(cs.my_role) &&
                           cs.user_role === 'MEMBER') ||
                         (cs.my_role === 'LEARNING_MENTOR' &&
-                          cs.user_role === 'LEARNING_MENTEE')
+                          cs.user_role === 'PARTICIPANT')
                       "
                     >
                       <router-link
diff --git a/client/src/pages/dashboard/agentAssignment/AgentAssignmentDetail.vue b/client/src/pages/dashboard/agentAssignment/AgentAssignmentDetail.vue
new file mode 100644
index 00000000..703e370f
--- /dev/null
+++ b/client/src/pages/dashboard/agentAssignment/AgentAssignmentDetail.vue
@@ -0,0 +1,59 @@
+<script setup lang="ts">
+import { useCourseData, useCurrentCourseSession } from "@/composables";
+import AssignmentDetails from "@/pages/cockpit/assignmentsPage/AssignmentDetails.vue";
+import * as log from "loglevel";
+import { computed } from "vue";
+import type { LearningContentAssignment, LearningContentEdoniqTest } from "@/types";
+import { useExpertCockpitPageData } from "@/pages/cockpit/cockpitPage/composables";
+import { getPreviousRoute } from "@/router/history";
+
+const props = defineProps<{
+  courseSlug: string;
+  assignmentId: string;
+  agentRole: string;
+  participantUserIds: string[];
+}>();
+
+log.debug("AgentAssignmentDetail created", props.courseSlug, props.agentRole);
+
+const courseSession = useCurrentCourseSession();
+const { loading } = useExpertCockpitPageData(
+  props.courseSlug,
+  props.participantUserIds
+);
+
+const lpQueryResult = useCourseData(props.courseSlug);
+
+const learningContentAssignment = computed(() => {
+  return lpQueryResult.findLearningContent(props.assignmentId);
+});
+</script>
+
+<template>
+  <div v-if="!loading" class="bg-gray-200">
+    <div class="container-large">
+      <nav class="py-4 pb-4">
+        <router-link
+          class="btn-text inline-flex items-center pl-0"
+          :to="`/statistic/${props.agentRole}/${props.courseSlug}/assignment`"
+        >
+          <it-icon-arrow-left />
+          <span>{{ $t("general.back") }}</span>
+        </router-link>
+      </nav>
+      <main>
+        <div class="bg-white p-6">
+          <!-- prettier-ignore -->
+          <AssignmentDetails
+            v-if="learningContentAssignment"
+            :course-session="courseSession"
+            :learning-content="learningContentAssignment as (LearningContentAssignment | LearningContentEdoniqTest)"
+            :user-selection-ids="participantUserIds"
+          />
+        </div>
+      </main>
+    </div>
+  </div>
+</template>
+
+<style scoped></style>
diff --git a/client/src/pages/dashboard/agentAssignment/AgentAssignmentDetailPage.vue b/client/src/pages/dashboard/agentAssignment/AgentAssignmentDetailPage.vue
index 0bfce4b5..66500f5d 100644
--- a/client/src/pages/dashboard/agentAssignment/AgentAssignmentDetailPage.vue
+++ b/client/src/pages/dashboard/agentAssignment/AgentAssignmentDetailPage.vue
@@ -1,56 +1,45 @@
 <script setup lang="ts">
-import { useCourseData, useCurrentCourseSession } from "@/composables";
-import AssignmentDetails from "@/pages/cockpit/assignmentsPage/AssignmentDetails.vue";
+import { useCurrentCourseSession } from "@/composables";
 import * as log from "loglevel";
-import { computed, onMounted } from "vue";
-import type { LearningContentAssignment, LearningContentEdoniqTest } from "@/types";
-import { useExpertCockpitPageData } from "@/pages/cockpit/cockpitPage/composables";
+import { onMounted, ref } from "vue";
+import { fetchDashboardPersons } from "@/services/dashboard";
+import AgentAssignmentDetail from "@/pages/dashboard/agentAssignment/AgentAssignmentDetail.vue";
 
 const props = defineProps<{
   courseSlug: string;
   assignmentId: string;
+  agentRole: string;
 }>();
 
-log.debug("AgentAssignmentDetailPage created", props.courseSlug);
+log.debug("AgentAssignmentDetailPage created", props.courseSlug, props.agentRole);
 
 const courseSession = useCurrentCourseSession();
-const { loading } = useExpertCockpitPageData(props.courseSlug);
+
+const loading = ref(true);
+const participantUserIds = ref<string[]>([]);
 
 onMounted(async () => {
-  log.debug("AgentAssignmentDetailPage mounted");
-});
+  log.debug("AgentAssignmentDetailPage mounted", courseSession);
 
-const lpQueryResult = useCourseData(props.courseSlug);
-
-const learningContentAssignment = computed(() => {
-  return lpQueryResult.findLearningContent(props.assignmentId);
+  const personData = await fetchDashboardPersons("default");
+  const participants = personData?.filter((p) => {
+    return p.course_sessions.find(
+      (cs) => cs.id === courseSession.value.id && cs.my_role === "BERUFSBILDNER"
+    );
+  });
+  participantUserIds.value = participants?.map((p) => p.user_id);
+  loading.value = false;
 });
 </script>
 
 <template>
-  <div v-if="!loading" class="bg-gray-200">
-    <div 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>
-      <main>
-        <div class="bg-white p-6">
-          <!-- prettier-ignore -->
-          <AssignmentDetails
-            v-if="learningContentAssignment"
-            :course-session="courseSession"
-            :learning-content="learningContentAssignment as (LearningContentAssignment | LearningContentEdoniqTest)"
-          />
-        </div>
-      </main>
-    </div>
-  </div>
+  <AgentAssignmentDetail
+    v-if="participantUserIds.length"
+    :assignment-id="props.assignmentId"
+    :agent-role="props.agentRole"
+    :course-slug="props.courseSlug"
+    :participant-user-ids="participantUserIds"
+  />
 </template>
 
 <style scoped></style>
diff --git a/client/src/pages/dashboard/agentAssignment/AgentAssignmentStatisticPage.vue b/client/src/pages/dashboard/agentAssignment/AgentAssignmentStatisticPage.vue
index 8be182b5..a6bd9530 100644
--- a/client/src/pages/dashboard/agentAssignment/AgentAssignmentStatisticPage.vue
+++ b/client/src/pages/dashboard/agentAssignment/AgentAssignmentStatisticPage.vue
@@ -72,6 +72,7 @@ onMounted(async () => {
         :course-statistics="agentAssignmentData"
         :course-session-name="courseSessionName"
         :circle-meta="circleMeta"
+        :detail-base-url="`/statistic/${props.agentRole}/${props.courseSlug}/assignment/`"
       ></AssignmentList>
     </div>
   </div>
diff --git a/client/src/pages/dashboard/statistic/AssignmentList.vue b/client/src/pages/dashboard/statistic/AssignmentList.vue
index a47ed085..1501b580 100644
--- a/client/src/pages/dashboard/statistic/AssignmentList.vue
+++ b/client/src/pages/dashboard/statistic/AssignmentList.vue
@@ -19,6 +19,7 @@ const props = defineProps<{
   courseStatistics: BaseStatisticsType;
   courseSessionName: (sessionId: string) => string;
   circleMeta: (circleId: string) => StatisticsCircleDataType;
+  detailBaseUrl?: string;
 }>();
 
 const statisticFilter: Ref<typeof StatisticFilterList | null> = ref(null);
@@ -51,6 +52,14 @@ async function exportData() {
   const filteredItems = statisticFilter.value.getFilteredItems();
   await exportDataAsXls(filteredItems, exportCompetenceElements, userStore.language);
 }
+
+const itemDetailUrl = (item: AssignmentStatisticsRecordType) => {
+  if (props.detailBaseUrl) {
+    return `${props.detailBaseUrl}${item.learning_content_id}?courseSessionId=${item.course_session_id}`;
+  }
+  return item.details_url;
+};
+
 </script>
 
 <template>
@@ -114,8 +123,7 @@ async function exportData() {
               ></ItProgress>
               <router-link
                 class="underline"
-                target="_blank"
-                :to="(item as AssignmentStatisticsRecordType).details_url"
+                :to="itemDetailUrl(item as AssignmentStatisticsRecordType)"
               >
                 {{ $t("a.Details anschauen") }}
               </router-link>
diff --git a/client/src/services/assignmentService.ts b/client/src/services/assignmentService.ts
index 3d2296f3..0e2ef964 100644
--- a/client/src/services/assignmentService.ts
+++ b/client/src/services/assignmentService.ts
@@ -1,5 +1,5 @@
 import { useCourseSessionDetailQuery } from "@/composables";
-import { itGet } from "@/fetchHelpers";
+import { itGet, itPost } from "@/fetchHelpers";
 import type {
   Assignment,
   AssignmentCompletion,
@@ -19,12 +19,16 @@ export interface GradedUser {
 export async function loadAssignmentCompletionStatusData(
   assignmentId: string,
   courseSessionId: string,
-  learningContentId: string
+  learningContentId: string,
+  userSelectionIds: string[] | undefined = undefined
 ) {
   const courseSessionDetailResult = useCourseSessionDetailQuery();
 
-  const assignmentCompletionData = (await itGet(
-    `/api/assignment/${assignmentId}/${courseSessionId}/status/`
+  const assignmentCompletionData = (await itPost(
+    `/api/assignment/${assignmentId}/${courseSessionId}/status/`,
+    {
+      user_selection_ids: userSelectionIds ?? [],
+    }
   )) as UserAssignmentCompletionStatus[];
 
   const members = courseSessionDetailResult.filterMembers();
diff --git a/client/src/services/dashboard.ts b/client/src/services/dashboard.ts
index d688d7c5..e9e7aec2 100644
--- a/client/src/services/dashboard.ts
+++ b/client/src/services/dashboard.ts
@@ -26,7 +26,8 @@ export type DashboardPersonRoleType =
   | "EXPERT"
   | "MEMBER"
   | "LEARNING_MENTOR"
-  | "LEARNING_MENTEE";
+  | "BERUFSBILDNER"
+  | "PARTICIPANT";
 
 export type DashboardRoleKeyType =
   | "Supervisor"
diff --git a/server/vbv_lernwelt/assignment/graphql/mutations.py b/server/vbv_lernwelt/assignment/graphql/mutations.py
index 7071876d..dae40efd 100644
--- a/server/vbv_lernwelt/assignment/graphql/mutations.py
+++ b/server/vbv_lernwelt/assignment/graphql/mutations.py
@@ -101,7 +101,7 @@ class AssignmentCompletionMutation(graphene.Mutation):
         ):
             if not can_evaluate_assignments(
                 evaluation_user=info.context.user,
-                assignment_user_id=assignment_user_id,
+                assignment_user_ids=[assignment_user_id],
                 course_session_id=course_session_id,
             ):
                 raise PermissionDenied()
diff --git a/server/vbv_lernwelt/assignment/graphql/types.py b/server/vbv_lernwelt/assignment/graphql/types.py
index fa29bdc9..7973942b 100644
--- a/server/vbv_lernwelt/assignment/graphql/types.py
+++ b/server/vbv_lernwelt/assignment/graphql/types.py
@@ -139,7 +139,7 @@ def resolve_assignment_completion(
 
     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,
+        assignment_user_ids=[assignment_user_id],
         course_session_id=course_session_id,
     ):
         course_id = CourseSession.objects.get(id=course_session_id).course_id
diff --git a/server/vbv_lernwelt/assignment/views.py b/server/vbv_lernwelt/assignment/views.py
index 1eb04ffb..d5e05fd9 100644
--- a/server/vbv_lernwelt/assignment/views.py
+++ b/server/vbv_lernwelt/assignment/views.py
@@ -9,14 +9,23 @@ from vbv_lernwelt.iam.permissions import can_evaluate_assignments
 logger = structlog.get_logger(__name__)
 
 
-@api_view(["GET"])
+@api_view(["GET", "POST"])
 def request_assignment_completion_status(request, assignment_id, course_session_id):
     # TODO quickfix before GraphQL...
-    if can_evaluate_assignments(request.user, course_session_id):
+
+    user_selection_ids = request.data.get("user_selection_ids", [])
+
+    if can_evaluate_assignments(
+        request.user, course_session_id, assignment_user_ids=user_selection_ids
+    ):
         qs = AssignmentCompletion.objects.filter(
             course_session_id=course_session_id,
             assignment_id=assignment_id,
-        ).values(
+        )
+        if len(user_selection_ids) > 0:
+            qs = qs.filter(assignment_user_id__in=user_selection_ids)
+
+        values = qs.values(
             "id",
             "assignment_user_id",
             "completion_status",
@@ -28,7 +37,7 @@ def request_assignment_completion_status(request, assignment_id, course_session_
         )
 
         # Convert the learning_content_page_id to a string
-        data = list(qs)  # Evaluate the queryset
+        data = list(values)  # Evaluate the queryset
         for item in data:
             if item["evaluation_points"] is not None:
                 # only `evaluation_points_final` is relevant for the frontend
diff --git a/server/vbv_lernwelt/dashboard/graphql/types/assignment.py b/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
index d5f3c50b..b9f8ec86 100644
--- a/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
+++ b/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
@@ -41,6 +41,7 @@ class AssignmentStatisticsRecordType(graphene.ObjectType):
     competence_certificate_id = graphene.ID()
     competence_certificate_title = graphene.String()
     metrics = graphene.Field(AssignmentCompletionMetricsType, required=True)
+    learning_content_id = graphene.ID(required=True)
     details_url = graphene.String(required=True)
 
 
@@ -101,13 +102,14 @@ def get_assignment_completion_metrics(
     user_selection_ids: List[str] | None,
     urql_id_postfix: str = "",
 ) -> AssignmentCompletionMetricsType:
+    csu_qs = CourseSessionUser.objects.filter(
+        course_session_id=course_session.id, role=CourseSessionUser.Role.MEMBER
+    )
+
     if user_selection_ids:
-        course_session_users = user_selection_ids
-    else:
-        course_session_users = CourseSessionUser.objects.filter(
-            course_session=course_session,
-            role=CourseSessionUser.Role.MEMBER,
-        ).values_list("user", flat=True)
+        csu_qs = csu_qs.filter(user_id__in=user_selection_ids)
+
+    course_session_users = csu_qs.values_list("user", flat=True)
 
     assignment_completions = AssignmentCompletion.objects.filter(
         completion_status=AssignmentCompletionStatus.EVALUATION_SUBMITTED.value,
@@ -165,17 +167,16 @@ def create_record(
 
     return AssignmentStatisticsRecordType(
         # make sure it's unique, across all types of assignments!
-        _id=f"{course_session_assignment._meta.model_name}#{course_session_assignment.id}@{urql_id_postfix}",
-        # noqa
+        _id=f"{course_session_assignment._meta.model_name}#{course_session_assignment.id}@{urql_id_postfix}",  # noqa
         course_session_id=str(course_session_assignment.course_session.id),  # noqa
         circle_id=learning_content.get_circle().id,  # noqa
         course_session_assignment_id=str(course_session_assignment.id),  # noqa
         generation=course_session_assignment.course_session.generation,  # noqa
-        assignment_type_translation_key=due_date.assignment_type_translation_key,
+        assignment_type_translation_key=due_date.assignment_type_translation_key,  # noqa
         competence_certificate_id=str(competence_certificate.id),  # noqa
         competence_certificate_title=competence_certificate.title,  # noqa
-        # noqa
         assignment_title=learning_content.content_assignment.title,  # noqa
+        learning_content_id=str(learning_content.id),  # noqa
         metrics=get_assignment_completion_metrics(  # noqa
             course_session=course_session_assignment.course_session,  # noqa
             assignment=learning_content.content_assignment,  # noqa
diff --git a/server/vbv_lernwelt/dashboard/views.py b/server/vbv_lernwelt/dashboard/views.py
index be1e5f82..d9240108 100644
--- a/server/vbv_lernwelt/dashboard/views.py
+++ b/server/vbv_lernwelt/dashboard/views.py
@@ -200,28 +200,34 @@ def _create_person_list_with_roles(user):
 
     # add persons where request.user is mentor
     for cs in course_sessions:
+
+        def _add_agent_relation(my_role, user_role):
+            course_session_entry = _create_course_session_dict(cs, my_role, user_role)
+            participant_user = relation.participant.user
+
+            if participant_user.id not in result_persons:
+                person_data = create_user_dict(participant_user)
+                person_data["course_sessions"] = [course_session_entry]
+                result_persons[participant_user] = person_data
+            else:
+                # user is already in result_persons
+                result_persons[participant_user]["course_sessions"].append(
+                    course_session_entry
+                )
+
         if "LEARNING_MENTOR" in cs.roles:
             for relation in AgentParticipantRelation.objects.filter(
-                agent=user, participant__course_session_id=cs.id
+                agent=user, participant__course_session_id=cs.id, role="LEARNING_MENTOR"
             ):
-                course_session_entry = _create_course_session_dict(
-                    cs,
-                    "LEARNING_MENTOR",
-                    "LEARNING_MENTEE",
-                )
-                participant_user = relation.participant.user
+                _add_agent_relation("LEARNING_MENTOR", "PARTICIPANT")
 
-                if participant_user.id not in result_persons:
-                    person_data = create_user_dict(participant_user)
-                    person_data["course_sessions"] = [course_session_entry]
-                    result_persons[participant_user] = person_data
-                else:
-                    # user is already in result_persons
-                    result_persons[participant_user]["course_sessions"].append(
-                        course_session_entry
-                    )
+        if "BERUFSBILDNER" in cs.roles:
+            for relation in AgentParticipantRelation.objects.filter(
+                agent=user, participant__course_session_id=cs.id, role="BERUFSBILDNER"
+            ):
+                _add_agent_relation("BERUFSBILDNER", "PARTICIPANT")
 
-    # add persons where request.user is mentee
+    # add persons where request.user is lerning mentee
     mentor_relation_qs = AgentParticipantRelation.objects.filter(
         participant__user=user,
         role=AgentParticipantRoleType.LEARNING_MENTOR.value,
@@ -230,7 +236,7 @@ def _create_person_list_with_roles(user):
         cs = mentor_relation.participant.course_session
         course_session_entry = _create_course_session_dict(
             cs,
-            "LEARNING_MENTEE",
+            "PARTICIPANT",
             "LEARNING_MENTOR",
         )
 
diff --git a/server/vbv_lernwelt/iam/permissions.py b/server/vbv_lernwelt/iam/permissions.py
index 622abc6f..e530ae49 100644
--- a/server/vbv_lernwelt/iam/permissions.py
+++ b/server/vbv_lernwelt/iam/permissions.py
@@ -97,7 +97,6 @@ def is_agent_for_user(
     qs = AgentParticipantRelation.objects.filter(
         agent=agent,
         participant=csu,
-        role=AgentParticipantRoleType.LEARNING_MENTOR.value,
     )
 
     if roles and len(roles) > 0:
@@ -159,7 +158,9 @@ def is_course_session_member(user, course_session_id: int | None = None):
 
 
 def can_evaluate_assignments(
-    evaluation_user: User, course_session_id: int, assignment_user_id: str | None = None
+    evaluation_user: User,
+    course_session_id: int,
+    assignment_user_ids: list[str] | None = None,
 ):
     if evaluation_user.is_superuser:
         return True
@@ -167,20 +168,28 @@ def can_evaluate_assignments(
     is_supervisor = CourseSessionGroup.objects.filter(
         supervisor=evaluation_user, course_session__id=course_session_id
     ).exists()
+    if is_supervisor:
+        return True
 
     is_expert = CourseSessionUser.objects.filter(
         course_session_id=course_session_id,
         user=evaluation_user,
         role=CourseSessionUser.Role.EXPERT,
     ).exists()
+    if is_expert:
+        return True
 
-    is_mentor = is_learning_mentor_for_user(
-        mentor=evaluation_user,
-        participant_user_id=assignment_user_id,
-        course_session_id=course_session_id,
-    )
-
-    return is_supervisor or is_expert or is_mentor
+    if assignment_user_ids and len(assignment_user_ids) > 0:
+        is_agent_array = []
+        for assignment_user_id in assignment_user_ids:
+            is_agent_array.append(
+                is_agent_for_user(
+                    agent=evaluation_user,
+                    participant_user_id=assignment_user_id,
+                    course_session_id=course_session_id,
+                )
+            )
+        return all(is_agent_array)
 
 
 def course_sessions_for_user_qs(user):

From 50709a34e8908dd129add9e51aa158576c02d3d5 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Mon, 22 Jul 2024 23:22:47 +0200
Subject: [PATCH 13/40] Only query live assignments

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

diff --git a/server/vbv_lernwelt/competence/services.py b/server/vbv_lernwelt/competence/services.py
index 0ef4d306..0f5cf691 100644
--- a/server/vbv_lernwelt/competence/services.py
+++ b/server/vbv_lernwelt/competence/services.py
@@ -17,6 +17,7 @@ def query_competence_course_session_assignments(course_session_ids, circle_ids=N
             AssignmentType.CASEWORK.value,
         ],
         learning_content__content_assignment__competence_certificate__isnull=False,
+        learning_content__live=True,
     ):
         if circle_ids and csa.learning_content.get_circle().id not in circle_ids:
             continue
@@ -34,6 +35,7 @@ def query_competence_course_session_edoniq_tests(course_session_ids, circle_ids=
     for cset in CourseSessionEdoniqTest.objects.filter(
         course_session_id__in=course_session_ids,
         learning_content__content_assignment__competence_certificate__isnull=False,
+        learning_content__live=True,
     ):
         if circle_ids and cset.learning_content.get_circle().id not in circle_ids:
             continue

From 4f6b14efae46d5024e3086bd2c39a5eccc7cb08f Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Tue, 23 Jul 2024 16:55:20 +0200
Subject: [PATCH 14/40] Fix unit tests

---
 .../dashboard/graphql/types/assignment.py     |  4 +-
 .../tests/graphql/test_mentor_statistics.py   |  6 +-
 .../dashboard/tests/test_views.py             | 10 +--
 server/vbv_lernwelt/dashboard/views.py        | 71 +++++++++++--------
 4 files changed, 47 insertions(+), 44 deletions(-)

diff --git a/server/vbv_lernwelt/dashboard/graphql/types/assignment.py b/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
index b9f8ec86..d2ea56d7 100644
--- a/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
+++ b/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
@@ -132,11 +132,11 @@ def get_assignment_completion_metrics(
 
     # calculate average points in percent
     evaluation_percent_results = [
-        (ac.evaluation_points_final / ac.evaluation_max_points)
+        ((ac.evaluation_points_final or 0) / (ac.evaluation_max_points or 1))
         for ac in assignment_completions
     ]
     average_evaluation_percent = (
-        sum(evaluation_percent_results) / len(evaluation_percent_results)
+        sum(evaluation_percent_results) / (len(evaluation_percent_results) or 1)
         if evaluation_percent_results
         else 0
     )
diff --git a/server/vbv_lernwelt/dashboard/tests/graphql/test_mentor_statistics.py b/server/vbv_lernwelt/dashboard/tests/graphql/test_mentor_statistics.py
index 31947f5b..4c188197 100644
--- a/server/vbv_lernwelt/dashboard/tests/graphql/test_mentor_statistics.py
+++ b/server/vbv_lernwelt/dashboard/tests/graphql/test_mentor_statistics.py
@@ -47,8 +47,8 @@ class MentorStatisticsTestCase(BaseMentorAssignmentTestCase, GraphQLTestCase):
             )
         # THEN
         # WHEN
-        query = """query ($courseId: ID!) {
-            mentor_course_statistics(course_id: $courseId) {
+        query = """query ($courseId: ID!, $agentRole: String!) {
+            mentor_course_statistics(course_id: $courseId, agent_role: $agentRole) {
               course_session_selection_ids
               user_selection_ids
               assignments {
@@ -65,7 +65,7 @@ class MentorStatisticsTestCase(BaseMentorAssignmentTestCase, GraphQLTestCase):
           }"""
 
         # THEN
-        variables = {"courseId": str(self.course.id)}
+        variables = {"courseId": str(self.course.id), "agentRole": "LEARNING_MENTOR"}
         self.client.force_login(self.mentor)
         response = self.query(query, variables=variables)
         self.assertResponseNoErrors(response)
diff --git a/server/vbv_lernwelt/dashboard/tests/test_views.py b/server/vbv_lernwelt/dashboard/tests/test_views.py
index 629b5b6d..56af80e7 100644
--- a/server/vbv_lernwelt/dashboard/tests/test_views.py
+++ b/server/vbv_lernwelt/dashboard/tests/test_views.py
@@ -124,7 +124,7 @@ class GetDashboardConfig(TestCase):
             course=self.course, title="Test Session"
         )
 
-    def _test_config(self, user, role, is_uk, is_vv, is_mentor, has_preview, widgets):
+    def _test_config(self, user, role, is_uk, is_vv, has_preview, widgets):
         # WHEN
         sessions = get_course_sessions_with_roles_for_user(user)
         course_configs = get_course_config(sessions)
@@ -134,13 +134,12 @@ class GetDashboardConfig(TestCase):
         self.assertEqual(course_configs[0].course_title, self.course.title)
         self.assertEqual(course_configs[0].is_uk, is_uk)
         self.assertEqual(course_configs[0].is_vv, is_vv)
-        self.assertEqual(course_configs[0].is_mentor, is_mentor)
         self.assertEqual(course_configs[0].has_preview, has_preview)
         self.assertEqual(
             course_configs[0].session_to_continue_id, str(self.course_session.id)
         )
         self.assertEqual(course_configs[0].role_key, role)
-        self.assertEqual(course_configs[0].widgets, widgets)
+        self.assertEqual(set(course_configs[0].widgets), set(widgets))
 
     def test_participant_uk_get_config(self):
         participant = create_user("participant")
@@ -157,7 +156,6 @@ class GetDashboardConfig(TestCase):
             role="Member",
             is_uk=True,
             is_vv=False,
-            is_mentor=False,
             has_preview=False,
             widgets=[
                 "ProgressWidget",
@@ -181,7 +179,6 @@ class GetDashboardConfig(TestCase):
             role="Member",
             is_uk=False,
             is_vv=True,
-            is_mentor=False,
             has_preview=False,
             widgets=["ProgressWidget", "CompetenceWidget"],
         )
@@ -208,7 +205,6 @@ class GetDashboardConfig(TestCase):
             role="MentorUK",
             is_uk=True,
             is_vv=False,
-            is_mentor=True,
             has_preview=True,
             widgets=["MentorPersonWidget", "MentorCompetenceWidget"],
         )
@@ -234,7 +230,6 @@ class GetDashboardConfig(TestCase):
             role="MentorVV",
             is_uk=False,
             is_vv=True,
-            is_mentor=True,
             has_preview=True,
             widgets=["MentorPersonWidget", "MentorTasksWidget"],
         )
@@ -266,7 +261,6 @@ class GetDashboardConfig(TestCase):
             role="Member",
             is_uk=False,
             is_vv=True,
-            is_mentor=True,
             has_preview=False,
             widgets=[
                 "ProgressWidget",
diff --git a/server/vbv_lernwelt/dashboard/views.py b/server/vbv_lernwelt/dashboard/views.py
index d9240108..c3534b1b 100644
--- a/server/vbv_lernwelt/dashboard/views.py
+++ b/server/vbv_lernwelt/dashboard/views.py
@@ -68,6 +68,7 @@ class RoleKeyType(Enum):
     SUPERVISOR = "Supervisor"
     TRAINER = "Trainer"
     BERUFSBILDNER = "Berufsbildner"
+    UNKNOWN_ROLE_KEY = "UnknownRoleKey"
 
 
 @dataclass(frozen=True)
@@ -365,55 +366,65 @@ def get_dashboard_due_dates(request):
 
 
 def get_widgets_for_course(
-    role_key: RoleKeyType, is_uk: bool, is_vv: bool
+    course_sessions: List[CourseSessionWithRoles], is_uk: bool, is_vv: bool
 ) -> List[str]:
+    relation_roles = set()
+    for cs in course_sessions:
+        relation_roles.update(cs.roles)
+
     widgets = []
 
-    if role_key == RoleKeyType.MEMBER:
+    if "MEMBER" in relation_roles:
         widgets.append(WidgetType.PROGRESS_WIDGET.value)
         widgets.append(WidgetType.COMPETENCE_WIDGET.value)
         if is_uk:
             widgets.append(WidgetType.COMPETENCE_CERTIFICATE_WIDGET.value)
 
-    if role_key in [RoleKeyType.SUPERVISOR, RoleKeyType.TRAINER] and is_uk:
-        widgets.append(WidgetType.UK_STATISTICS_WIDGET.value)
-
-    if role_key in [RoleKeyType.MENTOR_UK, RoleKeyType.MENTOR_VV]:
+    if "EXPERT" in relation_roles or "SUPERVISOR" in relation_roles:
+        widgets.append(WidgetType.MENTOR_TASKS_WIDGET.value)
         widgets.append(WidgetType.MENTOR_PERSON_WIDGET.value)
         if is_uk:
             widgets.append(WidgetType.MENTOR_COMPETENCE_WIDGET.value)
-        if is_vv:
+
+    if "LEARNING_MENTOR" in relation_roles:
+        widgets.append(WidgetType.MENTOR_PERSON_WIDGET.value)
+        if is_uk:
+            widgets.append(WidgetType.MENTOR_COMPETENCE_WIDGET.value)
+        elif is_vv:
             widgets.append(WidgetType.MENTOR_TASKS_WIDGET.value)
 
-    if role_key in [RoleKeyType.BERUFSBILDNER]:
-        widgets.append(WidgetType.UK_BERUFSBILDNER_STATISTICS_WIDGET.value)
+    if "BERUFSBILDNER" in relation_roles:
+        if is_uk:
+            widgets.append(WidgetType.UK_STATISTICS_WIDGET.value)
 
     return widgets
 
 
-def get_role_key_and_mentor(
+def get_relevant_role_key(
     course_sessions: List[CourseSessionWithRoles], is_uk: bool, is_vv: bool
-) -> tuple[RoleKeyType, bool]:
-    roles = set()
-    role = None
+) -> RoleKeyType:
+    relation_roles = set()
+
     for cs in course_sessions:
-        roles.update(cs.roles)
+        relation_roles.update(cs.roles)
 
-    if "SUPERVISOR" in roles:
-        role = RoleKeyType.SUPERVISOR
-    elif "EXPERT" in roles:
-        role = RoleKeyType.TRAINER
-    elif "MEMBER" in roles:
-        role = RoleKeyType.MEMBER
-    elif "LEARNING_MENTOR" in roles:
+    if "SUPERVISOR" in relation_roles:
+        return RoleKeyType.SUPERVISOR
+    elif "EXPERT" in relation_roles:
+        return RoleKeyType.TRAINER
+    elif "MEMBER" in relation_roles:
+        return RoleKeyType.MEMBER
+
+    elif "LEARNING_MENTOR" in relation_roles:
         if is_uk:
-            role = RoleKeyType.MENTOR_UK
+            return RoleKeyType.MENTOR_UK
         elif is_vv:
-            role = RoleKeyType.MENTOR_VV
-    elif "BERUFSBILDNER" in roles:
-        role = RoleKeyType.BERUFSBILDNER
+            return RoleKeyType.MENTOR_VV
+    elif "BERUFSBILDNER" in relation_roles:
+        if is_uk:
+            return RoleKeyType.BERUFSBILDNER
 
-    return role
+    return RoleKeyType.UNKNOWN_ROLE_KEY
 
 
 def collect_course_sessions_by_course(
@@ -455,7 +466,7 @@ def get_course_config(
     for _id, cs_in_course in cs_by_course.items():
         is_uk = cs_in_course[0].course.configuration.is_uk
         is_vv = cs_in_course[0].course.configuration.is_vv
-        role_key = get_role_key_and_mentor(cs_in_course, is_uk, is_vv)
+        role_key = get_relevant_role_key(cs_in_course, is_uk, is_vv)
         session_to_continue = get_newest_cs(cs_in_course)
         course_configs.append(
             CourseConfig(
@@ -465,7 +476,7 @@ def get_course_config(
                 role_key=role_key.value,
                 is_uk=is_uk,
                 is_vv=is_vv,
-                widgets=get_widgets_for_course(role_key, is_uk, is_vv),
+                widgets=get_widgets_for_course(cs_in_course, is_uk, is_vv),
                 has_preview=has_preview(role_key),
                 session_to_continue_id=(
                     str(session_to_continue.id) if session_to_continue else None
@@ -521,9 +532,7 @@ def get_mentor_open_tasks_count(request, course_id: str):
         return Response(
             status=200,
             data={
-                "open_task_count": _get_mentor_open_tasks_count(
-                    course_id, request.user
-                )  # noqa
+                "open_task_count": _get_mentor_open_tasks_count(course_id, request.user)  # noqa
             },
         )
     except PermissionDenied as e:

From 661f5aa43552c2a7dc93442bc17b5d4b42e856a0 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Tue, 23 Jul 2024 18:42:14 +0200
Subject: [PATCH 15/40] Show correct numbers for subset of users on
 AssignmentSubmissionProgress

---
 .../assignment/AssignmentSubmissionProgress.vue        | 10 +++++++++-
 .../agentAssignment/AgentAssignmentDetail.vue          |  1 -
 .../agentAssignment/AgentAssignmentStatisticPage.vue   | 10 ++++++----
 .../src/pages/dashboard/statistic/AssignmentList.vue   |  1 -
 client/src/services/assignmentService.ts               |  2 +-
 client/src/services/dashboard.ts                       |  2 +-
 server/vbv_lernwelt/dashboard/views.py                 |  6 ++++--
 7 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/client/src/components/assignment/AssignmentSubmissionProgress.vue b/client/src/components/assignment/AssignmentSubmissionProgress.vue
index c03d91a5..06e8c72e 100644
--- a/client/src/components/assignment/AssignmentSubmissionProgress.vue
+++ b/client/src/components/assignment/AssignmentSubmissionProgress.vue
@@ -32,7 +32,8 @@ const state = reactive({
 });
 
 onMounted(async () => {
-  const { assignmentSubmittedUsers, gradedUsers, total } =
+  // eslint-disable-next-line prefer-const
+  let { assignmentSubmittedUsers, gradedUsers, total } =
     await loadAssignmentCompletionStatusData(
       props.learningContent.content_assignment.id,
       props.courseSession.id,
@@ -40,6 +41,10 @@ onMounted(async () => {
       props.userSelectionIds
     );
 
+  if (props.userSelectionIds && props.userSelectionIds.length > 0) {
+    total = props.userSelectionIds.length;
+  }
+
   state.submissionProgressStatusCount = {
     SUCCESS: assignmentSubmittedUsers.length,
     UNKNOWN: total - assignmentSubmittedUsers.length,
@@ -57,6 +62,9 @@ const doneCount = (status: StatusCount) => {
 };
 
 const totalCount = (status: StatusCount) => {
+  if (props.userSelectionIds && props.userSelectionIds.length > 0) {
+    return props.userSelectionIds.length;
+  }
   return doneCount(status) + status.UNKNOWN || 0;
 };
 
diff --git a/client/src/pages/dashboard/agentAssignment/AgentAssignmentDetail.vue b/client/src/pages/dashboard/agentAssignment/AgentAssignmentDetail.vue
index 703e370f..cce98a2b 100644
--- a/client/src/pages/dashboard/agentAssignment/AgentAssignmentDetail.vue
+++ b/client/src/pages/dashboard/agentAssignment/AgentAssignmentDetail.vue
@@ -5,7 +5,6 @@ import * as log from "loglevel";
 import { computed } from "vue";
 import type { LearningContentAssignment, LearningContentEdoniqTest } from "@/types";
 import { useExpertCockpitPageData } from "@/pages/cockpit/cockpitPage/composables";
-import { getPreviousRoute } from "@/router/history";
 
 const props = defineProps<{
   courseSlug: string;
diff --git a/client/src/pages/dashboard/agentAssignment/AgentAssignmentStatisticPage.vue b/client/src/pages/dashboard/agentAssignment/AgentAssignmentStatisticPage.vue
index a6bd9530..99921b27 100644
--- a/client/src/pages/dashboard/agentAssignment/AgentAssignmentStatisticPage.vue
+++ b/client/src/pages/dashboard/agentAssignment/AgentAssignmentStatisticPage.vue
@@ -24,9 +24,11 @@ const courseId = ref<string | undefined>(undefined);
 const agentAssignmentData = ref<BaseStatisticsType | null>(null);
 
 const courseSessionName = (courseSessionId: string) => {
-  return agentAssignmentData.value?.course_session_properties?.sessions.find(
-    (session) => session.id === courseSessionId
-  )?.name;
+  return (
+    agentAssignmentData.value?.course_session_properties?.sessions.find(
+      (session) => session.id === courseSessionId
+    )?.name ?? ""
+  );
 };
 
 const circleMeta = (circleId: string) => {
@@ -71,7 +73,7 @@ onMounted(async () => {
         v-if="agentAssignmentData"
         :course-statistics="agentAssignmentData"
         :course-session-name="courseSessionName"
-        :circle-meta="circleMeta"
+        :circle-meta="circleMeta as any"
         :detail-base-url="`/statistic/${props.agentRole}/${props.courseSlug}/assignment/`"
       ></AssignmentList>
     </div>
diff --git a/client/src/pages/dashboard/statistic/AssignmentList.vue b/client/src/pages/dashboard/statistic/AssignmentList.vue
index 1501b580..43e64294 100644
--- a/client/src/pages/dashboard/statistic/AssignmentList.vue
+++ b/client/src/pages/dashboard/statistic/AssignmentList.vue
@@ -59,7 +59,6 @@ const itemDetailUrl = (item: AssignmentStatisticsRecordType) => {
   }
   return item.details_url;
 };
-
 </script>
 
 <template>
diff --git a/client/src/services/assignmentService.ts b/client/src/services/assignmentService.ts
index 0e2ef964..9cd76709 100644
--- a/client/src/services/assignmentService.ts
+++ b/client/src/services/assignmentService.ts
@@ -1,5 +1,5 @@
 import { useCourseSessionDetailQuery } from "@/composables";
-import { itGet, itPost } from "@/fetchHelpers";
+import { itPost } from "@/fetchHelpers";
 import type {
   Assignment,
   AssignmentCompletion,
diff --git a/client/src/services/dashboard.ts b/client/src/services/dashboard.ts
index e9e7aec2..b1ea2eb0 100644
--- a/client/src/services/dashboard.ts
+++ b/client/src/services/dashboard.ts
@@ -8,7 +8,6 @@ import {
 
 import { itGetCached, itPost } from "@/fetchHelpers";
 import type {
-  AssignmentsStatisticsType,
   BaseStatisticsType,
   CourseProgressType,
   CourseStatisticsType,
@@ -111,6 +110,7 @@ export const fetchStatisticData = async (
       console.error("Error fetching statistics for course ID:", courseId, res.error);
     }
 
+    // @ts-ignore
     return res.data?.course_statistics || null;
   } catch (error) {
     console.error(`Error fetching statistics for course ID: ${courseId}`, error);
diff --git a/server/vbv_lernwelt/dashboard/views.py b/server/vbv_lernwelt/dashboard/views.py
index c3534b1b..cf70b892 100644
--- a/server/vbv_lernwelt/dashboard/views.py
+++ b/server/vbv_lernwelt/dashboard/views.py
@@ -395,7 +395,7 @@ def get_widgets_for_course(
 
     if "BERUFSBILDNER" in relation_roles:
         if is_uk:
-            widgets.append(WidgetType.UK_STATISTICS_WIDGET.value)
+            widgets.append(WidgetType.UK_BERUFSBILDNER_STATISTICS_WIDGET.value)
 
     return widgets
 
@@ -532,7 +532,9 @@ def get_mentor_open_tasks_count(request, course_id: str):
         return Response(
             status=200,
             data={
-                "open_task_count": _get_mentor_open_tasks_count(course_id, request.user)  # noqa
+                "open_task_count": _get_mentor_open_tasks_count(
+                    course_id, request.user
+                )  # noqa
             },
         )
     except PermissionDenied as e:

From ca37f74e459bd379bcf17f19ee95a961243fc291 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Thu, 25 Jul 2024 17:31:31 +0200
Subject: [PATCH 16/40] Fix supervisor cypress

---
 server/vbv_lernwelt/dashboard/views.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/server/vbv_lernwelt/dashboard/views.py b/server/vbv_lernwelt/dashboard/views.py
index cf70b892..3ebcefbd 100644
--- a/server/vbv_lernwelt/dashboard/views.py
+++ b/server/vbv_lernwelt/dashboard/views.py
@@ -381,10 +381,8 @@ def get_widgets_for_course(
             widgets.append(WidgetType.COMPETENCE_CERTIFICATE_WIDGET.value)
 
     if "EXPERT" in relation_roles or "SUPERVISOR" in relation_roles:
-        widgets.append(WidgetType.MENTOR_TASKS_WIDGET.value)
-        widgets.append(WidgetType.MENTOR_PERSON_WIDGET.value)
         if is_uk:
-            widgets.append(WidgetType.MENTOR_COMPETENCE_WIDGET.value)
+            widgets.append(WidgetType.UK_STATISTICS_WIDGET.value)
 
     if "LEARNING_MENTOR" in relation_roles:
         widgets.append(WidgetType.MENTOR_PERSON_WIDGET.value)
@@ -532,9 +530,7 @@ def get_mentor_open_tasks_count(request, course_id: str):
         return Response(
             status=200,
             data={
-                "open_task_count": _get_mentor_open_tasks_count(
-                    course_id, request.user
-                )  # noqa
+                "open_task_count": _get_mentor_open_tasks_count(course_id, request.user)  # noqa
             },
         )
     except PermissionDenied as e:

From eef166575fe2fe687d4c7d06366543de7b306456 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Fri, 26 Jul 2024 13:05:38 +0200
Subject: [PATCH 17/40] Fix problem with persons for `Berufsbildner`

---
 .../dashboard/agentAssignment/AgentAssignmentDetail.vue    | 7 ++++++-
 server/vbv_lernwelt/dashboard/views.py                     | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/client/src/pages/dashboard/agentAssignment/AgentAssignmentDetail.vue b/client/src/pages/dashboard/agentAssignment/AgentAssignmentDetail.vue
index cce98a2b..bf0828c4 100644
--- a/client/src/pages/dashboard/agentAssignment/AgentAssignmentDetail.vue
+++ b/client/src/pages/dashboard/agentAssignment/AgentAssignmentDetail.vue
@@ -13,7 +13,12 @@ const props = defineProps<{
   participantUserIds: string[];
 }>();
 
-log.debug("AgentAssignmentDetail created", props.courseSlug, props.agentRole);
+log.debug(
+  "AgentAssignmentDetail created",
+  props.courseSlug,
+  props.agentRole,
+  props.participantUserIds
+);
 
 const courseSession = useCurrentCourseSession();
 const { loading } = useExpertCockpitPageData(
diff --git a/server/vbv_lernwelt/dashboard/views.py b/server/vbv_lernwelt/dashboard/views.py
index 3ebcefbd..76cef902 100644
--- a/server/vbv_lernwelt/dashboard/views.py
+++ b/server/vbv_lernwelt/dashboard/views.py
@@ -209,10 +209,10 @@ def _create_person_list_with_roles(user):
             if participant_user.id not in result_persons:
                 person_data = create_user_dict(participant_user)
                 person_data["course_sessions"] = [course_session_entry]
-                result_persons[participant_user] = person_data
+                result_persons[participant_user.id] = person_data
             else:
                 # user is already in result_persons
-                result_persons[participant_user]["course_sessions"].append(
+                result_persons[participant_user.id]["course_sessions"].append(
                     course_session_entry
                 )
 

From f4fbe1a894d424d3dbf8766907dd47d7f2fcc2af Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Fri, 26 Jul 2024 15:23:33 +0200
Subject: [PATCH 18/40] Calculate average grade in Berufsbildner

---
 client/src/gql/gql.ts                         |   8 +-
 client/src/gql/graphql.ts                     |   9 +-
 client/src/gql/schema.graphql                 |   1 +
 client/src/graphql/queries.ts                 |   2 +
 .../AgentCompetenceGradePage.vue              | 149 ++++++++++++++++++
 client/src/router/index.ts                    |   7 +
 .../dashboard/graphql/types/assignment.py     |   2 +
 7 files changed, 170 insertions(+), 8 deletions(-)
 create mode 100644 client/src/pages/dashboard/agentAssignment/AgentCompetenceGradePage.vue

diff --git a/client/src/gql/gql.ts b/client/src/gql/gql.ts
index 620ae0c7..e91c9b0e 100644
--- a/client/src/gql/gql.ts
+++ b/client/src/gql/gql.ts
@@ -25,8 +25,8 @@ const documents = {
     "\n  query dashboardConfig {\n    dashboard_config {\n      id\n      slug\n      name\n      dashboard_type\n      course_configuration {\n        id\n        enable_circle_documents\n        enable_learning_mentor\n        enable_competence_certificates\n        is_uk\n      }\n    }\n  }\n": types.DashboardConfigDocument,
     "\n  query dashboardProgress($courseId: ID!) {\n    course_progress(course_id: $courseId) {\n      _id\n      course_id\n      session_to_continue_id\n      competence {\n        _id\n        total_count\n        success_count\n        fail_count\n      }\n      assignment {\n        _id\n        total_count\n        points_max_count\n        points_achieved_count\n      }\n    }\n  }\n": types.DashboardProgressDocument,
     "\n  query dashboardCourseData($courseId: ID!) {\n    course_progress(course_id: $courseId) {\n      _id\n      course_id\n      session_to_continue_id\n    }\n  }\n": types.DashboardCourseDataDocument,
-    "\n  query courseStatistics($courseId: ID!) {\n    course_statistics(course_id: $courseId) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      course_session_selection_ids\n      course_session_selection_metrics {\n        _id\n        session_count\n        participant_count\n        expert_count\n      }\n      attendance_day_presences {\n        _id\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          due_date\n          participants_present\n          participants_total\n          details_url\n        }\n        summary {\n          _id\n          days_completed\n          participants_present\n        }\n      }\n      feedback_responses {\n        _id\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          experts\n          satisfaction_average\n          satisfaction_max\n          details_url\n        }\n        summary {\n          _id\n          satisfaction_average\n          satisfaction_max\n          total_responses\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_title\n          competence_certificate_id\n          details_url\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_evaluation_percent\n            average_passed\n          }\n        }\n      }\n      competences {\n        _id\n        summary {\n          _id\n          success_total\n          fail_total\n        }\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          title\n          success_count\n          fail_count\n          details_url\n        }\n      }\n    }\n  }\n": types.CourseStatisticsDocument,
-    "\n  query mentorCourseStatistics($courseId: ID!, $agentRole: String!) {\n    mentor_course_statistics(course_id: $courseId, agent_role: $agentRole) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_selection_ids\n      user_selection_ids\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_id\n          competence_certificate_title\n          details_url\n          learning_content_id\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_evaluation_percent\n            average_passed\n          }\n        }\n      }\n    }\n  }\n": types.MentorCourseStatisticsDocument,
+    "\n  query courseStatistics($courseId: ID!) {\n    course_statistics(course_id: $courseId) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      course_session_selection_ids\n      course_session_selection_metrics {\n        _id\n        session_count\n        participant_count\n        expert_count\n      }\n      attendance_day_presences {\n        _id\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          due_date\n          participants_present\n          participants_total\n          details_url\n        }\n        summary {\n          _id\n          days_completed\n          participants_present\n        }\n      }\n      feedback_responses {\n        _id\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          experts\n          satisfaction_average\n          satisfaction_max\n          details_url\n        }\n        summary {\n          _id\n          satisfaction_average\n          satisfaction_max\n          total_responses\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_title\n          competence_certificate_id\n          details_url\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_evaluation_percent\n            average_passed\n            competence_certificate_weight\n          }\n        }\n      }\n      competences {\n        _id\n        summary {\n          _id\n          success_total\n          fail_total\n        }\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          title\n          success_count\n          fail_count\n          details_url\n        }\n      }\n    }\n  }\n": types.CourseStatisticsDocument,
+    "\n  query mentorCourseStatistics($courseId: ID!, $agentRole: String!) {\n    mentor_course_statistics(course_id: $courseId, agent_role: $agentRole) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_selection_ids\n      user_selection_ids\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_id\n          competence_certificate_title\n          details_url\n          learning_content_id\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            competence_certificate_weight\n            average_evaluation_percent\n            average_passed\n          }\n        }\n      }\n    }\n  }\n": types.MentorCourseStatisticsDocument,
     "\n  mutation SendFeedbackMutation(\n    $courseSessionId: ID!\n    $learningContentId: ID!\n    $learningContentType: String!\n    $data: GenericScalar!\n    $submitted: Boolean\n  ) {\n    send_feedback(\n      course_session_id: $courseSessionId\n      learning_content_page_id: $learningContentId\n      learning_content_type: $learningContentType\n      data: $data\n      submitted: $submitted\n    ) {\n      feedback_response {\n        id\n        data\n        submitted\n      }\n      errors {\n        field\n        messages\n      }\n    }\n  }\n": types.SendFeedbackMutationDocument,
 };
 
@@ -95,11 +95,11 @@ export function graphql(source: "\n  query dashboardCourseData($courseId: ID!) {
 /**
  * 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 courseStatistics($courseId: ID!) {\n    course_statistics(course_id: $courseId) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      course_session_selection_ids\n      course_session_selection_metrics {\n        _id\n        session_count\n        participant_count\n        expert_count\n      }\n      attendance_day_presences {\n        _id\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          due_date\n          participants_present\n          participants_total\n          details_url\n        }\n        summary {\n          _id\n          days_completed\n          participants_present\n        }\n      }\n      feedback_responses {\n        _id\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          experts\n          satisfaction_average\n          satisfaction_max\n          details_url\n        }\n        summary {\n          _id\n          satisfaction_average\n          satisfaction_max\n          total_responses\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_title\n          competence_certificate_id\n          details_url\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_evaluation_percent\n            average_passed\n          }\n        }\n      }\n      competences {\n        _id\n        summary {\n          _id\n          success_total\n          fail_total\n        }\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          title\n          success_count\n          fail_count\n          details_url\n        }\n      }\n    }\n  }\n"): (typeof documents)["\n  query courseStatistics($courseId: ID!) {\n    course_statistics(course_id: $courseId) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      course_session_selection_ids\n      course_session_selection_metrics {\n        _id\n        session_count\n        participant_count\n        expert_count\n      }\n      attendance_day_presences {\n        _id\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          due_date\n          participants_present\n          participants_total\n          details_url\n        }\n        summary {\n          _id\n          days_completed\n          participants_present\n        }\n      }\n      feedback_responses {\n        _id\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          experts\n          satisfaction_average\n          satisfaction_max\n          details_url\n        }\n        summary {\n          _id\n          satisfaction_average\n          satisfaction_max\n          total_responses\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_title\n          competence_certificate_id\n          details_url\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_evaluation_percent\n            average_passed\n          }\n        }\n      }\n      competences {\n        _id\n        summary {\n          _id\n          success_total\n          fail_total\n        }\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          title\n          success_count\n          fail_count\n          details_url\n        }\n      }\n    }\n  }\n"];
+export function graphql(source: "\n  query courseStatistics($courseId: ID!) {\n    course_statistics(course_id: $courseId) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      course_session_selection_ids\n      course_session_selection_metrics {\n        _id\n        session_count\n        participant_count\n        expert_count\n      }\n      attendance_day_presences {\n        _id\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          due_date\n          participants_present\n          participants_total\n          details_url\n        }\n        summary {\n          _id\n          days_completed\n          participants_present\n        }\n      }\n      feedback_responses {\n        _id\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          experts\n          satisfaction_average\n          satisfaction_max\n          details_url\n        }\n        summary {\n          _id\n          satisfaction_average\n          satisfaction_max\n          total_responses\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_title\n          competence_certificate_id\n          details_url\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_evaluation_percent\n            average_passed\n            competence_certificate_weight\n          }\n        }\n      }\n      competences {\n        _id\n        summary {\n          _id\n          success_total\n          fail_total\n        }\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          title\n          success_count\n          fail_count\n          details_url\n        }\n      }\n    }\n  }\n"): (typeof documents)["\n  query courseStatistics($courseId: ID!) {\n    course_statistics(course_id: $courseId) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      course_session_selection_ids\n      course_session_selection_metrics {\n        _id\n        session_count\n        participant_count\n        expert_count\n      }\n      attendance_day_presences {\n        _id\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          due_date\n          participants_present\n          participants_total\n          details_url\n        }\n        summary {\n          _id\n          days_completed\n          participants_present\n        }\n      }\n      feedback_responses {\n        _id\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          experts\n          satisfaction_average\n          satisfaction_max\n          details_url\n        }\n        summary {\n          _id\n          satisfaction_average\n          satisfaction_max\n          total_responses\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_title\n          competence_certificate_id\n          details_url\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_evaluation_percent\n            average_passed\n            competence_certificate_weight\n          }\n        }\n      }\n      competences {\n        _id\n        summary {\n          _id\n          success_total\n          fail_total\n        }\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          title\n          success_count\n          fail_count\n          details_url\n        }\n      }\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  query mentorCourseStatistics($courseId: ID!, $agentRole: String!) {\n    mentor_course_statistics(course_id: $courseId, agent_role: $agentRole) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_selection_ids\n      user_selection_ids\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_id\n          competence_certificate_title\n          details_url\n          learning_content_id\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_evaluation_percent\n            average_passed\n          }\n        }\n      }\n    }\n  }\n"): (typeof documents)["\n  query mentorCourseStatistics($courseId: ID!, $agentRole: String!) {\n    mentor_course_statistics(course_id: $courseId, agent_role: $agentRole) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_selection_ids\n      user_selection_ids\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_id\n          competence_certificate_title\n          details_url\n          learning_content_id\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_evaluation_percent\n            average_passed\n          }\n        }\n      }\n    }\n  }\n"];
+export function graphql(source: "\n  query mentorCourseStatistics($courseId: ID!, $agentRole: String!) {\n    mentor_course_statistics(course_id: $courseId, agent_role: $agentRole) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_selection_ids\n      user_selection_ids\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_id\n          competence_certificate_title\n          details_url\n          learning_content_id\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            competence_certificate_weight\n            average_evaluation_percent\n            average_passed\n          }\n        }\n      }\n    }\n  }\n"): (typeof documents)["\n  query mentorCourseStatistics($courseId: ID!, $agentRole: String!) {\n    mentor_course_statistics(course_id: $courseId, agent_role: $agentRole) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_selection_ids\n      user_selection_ids\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_id\n          competence_certificate_title\n          details_url\n          learning_content_id\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            competence_certificate_weight\n            average_evaluation_percent\n            average_passed\n          }\n        }\n      }\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
diff --git a/client/src/gql/graphql.ts b/client/src/gql/graphql.ts
index 46c272f1..e47dce05 100644
--- a/client/src/gql/graphql.ts
+++ b/client/src/gql/graphql.ts
@@ -92,6 +92,7 @@ export type AssignmentCompletionMetricsType = {
   _id: Scalars['ID']['output'];
   average_evaluation_percent?: Maybe<Scalars['Float']['output']>;
   average_passed: Scalars['Float']['output'];
+  competence_certificate_weight?: Maybe<Scalars['Float']['output']>;
   failed_count: Scalars['Int']['output'];
   passed_count: Scalars['Int']['output'];
   ranking_completed: Scalars['Boolean']['output'];
@@ -1390,7 +1391,7 @@ export type CourseStatisticsQueryVariables = Exact<{
 }>;
 
 
-export type CourseStatisticsQuery = { __typename?: 'Query', course_statistics?: { __typename?: 'CourseStatisticsType', _id: string, course_id: string, course_title: string, course_slug: string, course_session_selection_ids: Array<string | null>, course_session_properties: { __typename?: 'StatisticsCourseSessionPropertiesType', _id: string, generations: Array<string>, sessions: Array<{ __typename?: 'StatisticsCourseSessionDataType', id: string, name: string }>, circles: Array<{ __typename?: 'StatisticsCircleDataType', id: string, name: string }> }, course_session_selection_metrics: { __typename?: 'StatisticsCourseSessionsSelectionMetricType', _id: string, session_count: number, participant_count: number, expert_count: number }, attendance_day_presences: { __typename?: 'AttendanceDayPresencesStatisticsType', _id: string, records: Array<{ __typename?: 'PresenceRecordStatisticsType', _id: string, course_session_id: string, generation: string, circle_id: string, due_date: string, participants_present: number, participants_total: number, details_url: string }>, summary: { __typename?: 'AttendanceSummaryStatisticsType', _id: string, days_completed: number, participants_present: number } }, feedback_responses: { __typename?: 'FeedbackStatisticsResponsesType', _id: string, records: Array<{ __typename?: 'FeedbackStatisticsRecordType', _id: string, course_session_id: string, generation: string, circle_id: string, experts: string, satisfaction_average: number, satisfaction_max: number, details_url: string }>, summary: { __typename?: 'FeedbackStatisticsSummaryType', _id: string, satisfaction_average: number, satisfaction_max: number, total_responses: number } }, assignments: { __typename?: 'AssignmentsStatisticsType', _id: string, summary: { __typename?: 'AssignmentStatisticsSummaryType', _id: string, completed_count: number, average_passed: number, total_passed: number, total_failed: number }, records: Array<{ __typename?: 'AssignmentStatisticsRecordType', _id: string, course_session_id: string, course_session_assignment_id: string, circle_id: string, generation: string, assignment_title: string, assignment_type_translation_key: string, competence_certificate_title?: string | null, competence_certificate_id?: string | null, details_url: string, deadline: string, metrics: { __typename?: 'AssignmentCompletionMetricsType', _id: string, passed_count: number, failed_count: number, unranked_count: number, ranking_completed: boolean, average_evaluation_percent?: number | null, average_passed: number } }> }, competences: { __typename?: 'CompetencesStatisticsType', _id: string, summary: { __typename?: 'CompetencePerformanceStatisticsSummaryType', _id: string, success_total: number, fail_total: number }, records: Array<{ __typename?: 'CompetenceRecordStatisticsType', _id: string, course_session_id: string, generation: string, circle_id: string, title: string, success_count: number, fail_count: number, details_url: string }> } } | null };
+export type CourseStatisticsQuery = { __typename?: 'Query', course_statistics?: { __typename?: 'CourseStatisticsType', _id: string, course_id: string, course_title: string, course_slug: string, course_session_selection_ids: Array<string | null>, course_session_properties: { __typename?: 'StatisticsCourseSessionPropertiesType', _id: string, generations: Array<string>, sessions: Array<{ __typename?: 'StatisticsCourseSessionDataType', id: string, name: string }>, circles: Array<{ __typename?: 'StatisticsCircleDataType', id: string, name: string }> }, course_session_selection_metrics: { __typename?: 'StatisticsCourseSessionsSelectionMetricType', _id: string, session_count: number, participant_count: number, expert_count: number }, attendance_day_presences: { __typename?: 'AttendanceDayPresencesStatisticsType', _id: string, records: Array<{ __typename?: 'PresenceRecordStatisticsType', _id: string, course_session_id: string, generation: string, circle_id: string, due_date: string, participants_present: number, participants_total: number, details_url: string }>, summary: { __typename?: 'AttendanceSummaryStatisticsType', _id: string, days_completed: number, participants_present: number } }, feedback_responses: { __typename?: 'FeedbackStatisticsResponsesType', _id: string, records: Array<{ __typename?: 'FeedbackStatisticsRecordType', _id: string, course_session_id: string, generation: string, circle_id: string, experts: string, satisfaction_average: number, satisfaction_max: number, details_url: string }>, summary: { __typename?: 'FeedbackStatisticsSummaryType', _id: string, satisfaction_average: number, satisfaction_max: number, total_responses: number } }, assignments: { __typename?: 'AssignmentsStatisticsType', _id: string, summary: { __typename?: 'AssignmentStatisticsSummaryType', _id: string, completed_count: number, average_passed: number, total_passed: number, total_failed: number }, records: Array<{ __typename?: 'AssignmentStatisticsRecordType', _id: string, course_session_id: string, course_session_assignment_id: string, circle_id: string, generation: string, assignment_title: string, assignment_type_translation_key: string, competence_certificate_title?: string | null, competence_certificate_id?: string | null, details_url: string, deadline: string, metrics: { __typename?: 'AssignmentCompletionMetricsType', _id: string, passed_count: number, failed_count: number, unranked_count: number, ranking_completed: boolean, average_evaluation_percent?: number | null, average_passed: number, competence_certificate_weight?: number | null } }> }, competences: { __typename?: 'CompetencesStatisticsType', _id: string, summary: { __typename?: 'CompetencePerformanceStatisticsSummaryType', _id: string, success_total: number, fail_total: number }, records: Array<{ __typename?: 'CompetenceRecordStatisticsType', _id: string, course_session_id: string, generation: string, circle_id: string, title: string, success_count: number, fail_count: number, details_url: string }> } } | null };
 
 export type MentorCourseStatisticsQueryVariables = Exact<{
   courseId: Scalars['ID']['input'];
@@ -1398,7 +1399,7 @@ export type MentorCourseStatisticsQueryVariables = Exact<{
 }>;
 
 
-export type MentorCourseStatisticsQuery = { __typename?: 'Query', mentor_course_statistics?: { __typename?: 'BaseStatisticsType', _id: string, course_id: string, course_title: string, course_slug: string, course_session_selection_ids: Array<string | null>, user_selection_ids?: Array<string | null> | null, course_session_properties: { __typename?: 'StatisticsCourseSessionPropertiesType', _id: string, generations: Array<string>, sessions: Array<{ __typename?: 'StatisticsCourseSessionDataType', id: string, name: string }>, circles: Array<{ __typename?: 'StatisticsCircleDataType', id: string, name: string }> }, assignments: { __typename?: 'AssignmentsStatisticsType', _id: string, summary: { __typename?: 'AssignmentStatisticsSummaryType', _id: string, completed_count: number, average_passed: number, total_passed: number, total_failed: number }, records: Array<{ __typename?: 'AssignmentStatisticsRecordType', _id: string, course_session_id: string, course_session_assignment_id: string, circle_id: string, generation: string, assignment_title: string, assignment_type_translation_key: string, competence_certificate_id?: string | null, competence_certificate_title?: string | null, details_url: string, learning_content_id: string, deadline: string, metrics: { __typename?: 'AssignmentCompletionMetricsType', _id: string, passed_count: number, failed_count: number, unranked_count: number, ranking_completed: boolean, average_evaluation_percent?: number | null, average_passed: number } }> } } | null };
+export type MentorCourseStatisticsQuery = { __typename?: 'Query', mentor_course_statistics?: { __typename?: 'BaseStatisticsType', _id: string, course_id: string, course_title: string, course_slug: string, course_session_selection_ids: Array<string | null>, user_selection_ids?: Array<string | null> | null, course_session_properties: { __typename?: 'StatisticsCourseSessionPropertiesType', _id: string, generations: Array<string>, sessions: Array<{ __typename?: 'StatisticsCourseSessionDataType', id: string, name: string }>, circles: Array<{ __typename?: 'StatisticsCircleDataType', id: string, name: string }> }, assignments: { __typename?: 'AssignmentsStatisticsType', _id: string, summary: { __typename?: 'AssignmentStatisticsSummaryType', _id: string, completed_count: number, average_passed: number, total_passed: number, total_failed: number }, records: Array<{ __typename?: 'AssignmentStatisticsRecordType', _id: string, course_session_id: string, course_session_assignment_id: string, circle_id: string, generation: string, assignment_title: string, assignment_type_translation_key: string, competence_certificate_id?: string | null, competence_certificate_title?: string | null, details_url: string, learning_content_id: string, deadline: string, metrics: { __typename?: 'AssignmentCompletionMetricsType', _id: string, passed_count: number, failed_count: number, unranked_count: number, ranking_completed: boolean, competence_certificate_weight?: number | null, average_evaluation_percent?: number | null, average_passed: number } }> } } | null };
 
 export type SendFeedbackMutationMutationVariables = Exact<{
   courseSessionId: Scalars['ID']['input'];
@@ -1423,6 +1424,6 @@ export const CourseQueryDocument = {"kind":"Document","definitions":[{"kind":"Op
 export const DashboardConfigDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"dashboardConfig"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"dashboard_config"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"dashboard_type"}},{"kind":"Field","name":{"kind":"Name","value":"course_configuration"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"enable_circle_documents"}},{"kind":"Field","name":{"kind":"Name","value":"enable_learning_mentor"}},{"kind":"Field","name":{"kind":"Name","value":"enable_competence_certificates"}},{"kind":"Field","name":{"kind":"Name","value":"is_uk"}}]}}]}}]}}]} as unknown as DocumentNode<DashboardConfigQuery, DashboardConfigQueryVariables>;
 export const DashboardProgressDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"dashboardProgress"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course_progress"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_id"}},{"kind":"Field","name":{"kind":"Name","value":"session_to_continue_id"}},{"kind":"Field","name":{"kind":"Name","value":"competence"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"total_count"}},{"kind":"Field","name":{"kind":"Name","value":"success_count"}},{"kind":"Field","name":{"kind":"Name","value":"fail_count"}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignment"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"total_count"}},{"kind":"Field","name":{"kind":"Name","value":"points_max_count"}},{"kind":"Field","name":{"kind":"Name","value":"points_achieved_count"}}]}}]}}]}}]} as unknown as DocumentNode<DashboardProgressQuery, DashboardProgressQueryVariables>;
 export const DashboardCourseDataDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"dashboardCourseData"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course_progress"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_id"}},{"kind":"Field","name":{"kind":"Name","value":"session_to_continue_id"}}]}}]}}]} as unknown as DocumentNode<DashboardCourseDataQuery, DashboardCourseDataQueryVariables>;
-export const CourseStatisticsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"courseStatistics"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course_statistics"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_title"}},{"kind":"Field","name":{"kind":"Name","value":"course_slug"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_properties"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"sessions"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"generations"}},{"kind":"Field","name":{"kind":"Name","value":"circles"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"course_session_selection_ids"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_selection_metrics"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"session_count"}},{"kind":"Field","name":{"kind":"Name","value":"participant_count"}},{"kind":"Field","name":{"kind":"Name","value":"expert_count"}}]}},{"kind":"Field","name":{"kind":"Name","value":"attendance_day_presences"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"due_date"}},{"kind":"Field","name":{"kind":"Name","value":"participants_present"}},{"kind":"Field","name":{"kind":"Name","value":"participants_total"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}}]}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"days_completed"}},{"kind":"Field","name":{"kind":"Name","value":"participants_present"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"feedback_responses"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"experts"}},{"kind":"Field","name":{"kind":"Name","value":"satisfaction_average"}},{"kind":"Field","name":{"kind":"Name","value":"satisfaction_max"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}}]}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"satisfaction_average"}},{"kind":"Field","name":{"kind":"Name","value":"satisfaction_max"}},{"kind":"Field","name":{"kind":"Name","value":"total_responses"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignments"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"completed_count"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_failed"}}]}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_assignment_id"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_title"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type_translation_key"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_title"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_id"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}},{"kind":"Field","name":{"kind":"Name","value":"deadline"}},{"kind":"Field","name":{"kind":"Name","value":"metrics"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"passed_count"}},{"kind":"Field","name":{"kind":"Name","value":"failed_count"}},{"kind":"Field","name":{"kind":"Name","value":"unranked_count"}},{"kind":"Field","name":{"kind":"Name","value":"ranking_completed"}},{"kind":"Field","name":{"kind":"Name","value":"average_evaluation_percent"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"competences"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"success_total"}},{"kind":"Field","name":{"kind":"Name","value":"fail_total"}}]}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"success_count"}},{"kind":"Field","name":{"kind":"Name","value":"fail_count"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}}]}}]}}]}}]}}]} as unknown as DocumentNode<CourseStatisticsQuery, CourseStatisticsQueryVariables>;
-export const MentorCourseStatisticsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"mentorCourseStatistics"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"agentRole"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"mentor_course_statistics"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}},{"kind":"Argument","name":{"kind":"Name","value":"agent_role"},"value":{"kind":"Variable","name":{"kind":"Name","value":"agentRole"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_title"}},{"kind":"Field","name":{"kind":"Name","value":"course_slug"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_selection_ids"}},{"kind":"Field","name":{"kind":"Name","value":"user_selection_ids"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_properties"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"sessions"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"generations"}},{"kind":"Field","name":{"kind":"Name","value":"circles"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignments"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"completed_count"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_failed"}}]}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_assignment_id"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_title"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type_translation_key"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_id"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_title"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}},{"kind":"Field","name":{"kind":"Name","value":"learning_content_id"}},{"kind":"Field","name":{"kind":"Name","value":"deadline"}},{"kind":"Field","name":{"kind":"Name","value":"metrics"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"passed_count"}},{"kind":"Field","name":{"kind":"Name","value":"failed_count"}},{"kind":"Field","name":{"kind":"Name","value":"unranked_count"}},{"kind":"Field","name":{"kind":"Name","value":"ranking_completed"}},{"kind":"Field","name":{"kind":"Name","value":"average_evaluation_percent"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}}]}}]}}]}}]}}]}}]} as unknown as DocumentNode<MentorCourseStatisticsQuery, MentorCourseStatisticsQueryVariables>;
+export const CourseStatisticsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"courseStatistics"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course_statistics"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_title"}},{"kind":"Field","name":{"kind":"Name","value":"course_slug"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_properties"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"sessions"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"generations"}},{"kind":"Field","name":{"kind":"Name","value":"circles"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"course_session_selection_ids"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_selection_metrics"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"session_count"}},{"kind":"Field","name":{"kind":"Name","value":"participant_count"}},{"kind":"Field","name":{"kind":"Name","value":"expert_count"}}]}},{"kind":"Field","name":{"kind":"Name","value":"attendance_day_presences"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"due_date"}},{"kind":"Field","name":{"kind":"Name","value":"participants_present"}},{"kind":"Field","name":{"kind":"Name","value":"participants_total"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}}]}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"days_completed"}},{"kind":"Field","name":{"kind":"Name","value":"participants_present"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"feedback_responses"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"experts"}},{"kind":"Field","name":{"kind":"Name","value":"satisfaction_average"}},{"kind":"Field","name":{"kind":"Name","value":"satisfaction_max"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}}]}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"satisfaction_average"}},{"kind":"Field","name":{"kind":"Name","value":"satisfaction_max"}},{"kind":"Field","name":{"kind":"Name","value":"total_responses"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignments"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"completed_count"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_failed"}}]}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_assignment_id"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_title"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type_translation_key"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_title"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_id"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}},{"kind":"Field","name":{"kind":"Name","value":"deadline"}},{"kind":"Field","name":{"kind":"Name","value":"metrics"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"passed_count"}},{"kind":"Field","name":{"kind":"Name","value":"failed_count"}},{"kind":"Field","name":{"kind":"Name","value":"unranked_count"}},{"kind":"Field","name":{"kind":"Name","value":"ranking_completed"}},{"kind":"Field","name":{"kind":"Name","value":"average_evaluation_percent"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_weight"}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"competences"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"success_total"}},{"kind":"Field","name":{"kind":"Name","value":"fail_total"}}]}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"success_count"}},{"kind":"Field","name":{"kind":"Name","value":"fail_count"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}}]}}]}}]}}]}}]} as unknown as DocumentNode<CourseStatisticsQuery, CourseStatisticsQueryVariables>;
+export const MentorCourseStatisticsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"mentorCourseStatistics"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"agentRole"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"mentor_course_statistics"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}},{"kind":"Argument","name":{"kind":"Name","value":"agent_role"},"value":{"kind":"Variable","name":{"kind":"Name","value":"agentRole"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_title"}},{"kind":"Field","name":{"kind":"Name","value":"course_slug"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_selection_ids"}},{"kind":"Field","name":{"kind":"Name","value":"user_selection_ids"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_properties"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"sessions"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"generations"}},{"kind":"Field","name":{"kind":"Name","value":"circles"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignments"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"completed_count"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_failed"}}]}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_assignment_id"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_title"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type_translation_key"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_id"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_title"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}},{"kind":"Field","name":{"kind":"Name","value":"learning_content_id"}},{"kind":"Field","name":{"kind":"Name","value":"deadline"}},{"kind":"Field","name":{"kind":"Name","value":"metrics"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"passed_count"}},{"kind":"Field","name":{"kind":"Name","value":"failed_count"}},{"kind":"Field","name":{"kind":"Name","value":"unranked_count"}},{"kind":"Field","name":{"kind":"Name","value":"ranking_completed"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_weight"}},{"kind":"Field","name":{"kind":"Name","value":"average_evaluation_percent"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}}]}}]}}]}}]}}]}}]} as unknown as DocumentNode<MentorCourseStatisticsQuery, MentorCourseStatisticsQueryVariables>;
 export const SendFeedbackMutationDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"SendFeedbackMutation"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"learningContentId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"learningContentType"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"data"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"GenericScalar"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"submitted"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Boolean"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"send_feedback"},"arguments":[{"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":"learning_content_type"},"value":{"kind":"Variable","name":{"kind":"Name","value":"learningContentType"}}},{"kind":"Argument","name":{"kind":"Name","value":"data"},"value":{"kind":"Variable","name":{"kind":"Name","value":"data"}}},{"kind":"Argument","name":{"kind":"Name","value":"submitted"},"value":{"kind":"Variable","name":{"kind":"Name","value":"submitted"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"feedback_response"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"data"}},{"kind":"Field","name":{"kind":"Name","value":"submitted"}}]}},{"kind":"Field","name":{"kind":"Name","value":"errors"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"field"}},{"kind":"Field","name":{"kind":"Name","value":"messages"}}]}}]}}]}}]} as unknown as DocumentNode<SendFeedbackMutationMutation, SendFeedbackMutationMutationVariables>;
\ No newline at end of file
diff --git a/client/src/gql/schema.graphql b/client/src/gql/schema.graphql
index 5b913f86..d4f364eb 100644
--- a/client/src/gql/schema.graphql
+++ b/client/src/gql/schema.graphql
@@ -78,6 +78,7 @@ type AssignmentCompletionMetricsType {
   ranking_completed: Boolean!
   average_passed: Float!
   average_evaluation_percent: Float
+  competence_certificate_weight: Float
 }
 
 type AssignmentStatisticsSummaryType {
diff --git a/client/src/graphql/queries.ts b/client/src/graphql/queries.ts
index be25a989..c4b3cd4f 100644
--- a/client/src/graphql/queries.ts
+++ b/client/src/graphql/queries.ts
@@ -481,6 +481,7 @@ export const DASHBOARD_COURSE_STATISTICS = graphql(`
             ranking_completed
             average_evaluation_percent
             average_passed
+            competence_certificate_weight
           }
         }
       }
@@ -555,6 +556,7 @@ export const DASHBOARD_MENTOR_COMPETENCE_SUMMARY = graphql(`
             failed_count
             unranked_count
             ranking_completed
+            competence_certificate_weight
             average_evaluation_percent
             average_passed
           }
diff --git a/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradePage.vue b/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradePage.vue
new file mode 100644
index 00000000..cce88dd0
--- /dev/null
+++ b/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradePage.vue
@@ -0,0 +1,149 @@
+<script setup lang="ts">
+import log from "loglevel";
+import { computed, onMounted, ref } from "vue";
+import {
+  courseIdForCourseSlug,
+  fetchMentorCompetenceSummary,
+} from "@/services/dashboard";
+import type { AssignmentStatisticsRecordType, BaseStatisticsType } from "@/gql/graphql";
+import { useDashboardStore } from "@/stores/dashboard";
+import LoadingSpinner from "@/components/ui/LoadingSpinner.vue";
+import _ from "lodash";
+import { percentToRoundedGrade } from "@/services/assignmentService";
+import { a } from "vitest/dist/suite-BWgaIsVn";
+
+const dashboardStore = useDashboardStore();
+
+const props = defineProps<{
+  agentRole: string;
+  courseSlug: string;
+}>();
+
+log.debug("AgentStatisticParentPage created", props);
+
+const loading = ref(true);
+const courseId = ref<string | undefined>(undefined);
+const agentAssignmentData = ref<BaseStatisticsType | null>(null);
+
+const courseSessionName = (courseSessionId: string) => {
+  return (
+    agentAssignmentData.value?.course_session_properties?.sessions.find(
+      (session) => session.id === courseSessionId
+    )?.name ?? ""
+  );
+};
+
+const circleMeta = (circleId: string) => {
+  return agentAssignmentData.value?.course_session_properties.circles.find(
+    (circle) => circle.id === circleId
+  );
+};
+
+onMounted(async () => {
+  await dashboardStore.loadDashboardDetails();
+  courseId.value = courseIdForCourseSlug(
+    dashboardStore.dashboardConfigsv2,
+    props.courseSlug
+  );
+
+  if (!courseId.value) {
+    log.error("CourseId not found for courseSlug", props.courseSlug);
+    return;
+  }
+
+  log.debug("courseId", courseId.value);
+  agentAssignmentData.value = await fetchMentorCompetenceSummary(
+    courseId.value,
+    props.agentRole
+  );
+
+  loading.value = false;
+});
+
+type GroupedAssignments = {
+  competenceCertificateId: string;
+  competenceCertificateTitle: string;
+  generation: string;
+  courseSessionId: string;
+  assignments: AssignmentStatisticsRecordType[];
+  sumAverageEvaluationPercent: number;
+  averageEvaluationPercent: number | null;
+  averageGrade: number | null;
+};
+
+const courseSessionCompetenceAssignments = computed(() => {
+  let resultArray = [] as GroupedAssignments[];
+
+  // group assignments by competence and course session
+  for (const assignment of agentAssignmentData.value?.assignments.records ?? []) {
+    const entry = resultArray.find(
+      (r) =>
+        r.competenceCertificateId === assignment.competence_certificate_id &&
+        r.courseSessionId === assignment.course_session_id
+    );
+    if (entry) {
+      if (assignment.metrics.ranking_completed) {
+        entry.assignments.push(assignment);
+      }
+    } else {
+      const newEntry = {
+        competenceCertificateId: assignment.competence_certificate_id ?? "",
+        competenceCertificateTitle: assignment.competence_certificate_title ?? "",
+        generation: assignment.generation ?? "",
+        courseSessionId: assignment.course_session_id ?? "",
+        assignments: [] as AssignmentStatisticsRecordType[],
+        sumAverageEvaluationPercent: 0,
+        averageEvaluationPercent: null,
+        averageGrade: null,
+      };
+      if (assignment && assignment.metrics.ranking_completed) {
+        newEntry.assignments.push(assignment);
+      }
+      resultArray.push(newEntry);
+    }
+  }
+
+  // filter out entries without assignments
+  resultArray = resultArray.filter((entry) => entry.assignments.length > 0);
+
+  // calculate average grade
+  for (const entry of resultArray) {
+    entry.sumAverageEvaluationPercent = _.sumBy(entry.assignments, (a) => {
+      return (
+        (a.metrics.average_evaluation_percent ?? 0) *
+        (a.metrics.competence_certificate_weight ?? 1)
+      );
+    });
+    entry.averageEvaluationPercent =
+      entry.sumAverageEvaluationPercent /
+      _.sumBy(entry.assignments, (a) => {
+        return a.metrics.competence_certificate_weight ?? 1;
+      });
+    entry.averageGrade = percentToRoundedGrade(entry.averageEvaluationPercent, false);
+  }
+  return resultArray;
+});
+</script>
+
+<template>
+  <div class="bg-gray-200">
+    <div v-if="loading" class="m-8 flex justify-center">
+      <LoadingSpinner />
+    </div>
+    <div v-else class="container-large flex flex-col space-y-8">
+      <router-link class="btn-text inline-flex items-center pl-0" to="/">
+        <it-icon-arrow-left />
+        <span>{{ $t("general.back") }}</span>
+      </router-link>
+      <div>
+        <h2 class="text-2xl font-bold">{{ $t("a.Statistik") }}</h2>
+        <p class="text-gray-800">
+          {{ $t("a.Statistik für alle Lernenden") }}
+        </p>
+        <pre>
+          {{ courseSessionCompetenceAssignments }}
+        </pre>
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/client/src/router/index.ts b/client/src/router/index.ts
index d1fd39f0..afbe0755 100644
--- a/client/src/router/index.ts
+++ b/client/src/router/index.ts
@@ -339,6 +339,7 @@ const router = createRouter({
         },
       ],
     },
+
     {
       path: "/statistic/:agentRole/:courseSlug/assignment",
       props: true,
@@ -351,6 +352,12 @@ const router = createRouter({
       component: () =>
         import("@/pages/dashboard/agentAssignment/AgentAssignmentDetailPage.vue"),
     },
+    {
+      path: "/statistic/:agentRole/:courseSlug/competence-grade",
+      props: true,
+      component: () =>
+        import("@/pages/dashboard/agentAssignment/AgentCompetenceGradePage.vue"),
+    },
 
     {
       path: "/shop",
diff --git a/server/vbv_lernwelt/dashboard/graphql/types/assignment.py b/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
index d2ea56d7..5ddd00c9 100644
--- a/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
+++ b/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
@@ -27,6 +27,7 @@ class AssignmentCompletionMetricsType(graphene.ObjectType):
     ranking_completed = graphene.Boolean(required=True)
     average_passed = graphene.Float(required=True)
     average_evaluation_percent = graphene.Float()
+    competence_certificate_weight = graphene.Float()
 
 
 class AssignmentStatisticsRecordType(graphene.ObjectType):
@@ -149,6 +150,7 @@ def get_assignment_completion_metrics(
         ranking_completed=(passed_count > 0 or failed_count > 0),  # noqa
         average_passed=average_passed,  # noqa
         average_evaluation_percent=average_evaluation_percent,  # noqa
+        competence_certificate_weight=assignment.competence_certificate_weight,  # noqa
     )
 
 

From 82a0cf8daa413514f5daac3da3018e1cd0068cc9 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Fri, 26 Jul 2024 15:37:26 +0200
Subject: [PATCH 19/40] Show list

---
 .../AgentCompetenceGradeDetailPage.vue        | 173 ++++++++++++++++++
 .../AgentCompetenceGradePage.vue              |  36 +++-
 2 files changed, 206 insertions(+), 3 deletions(-)
 create mode 100644 client/src/pages/dashboard/agentAssignment/AgentCompetenceGradeDetailPage.vue

diff --git a/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradeDetailPage.vue b/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradeDetailPage.vue
new file mode 100644
index 00000000..3cdc733f
--- /dev/null
+++ b/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradeDetailPage.vue
@@ -0,0 +1,173 @@
+<script setup lang="ts">
+import log from "loglevel";
+import { computed, onMounted, ref } from "vue";
+import {
+  courseIdForCourseSlug,
+  fetchMentorCompetenceSummary,
+} from "@/services/dashboard";
+import type { AssignmentStatisticsRecordType, BaseStatisticsType } from "@/gql/graphql";
+import { useDashboardStore } from "@/stores/dashboard";
+import LoadingSpinner from "@/components/ui/LoadingSpinner.vue";
+import _ from "lodash";
+import { percentToRoundedGrade } from "@/services/assignmentService";
+import { a } from "vitest/dist/suite-BWgaIsVn";
+
+const dashboardStore = useDashboardStore();
+
+const props = defineProps<{
+  agentRole: string;
+  courseSlug: string;
+}>();
+
+log.debug("AgentStatisticParentPage created", props);
+
+const loading = ref(true);
+const courseId = ref<string | undefined>(undefined);
+const agentAssignmentData = ref<BaseStatisticsType | null>(null);
+
+const courseSessionName = (courseSessionId: string) => {
+  return (
+    agentAssignmentData.value?.course_session_properties?.sessions.find(
+      (session) => session.id === courseSessionId
+    )?.name ?? ""
+  );
+};
+
+onMounted(async () => {
+  await dashboardStore.loadDashboardDetails();
+  courseId.value = courseIdForCourseSlug(
+    dashboardStore.dashboardConfigsv2,
+    props.courseSlug
+  );
+
+  if (!courseId.value) {
+    log.error("CourseId not found for courseSlug", props.courseSlug);
+    return;
+  }
+
+  log.debug("courseId", courseId.value);
+  agentAssignmentData.value = await fetchMentorCompetenceSummary(
+    courseId.value,
+    props.agentRole
+  );
+
+  loading.value = false;
+});
+
+type GroupedAssignments = {
+  competenceCertificateId: string;
+  competenceCertificateTitle: string;
+  generation: string;
+  courseSessionId: string;
+  assignments: AssignmentStatisticsRecordType[];
+  sumAverageEvaluationPercent: number;
+  averageEvaluationPercent: number | null;
+  averageGrade: number | null;
+};
+
+const courseSessionCompetenceAssignments = computed(() => {
+  let resultArray = [] as GroupedAssignments[];
+
+  // group assignments by competence and course session
+  for (const assignment of agentAssignmentData.value?.assignments.records ?? []) {
+    const entry = resultArray.find(
+      (r) =>
+        r.competenceCertificateId === assignment.competence_certificate_id &&
+        r.courseSessionId === assignment.course_session_id
+    );
+    if (entry) {
+      if (assignment.metrics.ranking_completed) {
+        entry.assignments.push(assignment);
+      }
+    } else {
+      const newEntry = {
+        competenceCertificateId: assignment.competence_certificate_id ?? "",
+        competenceCertificateTitle: assignment.competence_certificate_title ?? "",
+        generation: assignment.generation ?? "",
+        courseSessionId: assignment.course_session_id ?? "",
+        assignments: [] as AssignmentStatisticsRecordType[],
+        sumAverageEvaluationPercent: 0,
+        averageEvaluationPercent: null,
+        averageGrade: null,
+      };
+      if (assignment && assignment.metrics.ranking_completed) {
+        newEntry.assignments.push(assignment);
+      }
+      resultArray.push(newEntry);
+    }
+  }
+
+  // filter out entries without assignments
+  resultArray = resultArray.filter((entry) => entry.assignments.length > 0);
+
+  // calculate average grade
+  for (const entry of resultArray) {
+    entry.sumAverageEvaluationPercent = _.sumBy(entry.assignments, (a) => {
+      return (
+        (a.metrics.average_evaluation_percent ?? 0) *
+        (a.metrics.competence_certificate_weight ?? 1)
+      );
+    });
+    entry.averageEvaluationPercent =
+      entry.sumAverageEvaluationPercent /
+      _.sumBy(entry.assignments, (a) => {
+        return a.metrics.competence_certificate_weight ?? 1;
+      });
+    entry.averageGrade = percentToRoundedGrade(entry.averageEvaluationPercent, false);
+  }
+  return resultArray;
+});
+</script>
+
+<template>
+  <div class="bg-gray-200">
+    <div v-if="loading" class="m-8 flex justify-center">
+      <LoadingSpinner />
+    </div>
+    <div v-else class="container-large flex flex-col space-y-8">
+      <router-link class="btn-text inline-flex items-center pl-0" to="/">
+        <it-icon-arrow-left />
+        <span>{{ $t("general.back") }}</span>
+      </router-link>
+      <div>
+        <h2 class="text-2xl font-bold">{{ $t("a.Statistik") }}</h2>
+        <p class="text-gray-800">
+          {{ $t("a.Statistik für alle Lernenden") }}
+        </p>
+
+        <div class="bg-white px-4 py-2">
+          <section
+            class="flex flex-col space-x-0 border-b bg-white lg:flex-row lg:space-x-3"
+          ></section>
+          <div
+            v-for="entry in courseSessionCompetenceAssignments"
+            :key="entry.courseSessionId"
+            :data-cy="`entry-${entry.courseSessionId}`"
+            class="flex flex-col justify-between gap-4 border-b p-2 last:border-b-0 md:flex-row md:items-center md:justify-between md:gap-16"
+          >
+            <div class="w-full flex-auto md:w-1/3">
+              {{ entry.competenceCertificateTitle }}
+              <br />
+              {{ $t("a.Durchführung") }} «{{
+                courseSessionName(entry.courseSessionId)
+              }}»
+            </div>
+
+            <div class="flex w-full flex-auto items-start md:w-1/3">
+              <div class="flex">
+                <div>{{ $t("a.Durchschnittsnote") }}:</div>
+                <div class="w-16 text-center">
+                  {{ entry.averageGrade }}
+                </div>
+              </div>
+            </div>
+
+            <div class="w-full flex-auto items-end md:w-1/3 md:text-end">
+              Details anzeigen
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradePage.vue b/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradePage.vue
index cce88dd0..3680a8ed 100644
--- a/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradePage.vue
+++ b/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradePage.vue
@@ -140,9 +140,39 @@ const courseSessionCompetenceAssignments = computed(() => {
         <p class="text-gray-800">
           {{ $t("a.Statistik für alle Lernenden") }}
         </p>
-        <pre>
-          {{ courseSessionCompetenceAssignments }}
-        </pre>
+
+        <div class="bg-white px-4 py-2">
+          <section
+            class="flex flex-col space-x-0 border-b bg-white lg:flex-row lg:space-x-3"
+          ></section>
+          <div
+            v-for="entry in courseSessionCompetenceAssignments"
+            :key="entry.courseSessionId"
+            :data-cy="`entry-${entry.courseSessionId}`"
+            class="flex flex-col justify-between gap-4 border-b p-2 last:border-b-0 md:flex-row md:items-center md:justify-between md:gap-16"
+          >
+            <div class="w-full flex-auto md:w-1/3">
+              {{ entry.competenceCertificateTitle }}
+              <br />
+              {{ $t("a.Durchführung") }} «{{
+                courseSessionName(entry.courseSessionId)
+              }}»
+            </div>
+
+            <div class="flex w-full flex-auto items-start md:w-1/3">
+              <div class="flex">
+                <div>{{ $t("a.Durchschnittsnote") }}:</div>
+                <div class="w-16 text-center">
+                  {{ entry.averageGrade }}
+                </div>
+              </div>
+            </div>
+
+            <div class="w-full flex-auto items-end md:w-1/3 md:text-end">
+              Details anzeigen
+            </div>
+          </div>
+        </div>
       </div>
     </div>
   </div>

From 9674abfa94f508fe86e5d3aabd8a882501e3e625 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Fri, 26 Jul 2024 15:54:31 +0200
Subject: [PATCH 20/40] Add AgentCompetenceGradeDetailPage

---
 .../agentAssignment/AgentCompetenceGradeDetailPage.vue        | 4 +++-
 .../dashboard/agentAssignment/AgentCompetenceGradePage.vue    | 3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradeDetailPage.vue b/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradeDetailPage.vue
index 3cdc733f..c0a0f0d4 100644
--- a/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradeDetailPage.vue
+++ b/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradeDetailPage.vue
@@ -17,9 +17,11 @@ const dashboardStore = useDashboardStore();
 const props = defineProps<{
   agentRole: string;
   courseSlug: string;
+  competenceCertificateId: string;
+  courseSessionId: string;
 }>();
 
-log.debug("AgentStatisticParentPage created", props);
+log.debug("AgentCompetenceGradeDetailPage created", props);
 
 const loading = ref(true);
 const courseId = ref<string | undefined>(undefined);
diff --git a/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradePage.vue b/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradePage.vue
index 3680a8ed..7f85d2c2 100644
--- a/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradePage.vue
+++ b/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradePage.vue
@@ -10,7 +10,6 @@ import { useDashboardStore } from "@/stores/dashboard";
 import LoadingSpinner from "@/components/ui/LoadingSpinner.vue";
 import _ from "lodash";
 import { percentToRoundedGrade } from "@/services/assignmentService";
-import { a } from "vitest/dist/suite-BWgaIsVn";
 
 const dashboardStore = useDashboardStore();
 
@@ -19,7 +18,7 @@ const props = defineProps<{
   courseSlug: string;
 }>();
 
-log.debug("AgentStatisticParentPage created", props);
+log.debug("AgentCompetenceGradePage created", props);
 
 const loading = ref(true);
 const courseId = ref<string | undefined>(undefined);

From da348b775672879d79c482c99086077557774bf6 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Fri, 26 Jul 2024 17:01:00 +0200
Subject: [PATCH 21/40] Refactor completions query to get completions for a
 list of users

---
 client/src/composables.ts                     | 37 +--------
 client/src/gql/gql.ts                         |  9 +--
 client/src/gql/graphql.ts                     | 79 ++-----------------
 client/src/gql/schema.graphql                 |  5 +-
 client/src/graphql/queries.ts                 | 41 +---------
 .../competence/CompetenceAssignmentRow.vue    | 16 ++--
 .../CompetenceCertificateComponent.vue        |  2 +-
 .../CompetenceCertificateDetailPage.vue       | 41 ++++++----
 .../CompetenceCertificateListPage.vue         | 35 ++++----
 .../pages/competence/CompetenceIndexPage.vue  | 10 ++-
 client/src/pages/competence/utils.ts          | 12 +--
 .../AgentCompetenceGradeDetailPage.vue        |  1 -
 client/src/services/competence.ts             | 44 -----------
 client/src/types.ts                           |  4 +-
 .../vbv_lernwelt/assignment/graphql/types.py  | 31 +++++---
 .../competence/graphql/queries.py             | 36 ++-------
 .../competence/tests/test_graphql.py          |  8 +-
 17 files changed, 113 insertions(+), 298 deletions(-)

diff --git a/client/src/composables.ts b/client/src/composables.ts
index caf8a081..9b35b71c 100644
--- a/client/src/composables.ts
+++ b/client/src/composables.ts
@@ -1,12 +1,7 @@
 import { useCSRFFetch } from "@/fetchHelpers";
 import type { CourseStatisticsType } from "@/gql/graphql";
 import { graphqlClient } from "@/graphql/client";
-import {
-  COMPETENCE_NAVI_CERTIFICATE_FOR_USER_QUERY,
-  COMPETENCE_NAVI_CERTIFICATE_QUERY,
-  COURSE_QUERY,
-  COURSE_SESSION_DETAIL_QUERY,
-} from "@/graphql/queries";
+import { COURSE_QUERY, COURSE_SESSION_DETAIL_QUERY } from "@/graphql/queries";
 import {
   circleFlatChildren,
   circleFlatLearningContents,
@@ -31,6 +26,7 @@ import { useDashboardStore } from "@/stores/dashboard";
 import { useUserStore } from "@/stores/user";
 import type {
   ActionCompetence,
+  AgentParticipantRelation,
   CircleType,
   Course,
   CourseCompletion,
@@ -39,7 +35,6 @@ import type {
   CourseSessionDetail,
   DashboardPersonsPageMode,
   LearningContentWithCompletion,
-  AgentParticipantRelation,
   LearningPathType,
   LearningUnitPerformanceCriteria,
   PerformanceCriteria,
@@ -51,7 +46,7 @@ import orderBy from "lodash/orderBy";
 import log from "loglevel";
 import type { ComputedRef, Ref } from "vue";
 import { computed, onMounted, ref, watchEffect } from "vue";
-import { useRouter, type RouteLocationRaw } from "vue-router";
+import { type RouteLocationRaw, useRouter } from "vue-router";
 
 export function useCurrentCourseSession() {
   /**
@@ -674,32 +669,6 @@ export function useCourseStatisticsv2(courseSlug: string) {
   };
 }
 
-export function useCertificateQuery(userId: string | undefined, courseSlug: string) {
-  const certificatesQuery = (() => {
-    const courseSession = useCurrentCourseSession();
-    if (userId) {
-      return useQuery({
-        query: COMPETENCE_NAVI_CERTIFICATE_FOR_USER_QUERY,
-        variables: {
-          courseSlug: courseSlug,
-          courseSessionId: courseSession.value.id,
-          userId: userId,
-        },
-      });
-    } else {
-      return useQuery({
-        query: COMPETENCE_NAVI_CERTIFICATE_QUERY,
-        variables: {
-          courseSlug: courseSlug,
-          courseSessionId: courseSession.value.id,
-        },
-      });
-    }
-  })();
-
-  return { certificatesQuery };
-}
-
 export function useEvaluationWithFeedback() {
   const currentCourseSession = useCurrentCourseSession();
   const hasFeedback = computed(
diff --git a/client/src/gql/gql.ts b/client/src/gql/gql.ts
index e91c9b0e..8b7a749a 100644
--- a/client/src/gql/gql.ts
+++ b/client/src/gql/gql.ts
@@ -18,8 +18,7 @@ const documents = {
     "\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        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_points_deducted\n      evaluation_points_deducted_reason\n      evaluation_points_final\n\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          competence_certificate_weight\n          completion(course_session_id: $courseSessionId) {\n            id\n            completion_status\n            submitted_at\n            evaluation_points\n            evaluation_points_deducted\n            evaluation_points_final\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 competenceCertificateForUserQuery(\n    $courseSlug: String!\n    $courseSessionId: ID!\n    $userId: UUID!\n  ) {\n    competence_certificate_list_for_user(course_slug: $courseSlug, user_id: $userId) {\n      ...CoursePageFields\n      competence_certificates {\n        ...CoursePageFields\n        assignments {\n          ...CoursePageFields\n          assignment_type\n          max_points\n          competence_certificate_weight\n          completion(course_session_id: $courseSessionId) {\n            id\n            completion_status\n            submitted_at\n            evaluation_points\n            evaluation_points_final\n            evaluation_points_deducted\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.CompetenceCertificateForUserQueryDocument,
+    "\n  query competenceCertificateForUserQuery(\n    $courseSlug: String!\n    $courseSessionId: ID!\n    $userIds: [UUID!]!\n  ) {\n    competence_certificate_list(course_slug: $courseSlug, user_ids: $userIds) {\n      ...CoursePageFields\n      competence_certificates {\n        ...CoursePageFields\n        assignments {\n          ...CoursePageFields\n          assignment_type\n          max_points\n          competence_certificate_weight\n          completions(course_session_id: $courseSessionId) {\n            id\n            completion_status\n            submitted_at\n            evaluation_points\n            evaluation_points_final\n            evaluation_points_deducted\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.CompetenceCertificateForUserQueryDocument,
     "\n  query courseSessionDetail($courseSessionId: ID!) {\n    course_session(id: $courseSessionId) {\n      id\n      title\n      course {\n        id\n        title\n        slug\n        configuration {\n          id\n          enable_circle_documents\n          enable_learning_mentor\n          enable_competence_certificates\n        }\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      configuration {\n        id\n        enable_circle_documents\n        enable_learning_mentor\n        enable_competence_certificates\n        is_uk\n      }\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,
     "\n  query dashboardConfig {\n    dashboard_config {\n      id\n      slug\n      name\n      dashboard_type\n      course_configuration {\n        id\n        enable_circle_documents\n        enable_learning_mentor\n        enable_competence_certificates\n        is_uk\n      }\n    }\n  }\n": types.DashboardConfigDocument,
@@ -67,11 +66,7 @@ export function graphql(source: "\n  query assignmentCompletionQuery(\n    $assi
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  query 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          competence_certificate_weight\n          completion(course_session_id: $courseSessionId) {\n            id\n            completion_status\n            submitted_at\n            evaluation_points\n            evaluation_points_deducted\n            evaluation_points_final\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"): (typeof documents)["\n  query competenceCertificateQuery($courseSlug: String!, $courseSessionId: ID!) {\n    competence_certificate_list(course_slug: $courseSlug) {\n      ...CoursePageFields\n      competence_certificates {\n        ...CoursePageFields\n        assignments {\n          ...CoursePageFields\n          assignment_type\n          max_points\n          competence_certificate_weight\n          completion(course_session_id: $courseSessionId) {\n            id\n            completion_status\n            submitted_at\n            evaluation_points\n            evaluation_points_deducted\n            evaluation_points_final\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"];
-/**
- * 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 competenceCertificateForUserQuery(\n    $courseSlug: String!\n    $courseSessionId: ID!\n    $userId: UUID!\n  ) {\n    competence_certificate_list_for_user(course_slug: $courseSlug, user_id: $userId) {\n      ...CoursePageFields\n      competence_certificates {\n        ...CoursePageFields\n        assignments {\n          ...CoursePageFields\n          assignment_type\n          max_points\n          competence_certificate_weight\n          completion(course_session_id: $courseSessionId) {\n            id\n            completion_status\n            submitted_at\n            evaluation_points\n            evaluation_points_final\n            evaluation_points_deducted\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"): (typeof documents)["\n  query competenceCertificateForUserQuery(\n    $courseSlug: String!\n    $courseSessionId: ID!\n    $userId: UUID!\n  ) {\n    competence_certificate_list_for_user(course_slug: $courseSlug, user_id: $userId) {\n      ...CoursePageFields\n      competence_certificates {\n        ...CoursePageFields\n        assignments {\n          ...CoursePageFields\n          assignment_type\n          max_points\n          competence_certificate_weight\n          completion(course_session_id: $courseSessionId) {\n            id\n            completion_status\n            submitted_at\n            evaluation_points\n            evaluation_points_final\n            evaluation_points_deducted\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"];
+export function graphql(source: "\n  query competenceCertificateForUserQuery(\n    $courseSlug: String!\n    $courseSessionId: ID!\n    $userIds: [UUID!]!\n  ) {\n    competence_certificate_list(course_slug: $courseSlug, user_ids: $userIds) {\n      ...CoursePageFields\n      competence_certificates {\n        ...CoursePageFields\n        assignments {\n          ...CoursePageFields\n          assignment_type\n          max_points\n          competence_certificate_weight\n          completions(course_session_id: $courseSessionId) {\n            id\n            completion_status\n            submitted_at\n            evaluation_points\n            evaluation_points_final\n            evaluation_points_deducted\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"): (typeof documents)["\n  query competenceCertificateForUserQuery(\n    $courseSlug: String!\n    $courseSessionId: ID!\n    $userIds: [UUID!]!\n  ) {\n    competence_certificate_list(course_slug: $courseSlug, user_ids: $userIds) {\n      ...CoursePageFields\n      competence_certificates {\n        ...CoursePageFields\n        assignments {\n          ...CoursePageFields\n          assignment_type\n          max_points\n          competence_certificate_weight\n          completions(course_session_id: $courseSessionId) {\n            id\n            completion_status\n            submitted_at\n            evaluation_points\n            evaluation_points_final\n            evaluation_points_deducted\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"];
 /**
  * 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 e47dce05..0d0ae709 100644
--- a/client/src/gql/graphql.ts
+++ b/client/src/gql/graphql.ts
@@ -142,7 +142,7 @@ export type AssignmentObjectType = CoursePageInterface & {
   assignment_type: AssignmentAssignmentAssignmentTypeChoices;
   competence_certificate?: Maybe<CompetenceCertificateObjectType>;
   competence_certificate_weight?: Maybe<Scalars['Float']['output']>;
-  completion?: Maybe<AssignmentCompletionObjectType>;
+  completions?: Maybe<Array<Maybe<AssignmentCompletionObjectType>>>;
   content_type: Scalars['String']['output'];
   course?: Maybe<CourseObjectType>;
   /** Zeitaufwand als Text */
@@ -170,8 +170,8 @@ export type AssignmentObjectType = CoursePageInterface & {
 };
 
 
-export type AssignmentObjectTypeCompletionArgs = {
-  assignment_user_id?: InputMaybe<Scalars['UUID']['input']>;
+export type AssignmentObjectTypeCompletionsArgs = {
+  assignment_user_ids?: InputMaybe<Array<InputMaybe<Scalars['UUID']['input']>>>;
   course_session_id: Scalars['ID']['input'];
   learning_content_page_id?: InputMaybe<Scalars['ID']['input']>;
 };
@@ -929,7 +929,6 @@ export type Query = {
   assignment_completion?: Maybe<AssignmentCompletionObjectType>;
   competence_certificate?: Maybe<CompetenceCertificateObjectType>;
   competence_certificate_list?: Maybe<CompetenceCertificateListObjectType>;
-  competence_certificate_list_for_user?: Maybe<CompetenceCertificateListObjectType>;
   course?: Maybe<CourseObjectType>;
   course_progress?: Maybe<CourseProgressType>;
   course_session?: Maybe<CourseSessionObjectType>;
@@ -978,15 +977,7 @@ export type QueryCompetenceCertificateListArgs = {
   course_slug?: InputMaybe<Scalars['String']['input']>;
   id?: InputMaybe<Scalars['ID']['input']>;
   slug?: InputMaybe<Scalars['String']['input']>;
-};
-
-
-export type QueryCompetenceCertificateListForUserArgs = {
-  course_id?: InputMaybe<Scalars['ID']['input']>;
-  course_slug?: InputMaybe<Scalars['String']['input']>;
-  id?: InputMaybe<Scalars['ID']['input']>;
-  slug?: InputMaybe<Scalars['String']['input']>;
-  user_id?: InputMaybe<Scalars['UUID']['input']>;
+  user_ids?: InputMaybe<Array<InputMaybe<Scalars['UUID']['input']>>>;
 };
 
 
@@ -1180,70 +1171,17 @@ export type AssignmentCompletionQueryQuery = { __typename?: 'Query', assignment?
       & { ' $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_points_deducted: number, evaluation_points_deducted_reason: string, evaluation_points_final?: 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 | null, first_name: string, last_name: string, id: string } } | null };
 
-export type CompetenceCertificateQueryQueryVariables = Exact<{
-  courseSlug: Scalars['String']['input'];
-  courseSessionId: Scalars['ID']['input'];
-}>;
-
-
-export type CompetenceCertificateQueryQuery = { __typename?: 'Query', competence_certificate_list?: (
-    { __typename?: 'CompetenceCertificateListObjectType', competence_certificates: Array<(
-      { __typename?: 'CompetenceCertificateObjectType', assignments: Array<(
-        { __typename?: 'AssignmentObjectType', assignment_type: AssignmentAssignmentAssignmentTypeChoices, max_points?: number | null, competence_certificate_weight?: number | null, completion?: { __typename?: 'AssignmentCompletionObjectType', id: string, completion_status: AssignmentAssignmentCompletionCompletionStatusChoices, submitted_at?: string | null, evaluation_points?: number | null, evaluation_points_deducted: number, evaluation_points_final?: number | null, evaluation_max_points?: number | null, evaluation_passed?: boolean | null } | null, learning_content?: (
-          { __typename?: 'LearningContentAssignmentObjectType', circle?: { __typename?: 'CircleLightObjectType', id: string, title: string, slug: string } | null }
-          & { ' $fragmentRefs'?: { 'CoursePageFieldsLearningContentAssignmentObjectTypeFragment': CoursePageFieldsLearningContentAssignmentObjectTypeFragment } }
-        ) | (
-          { __typename?: 'LearningContentAttendanceCourseObjectType', circle?: { __typename?: 'CircleLightObjectType', id: string, title: string, slug: string } | null }
-          & { ' $fragmentRefs'?: { 'CoursePageFieldsLearningContentAttendanceCourseObjectTypeFragment': CoursePageFieldsLearningContentAttendanceCourseObjectTypeFragment } }
-        ) | (
-          { __typename?: 'LearningContentDocumentListObjectType', circle?: { __typename?: 'CircleLightObjectType', id: string, title: string, slug: string } | null }
-          & { ' $fragmentRefs'?: { 'CoursePageFieldsLearningContentDocumentListObjectTypeFragment': CoursePageFieldsLearningContentDocumentListObjectTypeFragment } }
-        ) | (
-          { __typename?: 'LearningContentEdoniqTestObjectType', circle?: { __typename?: 'CircleLightObjectType', id: string, title: string, slug: string } | null }
-          & { ' $fragmentRefs'?: { 'CoursePageFieldsLearningContentEdoniqTestObjectTypeFragment': CoursePageFieldsLearningContentEdoniqTestObjectTypeFragment } }
-        ) | (
-          { __typename?: 'LearningContentFeedbackUKObjectType', circle?: { __typename?: 'CircleLightObjectType', id: string, title: string, slug: string } | null }
-          & { ' $fragmentRefs'?: { 'CoursePageFieldsLearningContentFeedbackUkObjectTypeFragment': CoursePageFieldsLearningContentFeedbackUkObjectTypeFragment } }
-        ) | (
-          { __typename?: 'LearningContentFeedbackVVObjectType', circle?: { __typename?: 'CircleLightObjectType', id: string, title: string, slug: string } | null }
-          & { ' $fragmentRefs'?: { 'CoursePageFieldsLearningContentFeedbackVvObjectTypeFragment': CoursePageFieldsLearningContentFeedbackVvObjectTypeFragment } }
-        ) | (
-          { __typename?: 'LearningContentKnowledgeAssessmentObjectType', circle?: { __typename?: 'CircleLightObjectType', id: string, title: string, slug: string } | null }
-          & { ' $fragmentRefs'?: { 'CoursePageFieldsLearningContentKnowledgeAssessmentObjectTypeFragment': CoursePageFieldsLearningContentKnowledgeAssessmentObjectTypeFragment } }
-        ) | (
-          { __typename?: 'LearningContentLearningModuleObjectType', circle?: { __typename?: 'CircleLightObjectType', id: string, title: string, slug: string } | null }
-          & { ' $fragmentRefs'?: { 'CoursePageFieldsLearningContentLearningModuleObjectTypeFragment': CoursePageFieldsLearningContentLearningModuleObjectTypeFragment } }
-        ) | (
-          { __typename?: 'LearningContentMediaLibraryObjectType', circle?: { __typename?: 'CircleLightObjectType', id: string, title: string, slug: string } | null }
-          & { ' $fragmentRefs'?: { 'CoursePageFieldsLearningContentMediaLibraryObjectTypeFragment': CoursePageFieldsLearningContentMediaLibraryObjectTypeFragment } }
-        ) | (
-          { __typename?: 'LearningContentPlaceholderObjectType', circle?: { __typename?: 'CircleLightObjectType', id: string, title: string, slug: string } | null }
-          & { ' $fragmentRefs'?: { 'CoursePageFieldsLearningContentPlaceholderObjectTypeFragment': CoursePageFieldsLearningContentPlaceholderObjectTypeFragment } }
-        ) | (
-          { __typename?: 'LearningContentRichTextObjectType', circle?: { __typename?: 'CircleLightObjectType', id: string, title: string, slug: string } | null }
-          & { ' $fragmentRefs'?: { 'CoursePageFieldsLearningContentRichTextObjectTypeFragment': CoursePageFieldsLearningContentRichTextObjectTypeFragment } }
-        ) | (
-          { __typename?: 'LearningContentVideoObjectType', circle?: { __typename?: 'CircleLightObjectType', id: string, title: string, slug: string } | null }
-          & { ' $fragmentRefs'?: { 'CoursePageFieldsLearningContentVideoObjectTypeFragment': CoursePageFieldsLearningContentVideoObjectTypeFragment } }
-        ) | null }
-        & { ' $fragmentRefs'?: { 'CoursePageFieldsAssignmentObjectTypeFragment': CoursePageFieldsAssignmentObjectTypeFragment } }
-      )> }
-      & { ' $fragmentRefs'?: { 'CoursePageFieldsCompetenceCertificateObjectTypeFragment': CoursePageFieldsCompetenceCertificateObjectTypeFragment } }
-    )> }
-    & { ' $fragmentRefs'?: { 'CoursePageFieldsCompetenceCertificateListObjectTypeFragment': CoursePageFieldsCompetenceCertificateListObjectTypeFragment } }
-  ) | null };
-
 export type CompetenceCertificateForUserQueryQueryVariables = Exact<{
   courseSlug: Scalars['String']['input'];
   courseSessionId: Scalars['ID']['input'];
-  userId: Scalars['UUID']['input'];
+  userIds: Array<Scalars['UUID']['input']> | Scalars['UUID']['input'];
 }>;
 
 
-export type CompetenceCertificateForUserQueryQuery = { __typename?: 'Query', competence_certificate_list_for_user?: (
+export type CompetenceCertificateForUserQueryQuery = { __typename?: 'Query', competence_certificate_list?: (
     { __typename?: 'CompetenceCertificateListObjectType', competence_certificates: Array<(
       { __typename?: 'CompetenceCertificateObjectType', assignments: Array<(
-        { __typename?: 'AssignmentObjectType', assignment_type: AssignmentAssignmentAssignmentTypeChoices, max_points?: number | null, competence_certificate_weight?: number | null, completion?: { __typename?: 'AssignmentCompletionObjectType', id: string, completion_status: AssignmentAssignmentCompletionCompletionStatusChoices, submitted_at?: string | null, evaluation_points?: number | null, evaluation_points_final?: number | null, evaluation_points_deducted: number, evaluation_max_points?: number | null, evaluation_passed?: boolean | null } | null, learning_content?: (
+        { __typename?: 'AssignmentObjectType', assignment_type: AssignmentAssignmentAssignmentTypeChoices, max_points?: number | null, competence_certificate_weight?: number | null, completions?: Array<{ __typename?: 'AssignmentCompletionObjectType', id: string, completion_status: AssignmentAssignmentCompletionCompletionStatusChoices, submitted_at?: string | null, evaluation_points?: number | null, evaluation_points_final?: number | null, evaluation_points_deducted: number, evaluation_max_points?: number | null, evaluation_passed?: boolean | null } | null> | null, learning_content?: (
           { __typename?: 'LearningContentAssignmentObjectType', circle?: { __typename?: 'CircleLightObjectType', id: string, title: string, slug: string } | null }
           & { ' $fragmentRefs'?: { 'CoursePageFieldsLearningContentAssignmentObjectTypeFragment': CoursePageFieldsLearningContentAssignmentObjectTypeFragment } }
         ) | (
@@ -1417,8 +1355,7 @@ export const AttendanceCheckMutationDocument = {"kind":"Document","definitions":
 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":"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_points_deducted"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points_deducted_reason"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points_final"}},{"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":"competence_certificate_weight"}},{"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_points_deducted"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points_final"}},{"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 CompetenceCertificateForUserQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"competenceCertificateForUserQuery"},"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"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"userId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_list_for_user"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_slug"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseSlug"}}},{"kind":"Argument","name":{"kind":"Name","value":"user_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"userId"}}}],"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":"competence_certificate_weight"}},{"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_points_final"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points_deducted"}},{"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<CompetenceCertificateForUserQueryQuery, CompetenceCertificateForUserQueryQueryVariables>;
+export const CompetenceCertificateForUserQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"competenceCertificateForUserQuery"},"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"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"userIds"}},"type":{"kind":"NonNullType","type":{"kind":"ListType","type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}}}],"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"}}},{"kind":"Argument","name":{"kind":"Name","value":"user_ids"},"value":{"kind":"Variable","name":{"kind":"Name","value":"userIds"}}}],"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":"competence_certificate_weight"}},{"kind":"Field","name":{"kind":"Name","value":"completions"},"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_points_final"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points_deducted"}},{"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<CompetenceCertificateForUserQueryQuery, CompetenceCertificateForUserQueryQueryVariables>;
 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":"configuration"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"enable_circle_documents"}},{"kind":"Field","name":{"kind":"Name","value":"enable_learning_mentor"}},{"kind":"Field","name":{"kind":"Name","value":"enable_competence_certificates"}}]}}]}},{"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":"configuration"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"enable_circle_documents"}},{"kind":"Field","name":{"kind":"Name","value":"enable_learning_mentor"}},{"kind":"Field","name":{"kind":"Name","value":"enable_competence_certificates"}},{"kind":"Field","name":{"kind":"Name","value":"is_uk"}}]}},{"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>;
 export const DashboardConfigDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"dashboardConfig"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"dashboard_config"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"dashboard_type"}},{"kind":"Field","name":{"kind":"Name","value":"course_configuration"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"enable_circle_documents"}},{"kind":"Field","name":{"kind":"Name","value":"enable_learning_mentor"}},{"kind":"Field","name":{"kind":"Name","value":"enable_competence_certificates"}},{"kind":"Field","name":{"kind":"Name","value":"is_uk"}}]}}]}}]}}]} as unknown as DocumentNode<DashboardConfigQuery, DashboardConfigQueryVariables>;
diff --git a/client/src/gql/schema.graphql b/client/src/gql/schema.graphql
index d4f364eb..10571f78 100644
--- a/client/src/gql/schema.graphql
+++ b/client/src/gql/schema.graphql
@@ -20,8 +20,7 @@ type Query {
   learning_content_video: LearningContentVideoObjectType
   learning_content_document_list: LearningContentDocumentListObjectType
   competence_certificate(id: ID, slug: String): CompetenceCertificateObjectType
-  competence_certificate_list(id: ID, slug: String, course_id: ID, course_slug: String): CompetenceCertificateListObjectType
-  competence_certificate_list_for_user(id: ID, slug: String, course_id: ID, course_slug: String, user_id: UUID): CompetenceCertificateListObjectType
+  competence_certificate_list(id: ID, slug: String, course_id: ID, course_slug: String, user_ids: [UUID]): CompetenceCertificateListObjectType
   assignment(id: ID, slug: String): AssignmentObjectType
   assignment_completion(assignment_id: ID!, course_session_id: ID!, learning_content_page_id: ID, assignment_user_id: UUID): AssignmentCompletionObjectType
 }
@@ -520,7 +519,7 @@ type AssignmentObjectType implements CoursePageInterface {
   max_points: Int
   competence_certificate_weight: Float
   learning_content: LearningContentInterface
-  completion(course_session_id: ID!, learning_content_page_id: ID, assignment_user_id: UUID): AssignmentCompletionObjectType
+  completions(course_session_id: ID!, learning_content_page_id: ID, assignment_user_ids: [UUID]): [AssignmentCompletionObjectType]
   solution_sample: ContentDocumentObjectType
 }
 
diff --git a/client/src/graphql/queries.ts b/client/src/graphql/queries.ts
index c4b3cd4f..2447db41 100644
--- a/client/src/graphql/queries.ts
+++ b/client/src/graphql/queries.ts
@@ -90,47 +90,12 @@ export const ASSIGNMENT_COMPLETION_QUERY = graphql(`
 `);
 
 export const COMPETENCE_NAVI_CERTIFICATE_QUERY = graphql(`
-  query competenceCertificateQuery($courseSlug: String!, $courseSessionId: ID!) {
-    competence_certificate_list(course_slug: $courseSlug) {
-      ...CoursePageFields
-      competence_certificates {
-        ...CoursePageFields
-        assignments {
-          ...CoursePageFields
-          assignment_type
-          max_points
-          competence_certificate_weight
-          completion(course_session_id: $courseSessionId) {
-            id
-            completion_status
-            submitted_at
-            evaluation_points
-            evaluation_points_deducted
-            evaluation_points_final
-            evaluation_max_points
-            evaluation_passed
-          }
-          learning_content {
-            ...CoursePageFields
-            circle {
-              id
-              title
-              slug
-            }
-          }
-        }
-      }
-    }
-  }
-`);
-
-export const COMPETENCE_NAVI_CERTIFICATE_FOR_USER_QUERY = graphql(`
   query competenceCertificateForUserQuery(
     $courseSlug: String!
     $courseSessionId: ID!
-    $userId: UUID!
+    $userIds: [UUID!]!
   ) {
-    competence_certificate_list_for_user(course_slug: $courseSlug, user_id: $userId) {
+    competence_certificate_list(course_slug: $courseSlug, user_ids: $userIds) {
       ...CoursePageFields
       competence_certificates {
         ...CoursePageFields
@@ -139,7 +104,7 @@ export const COMPETENCE_NAVI_CERTIFICATE_FOR_USER_QUERY = graphql(`
           assignment_type
           max_points
           competence_certificate_weight
-          completion(course_session_id: $courseSessionId) {
+          completions(course_session_id: $courseSessionId) {
             id
             completion_status
             submitted_at
diff --git a/client/src/pages/competence/CompetenceAssignmentRow.vue b/client/src/pages/competence/CompetenceAssignmentRow.vue
index 6a9b652e..30aade11 100644
--- a/client/src/pages/competence/CompetenceAssignmentRow.vue
+++ b/client/src/pages/competence/CompetenceAssignmentRow.vue
@@ -48,7 +48,7 @@ const getIconName = () => {
     </div>
     <div class="grow lg:px-8">
       <div
-        v-if="assignment.completion?.completion_status === 'EVALUATION_SUBMITTED'"
+        v-if="assignment.completions[0]?.completion_status === 'EVALUATION_SUBMITTED'"
         class="flex items-center"
       >
         <div
@@ -61,7 +61,7 @@ const getIconName = () => {
       <div
         v-else-if="
           ['EVALUATION_IN_PROGRESS', 'SUBMITTED'].includes(
-            assignment.completion?.completion_status || ''
+            assignment.completions[0]?.completion_status || ''
           )
         "
         class="flex items-center"
@@ -76,31 +76,31 @@ const getIconName = () => {
     </div>
     <div>
       <div
-        v-if="assignment.completion?.completion_status === 'EVALUATION_SUBMITTED'"
+        v-if="assignment.completions[0]?.completion_status === 'EVALUATION_SUBMITTED'"
         class="flex flex-col lg:items-center"
       >
         <div class="flex flex-col lg:items-center">
           <div class="heading-2">
-            {{ assignment.completion?.evaluation_points_final }}
+            {{ assignment.completions[0]?.evaluation_points_final }}
           </div>
           <div>
             {{ $t("assignment.von x Punkten", { x: assignment.max_points }) }}
             ({{
               (
-                ((assignment.completion?.evaluation_points_final ?? 0) /
-                  (assignment.completion?.evaluation_max_points ?? 1)) *
+                ((assignment.completions[0]?.evaluation_points_final ?? 0) /
+                  (assignment.completions[0]?.evaluation_max_points ?? 1)) *
                 100
               ).toFixed(0)
             }}%)
           </div>
           <div
-            v-if="(assignment.completion?.evaluation_points_deducted ?? 0) > 0"
+            v-if="(assignment.completions[0]?.evaluation_points_deducted ?? 0) > 0"
             class="text-gray-900"
           >
             {{ $t("a.mit Abzug") }}
           </div>
           <div
-            v-if="assignment.completion && !assignment.completion.evaluation_passed"
+            v-if="assignment.completions[0] && !assignment.completions[0].evaluation_passed"
             class="my-2 rounded-md bg-error-red-200 px-2.5 py-0.5"
           >
             {{ $t("a.Nicht Bestanden") }}
diff --git a/client/src/pages/competence/CompetenceCertificateComponent.vue b/client/src/pages/competence/CompetenceCertificateComponent.vue
index b90a93a6..0e4a822a 100644
--- a/client/src/pages/competence/CompetenceCertificateComponent.vue
+++ b/client/src/pages/competence/CompetenceCertificateComponent.vue
@@ -32,7 +32,7 @@ const userGradeRounded2Places = computed(() => {
 
 const numAssignmentsEvaluated = computed(() => {
   return props.competenceCertificate.assignments.filter((a) => {
-    return a.completion?.completion_status === "EVALUATION_SUBMITTED";
+    return a.completions[0]?.completion_status === "EVALUATION_SUBMITTED";
   }).length;
 });
 
diff --git a/client/src/pages/competence/CompetenceCertificateDetailPage.vue b/client/src/pages/competence/CompetenceCertificateDetailPage.vue
index 80bdf276..d35c0b2e 100644
--- a/client/src/pages/competence/CompetenceCertificateDetailPage.vue
+++ b/client/src/pages/competence/CompetenceCertificateDetailPage.vue
@@ -2,10 +2,12 @@
 import log from "loglevel";
 import { computed } from "vue";
 import type { CompetenceCertificate } from "@/types";
-import { useCertificateQuery } from "@/composables";
+import { useCurrentCourseSession } from "@/composables";
 import CompetenceCertificateComponent from "@/pages/competence/CompetenceCertificateComponent.vue";
-import { getCertificates } from "@/services/competence";
 import { getPreviousRoute } from "@/router/history";
+import { useQuery } from "@urql/vue";
+import { COMPETENCE_NAVI_CERTIFICATE_QUERY } from "@/graphql/queries";
+import { useUserStore } from "@/stores/user";
 
 const props = defineProps<{
   courseSlug: string;
@@ -15,24 +17,29 @@ const props = defineProps<{
 
 log.debug("CompetenceCertificateDetailPage setup", props);
 
-const certificatesQuery = useCertificateQuery(
-  props.userId,
-  props.courseSlug
-).certificatesQuery;
+const user = useUserStore();
+const courseSession = useCurrentCourseSession();
+
+const certificatesQuery = useQuery({
+  query: COMPETENCE_NAVI_CERTIFICATE_QUERY,
+  variables: {
+    courseSlug: props.courseSlug,
+    courseSessionId: courseSession.value.id,
+    userIds: [user.id ?? user.id],
+  },
+});
+
+const competenceCertificates = computed(() => {
+  return (
+    (certificatesQuery.data.value?.competence_certificate_list
+      ?.competence_certificates as unknown as CompetenceCertificate[]) ?? []
+  );
+});
 
 const certificate = computed(() => {
-  const certificates = getCertificates(
-    certificatesQuery.data.value,
-    props.userId ?? null
+  return competenceCertificates.value.find((cc) =>
+    cc.slug.endsWith(props.certificateSlug)
   );
-
-  if (!certificates) {
-    return null;
-  }
-
-  return (
-    (certificates.competence_certificates as unknown as CompetenceCertificate[]) ?? []
-  ).find((cc) => cc.slug.endsWith(props.certificateSlug));
 });
 </script>
 
diff --git a/client/src/pages/competence/CompetenceCertificateListPage.vue b/client/src/pages/competence/CompetenceCertificateListPage.vue
index 7beb5b70..3d898ae2 100644
--- a/client/src/pages/competence/CompetenceCertificateListPage.vue
+++ b/client/src/pages/competence/CompetenceCertificateListPage.vue
@@ -2,14 +2,16 @@
 import log from "loglevel";
 import { computed, onMounted } from "vue";
 import type { CompetenceCertificate } from "@/types";
-import { useCertificateQuery } from "@/composables";
+import { useCurrentCourseSession } from "@/composables";
 import CompetenceCertificateComponent from "@/pages/competence/CompetenceCertificateComponent.vue";
 import {
   assignmentsUserPoints,
   calcCompetencesTotalGrade,
 } from "@/pages/competence/utils";
 import { useRoute } from "vue-router";
-import { getCertificates } from "@/services/competence";
+import { useQuery } from "@urql/vue";
+import { COMPETENCE_NAVI_CERTIFICATE_QUERY } from "@/graphql/queries";
+import { useUserStore } from "@/stores/user";
 
 const props = defineProps<{
   courseSlug: string;
@@ -20,23 +22,22 @@ log.debug("CompetenceCertificateListPage setup", props);
 
 const route = useRoute();
 
-const certificatesQuery = useCertificateQuery(
-  props.userId,
-  props.courseSlug
-).certificatesQuery;
+const user = useUserStore();
+const courseSession = useCurrentCourseSession();
+
+const certificatesQuery = useQuery({
+  query: COMPETENCE_NAVI_CERTIFICATE_QUERY,
+  variables: {
+    courseSlug: props.courseSlug,
+    courseSessionId: courseSession.value.id,
+    userIds: [user.id ?? user.id],
+  },
+});
 
 const competenceCertificates = computed(() => {
-  const certificates = getCertificates(
-    certificatesQuery.data.value,
-    props.userId ?? null
-  );
-
-  if (!certificates) {
-    return null;
-  }
-
   return (
-    (certificates?.competence_certificates as unknown as CompetenceCertificate[]) ?? []
+    (certificatesQuery.data.value?.competence_certificate_list
+      ?.competence_certificates as unknown as CompetenceCertificate[]) ?? []
   );
 });
 
@@ -54,7 +55,7 @@ const userPointsEvaluatedAssignments = computed(() => {
 
 const numAssignmentsEvaluated = computed(() => {
   return (assignments.value ?? []).filter((a) => {
-    return a.completion?.completion_status === "EVALUATION_SUBMITTED";
+    return a.completions[0]?.completion_status === "EVALUATION_SUBMITTED";
   }).length;
 });
 
diff --git a/client/src/pages/competence/CompetenceIndexPage.vue b/client/src/pages/competence/CompetenceIndexPage.vue
index d4b6df3b..4fad1aeb 100644
--- a/client/src/pages/competence/CompetenceIndexPage.vue
+++ b/client/src/pages/competence/CompetenceIndexPage.vue
@@ -1,6 +1,8 @@
 <script setup lang="ts">
 import log from "loglevel";
-import { COMPETENCE_NAVI_CERTIFICATE_QUERY } from "@/graphql/queries";
+import {
+  COMPETENCE_NAVI_CERTIFICATE_QUERY,
+} from "@/graphql/queries";
 import { useQuery } from "@urql/vue";
 import { computed } from "vue";
 import type { CompetenceCertificate } from "@/types";
@@ -24,11 +26,14 @@ log.debug("CompetenceIndexPage setup", props);
 
 const courseSession = useCurrentCourseSession();
 
+const user = useUserStore();
+
 const certificatesQuery = useQuery({
   query: COMPETENCE_NAVI_CERTIFICATE_QUERY,
   variables: {
     courseSlug: props.courseSlug,
     courseSessionId: courseSession.value.id,
+    userIds: [user.id ?? user.id],
   },
 });
 
@@ -105,7 +110,8 @@ const router = useRouter();
                 {{
                   $t("assignment.x von y Kompetenznachweis-Elementen abgeschlossen", {
                     x: certificate.assignments.filter(
-                      (a) => a.completion?.completion_status === "EVALUATION_SUBMITTED"
+                      (a) =>
+                        a.completions[0]?.completion_status === "EVALUATION_SUBMITTED"
                     ).length,
                     y: certificate.assignments.length,
                   })
diff --git a/client/src/pages/competence/utils.ts b/client/src/pages/competence/utils.ts
index 713c69be..27158bd3 100644
--- a/client/src/pages/competence/utils.ts
+++ b/client/src/pages/competence/utils.ts
@@ -8,7 +8,7 @@ export function assignmentsMaxEvaluationPoints(
 ): number {
   return _.sum(
     assignments
-      .filter((a) => a.completion?.completion_status === "EVALUATION_SUBMITTED")
+      .filter((a) => a.completions[0]?.completion_status === "EVALUATION_SUBMITTED")
       .map((a) => a.max_points)
   );
 }
@@ -16,8 +16,8 @@ export function assignmentsMaxEvaluationPoints(
 export function assignmentsUserPoints(assignments: CompetenceCertificateAssignment[]) {
   return +_.sum(
     assignments
-      .filter((a) => a.completion?.completion_status === "EVALUATION_SUBMITTED")
-      .map((a) => a.completion?.evaluation_points_final ?? 0)
+      .filter((a) => a.completions[0]?.completion_status === "EVALUATION_SUBMITTED")
+      .map((a) => a.completions[0]?.evaluation_points_final ?? 0)
   ).toFixed(1);
 }
 
@@ -26,12 +26,12 @@ export function calcCompetenceCertificateGrade(
   roundedToHalfGrade = true
 ) {
   const evaluatedAssignments = assignments.filter(
-    (a) => a.completion?.completion_status === "EVALUATION_SUBMITTED"
+    (a) => a.completions[0]?.completion_status === "EVALUATION_SUBMITTED"
   );
 
   const adjustedResults = evaluatedAssignments.map((a) => {
     return (
-      ((a.completion?.evaluation_points_final ?? 0) / a.max_points) *
+      ((a.completions[0]?.evaluation_points_final ?? 0) / a.max_points) *
       a.competence_certificate_weight
     );
   });
@@ -76,7 +76,7 @@ export function competenceCertificateProgressStatusCount(
   assignments: CompetenceCertificateAssignment[]
 ) {
   const numAssignmentsEvaluated = assignments.filter(
-    (a) => a.completion?.completion_status === "EVALUATION_SUBMITTED"
+    (a) => a.completions[0]?.completion_status === "EVALUATION_SUBMITTED"
   ).length;
   return {
     SUCCESS: numAssignmentsEvaluated,
diff --git a/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradeDetailPage.vue b/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradeDetailPage.vue
index c0a0f0d4..b5745cc4 100644
--- a/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradeDetailPage.vue
+++ b/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradeDetailPage.vue
@@ -10,7 +10,6 @@ import { useDashboardStore } from "@/stores/dashboard";
 import LoadingSpinner from "@/components/ui/LoadingSpinner.vue";
 import _ from "lodash";
 import { percentToRoundedGrade } from "@/services/assignmentService";
-import { a } from "vitest/dist/suite-BWgaIsVn";
 
 const dashboardStore = useDashboardStore();
 
diff --git a/client/src/services/competence.ts b/client/src/services/competence.ts
index 78689005..fd8e70a6 100644
--- a/client/src/services/competence.ts
+++ b/client/src/services/competence.ts
@@ -1,8 +1,3 @@
-import type {
-  CompetenceCertificateForUserQueryQuery,
-  CompetenceCertificateListObjectType,
-  CompetenceCertificateQueryQuery,
-} from "@/gql/graphql";
 import type { PerformanceCriteria } from "@/types";
 import groupBy from "lodash/groupBy";
 
@@ -22,42 +17,3 @@ export function calcPerformanceCriteriaStatusCount(criteria: PerformanceCriteria
     FAIL: 0,
   };
 }
-
-// Type guards
-export function isCompetenceCertificateForUserQueryQuery(
-  data: any
-): data is CompetenceCertificateForUserQueryQuery {
-  return (
-    (data as CompetenceCertificateForUserQueryQuery)
-      .competence_certificate_list_for_user !== undefined
-  );
-}
-
-export function isCompetenceCertificateQueryQuery(
-  data: any
-): data is CompetenceCertificateQueryQuery {
-  return (
-    (data as CompetenceCertificateQueryQuery).competence_certificate_list !== undefined
-  );
-}
-
-export function getCertificates(
-  data: any,
-  userId: string | null
-): CompetenceCertificateListObjectType | null {
-  if (!data) {
-    return null;
-  }
-  let certificates = null;
-
-  if (userId && isCompetenceCertificateForUserQueryQuery(data)) {
-    certificates = data.competence_certificate_list_for_user;
-  } else if (isCompetenceCertificateQueryQuery(data)) {
-    certificates = data.competence_certificate_list;
-  } else {
-    // Handle case where data does not match expected types
-    console.error("Data structure is not recognized!");
-    return null;
-  }
-  return (certificates as unknown as CompetenceCertificateListObjectType) ?? null;
-}
diff --git a/client/src/types.ts b/client/src/types.ts
index f37d93c7..b39feaa2 100644
--- a/client/src/types.ts
+++ b/client/src/types.ts
@@ -398,7 +398,7 @@ export interface CompetenceCertificateAssignment extends BaseCourseWagtailPage {
         circle: CircleLight;
       })
     | null;
-  completion: {
+  completions: {
     id: string;
     completion_status: AssignmentCompletionStatus;
     evaluation_submitted_at: string | null;
@@ -408,7 +408,7 @@ export interface CompetenceCertificateAssignment extends BaseCourseWagtailPage {
     evaluation_points_reason: string;
     evaluation_max_points: number | null;
     evaluation_passed: boolean | null;
-  } | null;
+  }[];
 }
 
 export interface CompetenceCertificate extends BaseCourseWagtailPage {
diff --git a/server/vbv_lernwelt/assignment/graphql/types.py b/server/vbv_lernwelt/assignment/graphql/types.py
index 7973942b..ba7b58af 100644
--- a/server/vbv_lernwelt/assignment/graphql/types.py
+++ b/server/vbv_lernwelt/assignment/graphql/types.py
@@ -69,11 +69,11 @@ class AssignmentObjectType(DjangoObjectType):
     max_points = graphene.Int()
     competence_certificate_weight = graphene.Float()
     learning_content = graphene.Field(LearningContentInterface)
-    completion = graphene.Field(
+    completions = graphene.List(
         AssignmentCompletionObjectType,
         course_session_id=graphene.ID(required=True),
         learning_content_page_id=graphene.ID(required=False),
-        assignment_user_id=graphene.UUID(required=False),
+        assignment_user_ids=graphene.List(graphene.UUID, required=False),
     )
     solution_sample = graphene.Field(ContentDocumentObjectType)
 
@@ -103,28 +103,33 @@ class AssignmentObjectType(DjangoObjectType):
     def resolve_learning_content(self, info):
         return self.find_attached_learning_content()
 
-    def resolve_completion(
+    def resolve_completions(
         self,
         info,
         course_session_id,
         learning_content_page_id=None,
-        assignment_user_id=None,
+        assignment_user_ids=None,
     ):
         if learning_content_page_id is None:
             lp = self.find_attached_learning_content()
             if lp:
                 learning_content_page_id = lp.id
 
-        if not assignment_user_id:
-            assignment_user_id = getattr(info.context, "assignment_user_id", None)
+        if not assignment_user_ids:
+            assignment_user_ids = getattr(info.context, "assignment_user_ids", [])
 
-        return resolve_assignment_completion(
-            info=info,
-            course_session_id=course_session_id,
-            learning_content_page_id=learning_content_page_id,
-            assignment_user_id=assignment_user_id,
-            assignment_id=self.id,
-        )
+        completions = []
+        for user_id in assignment_user_ids:
+            completion = resolve_assignment_completion(
+                info=info,
+                course_session_id=course_session_id,
+                learning_content_page_id=learning_content_page_id,
+                assignment_user_id=user_id,
+                assignment_id=self.id,
+            )
+            if completion:
+                completions.append(completion)
+        return completions
 
 
 def resolve_assignment_completion(
diff --git a/server/vbv_lernwelt/competence/graphql/queries.py b/server/vbv_lernwelt/competence/graphql/queries.py
index 1e949d45..df675caa 100644
--- a/server/vbv_lernwelt/competence/graphql/queries.py
+++ b/server/vbv_lernwelt/competence/graphql/queries.py
@@ -24,47 +24,23 @@ class CompetenceCertificateQuery(object):
         slug=graphene.String(),
         course_id=graphene.ID(),
         course_slug=graphene.String(),
-    )
-
-    competence_certificate_list_for_user = graphene.Field(
-        CompetenceCertificateListObjectType,
-        id=graphene.ID(),
-        slug=graphene.String(),
-        course_id=graphene.ID(),
-        course_slug=graphene.String(),
-        user_id=graphene.UUID(),
+        user_ids=graphene.List(graphene.UUID),
     )
 
     def resolve_competence_certificate(root, info, id=None, slug=None):
         return resolve_course_page(CompetenceCertificate, root, info, id=id, slug=slug)
 
     def resolve_competence_certificate_list(
-        root, info, id=None, slug=None, course_id=None, course_slug=None
+        root, info, id=None, slug=None, course_id=None, course_slug=None, user_ids=None
     ):
-        return resolve_course_page(
-            CompetenceCertificateList,
-            root,
-            info,
-            id=id,
-            slug=slug,
-            course_id=course_id,
-            course_slug=course_slug,
-        )
-
-    def resolve_competence_certificate_list_for_user(
-        root, info, id=None, slug=None, course_id=None, course_slug=None, user_id=None
-    ):
-        try:
+        for user_id in user_ids:
             course_session_user = CourseSessionUser.objects.filter(
                 user__id=user_id
             ).first()
-        except CourseSessionUser.DoesNotExist:
-            return None
+            if not can_view_profile(info.context.user, course_session_user):
+                return None
 
-        if not can_view_profile(info.context.user, course_session_user):
-            return None
-
-        setattr(info.context, "assignment_user_id", user_id)
+        setattr(info.context, "assignment_user_ids", user_ids)
 
         return resolve_course_page(
             CompetenceCertificateList,
diff --git a/server/vbv_lernwelt/competence/tests/test_graphql.py b/server/vbv_lernwelt/competence/tests/test_graphql.py
index c1b56fb0..6512f333 100644
--- a/server/vbv_lernwelt/competence/tests/test_graphql.py
+++ b/server/vbv_lernwelt/competence/tests/test_graphql.py
@@ -76,7 +76,7 @@ class TestCertificateList(GraphQLTestCase):
   $courseSessionId: ID!,
   $userId: UUID!
 ) {{
-  competence_certificate_list_for_user(
+  competence_certificate_list(
     course_slug: $courseSlug,
     user_id: $userId
   ) {{
@@ -136,7 +136,7 @@ fragment CoursePageFields on CoursePageInterface {{
         # THEN
         self.assertResponseNoErrors(response)
 
-        certificates = response.json()["data"]["competence_certificate_list_for_user"][
+        certificates = response.json()["data"]["competence_certificate_list"][
             "competence_certificates"
         ]
         self.assertEqual(len(certificates), 1)
@@ -161,7 +161,7 @@ fragment CoursePageFields on CoursePageInterface {{
           $courseSessionId: ID!,
           $userId: UUID!
         ) {{
-          competence_certificate_list_for_user(
+          competence_certificate_list(
             course_slug: $courseSlug,
             user_id: $userId
           ) {{
@@ -221,7 +221,7 @@ fragment CoursePageFields on CoursePageInterface {{
         # THEN
         self.assertResponseNoErrors(response)
         self.assertIsNone(
-            response.json()["data"]["competence_certificate_list_for_user"]
+            response.json()["data"]["competence_certificate_list"]
         )
 
     def test_member_userprofile_certificate_summary(self):

From b24dbc84c8521ea012d0566d180c273762307e81 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Fri, 26 Jul 2024 17:08:37 +0200
Subject: [PATCH 22/40] Make AgentCompetenceGradeDetailPage

---
 client/src/composables.ts                     |   8 +-
 client/src/gql/gql.ts                         |   4 +-
 client/src/gql/graphql.ts                     |   5 +-
 client/src/gql/schema.graphql                 |   1 +
 client/src/graphql/queries.ts                 |   4 +
 .../AgentCompetenceGradeDetailPage.vue        | 222 +++++++++---------
 .../AgentCompetenceGradePage.vue              |  14 +-
 client/src/router/index.ts                    |   6 +
 .../vbv_lernwelt/assignment/graphql/types.py  |   6 +
 server/vbv_lernwelt/assignment/models.py      |   4 +
 10 files changed, 147 insertions(+), 127 deletions(-)

diff --git a/client/src/composables.ts b/client/src/composables.ts
index 9b35b71c..753966ef 100644
--- a/client/src/composables.ts
+++ b/client/src/composables.ts
@@ -73,14 +73,14 @@ export function useCurrentCourseSession() {
   return result;
 }
 
-export function useCourseSessionDetailQuery(courSessionId?: string) {
-  if (!courSessionId) {
-    courSessionId = useCurrentCourseSession().value.id;
+export function useCourseSessionDetailQuery(courseSessionId?: string) {
+  if (!courseSessionId) {
+    courseSessionId = useCurrentCourseSession().value.id;
   }
   const queryResult = useQuery({
     query: COURSE_SESSION_DETAIL_QUERY,
     variables: {
-      courseSessionId: courSessionId,
+      courseSessionId: courseSessionId,
     },
   });
 
diff --git a/client/src/gql/gql.ts b/client/src/gql/gql.ts
index 8b7a749a..a69f39f3 100644
--- a/client/src/gql/gql.ts
+++ b/client/src/gql/gql.ts
@@ -18,7 +18,7 @@ const documents = {
     "\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        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_points_deducted\n      evaluation_points_deducted_reason\n      evaluation_points_final\n\n      evaluation_passed\n      edoniq_extended_time_flag\n      completion_data\n      task_completion_data\n    }\n  }\n": types.AssignmentCompletionQueryDocument,
-    "\n  query competenceCertificateForUserQuery(\n    $courseSlug: String!\n    $courseSessionId: ID!\n    $userIds: [UUID!]!\n  ) {\n    competence_certificate_list(course_slug: $courseSlug, user_ids: $userIds) {\n      ...CoursePageFields\n      competence_certificates {\n        ...CoursePageFields\n        assignments {\n          ...CoursePageFields\n          assignment_type\n          max_points\n          competence_certificate_weight\n          completions(course_session_id: $courseSessionId) {\n            id\n            completion_status\n            submitted_at\n            evaluation_points\n            evaluation_points_final\n            evaluation_points_deducted\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.CompetenceCertificateForUserQueryDocument,
+    "\n  query competenceCertificateForUserQuery(\n    $courseSlug: String!\n    $courseSessionId: ID!\n    $userIds: [UUID!]!\n  ) {\n    competence_certificate_list(course_slug: $courseSlug, user_ids: $userIds) {\n      ...CoursePageFields\n      competence_certificates {\n        ...CoursePageFields\n        assignments {\n          ...CoursePageFields\n          assignment_type\n          max_points\n          competence_certificate_weight\n          completions(course_session_id: $courseSessionId) {\n            id\n            completion_status\n            submitted_at\n            evaluation_points\n            evaluation_points_final\n            evaluation_points_deducted\n            evaluation_max_points\n            evaluation_passed\n            evaluation_percent\n            assignment_user {\n              id\n            }\n          }\n          learning_content {\n            ...CoursePageFields\n            circle {\n              id\n              title\n              slug\n            }\n          }\n        }\n      }\n    }\n  }\n": types.CompetenceCertificateForUserQueryDocument,
     "\n  query courseSessionDetail($courseSessionId: ID!) {\n    course_session(id: $courseSessionId) {\n      id\n      title\n      course {\n        id\n        title\n        slug\n        configuration {\n          id\n          enable_circle_documents\n          enable_learning_mentor\n          enable_competence_certificates\n        }\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      configuration {\n        id\n        enable_circle_documents\n        enable_learning_mentor\n        enable_competence_certificates\n        is_uk\n      }\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,
     "\n  query dashboardConfig {\n    dashboard_config {\n      id\n      slug\n      name\n      dashboard_type\n      course_configuration {\n        id\n        enable_circle_documents\n        enable_learning_mentor\n        enable_competence_certificates\n        is_uk\n      }\n    }\n  }\n": types.DashboardConfigDocument,
@@ -66,7 +66,7 @@ export function graphql(source: "\n  query assignmentCompletionQuery(\n    $assi
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  query competenceCertificateForUserQuery(\n    $courseSlug: String!\n    $courseSessionId: ID!\n    $userIds: [UUID!]!\n  ) {\n    competence_certificate_list(course_slug: $courseSlug, user_ids: $userIds) {\n      ...CoursePageFields\n      competence_certificates {\n        ...CoursePageFields\n        assignments {\n          ...CoursePageFields\n          assignment_type\n          max_points\n          competence_certificate_weight\n          completions(course_session_id: $courseSessionId) {\n            id\n            completion_status\n            submitted_at\n            evaluation_points\n            evaluation_points_final\n            evaluation_points_deducted\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"): (typeof documents)["\n  query competenceCertificateForUserQuery(\n    $courseSlug: String!\n    $courseSessionId: ID!\n    $userIds: [UUID!]!\n  ) {\n    competence_certificate_list(course_slug: $courseSlug, user_ids: $userIds) {\n      ...CoursePageFields\n      competence_certificates {\n        ...CoursePageFields\n        assignments {\n          ...CoursePageFields\n          assignment_type\n          max_points\n          competence_certificate_weight\n          completions(course_session_id: $courseSessionId) {\n            id\n            completion_status\n            submitted_at\n            evaluation_points\n            evaluation_points_final\n            evaluation_points_deducted\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"];
+export function graphql(source: "\n  query competenceCertificateForUserQuery(\n    $courseSlug: String!\n    $courseSessionId: ID!\n    $userIds: [UUID!]!\n  ) {\n    competence_certificate_list(course_slug: $courseSlug, user_ids: $userIds) {\n      ...CoursePageFields\n      competence_certificates {\n        ...CoursePageFields\n        assignments {\n          ...CoursePageFields\n          assignment_type\n          max_points\n          competence_certificate_weight\n          completions(course_session_id: $courseSessionId) {\n            id\n            completion_status\n            submitted_at\n            evaluation_points\n            evaluation_points_final\n            evaluation_points_deducted\n            evaluation_max_points\n            evaluation_passed\n            evaluation_percent\n            assignment_user {\n              id\n            }\n          }\n          learning_content {\n            ...CoursePageFields\n            circle {\n              id\n              title\n              slug\n            }\n          }\n        }\n      }\n    }\n  }\n"): (typeof documents)["\n  query competenceCertificateForUserQuery(\n    $courseSlug: String!\n    $courseSessionId: ID!\n    $userIds: [UUID!]!\n  ) {\n    competence_certificate_list(course_slug: $courseSlug, user_ids: $userIds) {\n      ...CoursePageFields\n      competence_certificates {\n        ...CoursePageFields\n        assignments {\n          ...CoursePageFields\n          assignment_type\n          max_points\n          competence_certificate_weight\n          completions(course_session_id: $courseSessionId) {\n            id\n            completion_status\n            submitted_at\n            evaluation_points\n            evaluation_points_final\n            evaluation_points_deducted\n            evaluation_max_points\n            evaluation_passed\n            evaluation_percent\n            assignment_user {\n              id\n            }\n          }\n          learning_content {\n            ...CoursePageFields\n            circle {\n              id\n              title\n              slug\n            }\n          }\n        }\n      }\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
diff --git a/client/src/gql/graphql.ts b/client/src/gql/graphql.ts
index 0d0ae709..f0ef805c 100644
--- a/client/src/gql/graphql.ts
+++ b/client/src/gql/graphql.ts
@@ -116,6 +116,7 @@ export type AssignmentCompletionObjectType = {
   edoniq_extended_time_flag: Scalars['Boolean']['output'];
   evaluation_max_points?: Maybe<Scalars['Float']['output']>;
   evaluation_passed?: Maybe<Scalars['Boolean']['output']>;
+  evaluation_percent?: Maybe<Scalars['Float']['output']>;
   evaluation_points?: Maybe<Scalars['Float']['output']>;
   evaluation_points_deducted: Scalars['Float']['output'];
   evaluation_points_deducted_reason: Scalars['String']['output'];
@@ -1181,7 +1182,7 @@ export type CompetenceCertificateForUserQueryQueryVariables = Exact<{
 export type CompetenceCertificateForUserQueryQuery = { __typename?: 'Query', competence_certificate_list?: (
     { __typename?: 'CompetenceCertificateListObjectType', competence_certificates: Array<(
       { __typename?: 'CompetenceCertificateObjectType', assignments: Array<(
-        { __typename?: 'AssignmentObjectType', assignment_type: AssignmentAssignmentAssignmentTypeChoices, max_points?: number | null, competence_certificate_weight?: number | null, completions?: Array<{ __typename?: 'AssignmentCompletionObjectType', id: string, completion_status: AssignmentAssignmentCompletionCompletionStatusChoices, submitted_at?: string | null, evaluation_points?: number | null, evaluation_points_final?: number | null, evaluation_points_deducted: number, evaluation_max_points?: number | null, evaluation_passed?: boolean | null } | null> | null, learning_content?: (
+        { __typename?: 'AssignmentObjectType', assignment_type: AssignmentAssignmentAssignmentTypeChoices, max_points?: number | null, competence_certificate_weight?: number | null, completions?: Array<{ __typename?: 'AssignmentCompletionObjectType', id: string, completion_status: AssignmentAssignmentCompletionCompletionStatusChoices, submitted_at?: string | null, evaluation_points?: number | null, evaluation_points_final?: number | null, evaluation_points_deducted: number, evaluation_max_points?: number | null, evaluation_passed?: boolean | null, evaluation_percent?: number | null, assignment_user: { __typename?: 'UserObjectType', id: string } } | null> | null, learning_content?: (
           { __typename?: 'LearningContentAssignmentObjectType', circle?: { __typename?: 'CircleLightObjectType', id: string, title: string, slug: string } | null }
           & { ' $fragmentRefs'?: { 'CoursePageFieldsLearningContentAssignmentObjectTypeFragment': CoursePageFieldsLearningContentAssignmentObjectTypeFragment } }
         ) | (
@@ -1355,7 +1356,7 @@ export const AttendanceCheckMutationDocument = {"kind":"Document","definitions":
 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":"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_points_deducted"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points_deducted_reason"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points_final"}},{"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 CompetenceCertificateForUserQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"competenceCertificateForUserQuery"},"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"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"userIds"}},"type":{"kind":"NonNullType","type":{"kind":"ListType","type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}}}],"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"}}},{"kind":"Argument","name":{"kind":"Name","value":"user_ids"},"value":{"kind":"Variable","name":{"kind":"Name","value":"userIds"}}}],"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":"competence_certificate_weight"}},{"kind":"Field","name":{"kind":"Name","value":"completions"},"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_points_final"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points_deducted"}},{"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<CompetenceCertificateForUserQueryQuery, CompetenceCertificateForUserQueryQueryVariables>;
+export const CompetenceCertificateForUserQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"competenceCertificateForUserQuery"},"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"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"userIds"}},"type":{"kind":"NonNullType","type":{"kind":"ListType","type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}}}],"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"}}},{"kind":"Argument","name":{"kind":"Name","value":"user_ids"},"value":{"kind":"Variable","name":{"kind":"Name","value":"userIds"}}}],"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":"competence_certificate_weight"}},{"kind":"Field","name":{"kind":"Name","value":"completions"},"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_points_final"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points_deducted"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_max_points"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_passed"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_percent"}},{"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":"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<CompetenceCertificateForUserQueryQuery, CompetenceCertificateForUserQueryQueryVariables>;
 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":"configuration"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"enable_circle_documents"}},{"kind":"Field","name":{"kind":"Name","value":"enable_learning_mentor"}},{"kind":"Field","name":{"kind":"Name","value":"enable_competence_certificates"}}]}}]}},{"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":"configuration"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"enable_circle_documents"}},{"kind":"Field","name":{"kind":"Name","value":"enable_learning_mentor"}},{"kind":"Field","name":{"kind":"Name","value":"enable_competence_certificates"}},{"kind":"Field","name":{"kind":"Name","value":"is_uk"}}]}},{"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>;
 export const DashboardConfigDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"dashboardConfig"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"dashboard_config"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"dashboard_type"}},{"kind":"Field","name":{"kind":"Name","value":"course_configuration"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"enable_circle_documents"}},{"kind":"Field","name":{"kind":"Name","value":"enable_learning_mentor"}},{"kind":"Field","name":{"kind":"Name","value":"enable_competence_certificates"}},{"kind":"Field","name":{"kind":"Name","value":"is_uk"}}]}}]}}]}}]} as unknown as DocumentNode<DashboardConfigQuery, DashboardConfigQueryVariables>;
diff --git a/client/src/gql/schema.graphql b/client/src/gql/schema.graphql
index 10571f78..a26bfff3 100644
--- a/client/src/gql/schema.graphql
+++ b/client/src/gql/schema.graphql
@@ -581,6 +581,7 @@ type AssignmentCompletionObjectType {
   evaluation_points: Float
   evaluation_points_final: Float
   evaluation_max_points: Float
+  evaluation_percent: Float
 }
 
 """
diff --git a/client/src/graphql/queries.ts b/client/src/graphql/queries.ts
index 2447db41..30eb11ee 100644
--- a/client/src/graphql/queries.ts
+++ b/client/src/graphql/queries.ts
@@ -113,6 +113,10 @@ export const COMPETENCE_NAVI_CERTIFICATE_QUERY = graphql(`
             evaluation_points_deducted
             evaluation_max_points
             evaluation_passed
+            evaluation_percent
+            assignment_user {
+              id
+            }
           }
           learning_content {
             ...CoursePageFields
diff --git a/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradeDetailPage.vue b/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradeDetailPage.vue
index b5745cc4..889d7c06 100644
--- a/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradeDetailPage.vue
+++ b/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradeDetailPage.vue
@@ -1,18 +1,17 @@
 <script setup lang="ts">
 import log from "loglevel";
 import { computed, onMounted, ref } from "vue";
-import {
-  courseIdForCourseSlug,
-  fetchMentorCompetenceSummary,
-} from "@/services/dashboard";
-import type { AssignmentStatisticsRecordType, BaseStatisticsType } from "@/gql/graphql";
-import { useDashboardStore } from "@/stores/dashboard";
+import { type DashboardPersonType, fetchDashboardPersons } from "@/services/dashboard";
 import LoadingSpinner from "@/components/ui/LoadingSpinner.vue";
+import { useCurrentCourseSession } from "@/composables";
+import { COMPETENCE_NAVI_CERTIFICATE_QUERY } from "@/graphql/queries";
+import { graphqlClient } from "@/graphql/client";
+import type { CompetenceCertificateObjectType } from "@/gql/graphql";
+import { calcCompetenceCertificateGrade } from "@/pages/competence/utils";
 import _ from "lodash";
+import type { CompetenceCertificateAssignment } from "@/types";
 import { percentToRoundedGrade } from "@/services/assignmentService";
 
-const dashboardStore = useDashboardStore();
-
 const props = defineProps<{
   agentRole: string;
   courseSlug: string;
@@ -22,101 +21,87 @@ const props = defineProps<{
 
 log.debug("AgentCompetenceGradeDetailPage created", props);
 
+const courseSession = useCurrentCourseSession();
+
 const loading = ref(true);
-const courseId = ref<string | undefined>(undefined);
-const agentAssignmentData = ref<BaseStatisticsType | null>(null);
 
-const courseSessionName = (courseSessionId: string) => {
-  return (
-    agentAssignmentData.value?.course_session_properties?.sessions.find(
-      (session) => session.id === courseSessionId
-    )?.name ?? ""
-  );
-};
-
-onMounted(async () => {
-  await dashboardStore.loadDashboardDetails();
-  courseId.value = courseIdForCourseSlug(
-    dashboardStore.dashboardConfigsv2,
-    props.courseSlug
-  );
-
-  if (!courseId.value) {
-    log.error("CourseId not found for courseSlug", props.courseSlug);
-    return;
-  }
-
-  log.debug("courseId", courseId.value);
-  agentAssignmentData.value = await fetchMentorCompetenceSummary(
-    courseId.value,
-    props.agentRole
-  );
-
-  loading.value = false;
+const participants = ref<DashboardPersonType[]>([]);
+const participantUserIds = computed(() => {
+  return (participants.value ?? []).map((p) => p.user_id);
 });
 
-type GroupedAssignments = {
-  competenceCertificateId: string;
-  competenceCertificateTitle: string;
-  generation: string;
-  courseSessionId: string;
-  assignments: AssignmentStatisticsRecordType[];
-  sumAverageEvaluationPercent: number;
-  averageEvaluationPercent: number | null;
-  averageGrade: number | null;
-};
+const certificateData = ref<CompetenceCertificateObjectType | undefined>(undefined);
 
-const courseSessionCompetenceAssignments = computed(() => {
-  let resultArray = [] as GroupedAssignments[];
-
-  // group assignments by competence and course session
-  for (const assignment of agentAssignmentData.value?.assignments.records ?? []) {
-    const entry = resultArray.find(
-      (r) =>
-        r.competenceCertificateId === assignment.competence_certificate_id &&
-        r.courseSessionId === assignment.course_session_id
+function userGrade(userId: string) {
+  if (certificateData.value) {
+    const assignmentsWithUserCompletions = _.cloneDeep(
+      certificateData.value.assignments
     );
-    if (entry) {
-      if (assignment.metrics.ranking_completed) {
-        entry.assignments.push(assignment);
-      }
-    } else {
-      const newEntry = {
-        competenceCertificateId: assignment.competence_certificate_id ?? "",
-        competenceCertificateTitle: assignment.competence_certificate_title ?? "",
-        generation: assignment.generation ?? "",
-        courseSessionId: assignment.course_session_id ?? "",
-        assignments: [] as AssignmentStatisticsRecordType[],
-        sumAverageEvaluationPercent: 0,
-        averageEvaluationPercent: null,
-        averageGrade: null,
-      };
-      if (assignment && assignment.metrics.ranking_completed) {
-        newEntry.assignments.push(assignment);
-      }
-      resultArray.push(newEntry);
-    }
-  }
-
-  // filter out entries without assignments
-  resultArray = resultArray.filter((entry) => entry.assignments.length > 0);
-
-  // calculate average grade
-  for (const entry of resultArray) {
-    entry.sumAverageEvaluationPercent = _.sumBy(entry.assignments, (a) => {
-      return (
-        (a.metrics.average_evaluation_percent ?? 0) *
-        (a.metrics.competence_certificate_weight ?? 1)
+    for (const assignment of assignmentsWithUserCompletions) {
+      assignment.completions = assignment.completions?.filter(
+        (c) => c?.assignment_user.id === userId
       );
-    });
-    entry.averageEvaluationPercent =
-      entry.sumAverageEvaluationPercent /
-      _.sumBy(entry.assignments, (a) => {
-        return a.metrics.competence_certificate_weight ?? 1;
-      });
-    entry.averageGrade = percentToRoundedGrade(entry.averageEvaluationPercent, false);
+    }
+
+    return calcCompetenceCertificateGrade(
+      assignmentsWithUserCompletions as unknown as CompetenceCertificateAssignment[],
+      false
+    );
   }
-  return resultArray;
+}
+
+const totalAverageGrade = computed(() => {
+  if (certificateData.value) {
+    let divisor = 0;
+    const assignmentAverageGrades = certificateData.value.assignments.map(
+      (assignment) => {
+        const relevantCompletions = (assignment.completions ?? []).filter(
+          (c) => c?.completion_status == "EVALUATION_SUBMITTED"
+        );
+
+        const averagePercent =
+          _.sumBy(relevantCompletions, (c) => c?.evaluation_percent ?? 0) /
+          relevantCompletions.length;
+
+        if (averagePercent > 0.0001) {
+          divisor += assignment.competence_certificate_weight ?? 1;
+        }
+
+        return averagePercent * (assignment.competence_certificate_weight ?? 1);
+      }
+    );
+
+    return percentToRoundedGrade(
+      _.sum(assignmentAverageGrades) / (divisor ?? 1),
+      false
+    );
+  }
+});
+
+onMounted(async () => {
+  log.debug("AgentAssignmentDetailPage mounted", courseSession);
+
+  const personData = await fetchDashboardPersons("default");
+  participants.value = personData?.filter((p) => {
+    return p.course_sessions.find(
+      (cs) => cs.id === courseSession.value.id && cs.my_role === "BERUFSBILDNER"
+    );
+  });
+
+  const res = await graphqlClient.query(COMPETENCE_NAVI_CERTIFICATE_QUERY, {
+    courseSlug: props.courseSlug,
+    courseSessionId: courseSession.value.id,
+    userIds: participantUserIds.value,
+  });
+
+  // @ts-ignore
+  certificateData.value =
+    res.data?.competence_certificate_list?.competence_certificates.find(
+      // @ts-ignore
+      (cc) => cc.id === props.competenceCertificateId
+    );
+
+  loading.value = false;
 });
 </script>
 
@@ -136,34 +121,47 @@ const courseSessionCompetenceAssignments = computed(() => {
           {{ $t("a.Statistik für alle Lernenden") }}
         </p>
 
+        <pre>{{ totalAverageGrade }}</pre>
+
         <div class="bg-white px-4 py-2">
           <section
             class="flex flex-col space-x-0 border-b bg-white lg:flex-row lg:space-x-3"
           ></section>
+
           <div
-            v-for="entry in courseSessionCompetenceAssignments"
-            :key="entry.courseSessionId"
-            :data-cy="`entry-${entry.courseSessionId}`"
+            v-for="person in participants"
+            :key="person.user_id"
+            data-cy="person"
             class="flex flex-col justify-between gap-4 border-b p-2 last:border-b-0 md:flex-row md:items-center md:justify-between md:gap-16"
           >
-            <div class="w-full flex-auto md:w-1/3">
-              {{ entry.competenceCertificateTitle }}
-              <br />
-              {{ $t("a.Durchführung") }} «{{
-                courseSessionName(entry.courseSessionId)
-              }}»
-            </div>
-
-            <div class="flex w-full flex-auto items-start md:w-1/3">
-              <div class="flex">
-                <div>{{ $t("a.Durchschnittsnote") }}:</div>
-                <div class="w-16 text-center">
-                  {{ entry.averageGrade }}
+            <div class="w-full flex-auto md:w-1/2">
+              <div class="flex items-center space-x-2">
+                <img
+                  class="inline-block h-11 w-11 rounded-full"
+                  :src="
+                    person.avatar_url_small ||
+                    '/static/avatars/myvbv-default-avatar.png'
+                  "
+                  :alt="`${person.first_name} ${person.last_name}`"
+                />
+                <div>
+                  <div class="text-bold">
+                    {{ person.first_name }}
+                    {{ person.last_name }}
+                  </div>
+                  <div class="text-gray-900">{{ person.email }}</div>
                 </div>
               </div>
             </div>
 
-            <div class="w-full flex-auto items-end md:w-1/3 md:text-end">
+            <div class="flex w-full flex-auto items-start md:w-1/4">
+              <div class="flex">
+                <div>{{ $t("a.Note") }}:</div>
+                <div class="w-16 text-center">{{ userGrade(person.user_id) }}</div>
+              </div>
+            </div>
+
+            <div class="w-full flex-auto items-end md:w-1/4 md:text-end">
               Details anzeigen
             </div>
           </div>
diff --git a/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradePage.vue b/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradePage.vue
index 7f85d2c2..af5ca355 100644
--- a/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradePage.vue
+++ b/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradePage.vue
@@ -32,12 +32,6 @@ const courseSessionName = (courseSessionId: string) => {
   );
 };
 
-const circleMeta = (circleId: string) => {
-  return agentAssignmentData.value?.course_session_properties.circles.find(
-    (circle) => circle.id === circleId
-  );
-};
-
 onMounted(async () => {
   await dashboardStore.loadDashboardDetails();
   courseId.value = courseIdForCourseSlug(
@@ -168,7 +162,13 @@ const courseSessionCompetenceAssignments = computed(() => {
             </div>
 
             <div class="w-full flex-auto items-end md:w-1/3 md:text-end">
-              Details anzeigen
+              <router-link
+                class="underline"
+                :to="`/statistic/${props.agentRole}/${props.courseSlug}/competence-grade/${entry.courseSessionId}/${entry.competenceCertificateId}`"
+                data-cy="basebox.detailsLink"
+              >
+                {{ $t("a.Details anschauen") }}
+              </router-link>
             </div>
           </div>
         </div>
diff --git a/client/src/router/index.ts b/client/src/router/index.ts
index afbe0755..716bb5a8 100644
--- a/client/src/router/index.ts
+++ b/client/src/router/index.ts
@@ -358,6 +358,12 @@ const router = createRouter({
       component: () =>
         import("@/pages/dashboard/agentAssignment/AgentCompetenceGradePage.vue"),
     },
+    {
+      path: "/statistic/:agentRole/:courseSlug/competence-grade/:courseSessionId/:competenceCertificateId",
+      props: true,
+      component: () =>
+        import("@/pages/dashboard/agentAssignment/AgentCompetenceGradeDetailPage.vue"),
+    },
 
     {
       path: "/shop",
diff --git a/server/vbv_lernwelt/assignment/graphql/types.py b/server/vbv_lernwelt/assignment/graphql/types.py
index ba7b58af..536dc73a 100644
--- a/server/vbv_lernwelt/assignment/graphql/types.py
+++ b/server/vbv_lernwelt/assignment/graphql/types.py
@@ -21,6 +21,7 @@ class AssignmentCompletionObjectType(DjangoObjectType):
     evaluation_points = graphene.Float()
     evaluation_points_final = graphene.Float()
     evaluation_max_points = graphene.Float()
+    evaluation_percent = graphene.Float()
 
     class Meta:
         model = AssignmentCompletion
@@ -61,6 +62,11 @@ class AssignmentCompletionObjectType(DjangoObjectType):
             return round(self.evaluation_max_points, 1)  # noqa
         return None
 
+    def resolve_evaluation_percent(self, info):
+        if self.evaluation_points:
+            return self.evaluation_percent
+        return None
+
 
 class AssignmentObjectType(DjangoObjectType):
     tasks = JSONStreamField()
diff --git a/server/vbv_lernwelt/assignment/models.py b/server/vbv_lernwelt/assignment/models.py
index af1d2ad4..f60cb268 100644
--- a/server/vbv_lernwelt/assignment/models.py
+++ b/server/vbv_lernwelt/assignment/models.py
@@ -368,6 +368,10 @@ class AssignmentCompletion(models.Model):
             return None
         return self.evaluation_points - self.evaluation_points_deducted
 
+    @property
+    def evaluation_percent(self):
+        return (self.evaluation_points_final or 0) / (self.evaluation_max_points or 1)
+
     assignment_user = models.ForeignKey(User, on_delete=models.CASCADE)
     assignment = models.ForeignKey(Assignment, on_delete=models.CASCADE)
     course_session = models.ForeignKey("course.CourseSession", on_delete=models.CASCADE)

From d36a6e36938eeda085fa0eda7fb4a88a6e8438d0 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Fri, 26 Jul 2024 18:26:59 +0200
Subject: [PATCH 23/40] Fix competence data loading for profile user

---
 .../competence/CompetenceAssignmentRow.vue    |  4 ++-
 .../CompetenceCertificateDetailPage.vue       |  2 +-
 .../CompetenceCertificateListPage.vue         |  2 +-
 .../pages/competence/CompetenceIndexPage.vue  |  6 ++--
 .../AgentCompetenceGradeDetailPage.vue        | 30 ++++++++++++++-----
 .../AgentCompetenceGradePage.vue              |  6 ++--
 .../competence/tests/test_graphql.py          |  4 +--
 server/vbv_lernwelt/dashboard/views.py        |  4 ++-
 8 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/client/src/pages/competence/CompetenceAssignmentRow.vue b/client/src/pages/competence/CompetenceAssignmentRow.vue
index 30aade11..0149f872 100644
--- a/client/src/pages/competence/CompetenceAssignmentRow.vue
+++ b/client/src/pages/competence/CompetenceAssignmentRow.vue
@@ -100,7 +100,9 @@ const getIconName = () => {
             {{ $t("a.mit Abzug") }}
           </div>
           <div
-            v-if="assignment.completions[0] && !assignment.completions[0].evaluation_passed"
+            v-if="
+              assignment.completions[0] && !assignment.completions[0].evaluation_passed
+            "
             class="my-2 rounded-md bg-error-red-200 px-2.5 py-0.5"
           >
             {{ $t("a.Nicht Bestanden") }}
diff --git a/client/src/pages/competence/CompetenceCertificateDetailPage.vue b/client/src/pages/competence/CompetenceCertificateDetailPage.vue
index d35c0b2e..9bd49535 100644
--- a/client/src/pages/competence/CompetenceCertificateDetailPage.vue
+++ b/client/src/pages/competence/CompetenceCertificateDetailPage.vue
@@ -25,7 +25,7 @@ const certificatesQuery = useQuery({
   variables: {
     courseSlug: props.courseSlug,
     courseSessionId: courseSession.value.id,
-    userIds: [user.id ?? user.id],
+    userIds: [props.userId ?? user.id],
   },
 });
 
diff --git a/client/src/pages/competence/CompetenceCertificateListPage.vue b/client/src/pages/competence/CompetenceCertificateListPage.vue
index 3d898ae2..bf1c12b6 100644
--- a/client/src/pages/competence/CompetenceCertificateListPage.vue
+++ b/client/src/pages/competence/CompetenceCertificateListPage.vue
@@ -30,7 +30,7 @@ const certificatesQuery = useQuery({
   variables: {
     courseSlug: props.courseSlug,
     courseSessionId: courseSession.value.id,
-    userIds: [user.id ?? user.id],
+    userIds: [props.userId ?? user.id],
   },
 });
 
diff --git a/client/src/pages/competence/CompetenceIndexPage.vue b/client/src/pages/competence/CompetenceIndexPage.vue
index 4fad1aeb..f85aa082 100644
--- a/client/src/pages/competence/CompetenceIndexPage.vue
+++ b/client/src/pages/competence/CompetenceIndexPage.vue
@@ -1,8 +1,6 @@
 <script setup lang="ts">
 import log from "loglevel";
-import {
-  COMPETENCE_NAVI_CERTIFICATE_QUERY,
-} from "@/graphql/queries";
+import { COMPETENCE_NAVI_CERTIFICATE_QUERY } from "@/graphql/queries";
 import { useQuery } from "@urql/vue";
 import { computed } from "vue";
 import type { CompetenceCertificate } from "@/types";
@@ -33,7 +31,7 @@ const certificatesQuery = useQuery({
   variables: {
     courseSlug: props.courseSlug,
     courseSessionId: courseSession.value.id,
-    userIds: [user.id ?? user.id],
+    userIds: user.id,
   },
 });
 
diff --git a/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradeDetailPage.vue b/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradeDetailPage.vue
index 889d7c06..e6710669 100644
--- a/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradeDetailPage.vue
+++ b/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradeDetailPage.vue
@@ -3,7 +3,6 @@ import log from "loglevel";
 import { computed, onMounted, ref } from "vue";
 import { type DashboardPersonType, fetchDashboardPersons } from "@/services/dashboard";
 import LoadingSpinner from "@/components/ui/LoadingSpinner.vue";
-import { useCurrentCourseSession } from "@/composables";
 import { COMPETENCE_NAVI_CERTIFICATE_QUERY } from "@/graphql/queries";
 import { graphqlClient } from "@/graphql/client";
 import type { CompetenceCertificateObjectType } from "@/gql/graphql";
@@ -21,8 +20,6 @@ const props = defineProps<{
 
 log.debug("AgentCompetenceGradeDetailPage created", props);
 
-const courseSession = useCurrentCourseSession();
-
 const loading = ref(true);
 
 const participants = ref<DashboardPersonType[]>([]);
@@ -76,21 +73,22 @@ const totalAverageGrade = computed(() => {
       false
     );
   }
+  return undefined;
 });
 
 onMounted(async () => {
-  log.debug("AgentAssignmentDetailPage mounted", courseSession);
+  log.debug("AgentAssignmentDetailPage mounted");
 
   const personData = await fetchDashboardPersons("default");
   participants.value = personData?.filter((p) => {
     return p.course_sessions.find(
-      (cs) => cs.id === courseSession.value.id && cs.my_role === "BERUFSBILDNER"
+      (cs) => cs.id === props.courseSessionId && cs.my_role === "BERUFSBILDNER"
     );
   });
 
   const res = await graphqlClient.query(COMPETENCE_NAVI_CERTIFICATE_QUERY, {
     courseSlug: props.courseSlug,
-    courseSessionId: courseSession.value.id,
+    courseSessionId: props.courseSessionId,
     userIds: participantUserIds.value,
   });
 
@@ -111,7 +109,10 @@ onMounted(async () => {
       <LoadingSpinner />
     </div>
     <div v-else class="container-large flex flex-col space-y-8">
-      <router-link class="btn-text inline-flex items-center pl-0" to="/">
+      <router-link
+        class="btn-text inline-flex items-center pl-0"
+        :to="`/statistic/${props.agentRole}/${props.courseSlug}/competence-grade`"
+      >
         <it-icon-arrow-left />
         <span>{{ $t("general.back") }}</span>
       </router-link>
@@ -162,7 +163,20 @@ onMounted(async () => {
             </div>
 
             <div class="w-full flex-auto items-end md:w-1/4 md:text-end">
-              Details anzeigen
+              <router-link
+                :to="{
+                  name: 'profileLearningPath',
+                  params: {
+                    userId: person.user_id,
+                    courseSlug: props.courseSlug,
+                  },
+                  query: { courseSessionId: props.courseSessionId },
+                }"
+                data-cy="person-learning-path-link"
+                class="link w-full lg:text-right"
+              >
+                {{ $t("a.Profil anzeigen") }}
+              </router-link>
             </div>
           </div>
         </div>
diff --git a/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradePage.vue b/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradePage.vue
index af5ca355..762f43fd 100644
--- a/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradePage.vue
+++ b/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradePage.vue
@@ -144,7 +144,7 @@ const courseSessionCompetenceAssignments = computed(() => {
             :data-cy="`entry-${entry.courseSessionId}`"
             class="flex flex-col justify-between gap-4 border-b p-2 last:border-b-0 md:flex-row md:items-center md:justify-between md:gap-16"
           >
-            <div class="w-full flex-auto md:w-1/3">
+            <div class="w-full flex-auto md:w-1/2">
               {{ entry.competenceCertificateTitle }}
               <br />
               {{ $t("a.Durchführung") }} «{{
@@ -152,7 +152,7 @@ const courseSessionCompetenceAssignments = computed(() => {
               }}»
             </div>
 
-            <div class="flex w-full flex-auto items-start md:w-1/3">
+            <div class="flex w-full flex-auto items-start md:w-1/4">
               <div class="flex">
                 <div>{{ $t("a.Durchschnittsnote") }}:</div>
                 <div class="w-16 text-center">
@@ -161,7 +161,7 @@ const courseSessionCompetenceAssignments = computed(() => {
               </div>
             </div>
 
-            <div class="w-full flex-auto items-end md:w-1/3 md:text-end">
+            <div class="w-full flex-auto items-end md:w-1/4 md:text-end">
               <router-link
                 class="underline"
                 :to="`/statistic/${props.agentRole}/${props.courseSlug}/competence-grade/${entry.courseSessionId}/${entry.competenceCertificateId}`"
diff --git a/server/vbv_lernwelt/competence/tests/test_graphql.py b/server/vbv_lernwelt/competence/tests/test_graphql.py
index 6512f333..e3f50c28 100644
--- a/server/vbv_lernwelt/competence/tests/test_graphql.py
+++ b/server/vbv_lernwelt/competence/tests/test_graphql.py
@@ -220,9 +220,7 @@ fragment CoursePageFields on CoursePageInterface {{
 
         # THEN
         self.assertResponseNoErrors(response)
-        self.assertIsNone(
-            response.json()["data"]["competence_certificate_list"]
-        )
+        self.assertIsNone(response.json()["data"]["competence_certificate_list"])
 
     def test_member_userprofile_certificate_summary(self):
         self.client.force_login(self.member_one)
diff --git a/server/vbv_lernwelt/dashboard/views.py b/server/vbv_lernwelt/dashboard/views.py
index 76cef902..95c85a7b 100644
--- a/server/vbv_lernwelt/dashboard/views.py
+++ b/server/vbv_lernwelt/dashboard/views.py
@@ -530,7 +530,9 @@ def get_mentor_open_tasks_count(request, course_id: str):
         return Response(
             status=200,
             data={
-                "open_task_count": _get_mentor_open_tasks_count(course_id, request.user)  # noqa
+                "open_task_count": _get_mentor_open_tasks_count(
+                    course_id, request.user
+                )  # noqa
             },
         )
     except PermissionDenied as e:

From c7afae928b1b78556d26fc389fb4cfee4078a816 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Fri, 26 Jul 2024 18:50:16 +0200
Subject: [PATCH 24/40] Fix unit tests

---
 .../competence/tests/test_graphql.py          | 129 +++++++++---------
 1 file changed, 66 insertions(+), 63 deletions(-)

diff --git a/server/vbv_lernwelt/competence/tests/test_graphql.py b/server/vbv_lernwelt/competence/tests/test_graphql.py
index e3f50c28..9f91bfee 100644
--- a/server/vbv_lernwelt/competence/tests/test_graphql.py
+++ b/server/vbv_lernwelt/competence/tests/test_graphql.py
@@ -71,23 +71,23 @@ class TestCertificateList(GraphQLTestCase):
     def test_supervisor_userprofile_certificate_summary(self):
         self.client.force_login(self.supervisor)
 
-        query = f"""query competenceCertificateForUserQuery(
+        query = """query competenceCertificateForUserQuery(
   $courseSlug: String!,
   $courseSessionId: ID!,
-  $userId: UUID!
-) {{
+  $userIds: [UUID!]
+) {
   competence_certificate_list(
     course_slug: $courseSlug,
-    user_id: $userId
-  ) {{
+    user_ids: $userIds
+  ) {
     ...CoursePageFields
-    competence_certificates {{
+    competence_certificates {
       ...CoursePageFields
-      assignments {{
+      assignments {
         ...CoursePageFields
         assignment_type
         max_points
-        completion(course_session_id: $courseSessionId) {{
+        completions(course_session_id: $courseSessionId) {
           id
           completion_status
           submitted_at
@@ -95,39 +95,39 @@ class TestCertificateList(GraphQLTestCase):
           evaluation_max_points
           evaluation_passed
           __typename
-        }}
-        learning_content {{
+        }
+        learning_content {
           ...CoursePageFields
-          circle {{
+          circle {
             id
             title
             slug
             __typename
-          }}
+          }
           __typename
-        }}
+        }
         __typename
-      }}
+      }
       __typename
-    }}
+    }
     __typename
-  }}
-}}
+  }
+}
 
-fragment CoursePageFields on CoursePageInterface {{
+fragment CoursePageFields on CoursePageInterface {
   title
   id
   slug
   content_type
   frontend_url
   __typename
-}}
+}
 
                                     """
         variables = {
             "courseSessionId": str(self.course_session.id),
             "courseSlug": self.course.slug,
-            "userId": str(self.member_one.id),
+            "userIds": [str(self.member_one.id)],
         }
 
         # WHEN
@@ -144,35 +144,35 @@ fragment CoursePageFields on CoursePageInterface {{
         assignments = certificates[0]["assignments"]
         self.assertEqual(len(assignments), 2)
 
-        completion1 = assignments[0]["completion"]
+        completion1 = assignments[0]["completions"][0]
         self.assertEqual(completion1["completion_status"], "SUBMITTED")
         self.assertEqual(completion1["evaluation_points"], 5)
         self.assertEqual(completion1["evaluation_max_points"], 10)
         self.assertEqual(completion1["evaluation_passed"], False)
 
-        completion2 = assignments[1]["completion"]
-        self.assertIsNone(completion2)
+        completion2 = assignments[1]["completions"]
+        self.assertEqual(len(completion2), 0)
 
     def test_member_cannot_see_other_user_certificate_summary(self):
         self.client.force_login(self.member_one)
 
-        query = f"""query competenceCertificateForUserQuery(
+        query = """query competenceCertificateForUserQuery(
           $courseSlug: String!,
           $courseSessionId: ID!,
-          $userId: UUID!
-        ) {{
+          $userIds: [UUID!]
+        ) {
           competence_certificate_list(
             course_slug: $courseSlug,
-            user_id: $userId
-          ) {{
+            user_ids: $userIds
+          ) {
             ...CoursePageFields
-            competence_certificates {{
+            competence_certificates {
               ...CoursePageFields
-              assignments {{
+              assignments {
                 ...CoursePageFields
                 assignment_type
                 max_points
-                completion(course_session_id: $courseSessionId) {{
+                completions(course_session_id: $courseSessionId) {
                   id
                   completion_status
                   submitted_at
@@ -180,39 +180,39 @@ fragment CoursePageFields on CoursePageInterface {{
                   evaluation_max_points
                   evaluation_passed
                   __typename
-                }}
-                learning_content {{
+                }
+                learning_content {
                   ...CoursePageFields
-                  circle {{
+                  circle {
                     id
                     title
                     slug
                     __typename
-                  }}
+                  }
                   __typename
-                }}
+                }
                 __typename
-              }}
+              }
               __typename
-            }}
+            }
             __typename
-          }}
-        }}
+          }
+        }
 
-        fragment CoursePageFields on CoursePageInterface {{
+        fragment CoursePageFields on CoursePageInterface {
           title
           id
           slug
           content_type
           frontend_url
           __typename
-        }}
+        }
 
                                             """
         variables = {
             "courseSessionId": str(self.course_session.id),
             "courseSlug": self.course.slug,
-            "userId": str(self.member_two.id),
+            "userIds": [str(self.member_two.id)],
         }
 
         # WHEN
@@ -225,21 +225,23 @@ fragment CoursePageFields on CoursePageInterface {{
     def test_member_userprofile_certificate_summary(self):
         self.client.force_login(self.member_one)
 
-        query = f"""query competenceCertificateForUserQuery(
+        query = """query competenceCertificateForUserQuery(
   $courseSlug: String!,
   $courseSessionId: ID!,
-) {{
+  $userIds: [UUID!],
+) {
   competence_certificate_list(
     course_slug: $courseSlug,
-  ) {{
+    user_ids: $userIds
+  ) {
     ...CoursePageFields
-    competence_certificates {{
+    competence_certificates {
       ...CoursePageFields
-      assignments {{
+      assignments {
         ...CoursePageFields
         assignment_type
         max_points
-        completion(course_session_id: $courseSessionId) {{
+        completions(course_session_id: $courseSessionId) {
           id
           completion_status
           submitted_at
@@ -247,38 +249,39 @@ fragment CoursePageFields on CoursePageInterface {{
           evaluation_max_points
           evaluation_passed
           __typename
-        }}
-        learning_content {{
+        }
+        learning_content {
           ...CoursePageFields
-          circle {{
+          circle {
             id
             title
             slug
             __typename
-          }}
+          }
           __typename
-        }}
+        }
         __typename
-      }}
+      }
       __typename
-    }}
+    }
     __typename
-  }}
-}}
+  }
+}
 
-fragment CoursePageFields on CoursePageInterface {{
+fragment CoursePageFields on CoursePageInterface {
   title
   id
   slug
   content_type
   frontend_url
   __typename
-}}
+}
 
                                     """
         variables = {
             "courseSessionId": str(self.course_session.id),
             "courseSlug": self.course.slug,
+            "userIds": [str(self.member_one.id)],
         }
 
         # WHEN
@@ -295,11 +298,11 @@ fragment CoursePageFields on CoursePageInterface {{
         assignments = certificates[0]["assignments"]
         self.assertEqual(len(assignments), 2)
 
-        completion1 = assignments[0]["completion"]
+        completion1 = assignments[0]["completions"][0]
         self.assertEqual(completion1["completion_status"], "SUBMITTED")
         self.assertEqual(completion1["evaluation_points"], 5)
         self.assertEqual(completion1["evaluation_max_points"], 10)
         self.assertEqual(completion1["evaluation_passed"], False)
 
-        completion2 = assignments[1]["completion"]
-        self.assertIsNone(completion2)
+        completion2 = assignments[1]["completions"]
+        self.assertEqual(len(completion2), 0)

From b7231fb1b790d62023cdf1bfca511215e4356a7d Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Sat, 27 Jul 2024 09:49:43 +0200
Subject: [PATCH 25/40] Styling

---
 .../AgentCompetenceGradeDetailPage.vue        | 39 ++++++++++++-------
 .../AgentCompetenceGradePage.vue              | 18 ++++-----
 2 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradeDetailPage.vue b/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradeDetailPage.vue
index e6710669..a13f0775 100644
--- a/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradeDetailPage.vue
+++ b/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradeDetailPage.vue
@@ -27,6 +27,12 @@ const participantUserIds = computed(() => {
   return (participants.value ?? []).map((p) => p.user_id);
 });
 
+const courseSession = computed(() => {
+  return participants.value[0]?.course_sessions.find(
+    (cs) => cs.id === props.courseSessionId
+  );
+});
+
 const certificateData = ref<CompetenceCertificateObjectType | undefined>(undefined);
 
 function userGrade(userId: string) {
@@ -108,7 +114,7 @@ onMounted(async () => {
     <div v-if="loading" class="m-8 flex justify-center">
       <LoadingSpinner />
     </div>
-    <div v-else class="container-large flex flex-col space-y-8">
+    <div v-else class="container-large flex flex-col space-y-4">
       <router-link
         class="btn-text inline-flex items-center pl-0"
         :to="`/statistic/${props.agentRole}/${props.courseSlug}/competence-grade`"
@@ -117,18 +123,16 @@ onMounted(async () => {
         <span>{{ $t("general.back") }}</span>
       </router-link>
       <div>
-        <h2 class="text-2xl font-bold">{{ $t("a.Statistik") }}</h2>
-        <p class="text-gray-800">
-          {{ $t("a.Statistik für alle Lernenden") }}
-        </p>
-
-        <pre>{{ totalAverageGrade }}</pre>
+        <h2 class="mb-8">{{ certificateData?.title }}</h2>
 
+        <div class="border-b bg-white px-6 py-6">
+          {{ courseSession?.session_title }}
+        </div>
+        <div class="heading-3 border-b bg-white px-6 py-6">
+          {{ $t("a.Durchschnittsnote") }}:
+          {{ totalAverageGrade }}
+        </div>
         <div class="bg-white px-4 py-2">
-          <section
-            class="flex flex-col space-x-0 border-b bg-white lg:flex-row lg:space-x-3"
-          ></section>
-
           <div
             v-for="person in participants"
             :key="person.user_id"
@@ -155,10 +159,15 @@ onMounted(async () => {
               </div>
             </div>
 
-            <div class="flex w-full flex-auto items-start md:w-1/4">
-              <div class="flex">
-                <div>{{ $t("a.Note") }}:</div>
-                <div class="w-16 text-center">{{ userGrade(person.user_id) }}</div>
+            <div class="flex flex-auto items-center gap-2 md:w-1/4">
+              <div>{{ $t("a.Note") }}:</div>
+              <div class="min-w-12 text-center">
+                <div
+                  class="rounded px-2 py-1 font-bold"
+                  :class="{ 'bg-red-400': (userGrade(person.user_id) ?? 4) < 4 }"
+                >
+                  {{ userGrade(person.user_id) }}
+                </div>
               </div>
             </div>
 
diff --git a/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradePage.vue b/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradePage.vue
index 762f43fd..7e26558e 100644
--- a/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradePage.vue
+++ b/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradePage.vue
@@ -123,16 +123,13 @@ const courseSessionCompetenceAssignments = computed(() => {
     <div v-if="loading" class="m-8 flex justify-center">
       <LoadingSpinner />
     </div>
-    <div v-else class="container-large flex flex-col space-y-8">
+    <div v-else class="container-large flex flex-col space-y-4">
       <router-link class="btn-text inline-flex items-center pl-0" to="/">
         <it-icon-arrow-left />
         <span>{{ $t("general.back") }}</span>
       </router-link>
       <div>
-        <h2 class="text-2xl font-bold">{{ $t("a.Statistik") }}</h2>
-        <p class="text-gray-800">
-          {{ $t("a.Statistik für alle Lernenden") }}
-        </p>
+        <h2>{{ $t("a.Kompetenznachweise") }}</h2>
 
         <div class="bg-white px-4 py-2">
           <section
@@ -152,10 +149,13 @@ const courseSessionCompetenceAssignments = computed(() => {
               }}»
             </div>
 
-            <div class="flex w-full flex-auto items-start md:w-1/4">
-              <div class="flex">
-                <div>{{ $t("a.Durchschnittsnote") }}:</div>
-                <div class="w-16 text-center">
+            <div class="flex flex-auto items-center gap-2 md:w-1/4">
+              <div>{{ $t("a.Durchschnittsnote") }}:</div>
+              <div class="min-w-12 text-center">
+                <div
+                  class="rounded px-2 py-1 font-bold"
+                  :class="{ 'bg-red-400': (entry.averageGrade ?? 4) < 4 }"
+                >
                   {{ entry.averageGrade }}
                 </div>
               </div>

From 29c42f35129f1b046785d43abec2717494b00ca1 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Sat, 27 Jul 2024 10:20:54 +0200
Subject: [PATCH 26/40] Filter for list, add average grade

---
 .../dashboard/StatisticFilterList.vue         |  79 ++++++++--
 client/src/gql/gql.ts                         |   8 +-
 client/src/gql/graphql.ts                     |  14 +-
 client/src/gql/schema.graphql                 |   6 +
 client/src/graphql/queries.ts                 |   8 +
 .../AgentCompetenceGradePage.vue              | 138 ++++++++++++------
 client/src/types.ts                           |   1 +
 .../dashboard/graphql/types/assignment.py     |   4 +
 .../dashboard/graphql/types/attendance.py     |   6 +-
 .../dashboard/graphql/types/competence.py     |   2 +
 .../dashboard/graphql/types/dashboard.py      |   5 +-
 .../dashboard/graphql/types/feedback.py       |   4 +
 12 files changed, 204 insertions(+), 71 deletions(-)

diff --git a/client/src/components/dashboard/StatisticFilterList.vue b/client/src/components/dashboard/StatisticFilterList.vue
index cda10a88..d885478f 100644
--- a/client/src/components/dashboard/StatisticFilterList.vue
+++ b/client/src/components/dashboard/StatisticFilterList.vue
@@ -4,27 +4,53 @@ import ItDropdownSelect from "@/components/ui/ItDropdownSelect.vue";
 import { useTranslation } from "i18next-vue";
 import type { StatisticsCourseSessionPropertiesType } from "@/gql/graphql";
 import type { StatisticsFilterItem } from "@/types";
+import _ from "lodash";
 
 const { t } = useTranslation();
 
 const props = defineProps<{
   items: StatisticsFilterItem[];
   courseSessionProperties: StatisticsCourseSessionPropertiesType;
+  hideCircleFilter?: boolean;
 }>();
 
 defineExpose({ getFilteredItems });
 
+const regionFilter = computed(() => {
+  const regions = _.uniq(
+    props.courseSessionProperties.sessions.map((session) => session.region)
+  );
+  const f = regions.map((region) => ({
+    name: `Region: ${region}`,
+    id: region,
+  }));
+  return [
+    {
+      name: `${t("Region")}: ${t("a.Alle")}`,
+      id: "_all",
+    },
+    ...f,
+  ];
+});
+
 const sessionFilter = computed(() => {
-  const f = props.courseSessionProperties.sessions.map((session) => ({
-    name: `${t("a.Durchfuehrung")}: ${session.name}`,
+  let values = props.courseSessionProperties.sessions.map((session) => ({
+    name: session.name,
+    region: session.region,
     id: session.id,
   }));
-  return [{ name: t("a.AlleDurchführungen"), id: "_all" }, ...f];
+
+  // filter by selected region
+  if (regionFilterValue.value.id !== "_all") {
+    values = values.filter((cs) => cs.region === regionFilterValue.value.id);
+  }
+
+  return [{ name: t("a.AlleDurchführungen"), id: "_all" }, ...values];
 });
 
 const generationFilter = computed(() => {
   const f = props.courseSessionProperties.generations.map((generation) => ({
-    name: `${t("a.Generation")}: ${generation}`,
+    name: generation,
     id: generation,
   }));
   return [{ name: t("a.AlleGenerationen"), id: "_all" }, ...f];
@@ -32,12 +58,13 @@ const generationFilter = computed(() => {
 
 const circleFilter = computed(() => {
   const f = props.courseSessionProperties.circles.map((circle) => ({
-    name: `Circle: ${circle.name}`,
+    name: circle.name,
     id: circle.id,
   }));
   return [{ name: t("a.AlleCircle"), id: "_all" }, ...f];
 });
 
+const regionFilterValue = ref(regionFilter.value[0]);
 const sessionFilterValue = ref(sessionFilter.value[0]);
 const generationFilterValue = ref(generationFilter.value[0]);
 const circleFilterValue = ref(circleFilter.value[0]);
@@ -48,12 +75,21 @@ watch(
     sessionFilterValue.value = sessionFilter.value[0];
     generationFilterValue.value = generationFilter.value[0];
     circleFilterValue.value = circleFilter.value[0];
+    regionFilterValue.value = regionFilter.value[0];
   },
   { deep: true }
 );
 
+watch(regionFilterValue, () => {
+  console.log("regionFilterValue", regionFilterValue.value);
+  sessionFilterValue.value = sessionFilter.value[0];
+});
+
 const filteredItems = computed(() => {
   return props.items.filter((item) => {
+    const regionMatch =
+      regionFilterValue.value.id === "_all" ||
+      item.region === regionFilterValue.value.id;
     const sessionMatch =
       sessionFilterValue.value.id === "_all" ||
       item.course_session_id === sessionFilterValue.value.id;
@@ -64,7 +100,7 @@ const filteredItems = computed(() => {
       circleFilterValue.value.id === "_all" ||
       item.circle_id === circleFilterValue.value.id;
 
-    return sessionMatch && generationMatch && circleMatch;
+    return regionMatch && sessionMatch && generationMatch && circleMatch;
   });
 });
 
@@ -75,30 +111,45 @@ function getFilteredItems() {
 
 <template>
   <div>
-    <div class="flex flex-col space-x-2 lg:flex-row">
+    <div class="flex flex-col space-x-2 lg:flex-row border-b">
+      <ItDropdownSelect
+        v-if="regionFilter.length > 2"
+        v-model="regionFilterValue"
+        class="min-w-[12rem]"
+        :items="regionFilter"
+        borderless
+      ></ItDropdownSelect>
       <ItDropdownSelect
         v-model="sessionFilterValue"
-        class="min-w-[18rem]"
+        class="min-w-[12rem]"
         :items="sessionFilter"
         borderless
       ></ItDropdownSelect>
       <ItDropdownSelect
         v-model="generationFilterValue"
-        class="min-w-[18rem]"
+        class="min-w-[12rem]"
         :items="generationFilter"
         borderless
       ></ItDropdownSelect>
       <ItDropdownSelect
+        v-if="!props.hideCircleFilter"
         v-model="circleFilterValue"
-        class="min-w-[18rem]"
+        class="min-w-[12rem]"
         :items="circleFilter"
         borderless
       ></ItDropdownSelect>
     </div>
-    <div v-for="item in filteredItems" :key="item._id" class="px-5">
-      <div class="border-t border-gray-500 py-4">
-        <slot :item="item"></slot>
+    <slot name="header"></slot>
+    <section>
+      <div
+        v-for="item in filteredItems"
+        :key="item._id"
+        class="mx-6 border-t border-gray-500 first:border-t-0"
+      >
+        <div class="py-4">
+          <slot :item="item"></slot>
+        </div>
       </div>
-    </div>
+    </section>
   </div>
 </template>
diff --git a/client/src/gql/gql.ts b/client/src/gql/gql.ts
index a69f39f3..27462e14 100644
--- a/client/src/gql/gql.ts
+++ b/client/src/gql/gql.ts
@@ -24,8 +24,8 @@ const documents = {
     "\n  query dashboardConfig {\n    dashboard_config {\n      id\n      slug\n      name\n      dashboard_type\n      course_configuration {\n        id\n        enable_circle_documents\n        enable_learning_mentor\n        enable_competence_certificates\n        is_uk\n      }\n    }\n  }\n": types.DashboardConfigDocument,
     "\n  query dashboardProgress($courseId: ID!) {\n    course_progress(course_id: $courseId) {\n      _id\n      course_id\n      session_to_continue_id\n      competence {\n        _id\n        total_count\n        success_count\n        fail_count\n      }\n      assignment {\n        _id\n        total_count\n        points_max_count\n        points_achieved_count\n      }\n    }\n  }\n": types.DashboardProgressDocument,
     "\n  query dashboardCourseData($courseId: ID!) {\n    course_progress(course_id: $courseId) {\n      _id\n      course_id\n      session_to_continue_id\n    }\n  }\n": types.DashboardCourseDataDocument,
-    "\n  query courseStatistics($courseId: ID!) {\n    course_statistics(course_id: $courseId) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      course_session_selection_ids\n      course_session_selection_metrics {\n        _id\n        session_count\n        participant_count\n        expert_count\n      }\n      attendance_day_presences {\n        _id\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          due_date\n          participants_present\n          participants_total\n          details_url\n        }\n        summary {\n          _id\n          days_completed\n          participants_present\n        }\n      }\n      feedback_responses {\n        _id\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          experts\n          satisfaction_average\n          satisfaction_max\n          details_url\n        }\n        summary {\n          _id\n          satisfaction_average\n          satisfaction_max\n          total_responses\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_title\n          competence_certificate_id\n          details_url\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_evaluation_percent\n            average_passed\n            competence_certificate_weight\n          }\n        }\n      }\n      competences {\n        _id\n        summary {\n          _id\n          success_total\n          fail_total\n        }\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          title\n          success_count\n          fail_count\n          details_url\n        }\n      }\n    }\n  }\n": types.CourseStatisticsDocument,
-    "\n  query mentorCourseStatistics($courseId: ID!, $agentRole: String!) {\n    mentor_course_statistics(course_id: $courseId, agent_role: $agentRole) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_selection_ids\n      user_selection_ids\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_id\n          competence_certificate_title\n          details_url\n          learning_content_id\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            competence_certificate_weight\n            average_evaluation_percent\n            average_passed\n          }\n        }\n      }\n    }\n  }\n": types.MentorCourseStatisticsDocument,
+    "\n  query courseStatistics($courseId: ID!) {\n    course_statistics(course_id: $courseId) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n          region\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      course_session_selection_ids\n      course_session_selection_metrics {\n        _id\n        session_count\n        participant_count\n        expert_count\n      }\n      attendance_day_presences {\n        _id\n        records {\n          _id\n          course_session_id\n          generation\n          region\n          circle_id\n          due_date\n          participants_present\n          participants_total\n          details_url\n        }\n        summary {\n          _id\n          days_completed\n          participants_present\n        }\n      }\n      feedback_responses {\n        _id\n        records {\n          _id\n          course_session_id\n          generation\n          region\n          circle_id\n          experts\n          satisfaction_average\n          satisfaction_max\n          details_url\n        }\n        summary {\n          _id\n          satisfaction_average\n          satisfaction_max\n          total_responses\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          region\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_title\n          competence_certificate_id\n          details_url\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_evaluation_percent\n            average_passed\n            competence_certificate_weight\n          }\n        }\n      }\n      competences {\n        _id\n        summary {\n          _id\n          success_total\n          fail_total\n        }\n        records {\n          _id\n          course_session_id\n          generation\n          region\n          circle_id\n          title\n          success_count\n          fail_count\n          details_url\n        }\n      }\n    }\n  }\n": types.CourseStatisticsDocument,
+    "\n  query mentorCourseStatistics($courseId: ID!, $agentRole: String!) {\n    mentor_course_statistics(course_id: $courseId, agent_role: $agentRole) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_selection_ids\n      user_selection_ids\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n          region\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          course_session_title\n          circle_id\n          generation\n          region\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_id\n          competence_certificate_title\n          details_url\n          learning_content_id\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            competence_certificate_weight\n            average_evaluation_percent\n            average_passed\n          }\n        }\n      }\n    }\n  }\n": types.MentorCourseStatisticsDocument,
     "\n  mutation SendFeedbackMutation(\n    $courseSessionId: ID!\n    $learningContentId: ID!\n    $learningContentType: String!\n    $data: GenericScalar!\n    $submitted: Boolean\n  ) {\n    send_feedback(\n      course_session_id: $courseSessionId\n      learning_content_page_id: $learningContentId\n      learning_content_type: $learningContentType\n      data: $data\n      submitted: $submitted\n    ) {\n      feedback_response {\n        id\n        data\n        submitted\n      }\n      errors {\n        field\n        messages\n      }\n    }\n  }\n": types.SendFeedbackMutationDocument,
 };
 
@@ -90,11 +90,11 @@ export function graphql(source: "\n  query dashboardCourseData($courseId: ID!) {
 /**
  * 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 courseStatistics($courseId: ID!) {\n    course_statistics(course_id: $courseId) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      course_session_selection_ids\n      course_session_selection_metrics {\n        _id\n        session_count\n        participant_count\n        expert_count\n      }\n      attendance_day_presences {\n        _id\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          due_date\n          participants_present\n          participants_total\n          details_url\n        }\n        summary {\n          _id\n          days_completed\n          participants_present\n        }\n      }\n      feedback_responses {\n        _id\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          experts\n          satisfaction_average\n          satisfaction_max\n          details_url\n        }\n        summary {\n          _id\n          satisfaction_average\n          satisfaction_max\n          total_responses\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_title\n          competence_certificate_id\n          details_url\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_evaluation_percent\n            average_passed\n            competence_certificate_weight\n          }\n        }\n      }\n      competences {\n        _id\n        summary {\n          _id\n          success_total\n          fail_total\n        }\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          title\n          success_count\n          fail_count\n          details_url\n        }\n      }\n    }\n  }\n"): (typeof documents)["\n  query courseStatistics($courseId: ID!) {\n    course_statistics(course_id: $courseId) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      course_session_selection_ids\n      course_session_selection_metrics {\n        _id\n        session_count\n        participant_count\n        expert_count\n      }\n      attendance_day_presences {\n        _id\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          due_date\n          participants_present\n          participants_total\n          details_url\n        }\n        summary {\n          _id\n          days_completed\n          participants_present\n        }\n      }\n      feedback_responses {\n        _id\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          experts\n          satisfaction_average\n          satisfaction_max\n          details_url\n        }\n        summary {\n          _id\n          satisfaction_average\n          satisfaction_max\n          total_responses\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_title\n          competence_certificate_id\n          details_url\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_evaluation_percent\n            average_passed\n            competence_certificate_weight\n          }\n        }\n      }\n      competences {\n        _id\n        summary {\n          _id\n          success_total\n          fail_total\n        }\n        records {\n          _id\n          course_session_id\n          generation\n          circle_id\n          title\n          success_count\n          fail_count\n          details_url\n        }\n      }\n    }\n  }\n"];
+export function graphql(source: "\n  query courseStatistics($courseId: ID!) {\n    course_statistics(course_id: $courseId) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n          region\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      course_session_selection_ids\n      course_session_selection_metrics {\n        _id\n        session_count\n        participant_count\n        expert_count\n      }\n      attendance_day_presences {\n        _id\n        records {\n          _id\n          course_session_id\n          generation\n          region\n          circle_id\n          due_date\n          participants_present\n          participants_total\n          details_url\n        }\n        summary {\n          _id\n          days_completed\n          participants_present\n        }\n      }\n      feedback_responses {\n        _id\n        records {\n          _id\n          course_session_id\n          generation\n          region\n          circle_id\n          experts\n          satisfaction_average\n          satisfaction_max\n          details_url\n        }\n        summary {\n          _id\n          satisfaction_average\n          satisfaction_max\n          total_responses\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          region\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_title\n          competence_certificate_id\n          details_url\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_evaluation_percent\n            average_passed\n            competence_certificate_weight\n          }\n        }\n      }\n      competences {\n        _id\n        summary {\n          _id\n          success_total\n          fail_total\n        }\n        records {\n          _id\n          course_session_id\n          generation\n          region\n          circle_id\n          title\n          success_count\n          fail_count\n          details_url\n        }\n      }\n    }\n  }\n"): (typeof documents)["\n  query courseStatistics($courseId: ID!) {\n    course_statistics(course_id: $courseId) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n          region\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      course_session_selection_ids\n      course_session_selection_metrics {\n        _id\n        session_count\n        participant_count\n        expert_count\n      }\n      attendance_day_presences {\n        _id\n        records {\n          _id\n          course_session_id\n          generation\n          region\n          circle_id\n          due_date\n          participants_present\n          participants_total\n          details_url\n        }\n        summary {\n          _id\n          days_completed\n          participants_present\n        }\n      }\n      feedback_responses {\n        _id\n        records {\n          _id\n          course_session_id\n          generation\n          region\n          circle_id\n          experts\n          satisfaction_average\n          satisfaction_max\n          details_url\n        }\n        summary {\n          _id\n          satisfaction_average\n          satisfaction_max\n          total_responses\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          region\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_title\n          competence_certificate_id\n          details_url\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_evaluation_percent\n            average_passed\n            competence_certificate_weight\n          }\n        }\n      }\n      competences {\n        _id\n        summary {\n          _id\n          success_total\n          fail_total\n        }\n        records {\n          _id\n          course_session_id\n          generation\n          region\n          circle_id\n          title\n          success_count\n          fail_count\n          details_url\n        }\n      }\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  query mentorCourseStatistics($courseId: ID!, $agentRole: String!) {\n    mentor_course_statistics(course_id: $courseId, agent_role: $agentRole) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_selection_ids\n      user_selection_ids\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_id\n          competence_certificate_title\n          details_url\n          learning_content_id\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            competence_certificate_weight\n            average_evaluation_percent\n            average_passed\n          }\n        }\n      }\n    }\n  }\n"): (typeof documents)["\n  query mentorCourseStatistics($courseId: ID!, $agentRole: String!) {\n    mentor_course_statistics(course_id: $courseId, agent_role: $agentRole) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_selection_ids\n      user_selection_ids\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_id\n          competence_certificate_title\n          details_url\n          learning_content_id\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            competence_certificate_weight\n            average_evaluation_percent\n            average_passed\n          }\n        }\n      }\n    }\n  }\n"];
+export function graphql(source: "\n  query mentorCourseStatistics($courseId: ID!, $agentRole: String!) {\n    mentor_course_statistics(course_id: $courseId, agent_role: $agentRole) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_selection_ids\n      user_selection_ids\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n          region\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          course_session_title\n          circle_id\n          generation\n          region\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_id\n          competence_certificate_title\n          details_url\n          learning_content_id\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            competence_certificate_weight\n            average_evaluation_percent\n            average_passed\n          }\n        }\n      }\n    }\n  }\n"): (typeof documents)["\n  query mentorCourseStatistics($courseId: ID!, $agentRole: String!) {\n    mentor_course_statistics(course_id: $courseId, agent_role: $agentRole) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_selection_ids\n      user_selection_ids\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n          region\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          course_session_title\n          circle_id\n          generation\n          region\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_id\n          competence_certificate_title\n          details_url\n          learning_content_id\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            competence_certificate_weight\n            average_evaluation_percent\n            average_passed\n          }\n        }\n      }\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
diff --git a/client/src/gql/graphql.ts b/client/src/gql/graphql.ts
index f0ef805c..b5433e30 100644
--- a/client/src/gql/graphql.ts
+++ b/client/src/gql/graphql.ts
@@ -187,11 +187,13 @@ export type AssignmentStatisticsRecordType = {
   competence_certificate_title?: Maybe<Scalars['String']['output']>;
   course_session_assignment_id: Scalars['ID']['output'];
   course_session_id: Scalars['ID']['output'];
+  course_session_title?: Maybe<Scalars['String']['output']>;
   deadline: Scalars['DateTime']['output'];
   details_url: Scalars['String']['output'];
   generation: Scalars['String']['output'];
   learning_content_id: Scalars['ID']['output'];
   metrics: AssignmentCompletionMetricsType;
+  region: Scalars['String']['output'];
 };
 
 export type AssignmentStatisticsSummaryType = {
@@ -323,6 +325,7 @@ export type CompetenceRecordStatisticsType = {
   details_url: Scalars['String']['output'];
   fail_count: Scalars['Int']['output'];
   generation: Scalars['String']['output'];
+  region: Scalars['String']['output'];
   success_count: Scalars['Int']['output'];
   title: Scalars['String']['output'];
 };
@@ -541,6 +544,7 @@ export type FeedbackStatisticsRecordType = {
   details_url: Scalars['String']['output'];
   experts: Scalars['String']['output'];
   generation: Scalars['String']['output'];
+  region: Scalars['String']['output'];
   satisfaction_average: Scalars['Float']['output'];
   satisfaction_max: Scalars['Int']['output'];
 };
@@ -906,6 +910,7 @@ export type PresenceRecordStatisticsType = {
   generation: Scalars['String']['output'];
   participants_present: Scalars['Int']['output'];
   participants_total: Scalars['Int']['output'];
+  region: Scalars['String']['output'];
 };
 
 export type ProgressDashboardAssignmentType = {
@@ -1039,6 +1044,7 @@ export type StatisticsCourseSessionDataType = {
   __typename?: 'StatisticsCourseSessionDataType';
   id: Scalars['ID']['output'];
   name: Scalars['String']['output'];
+  region: Scalars['String']['output'];
 };
 
 export type StatisticsCourseSessionPropertiesType = {
@@ -1330,7 +1336,7 @@ export type CourseStatisticsQueryVariables = Exact<{
 }>;
 
 
-export type CourseStatisticsQuery = { __typename?: 'Query', course_statistics?: { __typename?: 'CourseStatisticsType', _id: string, course_id: string, course_title: string, course_slug: string, course_session_selection_ids: Array<string | null>, course_session_properties: { __typename?: 'StatisticsCourseSessionPropertiesType', _id: string, generations: Array<string>, sessions: Array<{ __typename?: 'StatisticsCourseSessionDataType', id: string, name: string }>, circles: Array<{ __typename?: 'StatisticsCircleDataType', id: string, name: string }> }, course_session_selection_metrics: { __typename?: 'StatisticsCourseSessionsSelectionMetricType', _id: string, session_count: number, participant_count: number, expert_count: number }, attendance_day_presences: { __typename?: 'AttendanceDayPresencesStatisticsType', _id: string, records: Array<{ __typename?: 'PresenceRecordStatisticsType', _id: string, course_session_id: string, generation: string, circle_id: string, due_date: string, participants_present: number, participants_total: number, details_url: string }>, summary: { __typename?: 'AttendanceSummaryStatisticsType', _id: string, days_completed: number, participants_present: number } }, feedback_responses: { __typename?: 'FeedbackStatisticsResponsesType', _id: string, records: Array<{ __typename?: 'FeedbackStatisticsRecordType', _id: string, course_session_id: string, generation: string, circle_id: string, experts: string, satisfaction_average: number, satisfaction_max: number, details_url: string }>, summary: { __typename?: 'FeedbackStatisticsSummaryType', _id: string, satisfaction_average: number, satisfaction_max: number, total_responses: number } }, assignments: { __typename?: 'AssignmentsStatisticsType', _id: string, summary: { __typename?: 'AssignmentStatisticsSummaryType', _id: string, completed_count: number, average_passed: number, total_passed: number, total_failed: number }, records: Array<{ __typename?: 'AssignmentStatisticsRecordType', _id: string, course_session_id: string, course_session_assignment_id: string, circle_id: string, generation: string, assignment_title: string, assignment_type_translation_key: string, competence_certificate_title?: string | null, competence_certificate_id?: string | null, details_url: string, deadline: string, metrics: { __typename?: 'AssignmentCompletionMetricsType', _id: string, passed_count: number, failed_count: number, unranked_count: number, ranking_completed: boolean, average_evaluation_percent?: number | null, average_passed: number, competence_certificate_weight?: number | null } }> }, competences: { __typename?: 'CompetencesStatisticsType', _id: string, summary: { __typename?: 'CompetencePerformanceStatisticsSummaryType', _id: string, success_total: number, fail_total: number }, records: Array<{ __typename?: 'CompetenceRecordStatisticsType', _id: string, course_session_id: string, generation: string, circle_id: string, title: string, success_count: number, fail_count: number, details_url: string }> } } | null };
+export type CourseStatisticsQuery = { __typename?: 'Query', course_statistics?: { __typename?: 'CourseStatisticsType', _id: string, course_id: string, course_title: string, course_slug: string, course_session_selection_ids: Array<string | null>, course_session_properties: { __typename?: 'StatisticsCourseSessionPropertiesType', _id: string, generations: Array<string>, sessions: Array<{ __typename?: 'StatisticsCourseSessionDataType', id: string, name: string, region: string }>, circles: Array<{ __typename?: 'StatisticsCircleDataType', id: string, name: string }> }, course_session_selection_metrics: { __typename?: 'StatisticsCourseSessionsSelectionMetricType', _id: string, session_count: number, participant_count: number, expert_count: number }, attendance_day_presences: { __typename?: 'AttendanceDayPresencesStatisticsType', _id: string, records: Array<{ __typename?: 'PresenceRecordStatisticsType', _id: string, course_session_id: string, generation: string, region: string, circle_id: string, due_date: string, participants_present: number, participants_total: number, details_url: string }>, summary: { __typename?: 'AttendanceSummaryStatisticsType', _id: string, days_completed: number, participants_present: number } }, feedback_responses: { __typename?: 'FeedbackStatisticsResponsesType', _id: string, records: Array<{ __typename?: 'FeedbackStatisticsRecordType', _id: string, course_session_id: string, generation: string, region: string, circle_id: string, experts: string, satisfaction_average: number, satisfaction_max: number, details_url: string }>, summary: { __typename?: 'FeedbackStatisticsSummaryType', _id: string, satisfaction_average: number, satisfaction_max: number, total_responses: number } }, assignments: { __typename?: 'AssignmentsStatisticsType', _id: string, summary: { __typename?: 'AssignmentStatisticsSummaryType', _id: string, completed_count: number, average_passed: number, total_passed: number, total_failed: number }, records: Array<{ __typename?: 'AssignmentStatisticsRecordType', _id: string, course_session_id: string, course_session_assignment_id: string, circle_id: string, generation: string, region: string, assignment_title: string, assignment_type_translation_key: string, competence_certificate_title?: string | null, competence_certificate_id?: string | null, details_url: string, deadline: string, metrics: { __typename?: 'AssignmentCompletionMetricsType', _id: string, passed_count: number, failed_count: number, unranked_count: number, ranking_completed: boolean, average_evaluation_percent?: number | null, average_passed: number, competence_certificate_weight?: number | null } }> }, competences: { __typename?: 'CompetencesStatisticsType', _id: string, summary: { __typename?: 'CompetencePerformanceStatisticsSummaryType', _id: string, success_total: number, fail_total: number }, records: Array<{ __typename?: 'CompetenceRecordStatisticsType', _id: string, course_session_id: string, generation: string, region: string, circle_id: string, title: string, success_count: number, fail_count: number, details_url: string }> } } | null };
 
 export type MentorCourseStatisticsQueryVariables = Exact<{
   courseId: Scalars['ID']['input'];
@@ -1338,7 +1344,7 @@ export type MentorCourseStatisticsQueryVariables = Exact<{
 }>;
 
 
-export type MentorCourseStatisticsQuery = { __typename?: 'Query', mentor_course_statistics?: { __typename?: 'BaseStatisticsType', _id: string, course_id: string, course_title: string, course_slug: string, course_session_selection_ids: Array<string | null>, user_selection_ids?: Array<string | null> | null, course_session_properties: { __typename?: 'StatisticsCourseSessionPropertiesType', _id: string, generations: Array<string>, sessions: Array<{ __typename?: 'StatisticsCourseSessionDataType', id: string, name: string }>, circles: Array<{ __typename?: 'StatisticsCircleDataType', id: string, name: string }> }, assignments: { __typename?: 'AssignmentsStatisticsType', _id: string, summary: { __typename?: 'AssignmentStatisticsSummaryType', _id: string, completed_count: number, average_passed: number, total_passed: number, total_failed: number }, records: Array<{ __typename?: 'AssignmentStatisticsRecordType', _id: string, course_session_id: string, course_session_assignment_id: string, circle_id: string, generation: string, assignment_title: string, assignment_type_translation_key: string, competence_certificate_id?: string | null, competence_certificate_title?: string | null, details_url: string, learning_content_id: string, deadline: string, metrics: { __typename?: 'AssignmentCompletionMetricsType', _id: string, passed_count: number, failed_count: number, unranked_count: number, ranking_completed: boolean, competence_certificate_weight?: number | null, average_evaluation_percent?: number | null, average_passed: number } }> } } | null };
+export type MentorCourseStatisticsQuery = { __typename?: 'Query', mentor_course_statistics?: { __typename?: 'BaseStatisticsType', _id: string, course_id: string, course_title: string, course_slug: string, course_session_selection_ids: Array<string | null>, user_selection_ids?: Array<string | null> | null, course_session_properties: { __typename?: 'StatisticsCourseSessionPropertiesType', _id: string, generations: Array<string>, sessions: Array<{ __typename?: 'StatisticsCourseSessionDataType', id: string, name: string, region: string }>, circles: Array<{ __typename?: 'StatisticsCircleDataType', id: string, name: string }> }, assignments: { __typename?: 'AssignmentsStatisticsType', _id: string, summary: { __typename?: 'AssignmentStatisticsSummaryType', _id: string, completed_count: number, average_passed: number, total_passed: number, total_failed: number }, records: Array<{ __typename?: 'AssignmentStatisticsRecordType', _id: string, course_session_id: string, course_session_assignment_id: string, course_session_title?: string | null, circle_id: string, generation: string, region: string, assignment_title: string, assignment_type_translation_key: string, competence_certificate_id?: string | null, competence_certificate_title?: string | null, details_url: string, learning_content_id: string, deadline: string, metrics: { __typename?: 'AssignmentCompletionMetricsType', _id: string, passed_count: number, failed_count: number, unranked_count: number, ranking_completed: boolean, competence_certificate_weight?: number | null, average_evaluation_percent?: number | null, average_passed: number } }> } } | null };
 
 export type SendFeedbackMutationMutationVariables = Exact<{
   courseSessionId: Scalars['ID']['input'];
@@ -1362,6 +1368,6 @@ export const CourseQueryDocument = {"kind":"Document","definitions":[{"kind":"Op
 export const DashboardConfigDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"dashboardConfig"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"dashboard_config"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"dashboard_type"}},{"kind":"Field","name":{"kind":"Name","value":"course_configuration"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"enable_circle_documents"}},{"kind":"Field","name":{"kind":"Name","value":"enable_learning_mentor"}},{"kind":"Field","name":{"kind":"Name","value":"enable_competence_certificates"}},{"kind":"Field","name":{"kind":"Name","value":"is_uk"}}]}}]}}]}}]} as unknown as DocumentNode<DashboardConfigQuery, DashboardConfigQueryVariables>;
 export const DashboardProgressDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"dashboardProgress"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course_progress"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_id"}},{"kind":"Field","name":{"kind":"Name","value":"session_to_continue_id"}},{"kind":"Field","name":{"kind":"Name","value":"competence"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"total_count"}},{"kind":"Field","name":{"kind":"Name","value":"success_count"}},{"kind":"Field","name":{"kind":"Name","value":"fail_count"}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignment"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"total_count"}},{"kind":"Field","name":{"kind":"Name","value":"points_max_count"}},{"kind":"Field","name":{"kind":"Name","value":"points_achieved_count"}}]}}]}}]}}]} as unknown as DocumentNode<DashboardProgressQuery, DashboardProgressQueryVariables>;
 export const DashboardCourseDataDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"dashboardCourseData"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course_progress"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_id"}},{"kind":"Field","name":{"kind":"Name","value":"session_to_continue_id"}}]}}]}}]} as unknown as DocumentNode<DashboardCourseDataQuery, DashboardCourseDataQueryVariables>;
-export const CourseStatisticsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"courseStatistics"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course_statistics"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_title"}},{"kind":"Field","name":{"kind":"Name","value":"course_slug"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_properties"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"sessions"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"generations"}},{"kind":"Field","name":{"kind":"Name","value":"circles"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"course_session_selection_ids"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_selection_metrics"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"session_count"}},{"kind":"Field","name":{"kind":"Name","value":"participant_count"}},{"kind":"Field","name":{"kind":"Name","value":"expert_count"}}]}},{"kind":"Field","name":{"kind":"Name","value":"attendance_day_presences"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"due_date"}},{"kind":"Field","name":{"kind":"Name","value":"participants_present"}},{"kind":"Field","name":{"kind":"Name","value":"participants_total"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}}]}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"days_completed"}},{"kind":"Field","name":{"kind":"Name","value":"participants_present"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"feedback_responses"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"experts"}},{"kind":"Field","name":{"kind":"Name","value":"satisfaction_average"}},{"kind":"Field","name":{"kind":"Name","value":"satisfaction_max"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}}]}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"satisfaction_average"}},{"kind":"Field","name":{"kind":"Name","value":"satisfaction_max"}},{"kind":"Field","name":{"kind":"Name","value":"total_responses"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignments"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"completed_count"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_failed"}}]}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_assignment_id"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_title"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type_translation_key"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_title"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_id"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}},{"kind":"Field","name":{"kind":"Name","value":"deadline"}},{"kind":"Field","name":{"kind":"Name","value":"metrics"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"passed_count"}},{"kind":"Field","name":{"kind":"Name","value":"failed_count"}},{"kind":"Field","name":{"kind":"Name","value":"unranked_count"}},{"kind":"Field","name":{"kind":"Name","value":"ranking_completed"}},{"kind":"Field","name":{"kind":"Name","value":"average_evaluation_percent"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_weight"}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"competences"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"success_total"}},{"kind":"Field","name":{"kind":"Name","value":"fail_total"}}]}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"success_count"}},{"kind":"Field","name":{"kind":"Name","value":"fail_count"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}}]}}]}}]}}]}}]} as unknown as DocumentNode<CourseStatisticsQuery, CourseStatisticsQueryVariables>;
-export const MentorCourseStatisticsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"mentorCourseStatistics"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"agentRole"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"mentor_course_statistics"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}},{"kind":"Argument","name":{"kind":"Name","value":"agent_role"},"value":{"kind":"Variable","name":{"kind":"Name","value":"agentRole"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_title"}},{"kind":"Field","name":{"kind":"Name","value":"course_slug"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_selection_ids"}},{"kind":"Field","name":{"kind":"Name","value":"user_selection_ids"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_properties"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"sessions"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"generations"}},{"kind":"Field","name":{"kind":"Name","value":"circles"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignments"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"completed_count"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_failed"}}]}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_assignment_id"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_title"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type_translation_key"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_id"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_title"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}},{"kind":"Field","name":{"kind":"Name","value":"learning_content_id"}},{"kind":"Field","name":{"kind":"Name","value":"deadline"}},{"kind":"Field","name":{"kind":"Name","value":"metrics"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"passed_count"}},{"kind":"Field","name":{"kind":"Name","value":"failed_count"}},{"kind":"Field","name":{"kind":"Name","value":"unranked_count"}},{"kind":"Field","name":{"kind":"Name","value":"ranking_completed"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_weight"}},{"kind":"Field","name":{"kind":"Name","value":"average_evaluation_percent"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}}]}}]}}]}}]}}]}}]} as unknown as DocumentNode<MentorCourseStatisticsQuery, MentorCourseStatisticsQueryVariables>;
+export const CourseStatisticsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"courseStatistics"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course_statistics"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_title"}},{"kind":"Field","name":{"kind":"Name","value":"course_slug"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_properties"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"sessions"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"region"}}]}},{"kind":"Field","name":{"kind":"Name","value":"generations"}},{"kind":"Field","name":{"kind":"Name","value":"circles"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"course_session_selection_ids"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_selection_metrics"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"session_count"}},{"kind":"Field","name":{"kind":"Name","value":"participant_count"}},{"kind":"Field","name":{"kind":"Name","value":"expert_count"}}]}},{"kind":"Field","name":{"kind":"Name","value":"attendance_day_presences"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"region"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"due_date"}},{"kind":"Field","name":{"kind":"Name","value":"participants_present"}},{"kind":"Field","name":{"kind":"Name","value":"participants_total"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}}]}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"days_completed"}},{"kind":"Field","name":{"kind":"Name","value":"participants_present"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"feedback_responses"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"region"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"experts"}},{"kind":"Field","name":{"kind":"Name","value":"satisfaction_average"}},{"kind":"Field","name":{"kind":"Name","value":"satisfaction_max"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}}]}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"satisfaction_average"}},{"kind":"Field","name":{"kind":"Name","value":"satisfaction_max"}},{"kind":"Field","name":{"kind":"Name","value":"total_responses"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignments"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"completed_count"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_failed"}}]}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_assignment_id"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"region"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_title"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type_translation_key"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_title"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_id"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}},{"kind":"Field","name":{"kind":"Name","value":"deadline"}},{"kind":"Field","name":{"kind":"Name","value":"metrics"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"passed_count"}},{"kind":"Field","name":{"kind":"Name","value":"failed_count"}},{"kind":"Field","name":{"kind":"Name","value":"unranked_count"}},{"kind":"Field","name":{"kind":"Name","value":"ranking_completed"}},{"kind":"Field","name":{"kind":"Name","value":"average_evaluation_percent"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_weight"}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"competences"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"success_total"}},{"kind":"Field","name":{"kind":"Name","value":"fail_total"}}]}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"region"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"success_count"}},{"kind":"Field","name":{"kind":"Name","value":"fail_count"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}}]}}]}}]}}]}}]} as unknown as DocumentNode<CourseStatisticsQuery, CourseStatisticsQueryVariables>;
+export const MentorCourseStatisticsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"mentorCourseStatistics"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"agentRole"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"mentor_course_statistics"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}},{"kind":"Argument","name":{"kind":"Name","value":"agent_role"},"value":{"kind":"Variable","name":{"kind":"Name","value":"agentRole"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_title"}},{"kind":"Field","name":{"kind":"Name","value":"course_slug"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_selection_ids"}},{"kind":"Field","name":{"kind":"Name","value":"user_selection_ids"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_properties"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"sessions"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"region"}}]}},{"kind":"Field","name":{"kind":"Name","value":"generations"}},{"kind":"Field","name":{"kind":"Name","value":"circles"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignments"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"completed_count"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_failed"}}]}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_assignment_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_title"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"region"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_title"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type_translation_key"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_id"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_title"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}},{"kind":"Field","name":{"kind":"Name","value":"learning_content_id"}},{"kind":"Field","name":{"kind":"Name","value":"deadline"}},{"kind":"Field","name":{"kind":"Name","value":"metrics"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"passed_count"}},{"kind":"Field","name":{"kind":"Name","value":"failed_count"}},{"kind":"Field","name":{"kind":"Name","value":"unranked_count"}},{"kind":"Field","name":{"kind":"Name","value":"ranking_completed"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_weight"}},{"kind":"Field","name":{"kind":"Name","value":"average_evaluation_percent"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}}]}}]}}]}}]}}]}}]} as unknown as DocumentNode<MentorCourseStatisticsQuery, MentorCourseStatisticsQueryVariables>;
 export const SendFeedbackMutationDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"SendFeedbackMutation"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"learningContentId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"learningContentType"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"data"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"GenericScalar"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"submitted"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Boolean"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"send_feedback"},"arguments":[{"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":"learning_content_type"},"value":{"kind":"Variable","name":{"kind":"Name","value":"learningContentType"}}},{"kind":"Argument","name":{"kind":"Name","value":"data"},"value":{"kind":"Variable","name":{"kind":"Name","value":"data"}}},{"kind":"Argument","name":{"kind":"Name","value":"submitted"},"value":{"kind":"Variable","name":{"kind":"Name","value":"submitted"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"feedback_response"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"data"}},{"kind":"Field","name":{"kind":"Name","value":"submitted"}}]}},{"kind":"Field","name":{"kind":"Name","value":"errors"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"field"}},{"kind":"Field","name":{"kind":"Name","value":"messages"}}]}}]}}]}}]} as unknown as DocumentNode<SendFeedbackMutationMutation, SendFeedbackMutationMutationVariables>;
\ No newline at end of file
diff --git a/client/src/gql/schema.graphql b/client/src/gql/schema.graphql
index a26bfff3..7bbcbd1d 100644
--- a/client/src/gql/schema.graphql
+++ b/client/src/gql/schema.graphql
@@ -52,9 +52,11 @@ type AssignmentStatisticsRecordType {
   course_session_assignment_id: ID!
   circle_id: ID!
   generation: String!
+  region: String!
   assignment_type_translation_key: String!
   assignment_title: String!
   deadline: DateTime!
+  course_session_title: String
   competence_certificate_id: ID
   competence_certificate_title: String
   metrics: AssignmentCompletionMetricsType!
@@ -98,6 +100,7 @@ type StatisticsCourseSessionPropertiesType {
 type StatisticsCourseSessionDataType {
   id: ID!
   name: String!
+  region: String!
 }
 
 type StatisticsCircleDataType {
@@ -122,6 +125,7 @@ type PresenceRecordStatisticsType {
   _id: ID!
   course_session_id: ID!
   generation: String!
+  region: String!
   circle_id: ID!
   due_date: DateTime!
   participants_present: Int!
@@ -145,6 +149,7 @@ type FeedbackStatisticsRecordType {
   _id: ID!
   course_session_id: ID!
   generation: String!
+  region: String!
   circle_id: ID!
   satisfaction_average: Float!
   satisfaction_max: Int!
@@ -175,6 +180,7 @@ type CompetenceRecordStatisticsType {
   _id: ID!
   course_session_id: ID!
   generation: String!
+  region: String!
   title: String!
   circle_id: ID!
   success_count: Int!
diff --git a/client/src/graphql/queries.ts b/client/src/graphql/queries.ts
index 30eb11ee..4c762d20 100644
--- a/client/src/graphql/queries.ts
+++ b/client/src/graphql/queries.ts
@@ -370,6 +370,7 @@ export const DASHBOARD_COURSE_STATISTICS = graphql(`
         sessions {
           id
           name
+          region
         }
         generations
         circles {
@@ -390,6 +391,7 @@ export const DASHBOARD_COURSE_STATISTICS = graphql(`
           _id
           course_session_id
           generation
+          region
           circle_id
           due_date
           participants_present
@@ -408,6 +410,7 @@ export const DASHBOARD_COURSE_STATISTICS = graphql(`
           _id
           course_session_id
           generation
+          region
           circle_id
           experts
           satisfaction_average
@@ -436,6 +439,7 @@ export const DASHBOARD_COURSE_STATISTICS = graphql(`
           course_session_assignment_id
           circle_id
           generation
+          region
           assignment_title
           assignment_type_translation_key
           competence_certificate_title
@@ -465,6 +469,7 @@ export const DASHBOARD_COURSE_STATISTICS = graphql(`
           _id
           course_session_id
           generation
+          region
           circle_id
           title
           success_count
@@ -490,6 +495,7 @@ export const DASHBOARD_MENTOR_COMPETENCE_SUMMARY = graphql(`
         sessions {
           id
           name
+          region
         }
         generations
         circles {
@@ -510,8 +516,10 @@ export const DASHBOARD_MENTOR_COMPETENCE_SUMMARY = graphql(`
           _id
           course_session_id
           course_session_assignment_id
+          course_session_title
           circle_id
           generation
+          region
           assignment_title
           assignment_type_translation_key
           competence_certificate_id
diff --git a/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradePage.vue b/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradePage.vue
index 7e26558e..99e8e8da 100644
--- a/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradePage.vue
+++ b/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradePage.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import log from "loglevel";
-import { computed, onMounted, ref } from "vue";
+import { computed, onMounted, type Ref, ref } from "vue";
 import {
   courseIdForCourseSlug,
   fetchMentorCompetenceSummary,
@@ -10,6 +10,8 @@ import { useDashboardStore } from "@/stores/dashboard";
 import LoadingSpinner from "@/components/ui/LoadingSpinner.vue";
 import _ from "lodash";
 import { percentToRoundedGrade } from "@/services/assignmentService";
+import StatisticFilterList from "@/components/dashboard/StatisticFilterList.vue";
+import type { StatisticsFilterItem } from "@/types";
 
 const dashboardStore = useDashboardStore();
 
@@ -32,6 +34,22 @@ const courseSessionName = (courseSessionId: string) => {
   );
 };
 
+const statisticFilter: Ref<typeof StatisticFilterList | null> = ref(null);
+const filteredItems = computed(() => {
+  if (!statisticFilter.value) {
+    return [];
+  }
+  return statisticFilter.value.getFilteredItems();
+});
+const totalAverageGrade = computed(() => {
+  return percentToRoundedGrade(
+    _.sumBy(filteredItems.value, (i) => {
+      return (i as GroupedAssignmentEntry).averageEvaluationPercent ?? 0;
+    }) / filteredItems.value.length,
+    false
+  );
+});
+
 onMounted(async () => {
   await dashboardStore.loadDashboardDetails();
   courseId.value = courseIdForCourseSlug(
@@ -53,26 +71,31 @@ onMounted(async () => {
   loading.value = false;
 });
 
-type GroupedAssignments = {
+interface GroupedAssignmentEntry extends StatisticsFilterItem {
   competenceCertificateId: string;
   competenceCertificateTitle: string;
-  generation: string;
-  courseSessionId: string;
+  course_session_title: string;
   assignments: AssignmentStatisticsRecordType[];
   sumAverageEvaluationPercent: number;
   averageEvaluationPercent: number | null;
   averageGrade: number | null;
-};
+}
+
+function isGroupedAssignmentEntry(
+  item: StatisticsFilterItem
+): item is GroupedAssignmentEntry {
+  return (item as GroupedAssignmentEntry).competenceCertificateId !== undefined;
+}
 
 const courseSessionCompetenceAssignments = computed(() => {
-  let resultArray = [] as GroupedAssignments[];
+  let resultArray = [] as GroupedAssignmentEntry[];
 
   // group assignments by competence and course session
   for (const assignment of agentAssignmentData.value?.assignments.records ?? []) {
     const entry = resultArray.find(
       (r) =>
         r.competenceCertificateId === assignment.competence_certificate_id &&
-        r.courseSessionId === assignment.course_session_id
+        r.course_session_id === assignment.course_session_id
     );
     if (entry) {
       if (assignment.metrics.ranking_completed) {
@@ -80,14 +103,18 @@ const courseSessionCompetenceAssignments = computed(() => {
       }
     } else {
       const newEntry = {
+        _id: `${assignment.competence_certificate_id}-${assignment.course_session_id}`,
         competenceCertificateId: assignment.competence_certificate_id ?? "",
         competenceCertificateTitle: assignment.competence_certificate_title ?? "",
         generation: assignment.generation ?? "",
-        courseSessionId: assignment.course_session_id ?? "",
+        region: assignment.region ?? "",
+        course_session_id: assignment.course_session_id ?? "",
+        course_session_title: assignment.course_session_title ?? "",
         assignments: [] as AssignmentStatisticsRecordType[],
         sumAverageEvaluationPercent: 0,
         averageEvaluationPercent: null,
         averageGrade: null,
+        circle_id: assignment.circle_id ?? "",
       };
       if (assignment && assignment.metrics.ranking_completed) {
         newEntry.assignments.push(assignment);
@@ -114,7 +141,11 @@ const courseSessionCompetenceAssignments = computed(() => {
       });
     entry.averageGrade = percentToRoundedGrade(entry.averageEvaluationPercent, false);
   }
-  return resultArray;
+  return _.orderBy(
+    resultArray,
+    ["course_session_title", "competenceCertificateTitle"],
+    ["asc", "asc"]
+  );
 });
 </script>
 
@@ -129,48 +160,61 @@ const courseSessionCompetenceAssignments = computed(() => {
         <span>{{ $t("general.back") }}</span>
       </router-link>
       <div>
-        <h2>{{ $t("a.Kompetenznachweise") }}</h2>
+        <h2 class="mb-8">{{ $t("a.Kompetenznachweise") }}</h2>
 
-        <div class="bg-white px-4 py-2">
-          <section
-            class="flex flex-col space-x-0 border-b bg-white lg:flex-row lg:space-x-3"
-          ></section>
-          <div
-            v-for="entry in courseSessionCompetenceAssignments"
-            :key="entry.courseSessionId"
-            :data-cy="`entry-${entry.courseSessionId}`"
-            class="flex flex-col justify-between gap-4 border-b p-2 last:border-b-0 md:flex-row md:items-center md:justify-between md:gap-16"
+        <div class="bg-white py-2">
+          <StatisticFilterList
+            v-if="
+              agentAssignmentData?.course_session_properties &&
+              courseSessionCompetenceAssignments?.length
+            "
+            ref="statisticFilter"
+            :course-session-properties="agentAssignmentData?.course_session_properties"
+            :items="courseSessionCompetenceAssignments"
+            :hide-circle-filter="true"
           >
-            <div class="w-full flex-auto md:w-1/2">
-              {{ entry.competenceCertificateTitle }}
-              <br />
-              {{ $t("a.Durchführung") }} «{{
-                courseSessionName(entry.courseSessionId)
-              }}»
-            </div>
-
-            <div class="flex flex-auto items-center gap-2 md:w-1/4">
-              <div>{{ $t("a.Durchschnittsnote") }}:</div>
-              <div class="min-w-12 text-center">
-                <div
-                  class="rounded px-2 py-1 font-bold"
-                  :class="{ 'bg-red-400': (entry.averageGrade ?? 4) < 4 }"
-                >
-                  {{ entry.averageGrade }}
+            <template #header>
+              <div class="heading-3 border-b px-6 py-4">
+                {{ $t("a.Durchschnittsnote") }}: {{ totalAverageGrade }}
+              </div>
+            </template>
+            <template #default="{ item: item }">
+              <div
+                v-if="isGroupedAssignmentEntry(item)"
+                class="flex flex-col justify-between gap-4 border-b last:border-b-0 md:flex-row md:items-center md:justify-between md:gap-16"
+              >
+                <div class="w-full flex-auto md:w-1/2">
+                  <span class="text-bold">
+                    {{ item.competenceCertificateTitle }}
+                  </span>
+                  <br />
+                  {{ $t("a.Durchführung") }} «{{
+                    courseSessionName(item.course_session_id)
+                  }}»
+                </div>
+                <div class="flex flex-auto items-center gap-2 md:w-1/4">
+                  <div>{{ $t("a.Durchschnittsnote") }}:</div>
+                  <div class="min-w-12 text-center">
+                    <div
+                      class="rounded px-2 py-1 font-bold"
+                      :class="{ 'bg-red-400': (item.averageGrade ?? 4) < 4 }"
+                    >
+                      {{ item.averageGrade }}
+                    </div>
+                  </div>
+                </div>
+                <div class="w-full flex-auto items-end md:w-1/4 md:text-end">
+                  <router-link
+                    class="underline"
+                    :to="`/statistic/${props.agentRole}/${props.courseSlug}/competence-grade/${item.course_session_id}/${item.competenceCertificateId}`"
+                    data-cy="basebox.detailsLink"
+                  >
+                    {{ $t("a.Details anschauen") }}
+                  </router-link>
                 </div>
               </div>
-            </div>
-
-            <div class="w-full flex-auto items-end md:w-1/4 md:text-end">
-              <router-link
-                class="underline"
-                :to="`/statistic/${props.agentRole}/${props.courseSlug}/competence-grade/${entry.courseSessionId}/${entry.competenceCertificateId}`"
-                data-cy="basebox.detailsLink"
-              >
-                {{ $t("a.Details anschauen") }}
-              </router-link>
-            </div>
-          </div>
+            </template>
+          </StatisticFilterList>
         </div>
       </div>
     </div>
diff --git a/client/src/types.ts b/client/src/types.ts
index b39feaa2..7dec9dc2 100644
--- a/client/src/types.ts
+++ b/client/src/types.ts
@@ -623,6 +623,7 @@ export type DashboardPersonsPageMode = "default" | "competenceMetrics";
 export interface StatisticsFilterItem {
   _id: string;
   course_session_id: string;
+  region: string;
   generation: string;
   circle_id: string;
 }
diff --git a/server/vbv_lernwelt/dashboard/graphql/types/assignment.py b/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
index 5ddd00c9..f474e5d5 100644
--- a/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
+++ b/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
@@ -36,9 +36,11 @@ class AssignmentStatisticsRecordType(graphene.ObjectType):
     course_session_assignment_id = graphene.ID(required=True)
     circle_id = graphene.ID(required=True)
     generation = graphene.String(required=True)
+    region = graphene.String(required=True)
     assignment_type_translation_key = graphene.String(required=True)
     assignment_title = graphene.String(required=True)
     deadline = graphene.DateTime(required=True)
+    course_session_title = graphene.String()
     competence_certificate_id = graphene.ID()
     competence_certificate_title = graphene.String()
     metrics = graphene.Field(AssignmentCompletionMetricsType, required=True)
@@ -171,9 +173,11 @@ def create_record(
         # make sure it's unique, across all types of assignments!
         _id=f"{course_session_assignment._meta.model_name}#{course_session_assignment.id}@{urql_id_postfix}",  # noqa
         course_session_id=str(course_session_assignment.course_session.id),  # noqa
+        course_session_title=course_session_assignment.course_session.title,  # noqa
         circle_id=learning_content.get_circle().id,  # noqa
         course_session_assignment_id=str(course_session_assignment.id),  # noqa
         generation=course_session_assignment.course_session.generation,  # noqa
+        region=course_session_assignment.course_session.region,  # noqa
         assignment_type_translation_key=due_date.assignment_type_translation_key,  # noqa
         competence_certificate_id=str(competence_certificate.id),  # noqa
         competence_certificate_title=competence_certificate.title,  # noqa
diff --git a/server/vbv_lernwelt/dashboard/graphql/types/attendance.py b/server/vbv_lernwelt/dashboard/graphql/types/attendance.py
index ef9ee28e..4c1a3b23 100644
--- a/server/vbv_lernwelt/dashboard/graphql/types/attendance.py
+++ b/server/vbv_lernwelt/dashboard/graphql/types/attendance.py
@@ -19,6 +19,7 @@ class PresenceRecordStatisticsType(graphene.ObjectType):
     _id = graphene.ID(required=True)
     course_session_id = graphene.ID(required=True)
     generation = graphene.String(required=True)
+    region = graphene.String(required=True)
     circle_id = graphene.ID(required=True)
     due_date = graphene.DateTime(required=True)
     participants_present = graphene.Int(required=True)
@@ -83,6 +84,7 @@ def attendance_day_presences(
                 _id=f"{urql_id}:attendance_day:{attendance_day.id}",  # noqa
                 course_session_id=course_session.id,  # noqa
                 generation=course_session.generation,  # noqa
+                region=course_session.region,  # noqa
                 circle_id=circle.id,  # noqa
                 due_date=attendance_day.due_date.end,  # noqa
                 participants_present=participants_present,  # noqa
@@ -98,7 +100,9 @@ def attendance_day_presences(
     )
 
     return AttendanceDayPresencesStatisticsType(
-        summary=summary, records=records, _id=course_id  # noqa
+        summary=summary,
+        records=records,
+        _id=course_id,  # noqa
     )
 
 
diff --git a/server/vbv_lernwelt/dashboard/graphql/types/competence.py b/server/vbv_lernwelt/dashboard/graphql/types/competence.py
index 28dbae75..4df3984e 100644
--- a/server/vbv_lernwelt/dashboard/graphql/types/competence.py
+++ b/server/vbv_lernwelt/dashboard/graphql/types/competence.py
@@ -16,6 +16,7 @@ class CompetenceRecordStatisticsType(graphene.ObjectType):
     _id = graphene.ID(required=True)
     course_session_id = graphene.ID(required=True)
     generation = graphene.String(required=True)
+    region = graphene.String(required=True)
     title = graphene.String(required=True)
     circle_id = graphene.ID(required=True)
     success_count = graphene.Int(required=True)
@@ -80,6 +81,7 @@ def competences(
                 title=learning_unit.title,  # noqa
                 course_session_id=completion.course_session.id,  # noqa
                 generation=completion.course_session.generation,  # noqa
+                region=completion.course_session.region,  # noqa
                 circle_id=circle.id,  # noqa
                 success_count=0,  # noqa
                 fail_count=0,  # noqa
diff --git a/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py b/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py
index 8f9845cd..386b185d 100644
--- a/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py
+++ b/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py
@@ -26,6 +26,7 @@ from vbv_lernwelt.learnpath.models import Circle
 class StatisticsCourseSessionDataType(graphene.ObjectType):
     id = graphene.ID(required=True)
     name = graphene.String(required=True)
+    region = graphene.String(required=True)
 
 
 class StatisticsCircleDataType(graphene.ObjectType):
@@ -129,6 +130,7 @@ class BaseStatisticsType(graphene.ObjectType):
                 StatisticsCourseSessionDataType(
                     id=course_session.id,  # noqa
                     name=course_session.title,  # noqa
+                    region=course_session.region,  # noqa
                 )
             )
             generations.add(course_session.generation)
@@ -199,7 +201,8 @@ class CourseStatisticsType(BaseStatisticsType):
         records, success_total, fail_total = competences(
             course_slug=str(root.course_slug),
             course_session_selection_ids=[
-                str(cs) for cs in root.course_session_selection_ids  # noqa
+                str(cs)
+                for cs in root.course_session_selection_ids  # noqa
             ],
             user_selection_ids=user_selection_ids,  # noqa
             circle_ids=root.get_circle_ids(info),  # noqa
diff --git a/server/vbv_lernwelt/dashboard/graphql/types/feedback.py b/server/vbv_lernwelt/dashboard/graphql/types/feedback.py
index b8f3be28..465909bb 100644
--- a/server/vbv_lernwelt/dashboard/graphql/types/feedback.py
+++ b/server/vbv_lernwelt/dashboard/graphql/types/feedback.py
@@ -18,6 +18,7 @@ class FeedbackStatisticsRecordType(graphene.ObjectType):
     _id = graphene.ID(required=True)
     course_session_id = graphene.ID(required=True)
     generation = graphene.String(required=True)
+    region = graphene.String(required=True)
     circle_id = graphene.ID(required=True)
     satisfaction_average = graphene.Float(required=True)
     satisfaction_max = graphene.Int(required=True)
@@ -68,6 +69,7 @@ def feedback_responses(
                 feedbacks=fbs,
                 course_session_id=course_session.id,
                 generation=course_session.generation,
+                region=course_session.region,
                 course_slug=str(course_slug),
                 urql_id_postfix=urql_id,
             )
@@ -96,6 +98,7 @@ def circle_feedback_average(
     feedbacks: List[FeedbackResponse],
     course_session_id,
     generation: str,
+    region: str,
     course_slug: str,
     urql_id_postfix: str = "",
 ):
@@ -128,6 +131,7 @@ def circle_feedback_average(
                 _id=f"circle:{circle_id}-course_session:{course_session_id}@{urql_id_postfix}",  # noqa
                 course_session_id=course_session_id,  # noqa
                 generation=generation,  # noqa
+                region=region,  # noqa
                 circle_id=circle_id,  # noqa
                 satisfaction_average=data["total"] / data["count"],  # noqa
                 satisfaction_max=4,  # noqa

From e41b3222bfe21cfb2d78a8eae156f11b460e92df Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Sat, 27 Jul 2024 15:43:59 +0200
Subject: [PATCH 27/40] Add Grade widget in dashboard

---
 .../dashboard/BerufsbildnerStatistics.vue     | 36 +++++++++++++++++--
 .../src/components/dashboard/CoursePanel.vue  |  9 ++++-
 .../dashboard/StatisticFilterList.vue         |  2 +-
 .../components/header/CoursePreviewBar.vue    |  2 +-
 .../components/header/MainNavigationBar.vue   |  2 +-
 client/src/components/header/MobileMenu.vue   |  2 +-
 client/src/gql/gql.ts                         |  4 +--
 client/src/gql/graphql.ts                     |  5 +--
 client/src/gql/schema.graphql                 |  1 +
 client/src/graphql/queries.ts                 |  1 +
 .../dashboard/graphql/types/assignment.py     |  6 ++++
 .../dashboard/graphql/types/dashboard.py      |  3 +-
 12 files changed, 60 insertions(+), 13 deletions(-)

diff --git a/client/src/components/dashboard/BerufsbildnerStatistics.vue b/client/src/components/dashboard/BerufsbildnerStatistics.vue
index de812067..57255a25 100644
--- a/client/src/components/dashboard/BerufsbildnerStatistics.vue
+++ b/client/src/components/dashboard/BerufsbildnerStatistics.vue
@@ -7,6 +7,8 @@ import {
 import type { BaseStatisticsType } from "@/gql/graphql";
 import LoadingSpinner from "@/components/ui/LoadingSpinner.vue";
 import AssignmentSummaryBox from "@/components/dashboard/AssignmentSummaryBox.vue";
+import BaseBox from "@/components/dashboard/BaseBox.vue";
+import { percentToRoundedGrade } from "@/services/assignmentService";
 
 const props = defineProps<{
   courseSlug: string;
@@ -28,18 +30,48 @@ onMounted(async () => {
   );
   loading.value = false;
 });
+
+const averageGrade = computed(() => {
+  return percentToRoundedGrade(
+    assignmentStats.value?.summary.average_evaluation_percent ?? 0,
+    false
+  );
+});
 </script>
 
 <template>
   <div v-if="loading" class="m-8 flex justify-center">
     <LoadingSpinner />
   </div>
-  <div v-if="assignmentStats" class="space-y-8">
+  <div v-if="assignmentStats" class="w-full space-y-8">
     <div
       class="flex flex-col flex-wrap justify-between gap-x-5 border-b border-gray-300 pb-8 last:border-0 md:flex-row"
     >
+      <div class="flex-1">
+        <BaseBox
+          :details-link="`/statistic/berufsbildner/${props.courseSlug}/competence-grade`"
+          data-cy="dashboard.stats.competenceGrades"
+        >
+          <template #title>{{ $t("a.Kompetenznachweise") }}</template>
+          <template #content>
+            <div class="flex items-center gap-4">
+              <div class="min-w-12 text-center">
+                <div
+                  class="heading-2 rounded bg-green-500 p-4"
+                  :class="{ 'bg-red-400': averageGrade < 4 }"
+                >
+                  {{ averageGrade }}
+                </div>
+              </div>
+              <div>
+                {{ $t("a.Durchschnittsnote") }}
+              </div>
+            </div>
+          </template>
+        </BaseBox>
+      </div>
       <AssignmentSummaryBox
-        class="flex-grow"
+        class="flex-1"
         :assignments-completed="assignmentStats.summary.completed_count"
         :avg-passed="assignmentStats.summary.average_passed"
         :course-slug="props.courseSlug"
diff --git a/client/src/components/dashboard/CoursePanel.vue b/client/src/components/dashboard/CoursePanel.vue
index d97a6d02..4b052c48 100644
--- a/client/src/components/dashboard/CoursePanel.vue
+++ b/client/src/components/dashboard/CoursePanel.vue
@@ -64,6 +64,13 @@ const actionButtonProps = computed<{ href: string; text: string; cyKey: string }
         cyKey: "lm-dashboard-link",
       };
     }
+    if (props.courseConfig?.role_key === "Berufsbildner") {
+      return {
+        href: getLearningPathUrl(props.courseConfig?.course_slug),
+        text: "a.Vorschau Teilnehmer",
+        cyKey: "progress-dashboard-continue-course-link",
+      };
+    }
     return {
       href: getLearningPathUrl(props.courseConfig?.course_slug),
       text: "Weiter lernen",
@@ -107,7 +114,7 @@ function hasActionButton(): boolean {
             target="_blank"
           >
             <div class="flex items-center">
-              <span>{{ $t("a.VorschauTeilnehmer") }}</span>
+              <span>{{ $t("a.Vorschau Teilnehmer") }}</span>
               <it-icon-external-link class="ml-1 !h-4 !w-4" />
             </div>
           </router-link>
diff --git a/client/src/components/dashboard/StatisticFilterList.vue b/client/src/components/dashboard/StatisticFilterList.vue
index d885478f..d0dea178 100644
--- a/client/src/components/dashboard/StatisticFilterList.vue
+++ b/client/src/components/dashboard/StatisticFilterList.vue
@@ -111,7 +111,7 @@ function getFilteredItems() {
 
 <template>
   <div>
-    <div class="flex flex-col space-x-2 lg:flex-row border-b">
+    <div class="flex flex-col space-x-2 border-b lg:flex-row">
       <ItDropdownSelect
         v-if="regionFilter.length > 2"
         v-model="regionFilterValue"
diff --git a/client/src/components/header/CoursePreviewBar.vue b/client/src/components/header/CoursePreviewBar.vue
index c2bf4259..fbdc425f 100644
--- a/client/src/components/header/CoursePreviewBar.vue
+++ b/client/src/components/header/CoursePreviewBar.vue
@@ -18,7 +18,7 @@ const { t } = useTranslation();
           class="relative flex h-16 w-full flex-col items-center justify-end space-x-8 lg:flex-row lg:items-stretch lg:justify-center"
         >
           <span class="flex items-center px-1 pt-1 font-bold text-black">
-            {{ t("a.VorschauTeilnehmer") }} ({{ courseSession.title }})
+            {{ t("a.Vorschau Teilnehmer") }} ({{ courseSession.title }})
           </span>
 
           <div class="flex space-x-8">
diff --git a/client/src/components/header/MainNavigationBar.vue b/client/src/components/header/MainNavigationBar.vue
index 4e7400bd..3c448f60 100644
--- a/client/src/components/header/MainNavigationBar.vue
+++ b/client/src/components/header/MainNavigationBar.vue
@@ -231,7 +231,7 @@ const mentorTabTitle = computed(() =>
                     class="nav-item"
                   >
                     <div class="flex items-center">
-                      <span>{{ t("a.VorschauTeilnehmer") }}</span>
+                      <span>{{ t("a.Vorschau Teilnehmer") }}</span>
                       <it-icon-external-link class="ml-2" />
                     </div>
                   </router-link>
diff --git a/client/src/components/header/MobileMenu.vue b/client/src/components/header/MobileMenu.vue
index efbc7516..24fa9d8c 100644
--- a/client/src/components/header/MobileMenu.vue
+++ b/client/src/components/header/MobileMenu.vue
@@ -86,7 +86,7 @@ const mentorTabTitle = computed(() =>
                   data-cy="navigation-mobile-preview-link"
                   @click="clickLink(getLearningPathUrl(courseSession.course.slug))"
                 >
-                  {{ $t("a.VorschauTeilnehmer") }}
+                  {{ $t("a.Vorschau Teilnehmer") }}
                 </button>
               </li>
               <li v-if="hasLearningPathMenu" class="mb-6">
diff --git a/client/src/gql/gql.ts b/client/src/gql/gql.ts
index 27462e14..2753dc52 100644
--- a/client/src/gql/gql.ts
+++ b/client/src/gql/gql.ts
@@ -25,7 +25,7 @@ const documents = {
     "\n  query dashboardProgress($courseId: ID!) {\n    course_progress(course_id: $courseId) {\n      _id\n      course_id\n      session_to_continue_id\n      competence {\n        _id\n        total_count\n        success_count\n        fail_count\n      }\n      assignment {\n        _id\n        total_count\n        points_max_count\n        points_achieved_count\n      }\n    }\n  }\n": types.DashboardProgressDocument,
     "\n  query dashboardCourseData($courseId: ID!) {\n    course_progress(course_id: $courseId) {\n      _id\n      course_id\n      session_to_continue_id\n    }\n  }\n": types.DashboardCourseDataDocument,
     "\n  query courseStatistics($courseId: ID!) {\n    course_statistics(course_id: $courseId) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n          region\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      course_session_selection_ids\n      course_session_selection_metrics {\n        _id\n        session_count\n        participant_count\n        expert_count\n      }\n      attendance_day_presences {\n        _id\n        records {\n          _id\n          course_session_id\n          generation\n          region\n          circle_id\n          due_date\n          participants_present\n          participants_total\n          details_url\n        }\n        summary {\n          _id\n          days_completed\n          participants_present\n        }\n      }\n      feedback_responses {\n        _id\n        records {\n          _id\n          course_session_id\n          generation\n          region\n          circle_id\n          experts\n          satisfaction_average\n          satisfaction_max\n          details_url\n        }\n        summary {\n          _id\n          satisfaction_average\n          satisfaction_max\n          total_responses\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          circle_id\n          generation\n          region\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_title\n          competence_certificate_id\n          details_url\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            average_evaluation_percent\n            average_passed\n            competence_certificate_weight\n          }\n        }\n      }\n      competences {\n        _id\n        summary {\n          _id\n          success_total\n          fail_total\n        }\n        records {\n          _id\n          course_session_id\n          generation\n          region\n          circle_id\n          title\n          success_count\n          fail_count\n          details_url\n        }\n      }\n    }\n  }\n": types.CourseStatisticsDocument,
-    "\n  query mentorCourseStatistics($courseId: ID!, $agentRole: String!) {\n    mentor_course_statistics(course_id: $courseId, agent_role: $agentRole) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_selection_ids\n      user_selection_ids\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n          region\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          course_session_title\n          circle_id\n          generation\n          region\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_id\n          competence_certificate_title\n          details_url\n          learning_content_id\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            competence_certificate_weight\n            average_evaluation_percent\n            average_passed\n          }\n        }\n      }\n    }\n  }\n": types.MentorCourseStatisticsDocument,
+    "\n  query mentorCourseStatistics($courseId: ID!, $agentRole: String!) {\n    mentor_course_statistics(course_id: $courseId, agent_role: $agentRole) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_selection_ids\n      user_selection_ids\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n          region\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n          average_evaluation_percent\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          course_session_title\n          circle_id\n          generation\n          region\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_id\n          competence_certificate_title\n          details_url\n          learning_content_id\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            competence_certificate_weight\n            average_evaluation_percent\n            average_passed\n          }\n        }\n      }\n    }\n  }\n": types.MentorCourseStatisticsDocument,
     "\n  mutation SendFeedbackMutation(\n    $courseSessionId: ID!\n    $learningContentId: ID!\n    $learningContentType: String!\n    $data: GenericScalar!\n    $submitted: Boolean\n  ) {\n    send_feedback(\n      course_session_id: $courseSessionId\n      learning_content_page_id: $learningContentId\n      learning_content_type: $learningContentType\n      data: $data\n      submitted: $submitted\n    ) {\n      feedback_response {\n        id\n        data\n        submitted\n      }\n      errors {\n        field\n        messages\n      }\n    }\n  }\n": types.SendFeedbackMutationDocument,
 };
 
@@ -94,7 +94,7 @@ export function graphql(source: "\n  query courseStatistics($courseId: ID!) {\n
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  query mentorCourseStatistics($courseId: ID!, $agentRole: String!) {\n    mentor_course_statistics(course_id: $courseId, agent_role: $agentRole) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_selection_ids\n      user_selection_ids\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n          region\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          course_session_title\n          circle_id\n          generation\n          region\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_id\n          competence_certificate_title\n          details_url\n          learning_content_id\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            competence_certificate_weight\n            average_evaluation_percent\n            average_passed\n          }\n        }\n      }\n    }\n  }\n"): (typeof documents)["\n  query mentorCourseStatistics($courseId: ID!, $agentRole: String!) {\n    mentor_course_statistics(course_id: $courseId, agent_role: $agentRole) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_selection_ids\n      user_selection_ids\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n          region\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          course_session_title\n          circle_id\n          generation\n          region\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_id\n          competence_certificate_title\n          details_url\n          learning_content_id\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            competence_certificate_weight\n            average_evaluation_percent\n            average_passed\n          }\n        }\n      }\n    }\n  }\n"];
+export function graphql(source: "\n  query mentorCourseStatistics($courseId: ID!, $agentRole: String!) {\n    mentor_course_statistics(course_id: $courseId, agent_role: $agentRole) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_selection_ids\n      user_selection_ids\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n          region\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n          average_evaluation_percent\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          course_session_title\n          circle_id\n          generation\n          region\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_id\n          competence_certificate_title\n          details_url\n          learning_content_id\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            competence_certificate_weight\n            average_evaluation_percent\n            average_passed\n          }\n        }\n      }\n    }\n  }\n"): (typeof documents)["\n  query mentorCourseStatistics($courseId: ID!, $agentRole: String!) {\n    mentor_course_statistics(course_id: $courseId, agent_role: $agentRole) {\n      _id\n      course_id\n      course_title\n      course_slug\n      course_session_selection_ids\n      user_selection_ids\n      course_session_properties {\n        _id\n        sessions {\n          id\n          name\n          region\n        }\n        generations\n        circles {\n          id\n          name\n        }\n      }\n      assignments {\n        _id\n        summary {\n          _id\n          completed_count\n          average_passed\n          total_passed\n          total_failed\n          average_evaluation_percent\n        }\n        records {\n          _id\n          course_session_id\n          course_session_assignment_id\n          course_session_title\n          circle_id\n          generation\n          region\n          assignment_title\n          assignment_type_translation_key\n          competence_certificate_id\n          competence_certificate_title\n          details_url\n          learning_content_id\n          deadline\n          metrics {\n            _id\n            passed_count\n            failed_count\n            unranked_count\n            ranking_completed\n            competence_certificate_weight\n            average_evaluation_percent\n            average_passed\n          }\n        }\n      }\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
diff --git a/client/src/gql/graphql.ts b/client/src/gql/graphql.ts
index b5433e30..a5a0c17c 100644
--- a/client/src/gql/graphql.ts
+++ b/client/src/gql/graphql.ts
@@ -199,6 +199,7 @@ export type AssignmentStatisticsRecordType = {
 export type AssignmentStatisticsSummaryType = {
   __typename?: 'AssignmentStatisticsSummaryType';
   _id: Scalars['ID']['output'];
+  average_evaluation_percent?: Maybe<Scalars['Float']['output']>;
   average_passed: Scalars['Float']['output'];
   completed_count: Scalars['Int']['output'];
   total_failed: Scalars['Int']['output'];
@@ -1344,7 +1345,7 @@ export type MentorCourseStatisticsQueryVariables = Exact<{
 }>;
 
 
-export type MentorCourseStatisticsQuery = { __typename?: 'Query', mentor_course_statistics?: { __typename?: 'BaseStatisticsType', _id: string, course_id: string, course_title: string, course_slug: string, course_session_selection_ids: Array<string | null>, user_selection_ids?: Array<string | null> | null, course_session_properties: { __typename?: 'StatisticsCourseSessionPropertiesType', _id: string, generations: Array<string>, sessions: Array<{ __typename?: 'StatisticsCourseSessionDataType', id: string, name: string, region: string }>, circles: Array<{ __typename?: 'StatisticsCircleDataType', id: string, name: string }> }, assignments: { __typename?: 'AssignmentsStatisticsType', _id: string, summary: { __typename?: 'AssignmentStatisticsSummaryType', _id: string, completed_count: number, average_passed: number, total_passed: number, total_failed: number }, records: Array<{ __typename?: 'AssignmentStatisticsRecordType', _id: string, course_session_id: string, course_session_assignment_id: string, course_session_title?: string | null, circle_id: string, generation: string, region: string, assignment_title: string, assignment_type_translation_key: string, competence_certificate_id?: string | null, competence_certificate_title?: string | null, details_url: string, learning_content_id: string, deadline: string, metrics: { __typename?: 'AssignmentCompletionMetricsType', _id: string, passed_count: number, failed_count: number, unranked_count: number, ranking_completed: boolean, competence_certificate_weight?: number | null, average_evaluation_percent?: number | null, average_passed: number } }> } } | null };
+export type MentorCourseStatisticsQuery = { __typename?: 'Query', mentor_course_statistics?: { __typename?: 'BaseStatisticsType', _id: string, course_id: string, course_title: string, course_slug: string, course_session_selection_ids: Array<string | null>, user_selection_ids?: Array<string | null> | null, course_session_properties: { __typename?: 'StatisticsCourseSessionPropertiesType', _id: string, generations: Array<string>, sessions: Array<{ __typename?: 'StatisticsCourseSessionDataType', id: string, name: string, region: string }>, circles: Array<{ __typename?: 'StatisticsCircleDataType', id: string, name: string }> }, assignments: { __typename?: 'AssignmentsStatisticsType', _id: string, summary: { __typename?: 'AssignmentStatisticsSummaryType', _id: string, completed_count: number, average_passed: number, total_passed: number, total_failed: number, average_evaluation_percent?: number | null }, records: Array<{ __typename?: 'AssignmentStatisticsRecordType', _id: string, course_session_id: string, course_session_assignment_id: string, course_session_title?: string | null, circle_id: string, generation: string, region: string, assignment_title: string, assignment_type_translation_key: string, competence_certificate_id?: string | null, competence_certificate_title?: string | null, details_url: string, learning_content_id: string, deadline: string, metrics: { __typename?: 'AssignmentCompletionMetricsType', _id: string, passed_count: number, failed_count: number, unranked_count: number, ranking_completed: boolean, competence_certificate_weight?: number | null, average_evaluation_percent?: number | null, average_passed: number } }> } } | null };
 
 export type SendFeedbackMutationMutationVariables = Exact<{
   courseSessionId: Scalars['ID']['input'];
@@ -1369,5 +1370,5 @@ export const DashboardConfigDocument = {"kind":"Document","definitions":[{"kind"
 export const DashboardProgressDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"dashboardProgress"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course_progress"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_id"}},{"kind":"Field","name":{"kind":"Name","value":"session_to_continue_id"}},{"kind":"Field","name":{"kind":"Name","value":"competence"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"total_count"}},{"kind":"Field","name":{"kind":"Name","value":"success_count"}},{"kind":"Field","name":{"kind":"Name","value":"fail_count"}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignment"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"total_count"}},{"kind":"Field","name":{"kind":"Name","value":"points_max_count"}},{"kind":"Field","name":{"kind":"Name","value":"points_achieved_count"}}]}}]}}]}}]} as unknown as DocumentNode<DashboardProgressQuery, DashboardProgressQueryVariables>;
 export const DashboardCourseDataDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"dashboardCourseData"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course_progress"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_id"}},{"kind":"Field","name":{"kind":"Name","value":"session_to_continue_id"}}]}}]}}]} as unknown as DocumentNode<DashboardCourseDataQuery, DashboardCourseDataQueryVariables>;
 export const CourseStatisticsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"courseStatistics"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course_statistics"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_title"}},{"kind":"Field","name":{"kind":"Name","value":"course_slug"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_properties"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"sessions"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"region"}}]}},{"kind":"Field","name":{"kind":"Name","value":"generations"}},{"kind":"Field","name":{"kind":"Name","value":"circles"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"course_session_selection_ids"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_selection_metrics"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"session_count"}},{"kind":"Field","name":{"kind":"Name","value":"participant_count"}},{"kind":"Field","name":{"kind":"Name","value":"expert_count"}}]}},{"kind":"Field","name":{"kind":"Name","value":"attendance_day_presences"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"region"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"due_date"}},{"kind":"Field","name":{"kind":"Name","value":"participants_present"}},{"kind":"Field","name":{"kind":"Name","value":"participants_total"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}}]}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"days_completed"}},{"kind":"Field","name":{"kind":"Name","value":"participants_present"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"feedback_responses"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"region"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"experts"}},{"kind":"Field","name":{"kind":"Name","value":"satisfaction_average"}},{"kind":"Field","name":{"kind":"Name","value":"satisfaction_max"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}}]}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"satisfaction_average"}},{"kind":"Field","name":{"kind":"Name","value":"satisfaction_max"}},{"kind":"Field","name":{"kind":"Name","value":"total_responses"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignments"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"completed_count"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_failed"}}]}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_assignment_id"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"region"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_title"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type_translation_key"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_title"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_id"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}},{"kind":"Field","name":{"kind":"Name","value":"deadline"}},{"kind":"Field","name":{"kind":"Name","value":"metrics"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"passed_count"}},{"kind":"Field","name":{"kind":"Name","value":"failed_count"}},{"kind":"Field","name":{"kind":"Name","value":"unranked_count"}},{"kind":"Field","name":{"kind":"Name","value":"ranking_completed"}},{"kind":"Field","name":{"kind":"Name","value":"average_evaluation_percent"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_weight"}}]}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"competences"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"success_total"}},{"kind":"Field","name":{"kind":"Name","value":"fail_total"}}]}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"region"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"success_count"}},{"kind":"Field","name":{"kind":"Name","value":"fail_count"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}}]}}]}}]}}]}}]} as unknown as DocumentNode<CourseStatisticsQuery, CourseStatisticsQueryVariables>;
-export const MentorCourseStatisticsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"mentorCourseStatistics"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"agentRole"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"mentor_course_statistics"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}},{"kind":"Argument","name":{"kind":"Name","value":"agent_role"},"value":{"kind":"Variable","name":{"kind":"Name","value":"agentRole"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_title"}},{"kind":"Field","name":{"kind":"Name","value":"course_slug"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_selection_ids"}},{"kind":"Field","name":{"kind":"Name","value":"user_selection_ids"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_properties"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"sessions"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"region"}}]}},{"kind":"Field","name":{"kind":"Name","value":"generations"}},{"kind":"Field","name":{"kind":"Name","value":"circles"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignments"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"completed_count"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_failed"}}]}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_assignment_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_title"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"region"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_title"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type_translation_key"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_id"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_title"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}},{"kind":"Field","name":{"kind":"Name","value":"learning_content_id"}},{"kind":"Field","name":{"kind":"Name","value":"deadline"}},{"kind":"Field","name":{"kind":"Name","value":"metrics"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"passed_count"}},{"kind":"Field","name":{"kind":"Name","value":"failed_count"}},{"kind":"Field","name":{"kind":"Name","value":"unranked_count"}},{"kind":"Field","name":{"kind":"Name","value":"ranking_completed"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_weight"}},{"kind":"Field","name":{"kind":"Name","value":"average_evaluation_percent"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}}]}}]}}]}}]}}]}}]} as unknown as DocumentNode<MentorCourseStatisticsQuery, MentorCourseStatisticsQueryVariables>;
+export const MentorCourseStatisticsDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"mentorCourseStatistics"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"agentRole"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"mentor_course_statistics"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseId"}}},{"kind":"Argument","name":{"kind":"Name","value":"agent_role"},"value":{"kind":"Variable","name":{"kind":"Name","value":"agentRole"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_title"}},{"kind":"Field","name":{"kind":"Name","value":"course_slug"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_selection_ids"}},{"kind":"Field","name":{"kind":"Name","value":"user_selection_ids"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_properties"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"sessions"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}},{"kind":"Field","name":{"kind":"Name","value":"region"}}]}},{"kind":"Field","name":{"kind":"Name","value":"generations"}},{"kind":"Field","name":{"kind":"Name","value":"circles"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"name"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignments"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"summary"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"completed_count"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_failed"}},{"kind":"Field","name":{"kind":"Name","value":"average_evaluation_percent"}}]}},{"kind":"Field","name":{"kind":"Name","value":"records"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_assignment_id"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_title"}},{"kind":"Field","name":{"kind":"Name","value":"circle_id"}},{"kind":"Field","name":{"kind":"Name","value":"generation"}},{"kind":"Field","name":{"kind":"Name","value":"region"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_title"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type_translation_key"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_id"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_title"}},{"kind":"Field","name":{"kind":"Name","value":"details_url"}},{"kind":"Field","name":{"kind":"Name","value":"learning_content_id"}},{"kind":"Field","name":{"kind":"Name","value":"deadline"}},{"kind":"Field","name":{"kind":"Name","value":"metrics"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"passed_count"}},{"kind":"Field","name":{"kind":"Name","value":"failed_count"}},{"kind":"Field","name":{"kind":"Name","value":"unranked_count"}},{"kind":"Field","name":{"kind":"Name","value":"ranking_completed"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_weight"}},{"kind":"Field","name":{"kind":"Name","value":"average_evaluation_percent"}},{"kind":"Field","name":{"kind":"Name","value":"average_passed"}}]}}]}}]}}]}}]}}]} as unknown as DocumentNode<MentorCourseStatisticsQuery, MentorCourseStatisticsQueryVariables>;
 export const SendFeedbackMutationDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"SendFeedbackMutation"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"learningContentId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"learningContentType"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"data"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"GenericScalar"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"submitted"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"Boolean"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"send_feedback"},"arguments":[{"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":"learning_content_type"},"value":{"kind":"Variable","name":{"kind":"Name","value":"learningContentType"}}},{"kind":"Argument","name":{"kind":"Name","value":"data"},"value":{"kind":"Variable","name":{"kind":"Name","value":"data"}}},{"kind":"Argument","name":{"kind":"Name","value":"submitted"},"value":{"kind":"Variable","name":{"kind":"Name","value":"submitted"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"feedback_response"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"data"}},{"kind":"Field","name":{"kind":"Name","value":"submitted"}}]}},{"kind":"Field","name":{"kind":"Name","value":"errors"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"field"}},{"kind":"Field","name":{"kind":"Name","value":"messages"}}]}}]}}]}}]} as unknown as DocumentNode<SendFeedbackMutationMutation, SendFeedbackMutationMutationVariables>;
\ No newline at end of file
diff --git a/client/src/gql/schema.graphql b/client/src/gql/schema.graphql
index 7bbcbd1d..a7a29224 100644
--- a/client/src/gql/schema.graphql
+++ b/client/src/gql/schema.graphql
@@ -88,6 +88,7 @@ type AssignmentStatisticsSummaryType {
   average_passed: Float!
   total_passed: Int!
   total_failed: Int!
+  average_evaluation_percent: Float
 }
 
 type StatisticsCourseSessionPropertiesType {
diff --git a/client/src/graphql/queries.ts b/client/src/graphql/queries.ts
index 4c762d20..7144c854 100644
--- a/client/src/graphql/queries.ts
+++ b/client/src/graphql/queries.ts
@@ -511,6 +511,7 @@ export const DASHBOARD_MENTOR_COMPETENCE_SUMMARY = graphql(`
           average_passed
           total_passed
           total_failed
+          average_evaluation_percent
         }
         records {
           _id
diff --git a/server/vbv_lernwelt/dashboard/graphql/types/assignment.py b/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
index f474e5d5..f2d36caa 100644
--- a/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
+++ b/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
@@ -54,6 +54,7 @@ class AssignmentStatisticsSummaryType(graphene.ObjectType):
     average_passed = graphene.Float(required=True)
     total_passed = graphene.Int(required=True)
     total_failed = graphene.Int(required=True)
+    average_evaluation_percent = graphene.Float()
 
 
 class AssignmentsStatisticsType(graphene.ObjectType):
@@ -90,12 +91,17 @@ def create_assignment_summary(
     total_passed = sum([m.passed_count for m in completed_metrics])
     total_failed = sum([m.failed_count for m in completed_metrics])
 
+    total_average_evaluation_percent = (
+        sum([m.average_evaluation_percent for m in completed_metrics]) / completed_count
+    )
+
     return AssignmentStatisticsSummaryType(
         _id=urql_id,  # noqa
         completed_count=completed_count,  # noqa
         average_passed=average_passed_completed,  # noqa
         total_passed=total_passed,  # noqa
         total_failed=total_failed,  # noqa
+        average_evaluation_percent=total_average_evaluation_percent,  # noqa
     )
 
 
diff --git a/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py b/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py
index 386b185d..1981b156 100644
--- a/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py
+++ b/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py
@@ -201,8 +201,7 @@ class CourseStatisticsType(BaseStatisticsType):
         records, success_total, fail_total = competences(
             course_slug=str(root.course_slug),
             course_session_selection_ids=[
-                str(cs)
-                for cs in root.course_session_selection_ids  # noqa
+                str(cs) for cs in root.course_session_selection_ids  # noqa
             ],
             user_selection_ids=user_selection_ids,  # noqa
             circle_ids=root.get_circle_ids(info),  # noqa

From 7110b5f97c07423e5842785b29c7a185beaaf4d7 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Wed, 31 Jul 2024 15:27:06 +0200
Subject: [PATCH 28/40] Add admin command to create & sync Berufsbildner

---
 ...r_mobi.py => create_berufsbildner_mobi.py} |  0
 server/vbv_lernwelt/core/admin.py             | 26 ++++++++-
 .../vbv_lernwelt/learning_mentor/services.py  | 54 +++++++++++++++++++
 3 files changed, 79 insertions(+), 1 deletion(-)
 rename scripts/{create_berufsbilnder_mobi.py => create_berufsbildner_mobi.py} (100%)
 create mode 100644 server/vbv_lernwelt/learning_mentor/services.py

diff --git a/scripts/create_berufsbilnder_mobi.py b/scripts/create_berufsbildner_mobi.py
similarity index 100%
rename from scripts/create_berufsbilnder_mobi.py
rename to scripts/create_berufsbildner_mobi.py
diff --git a/server/vbv_lernwelt/core/admin.py b/server/vbv_lernwelt/core/admin.py
index 962c9b71..55e665da 100644
--- a/server/vbv_lernwelt/core/admin.py
+++ b/server/vbv_lernwelt/core/admin.py
@@ -1,4 +1,4 @@
-from django.contrib import admin
+from django.contrib import admin, messages
 from django.contrib.auth import admin as auth_admin, get_user_model
 from django.utils.translation import gettext_lazy as _
 
@@ -10,6 +10,9 @@ from vbv_lernwelt.core.models import (
     SecurityRequestResponseLog,
 )
 from vbv_lernwelt.core.utils import pretty_print_json
+from vbv_lernwelt.learning_mentor.services import (
+    create_or_sync_berufsbildner as create_or_sync_bb,
+)
 
 User = get_user_model()
 
@@ -31,6 +34,26 @@ class LogAdmin(admin.ModelAdmin):
         return pretty_print_json(json_string)
 
 
+@admin.action(description="Berufsbildner: Create or Sync")
+def create_or_sync_berufsbildner(modeladmin, request, queryset):
+    # keep it easy
+    success = []
+    for user in queryset:
+        success.append(create_or_sync_bb(user))
+    if all(success):
+        messages.add_message(
+            request,
+            messages.SUCCESS,
+            f"Berufsbildner erfolgreich erstellt oder synchronisiert",
+        )
+    else:
+        messages.add_message(
+            request,
+            messages.ERROR,
+            f"Einige Berufsbildner konnten nicht erstellt oder synchronisiert werden",
+        )
+
+
 @admin.register(User)
 class UserAdmin(auth_admin.UserAdmin):
     fieldsets = (
@@ -91,6 +114,7 @@ class UserAdmin(auth_admin.UserAdmin):
         "sso_id",
     ]
     search_fields = ["first_name", "last_name", "email", "username", "sso_id"]
+    actions = [create_or_sync_berufsbildner]
 
 
 @admin.register(JobLog)
diff --git a/server/vbv_lernwelt/learning_mentor/services.py b/server/vbv_lernwelt/learning_mentor/services.py
new file mode 100644
index 00000000..62e2d176
--- /dev/null
+++ b/server/vbv_lernwelt/learning_mentor/services.py
@@ -0,0 +1,54 @@
+import structlog
+
+from vbv_lernwelt.core.models import User
+from vbv_lernwelt.course.consts import COURSE_UK, COURSE_UK_FR, COURSE_UK_IT
+from vbv_lernwelt.course.models import CourseSessionUser
+from vbv_lernwelt.learning_mentor.models import (
+    AgentParticipantRelation,
+    AgentParticipantRoleType,
+)
+
+logger = structlog.get_logger(__name__)
+
+UK_COURSES = [COURSE_UK, COURSE_UK_FR, COURSE_UK_IT]
+
+
+def create_or_sync_berufsbildner(berufsbildner: User) -> bool:
+    logger.info(
+        "Creating or syncing berufsbildner",
+        berufsbildner=berufsbildner,
+        org=berufsbildner.organisation.name_de,
+    )
+
+    # check if it is a valid organisation
+    if berufsbildner.organisation and berufsbildner.organisation.organisation_id < 4:
+        logger.error("Invalid organisation", org=berufsbildner.organisation)
+        return False
+
+    # get existing connections
+    existing_members = set(berufsbildner.agentparticipantrelation_set.all())
+
+    # gather new relations
+    new_members = set(
+        CourseSessionUser.objects.filter(user__organisation=berufsbildner.organisation)
+        .filter(course_session__course__configuration__is_uk=True)
+        .filter(role=CourseSessionUser.Role.MEMBER.value)
+        .filter(course_session__course_id__in=UK_COURSES)
+        .exclude(course_session_id__in=[4, 5, 6])
+    )
+
+    # add new relations that are not in existing relations
+    for csu in new_members:
+        if csu not in existing_members:
+            AgentParticipantRelation.objects.get_or_create(
+                agent=berufsbildner,
+                participant=csu,
+                role=AgentParticipantRoleType.BERUFSBILDNER.value,
+            )
+
+    # remove old relations that are not in the new relations
+    for relation in existing_members:
+        if relation.participant not in new_members:
+            relation.delete()
+
+    return True

From 9706d7a2f0ef4fbdbf11ea8b0a8c923e7ea8a9a6 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Sun, 4 Aug 2024 19:14:56 +0200
Subject: [PATCH 29/40] Don't route to main profile for child pages

---
 .../src/pages/userProfile/UserProfilePage.vue | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/client/src/pages/userProfile/UserProfilePage.vue b/client/src/pages/userProfile/UserProfilePage.vue
index b2d49465..b98e8126 100644
--- a/client/src/pages/userProfile/UserProfilePage.vue
+++ b/client/src/pages/userProfile/UserProfilePage.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { onMounted, ref } from "vue";
+import { onMounted } from "vue";
 import { useRoute, useRouter } from "vue-router";
 import { useTranslation } from "i18next-vue";
 import { useFetch } from "@vueuse/core";
@@ -12,18 +12,24 @@ const props = defineProps<{
 
 const { t } = useTranslation();
 
-const pages = ref([
+const pages = [
   {
     label: t("general.learningPath"),
     route: "profileLearningPath",
     routeMatch: "profileLearningPath",
+    childrenRouteMatches: [],
   },
   {
     label: t("a.KompetenzNavi"),
     route: "competenceMain",
     routeMatch: "profileCompetence",
+    childrenRouteMatches: [
+      "competenceCertificates",
+      "competenceCertificateDetail",
+      "competenceEvaluations",
+    ],
   },
-]);
+];
 
 const courseSession = useCurrentCourseSession();
 const { data: user } = useFetch(
@@ -35,9 +41,16 @@ 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)) {
+  if (
+    route.name &&
+    !pages.find((page) => {
+      const routeName = route.name?.toString() || "";
+      const routeMatch = [...page.childrenRouteMatches, page.routeMatch];
+      return routeMatch.some((match) => routeName.includes(match));
+    })
+  ) {
     router.push({
-      name: pages.value[0].route,
+      name: pages[0].route,
       params: { userId: props.userId, courseSlug: props.courseSlug },
     });
   }

From f2a765ee3b0643af1bf0d546a7a1f8e71235ec26 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Mon, 5 Aug 2024 07:33:08 +0200
Subject: [PATCH 30/40] Merge migrations

---
 .../course/migrations/0010_merge_20240805_0731.py    | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 server/vbv_lernwelt/course/migrations/0010_merge_20240805_0731.py

diff --git a/server/vbv_lernwelt/course/migrations/0010_merge_20240805_0731.py b/server/vbv_lernwelt/course/migrations/0010_merge_20240805_0731.py
new file mode 100644
index 00000000..d6f890cb
--- /dev/null
+++ b/server/vbv_lernwelt/course/migrations/0010_merge_20240805_0731.py
@@ -0,0 +1,12 @@
+# Generated by Django 4.2.13 on 2024-08-05 05:31
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("course", "0009_alter_coursecompletion_completion_status"),
+        ("course", "0009_coursesessionuser_required_attendance_and_more"),
+    ]
+
+    operations = []

From 6b2628b3339d33816d5c378eddd44935b1b1a8f7 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Mon, 5 Aug 2024 14:11:26 +0200
Subject: [PATCH 31/40] Show different links for different roles

---
 .../assignmentsPage/AssignmentDetails.vue     | 19 +++++++++++++++++--
 .../assignmentsPage/AssignmentsPage.vue       |  1 +
 .../agentAssignment/AgentAssignmentDetail.vue |  1 +
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue b/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue
index 844668c0..15df55fd 100644
--- a/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue
+++ b/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue
@@ -23,6 +23,7 @@ export interface Props {
   courseSession: CourseSession;
   learningContent: LearningContentAssignment | LearningContentEdoniqTest;
   userSelectionIds?: string[];
+  linkToResults?: boolean;
 }
 
 const props = defineProps<Props>();
@@ -85,6 +86,12 @@ function findUserPointsHtml(userId: string) {
   }
   return result;
 }
+
+function generateCertificatesLink(userId: string) {
+  const parts = props.learningContent.competence_certificate?.frontend_url?.split("/");
+  const certificatePart = parts[parts.length - 1];
+  return `/course/${props.courseSession.course.slug}/profile/${userId}/competence/certificates/${certificatePart}`;
+}
 </script>
 
 <template>
@@ -178,11 +185,19 @@ function findUserPointsHtml(userId: string) {
                   props.learningContent.content_type !==
                     'learnpath.LearningContentEdoniqTest'
                 "
-                :to="`/course/${props.courseSession.course.slug}/assignment-evaluation/${learningContent.content_assignment.id}/${csu.user_id}`"
+                :to="
+                  props.linkToResults
+                    ? `/course/${props.courseSession.course.slug}/assignment-evaluation/${learningContent.content_assignment.id}/${csu.user_id}`
+                    : generateCertificatesLink(csu.user_id)
+                "
                 class="link lg:w-full lg:text-right"
                 data-cy="show-results"
               >
-                {{ $t("a.Ergebnisse anschauen") }}
+                {{
+                  props.linkToResults
+                    ? $t("a.Ergebnisse anschauen")
+                    : $t("a.Profil anzeigen")
+                }}
               </router-link>
             </div>
           </template>
diff --git a/client/src/pages/cockpit/assignmentsPage/AssignmentsPage.vue b/client/src/pages/cockpit/assignmentsPage/AssignmentsPage.vue
index a4281394..1e92d1db 100644
--- a/client/src/pages/cockpit/assignmentsPage/AssignmentsPage.vue
+++ b/client/src/pages/cockpit/assignmentsPage/AssignmentsPage.vue
@@ -53,6 +53,7 @@ const backRoute = computed(() => {
             v-if="learningContentAssignment"
             :course-session="courseSession"
             :learning-content="learningContentAssignment as (LearningContentAssignment | LearningContentEdoniqTest)"
+            :link-to-results="true"
           />
         </div>
       </main>
diff --git a/client/src/pages/dashboard/agentAssignment/AgentAssignmentDetail.vue b/client/src/pages/dashboard/agentAssignment/AgentAssignmentDetail.vue
index bf0828c4..03d6f474 100644
--- a/client/src/pages/dashboard/agentAssignment/AgentAssignmentDetail.vue
+++ b/client/src/pages/dashboard/agentAssignment/AgentAssignmentDetail.vue
@@ -53,6 +53,7 @@ const learningContentAssignment = computed(() => {
             :course-session="courseSession"
             :learning-content="learningContentAssignment as (LearningContentAssignment | LearningContentEdoniqTest)"
             :user-selection-ids="participantUserIds"
+            :link-to-results="props.agentRole.toLowerCase() !== 'berufsbildner'"
           />
         </div>
       </main>

From 37758961b00e67a9d3168f8f240aa764cc1847ce Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Mon, 5 Aug 2024 14:12:02 +0200
Subject: [PATCH 32/40] Remove course specifc data from dashboard navbar

---
 client/src/components/header/MainNavigationBar.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/client/src/components/header/MainNavigationBar.vue b/client/src/components/header/MainNavigationBar.vue
index 3c448f60..f7efdce5 100644
--- a/client/src/components/header/MainNavigationBar.vue
+++ b/client/src/components/header/MainNavigationBar.vue
@@ -104,7 +104,8 @@ const hasPreviewMenu = computed(() =>
 const hasAppointmentsMenu = computed(() =>
   Boolean(
     courseSessionsStore.currentCourseSession?.actions.includes("appointments") &&
-      userStore.loggedIn
+      userStore.loggedIn &&
+      inCourse()
   )
 );
 
@@ -130,6 +131,10 @@ const mentorTabTitle = computed(() =>
     ? "a.Praxisbildner"
     : "a.Lernbegleitung"
 );
+
+const hasSessionTitle = computed(() => {
+  return courseSessionsStore.currentCourseSession?.title && inCourse();
+});
 </script>
 
 <template>
@@ -334,7 +339,7 @@ const mentorTabTitle = computed(() =>
               </div>
 
               <div
-                v-if="selectedCourseSessionTitle"
+                v-if="hasSessionTitle"
                 class="nav-item hidden items-center lg:inline-flex"
               >
                 <div class="">

From 6447843656446d89d5d8b9aca5a63733444ff461 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Mon, 5 Aug 2024 16:01:13 +0200
Subject: [PATCH 33/40] Add Person count widget (VBV-718)

---
 client/src/components/dashboard/BaseBox.vue   | 16 +++++++----
 .../dashboard/BerufsbildnerStatistics.vue     |  7 +++++
 .../dashboard/MentorMenteeCount.vue           | 28 +++++++++++++------
 .../assignmentsPage/AssignmentDetails.vue     |  5 ++++
 4 files changed, 43 insertions(+), 13 deletions(-)

diff --git a/client/src/components/dashboard/BaseBox.vue b/client/src/components/dashboard/BaseBox.vue
index d0f0310e..eaee5e1d 100644
--- a/client/src/components/dashboard/BaseBox.vue
+++ b/client/src/components/dashboard/BaseBox.vue
@@ -1,17 +1,23 @@
 <script setup lang="ts">
-defineProps<{
-  detailsLink: string;
-}>();
+withDefaults(
+  defineProps<{
+    detailsLink: string;
+    slim?: boolean;
+  }>(),
+  {
+    slim: false,
+  }
+);
 </script>
 
 <template>
-  <div class="flex h-full flex-col space-y-4 bg-white">
+  <div :class="['flex h-full flex-col bg-white', slim ? '' : 'space-y-4']">
     <h4 class="mb-1 font-bold">
       <slot name="title"></slot>
     </h4>
     <slot name="content"></slot>
     <div class="flex-grow"></div>
-    <div class="pt-8">
+    <div class="pt-0">
       <router-link class="underline" :to="detailsLink" data-cy="basebox.detailsLink">
         {{ $t("a.Details anschauen") }}
       </router-link>
diff --git a/client/src/components/dashboard/BerufsbildnerStatistics.vue b/client/src/components/dashboard/BerufsbildnerStatistics.vue
index 57255a25..5228b740 100644
--- a/client/src/components/dashboard/BerufsbildnerStatistics.vue
+++ b/client/src/components/dashboard/BerufsbildnerStatistics.vue
@@ -9,6 +9,7 @@ import LoadingSpinner from "@/components/ui/LoadingSpinner.vue";
 import AssignmentSummaryBox from "@/components/dashboard/AssignmentSummaryBox.vue";
 import BaseBox from "@/components/dashboard/BaseBox.vue";
 import { percentToRoundedGrade } from "@/services/assignmentService";
+import MentorMenteeCount from "@/components/dashboard/MentorMenteeCount.vue";
 
 const props = defineProps<{
   courseSlug: string;
@@ -78,5 +79,11 @@ const averageGrade = computed(() => {
         :details-link="`/statistic/berufsbildner/${props.courseSlug}/assignment`"
       />
     </div>
+    <MentorMenteeCount
+      :course-id="props.courseId"
+      :course-slug="props.courseSlug"
+      :count="mentorData.user_selection_ids.length"
+      :slim="true"
+    />
   </div>
 </template>
diff --git a/client/src/components/dashboard/MentorMenteeCount.vue b/client/src/components/dashboard/MentorMenteeCount.vue
index d9a76479..71f047f8 100644
--- a/client/src/components/dashboard/MentorMenteeCount.vue
+++ b/client/src/components/dashboard/MentorMenteeCount.vue
@@ -4,16 +4,27 @@ import { onMounted, ref } from "vue";
 import { fetchMenteeCount } from "@/services/dashboard";
 import BaseBox from "@/components/dashboard/BaseBox.vue";
 
-const props = defineProps<{
-  courseId: string;
-  courseSlug: string;
-}>();
+const props = withDefaults(
+  defineProps<{
+    courseId: string;
+    courseSlug: string;
+    slim?: boolean;
+    count?: number;
+  }>(),
+  {
+    count: -1,
+    slim: false,
+  }
+);
 
-const menteeCount: Ref<number> = ref(0);
+const menteeCount: Ref<number> = ref(props.count);
 
 onMounted(async () => {
-  const data = await fetchMenteeCount(props.courseId);
-  menteeCount.value = data?.mentee_count;
+  if (props.count == -1) {
+    menteeCount.value = 0;
+    const data = await fetchMenteeCount(props.courseId);
+    menteeCount.value = data?.mentee_count;
+  }
 });
 </script>
 
@@ -22,10 +33,11 @@ onMounted(async () => {
     <BaseBox
       :details-link="`/dashboard/persons?course=${props.courseId}`"
       data-cy="dashboard.mentor.menteeCount"
+      :slim="props.slim"
     >
       <template #title>{{ $t("a.Personen") }}</template>
       <template #content>
-        <div class="flex flex-row space-x-3 bg-white pb-6">
+        <div :class="['flex flex-row space-x-3 bg-white', slim ? '' : 'pb-6']">
           <div
             class="flex h-[74px] items-center justify-center py-1 pr-3 text-3xl font-bold"
           >
diff --git a/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue b/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue
index 15df55fd..a7087392 100644
--- a/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue
+++ b/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue
@@ -89,6 +89,11 @@ function findUserPointsHtml(userId: string) {
 
 function generateCertificatesLink(userId: string) {
   const parts = props.learningContent.competence_certificate?.frontend_url?.split("/");
+
+  if (!parts) {
+    return "";
+  }
+
   const certificatePart = parts[parts.length - 1];
   return `/course/${props.courseSession.course.slug}/profile/${userId}/competence/certificates/${certificatePart}`;
 }

From cb2eb3cc7f1a155dfb574eee85bfb95354211440 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Mon, 5 Aug 2024 16:04:15 +0200
Subject: [PATCH 34/40] Rename component

---
 ...{MentorMenteeCount.vue => AgentConnectionCount.vue} |  0
 .../components/dashboard/BerufsbildnerStatistics.vue   | 10 +++++++---
 client/src/components/dashboard/CoursePanel.vue        |  4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)
 rename client/src/components/dashboard/{MentorMenteeCount.vue => AgentConnectionCount.vue} (100%)

diff --git a/client/src/components/dashboard/MentorMenteeCount.vue b/client/src/components/dashboard/AgentConnectionCount.vue
similarity index 100%
rename from client/src/components/dashboard/MentorMenteeCount.vue
rename to client/src/components/dashboard/AgentConnectionCount.vue
diff --git a/client/src/components/dashboard/BerufsbildnerStatistics.vue b/client/src/components/dashboard/BerufsbildnerStatistics.vue
index 5228b740..29c35afd 100644
--- a/client/src/components/dashboard/BerufsbildnerStatistics.vue
+++ b/client/src/components/dashboard/BerufsbildnerStatistics.vue
@@ -9,7 +9,7 @@ import LoadingSpinner from "@/components/ui/LoadingSpinner.vue";
 import AssignmentSummaryBox from "@/components/dashboard/AssignmentSummaryBox.vue";
 import BaseBox from "@/components/dashboard/BaseBox.vue";
 import { percentToRoundedGrade } from "@/services/assignmentService";
-import MentorMenteeCount from "@/components/dashboard/MentorMenteeCount.vue";
+import AgentConnectionCount from "@/components/dashboard/AgentConnectionCount.vue";
 
 const props = defineProps<{
   courseSlug: string;
@@ -24,6 +24,10 @@ const assignmentStats = computed(() => {
   return mentorData.value?.assignments ?? null;
 });
 
+const numberOfPerson = computed(() => {
+  return mentorData.value?.user_selection_ids?.length ?? 0;
+});
+
 onMounted(async () => {
   mentorData.value = await fetchMentorCompetenceSummary(
     props.courseId,
@@ -79,10 +83,10 @@ const averageGrade = computed(() => {
         :details-link="`/statistic/berufsbildner/${props.courseSlug}/assignment`"
       />
     </div>
-    <MentorMenteeCount
+    <AgentConnectionCount
       :course-id="props.courseId"
       :course-slug="props.courseSlug"
-      :count="mentorData.user_selection_ids.length"
+      :count="numberOfPerson"
       :slim="true"
     />
   </div>
diff --git a/client/src/components/dashboard/CoursePanel.vue b/client/src/components/dashboard/CoursePanel.vue
index 4b052c48..e052a9af 100644
--- a/client/src/components/dashboard/CoursePanel.vue
+++ b/client/src/components/dashboard/CoursePanel.vue
@@ -5,7 +5,7 @@ import LearningPathDiagram from "@/components/learningPath/LearningPathDiagram.v
 import CompetenceSummary from "@/components/dashboard/CompetenceSummary.vue";
 import AssignmentSummary from "@/components/dashboard/AssignmentSummary.vue";
 import MentorOpenTasksCount from "@/components/dashboard/MentorOpenTasksCount.vue";
-import MentorMenteeCount from "@/components/dashboard/MentorMenteeCount.vue";
+import AgentConnectionCount from "@/components/dashboard/AgentConnectionCount.vue";
 import MentorCompetenceSummary from "@/components/dashboard/MentorCompetenceSummary.vue";
 import { getCockpitUrl, getLearningMentorUrl, getLearningPathUrl } from "@/utils/utils";
 import UkStatistics from "@/components/dashboard/UkStatistics.vue";
@@ -177,7 +177,7 @@ function hasActionButton(): boolean {
         v-if="numberOfMentorWidgets > 0"
         class="flex flex-col flex-wrap items-stretch md:flex-row"
       >
-        <MentorMenteeCount
+        <AgentConnectionCount
           v-if="hasWidget('MentorPersonWidget')"
           :course-id="courseConfig.course_id"
           :course-slug="courseConfig?.course_slug"

From ed1375ba3320fef3b14cd88b231161e6ea86a63f Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Wed, 7 Aug 2024 09:19:51 +0200
Subject: [PATCH 35/40] Fix utils

---
 .../pages/dashboard/DashboardPersonsPage.vue  |   1 +
 .../dashboard/tests/test_export.py            |   4 +-
 server/vbv_lernwelt/dashboard/utils.py        | 168 +++++++++---------
 3 files changed, 90 insertions(+), 83 deletions(-)

diff --git a/client/src/pages/dashboard/DashboardPersonsPage.vue b/client/src/pages/dashboard/DashboardPersonsPage.vue
index 6e98930e..bd7269ff 100644
--- a/client/src/pages/dashboard/DashboardPersonsPage.vue
+++ b/client/src/pages/dashboard/DashboardPersonsPage.vue
@@ -254,6 +254,7 @@ function exportData() {
       course_session_id: csId,
       generation: "",
       circle_id: "",
+      region: "",
     });
   }
   exportDataAsXls(items, exportPersons, userStore.language);
diff --git a/server/vbv_lernwelt/dashboard/tests/test_export.py b/server/vbv_lernwelt/dashboard/tests/test_export.py
index 565d0e48..c00d1fef 100644
--- a/server/vbv_lernwelt/dashboard/tests/test_export.py
+++ b/server/vbv_lernwelt/dashboard/tests/test_export.py
@@ -139,9 +139,7 @@ class PersonsExportTestCase(ExportBaseTestCase):
         self.assertEqual(wb.sheetnames[0], "Test Zürich 2022 a")
         wb.active = wb["Test Zürich 2022 a"]
 
-        data = self._generate_expected_data([[None] * 6])
-
-        self._check_export(wb, data, 1, 6)
+        self._check_export(wb, [[None] * 6], 1, 6)
 
     def test_export_in_fr(self):
         activate("fr")
diff --git a/server/vbv_lernwelt/dashboard/utils.py b/server/vbv_lernwelt/dashboard/utils.py
index 8f668ce4..799b8ee5 100644
--- a/server/vbv_lernwelt/dashboard/utils.py
+++ b/server/vbv_lernwelt/dashboard/utils.py
@@ -99,90 +99,98 @@ def create_person_list_with_roles(
     user, course_session_ids=None, include_private_data=False
 ):
     def create_user_dict(user_object):
-        def create_user_dict(user_object):
-            return {
-                "user_id": user_object.id,
-                "first_name": user_object.first_name,
-                "last_name": user_object.last_name,
-                "email": user_object.email,
-                "avatar_url_small": user_object.avatar_url_small,
-                "avatar_url": user_object.avatar_url,
-                "course_sessions": [],
-            }
-
-        course_sessions = get_course_sessions_with_roles_for_user(user)
-
-        result_persons = {}
-        for cs in course_sessions:
-            if has_cs_role(cs.roles) and cs.course.configuration.is_uk:
-                course_session_users = CourseSessionUser.objects.filter(
-                    course_session=cs.id
-                ).select_related("user")
-                my_role = user_role(cs.roles)
-                for csu in course_session_users:
-                    person_data = result_persons.get(
-                        csu.user.id, create_user_dict(csu.user)
-                    )
-                    person_data["course_sessions"].append(
-                        create_course_session_dict(cs, my_role, csu.role)
-                    )
-                    result_persons[csu.user.id] = person_data
-
-        # add persons where request.user is mentor
-        for cs in course_sessions:
-
-            def _add_agent_relation(my_role, user_role):
-                course_session_entry = create_course_session_dict(
-                    cs, my_role, user_role
-                )
-                participant_user = relation.participant.user
-
-                if participant_user.id not in result_persons:
-                    person_data = create_user_dict(participant_user)
-                    person_data["course_sessions"] = [course_session_entry]
-                    result_persons[participant_user.id] = person_data
-                else:
-                    # user is already in result_persons
-                    result_persons[participant_user.id]["course_sessions"].append(
-                        course_session_entry
-                    )
-
-            if "LEARNING_MENTOR" in cs.roles:
-                for relation in AgentParticipantRelation.objects.filter(
-                    agent=user,
-                    participant__course_session_id=cs.id,
-                    role="LEARNING_MENTOR",
-                ):
-                    _add_agent_relation("LEARNING_MENTOR", "PARTICIPANT")
-
-            if "BERUFSBILDNER" in cs.roles:
-                for relation in AgentParticipantRelation.objects.filter(
-                    agent=user,
-                    participant__course_session_id=cs.id,
-                    role="BERUFSBILDNER",
-                ):
-                    _add_agent_relation("BERUFSBILDNER", "PARTICIPANT")
-
-        # add persons where request.user is lerning mentee
-        mentor_relation_qs = AgentParticipantRelation.objects.filter(
-            participant__user=user,
-            role=AgentParticipantRoleType.LEARNING_MENTOR.value,
-        ).prefetch_related("agent")
-        for mentor_relation in mentor_relation_qs:
-            cs = mentor_relation.participant.course_session
-            course_session_entry = create_course_session_dict(
-                cs,
-                "PARTICIPANT",
-                "LEARNING_MENTOR",
+        user_data = {
+            "user_id": user_object.id,
+            "first_name": user_object.first_name,
+            "last_name": user_object.last_name,
+            "email": user_object.email,
+            "avatar_url_small": user_object.avatar_url_small,
+            "avatar_url": user_object.avatar_url,
+            "course_sessions": [],
+        }
+        if include_private_data:
+            user_data["phone_number"] = user_object.phone_number
+            user_data["Lehrvertragsnummer"] = user_object.additional_json_data.get(
+                "Lehrvertragsnummer", ""
             )
 
-            if mentor_relation.agent.id not in result_persons:
-                person_data = create_user_dict(mentor_relation.agent)
+        return user_data
+
+    course_sessions = get_course_sessions_with_roles_for_user(user)
+    if course_session_ids:
+        course_sessions = [
+            csr for csr in course_sessions if csr._original.id in course_session_ids
+        ]
+
+    result_persons = {}
+    for cs in course_sessions:
+        if has_cs_role(cs.roles) and cs.course.configuration.is_uk:
+            course_session_users = CourseSessionUser.objects.filter(
+                course_session=cs.id
+            ).select_related("user")
+            my_role = user_role(cs.roles)
+            for csu in course_session_users:
+                person_data = result_persons.get(
+                    csu.user.id, create_user_dict(csu.user)
+                )
+                person_data["course_sessions"].append(
+                    create_course_session_dict(cs, my_role, csu.role)
+                )
+                result_persons[csu.user.id] = person_data
+
+    # add persons where request.user is mentor
+    for cs in course_sessions:
+
+        def _add_agent_relation(my_role, user_role):
+            course_session_entry = create_course_session_dict(cs, my_role, user_role)
+            participant_user = relation.participant.user
+
+            if participant_user.id not in result_persons:
+                person_data = create_user_dict(participant_user)
                 person_data["course_sessions"] = [course_session_entry]
-                result_persons[mentor_relation.agent.id] = person_data
+                result_persons[participant_user.id] = person_data
             else:
                 # user is already in result_persons
-                result_persons[mentor_relation.agent.id]["course_sessions"].append(
+                result_persons[participant_user.id]["course_sessions"].append(
                     course_session_entry
                 )
-        return result_persons.values()
+
+        if "LEARNING_MENTOR" in cs.roles:
+            for relation in AgentParticipantRelation.objects.filter(
+                agent=user,
+                participant__course_session_id=cs.id,
+                role="LEARNING_MENTOR",
+            ):
+                _add_agent_relation("LEARNING_MENTOR", "PARTICIPANT")
+
+        if "BERUFSBILDNER" in cs.roles:
+            for relation in AgentParticipantRelation.objects.filter(
+                agent=user,
+                participant__course_session_id=cs.id,
+                role="BERUFSBILDNER",
+            ):
+                _add_agent_relation("BERUFSBILDNER", "PARTICIPANT")
+
+    # add persons where request.user is lerning mentee
+    mentor_relation_qs = AgentParticipantRelation.objects.filter(
+        participant__user=user,
+        role=AgentParticipantRoleType.LEARNING_MENTOR.value,
+    ).prefetch_related("agent")
+    for mentor_relation in mentor_relation_qs:
+        cs = mentor_relation.participant.course_session
+        course_session_entry = create_course_session_dict(
+            cs,
+            "PARTICIPANT",
+            "LEARNING_MENTOR",
+        )
+
+        if mentor_relation.agent.id not in result_persons:
+            person_data = create_user_dict(mentor_relation.agent)
+            person_data["course_sessions"] = [course_session_entry]
+            result_persons[mentor_relation.agent.id] = person_data
+        else:
+            # user is already in result_persons
+            result_persons[mentor_relation.agent.id]["course_sessions"].append(
+                course_session_entry
+            )
+    return result_persons.values()

From 05c4d471d84b76d5c024ff87fdd85e589885e727 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Sat, 10 Aug 2024 13:30:15 +0200
Subject: [PATCH 36/40] Fix typecheck

---
 client/src/composables.ts                     | 68 +++++++++++--------
 client/src/gql/gql.ts                         |  4 +-
 client/src/gql/graphql.ts                     |  3 +-
 client/src/graphql/queries.ts                 |  8 ++-
 .../competence/CompetenceAssignmentRow.vue    |  6 +-
 .../CompetenceCertificateComponent.vue        |  3 +-
 .../CompetenceCertificateDetailPage.vue       | 17 ++---
 .../CompetenceCertificateListPage.vue         | 14 ++--
 .../pages/competence/CompetenceIndexPage.vue  | 22 ++----
 client/src/pages/competence/utils.ts          |  8 +--
 10 files changed, 76 insertions(+), 77 deletions(-)

diff --git a/client/src/composables.ts b/client/src/composables.ts
index 6ba8621c..bd543a5a 100644
--- a/client/src/composables.ts
+++ b/client/src/composables.ts
@@ -1,25 +1,33 @@
-import {useCSRFFetch} from "@/fetchHelpers";
-import type {CourseStatisticsType} from "@/gql/graphql";
-import {graphqlClient} from "@/graphql/client";
-import {COURSE_QUERY, COURSE_SESSION_DETAIL_QUERY} from "@/graphql/queries";
+import { useCSRFFetch } from "@/fetchHelpers";
+import type { CourseStatisticsType } from "@/gql/graphql";
+import { graphqlClient } from "@/graphql/client";
+import {
+  COMPETENCE_NAVI_CERTIFICATE_QUERY,
+  COURSE_QUERY,
+  COURSE_SESSION_DETAIL_QUERY,
+} from "@/graphql/queries";
 import {
   circleFlatChildren,
   circleFlatLearningContents,
   circleFlatLearningUnits,
   someFinishedInLearningSequence,
 } from "@/services/circle";
-import type {DashboardDueDate, DashboardPersonRoleType, DashboardPersonType,} from "@/services/dashboard";
+import type {
+  DashboardDueDate,
+  DashboardPersonRoleType,
+  DashboardPersonType,
+} from "@/services/dashboard";
 import {
   courseIdForCourseSlug,
   fetchDashboardDueDates,
   fetchDashboardPersons,
   fetchStatisticData,
 } from "@/services/dashboard";
-import {presignUpload, uploadFile} from "@/services/files";
-import {useCompletionStore} from "@/stores/completion";
-import {useCourseSessionsStore} from "@/stores/courseSessions";
-import {useDashboardStore} from "@/stores/dashboard";
-import {useUserStore} from "@/stores/user";
+import { presignUpload, uploadFile } from "@/services/files";
+import { useCompletionStore } from "@/stores/completion";
+import { useCourseSessionsStore } from "@/stores/courseSessions";
+import { useDashboardStore } from "@/stores/dashboard";
+import { useUserStore } from "@/stores/user";
 import type {
   ActionCompetence,
   AgentParticipantRelation,
@@ -36,16 +44,15 @@ import type {
   LearningUnitPerformanceCriteria,
   PerformanceCriteria,
 } from "@/types";
-import {useQuery} from "@urql/vue";
+import { useQuery } from "@urql/vue";
 import dayjs from "dayjs";
-import {t} from "i18next";
+import { t } from "i18next";
 import orderBy from "lodash/orderBy";
 import log from "loglevel";
-import type {ComputedRef, Ref} from "vue";
-import {computed, onMounted, ref, watchEffect} from "vue";
-import {type RouteLocationRaw, useRouter} from "vue-router";
-import {getCertificates} from "./services/competence";
-import {mergeCompetenceCertificates} from "./pages/competence/utils";
+import type { ComputedRef, Ref } from "vue";
+import { computed, onMounted, ref, watchEffect } from "vue";
+import { type RouteLocationRaw, useRouter } from "vue-router";
+import { mergeCompetenceCertificates } from "./pages/competence/utils";
 
 export function useCurrentCourseSession() {
   /**
@@ -177,7 +184,7 @@ export function useCourseData(courseSlug: string) {
 
   // urql.useQuery is not meant to be used programmatically, so we use graphqlClient.query instead
   const resultPromise = graphqlClient
-    .query(COURSE_QUERY, {slug: `${courseSlug}`})
+    .query(COURSE_QUERY, { slug: `${courseSlug}` })
     .toPromise();
 
   resultPromise.then((result) => {
@@ -442,7 +449,7 @@ export function useFileUpload() {
   const fileInfo = ref({} as { id: string; name: string; url: string });
 
   async function upload(e: Event) {
-    const {files} = e.target as HTMLInputElement;
+    const { files } = e.target as HTMLInputElement;
     if (!files?.length) return;
 
     try {
@@ -460,7 +467,7 @@ export function useFileUpload() {
     }
   }
 
-  return {upload, error, loading, fileInfo};
+  return { upload, error, loading, fileInfo };
 }
 
 export function useMyLearningMentors() {
@@ -470,7 +477,7 @@ export function useMyLearningMentors() {
 
   const fetchMentors = async () => {
     loading.value = true;
-    const {data} = await useCSRFFetch(
+    const { data } = await useCSRFFetch(
       `/api/mentor/${currentCourseSessionId}/mentors`
     ).json();
     learningMentors.value = data.value;
@@ -622,7 +629,7 @@ export function useCourseCircleProgress(circles: Ref<CircleType[] | undefined>)
     return circles.value?.length ?? 0;
   });
 
-  return {inProgressCirclesCount, circlesCount};
+  return { inProgressCirclesCount, circlesCount };
 }
 
 export function useCourseStatisticsv2(courseSlug: string) {
@@ -684,7 +691,7 @@ export function useCertificateQuery(
     });
   })();
 
-  return {certificatesQuery};
+  return { certificatesQuery };
 }
 
 export function useEvaluationWithFeedback() {
@@ -695,7 +702,7 @@ export function useEvaluationWithFeedback() {
       currentCourseSession.value.course.configuration.is_vv
   );
 
-  return {hasFeedback};
+  return { hasFeedback };
 }
 
 export function useVVByLink() {
@@ -705,11 +712,11 @@ export function useVVByLink() {
     () =>
       router.resolve({
         name: "accountConfirm",
-        params: {courseType: `vv-${userStore.language}`},
+        params: { courseType: `vv-${userStore.language}` },
       }).href as RouteLocationRaw
   );
 
-  return {href};
+  return { href };
 }
 
 export function useAllCompetenceCertificates(
@@ -719,14 +726,17 @@ export function useAllCompetenceCertificates(
   const courseSessionsStore = useCourseSessionsStore();
   const certificateQueries = courseSessionsStore.allCourseSessions.map(
     (courseSession) => {
-      return useCertificateQuery([userId], courseSlug, courseSession).certificatesQuery;
+      return useCertificateQuery([userId ?? ""], courseSlug, courseSession)
+        .certificatesQuery;
     }
   );
 
   const competenceCertificatesPerCs = computed(() =>
     certificateQueries.map((query) => {
-      return getCertificates(query.data.value, userId ?? null)
-        ?.competence_certificates as unknown as CompetenceCertificate[];
+      return (
+        (query.data.value?.competence_certificate_list
+          ?.competence_certificates as unknown as CompetenceCertificate[]) ?? []
+      );
     })
   );
   const isLoaded = computed(() => !certificateQueries.some((q) => q.fetching.value));
diff --git a/client/src/gql/gql.ts b/client/src/gql/gql.ts
index 4a360391..f5aa9ee2 100644
--- a/client/src/gql/gql.ts
+++ b/client/src/gql/gql.ts
@@ -19,7 +19,7 @@ const documents = {
     "\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        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_points_deducted\n      evaluation_points_deducted_reason\n      evaluation_points_final\n\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          competence_certificate_weight\n          completions(course_session_id: $courseSessionId) {\n            id\n            completion_status\n            submitted_at\n            evaluation_points\n            evaluation_points_deducted\n            evaluation_points_final\n            evaluation_max_points\n            evaluation_passed\n            course_session {\n              id\n              title\n            }\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 competenceCertificateQuery($courseSlug: String!, $courseSessionId: ID!, $userIds: [UUID!]) {\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          competence_certificate_weight\n          completions(course_session_id: $courseSessionId) {\n            id\n            completion_status\n            submitted_at\n            evaluation_points\n            evaluation_points_deducted\n            evaluation_points_final\n            evaluation_max_points\n            evaluation_passed\n            course_session {\n              id\n              title\n            }\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 competenceCertificateForUserQuery(\n    $courseSlug: String!\n    $courseSessionId: ID!\n    $userIds: [UUID!]!\n  ) {\n    competence_certificate_list(course_slug: $courseSlug, user_ids: $userIds) {\n      ...CoursePageFields\n      competence_certificates {\n        ...CoursePageFields\n        assignments {\n          ...CoursePageFields\n          assignment_type\n          max_points\n          competence_certificate_weight\n          completions(course_session_id: $courseSessionId) {\n            id\n            completion_status\n            submitted_at\n            evaluation_points\n            evaluation_points_final\n            evaluation_points_deducted\n            evaluation_max_points\n            evaluation_passed\n            evaluation_percent\n            assignment_user {\n              id\n            }\n            course_session {\n              id\n              title\n            }\n          }\n          learning_content {\n            ...CoursePageFields\n            circle {\n              id\n              title\n              slug\n            }\n          }\n        }\n      }\n    }\n  }\n": types.CompetenceCertificateForUserQueryDocument,
     "\n  query courseSessionDetail($courseSessionId: ID!) {\n    course_session(id: $courseSessionId) {\n      id\n      title\n      course {\n        id\n        title\n        slug\n        configuration {\n          id\n          enable_circle_documents\n          enable_learning_mentor\n          enable_competence_certificates\n        }\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        optional_attendance\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!, $user: String) {\n    course(slug: $slug) {\n      id\n      title\n      slug\n      category_name\n      profiles\n      course_session_users(id: $user) {\n        id\n        __typename\n        chosen_profile\n        course_session {\n          id\n        }\n      }\n      configuration {\n        id\n        enable_circle_documents\n        enable_learning_mentor\n        enable_competence_certificates\n        is_uk\n        is_vv\n      }\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            profiles\n            is_base_circle\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,
@@ -72,7 +72,7 @@ export function graphql(source: "\n  query assignmentCompletionQuery(\n    $assi
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  query 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          competence_certificate_weight\n          completions(course_session_id: $courseSessionId) {\n            id\n            completion_status\n            submitted_at\n            evaluation_points\n            evaluation_points_deducted\n            evaluation_points_final\n            evaluation_max_points\n            evaluation_passed\n            course_session {\n              id\n              title\n            }\n          }\n          learning_content {\n            ...CoursePageFields\n            circle {\n              id\n              title\n              slug\n            }\n          }\n        }\n      }\n    }\n  }\n"): (typeof documents)["\n  query competenceCertificateQuery($courseSlug: String!, $courseSessionId: ID!) {\n    competence_certificate_list(course_slug: $courseSlug) {\n      ...CoursePageFields\n      competence_certificates {\n        ...CoursePageFields\n        assignments {\n          ...CoursePageFields\n          assignment_type\n          max_points\n          competence_certificate_weight\n          completions(course_session_id: $courseSessionId) {\n            id\n            completion_status\n            submitted_at\n            evaluation_points\n            evaluation_points_deducted\n            evaluation_points_final\n            evaluation_max_points\n            evaluation_passed\n            course_session {\n              id\n              title\n            }\n          }\n          learning_content {\n            ...CoursePageFields\n            circle {\n              id\n              title\n              slug\n            }\n          }\n        }\n      }\n    }\n  }\n"];
+export function graphql(source: "\n  query competenceCertificateQuery($courseSlug: String!, $courseSessionId: ID!, $userIds: [UUID!]) {\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          competence_certificate_weight\n          completions(course_session_id: $courseSessionId) {\n            id\n            completion_status\n            submitted_at\n            evaluation_points\n            evaluation_points_deducted\n            evaluation_points_final\n            evaluation_max_points\n            evaluation_passed\n            course_session {\n              id\n              title\n            }\n          }\n          learning_content {\n            ...CoursePageFields\n            circle {\n              id\n              title\n              slug\n            }\n          }\n        }\n      }\n    }\n  }\n"): (typeof documents)["\n  query competenceCertificateQuery($courseSlug: String!, $courseSessionId: ID!, $userIds: [UUID!]) {\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          competence_certificate_weight\n          completions(course_session_id: $courseSessionId) {\n            id\n            completion_status\n            submitted_at\n            evaluation_points\n            evaluation_points_deducted\n            evaluation_points_final\n            evaluation_max_points\n            evaluation_passed\n            course_session {\n              id\n              title\n            }\n          }\n          learning_content {\n            ...CoursePageFields\n            circle {\n              id\n              title\n              slug\n            }\n          }\n        }\n      }\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
diff --git a/client/src/gql/graphql.ts b/client/src/gql/graphql.ts
index ee1d1a2d..fafc3106 100644
--- a/client/src/gql/graphql.ts
+++ b/client/src/gql/graphql.ts
@@ -1236,6 +1236,7 @@ export type AssignmentCompletionQueryQuery = { __typename?: 'Query', assignment?
 export type CompetenceCertificateQueryQueryVariables = Exact<{
   courseSlug: Scalars['String']['input'];
   courseSessionId: Scalars['ID']['input'];
+  userIds?: InputMaybe<Array<Scalars['UUID']['input']> | Scalars['UUID']['input']>;
 }>;
 
 
@@ -1472,7 +1473,7 @@ export const UpsertAssignmentCompletionDocument = {"kind":"Document","definition
 export const UpdateCourseSessionProfileDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateCourseSessionProfile"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"CourseSessionProfileMutationInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"update_course_session_profile"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"clientMutationId"}},{"kind":"Field","name":{"kind":"Name","value":"result"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"__typename"}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateCourseProfileSuccess"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"chosen_profile"}}]}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateCourseProfileError"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"message"}}]}}]}}]}}]}}]} as unknown as DocumentNode<UpdateCourseSessionProfileMutation, UpdateCourseSessionProfileMutationVariables>;
 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":"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_points_deducted"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points_deducted_reason"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points_final"}},{"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":"competence_certificate_weight"}},{"kind":"Field","name":{"kind":"Name","value":"completions"},"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_points_deducted"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points_final"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_max_points"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_passed"}},{"kind":"Field","name":{"kind":"Name","value":"course_session"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}}]}}]}},{"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 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"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"userIds"}},"type":{"kind":"ListType","type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}}],"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":"competence_certificate_weight"}},{"kind":"Field","name":{"kind":"Name","value":"completions"},"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_points_deducted"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points_final"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_max_points"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_passed"}},{"kind":"Field","name":{"kind":"Name","value":"course_session"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}}]}}]}},{"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 CompetenceCertificateForUserQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"competenceCertificateForUserQuery"},"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"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"userIds"}},"type":{"kind":"NonNullType","type":{"kind":"ListType","type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}}}],"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"}}},{"kind":"Argument","name":{"kind":"Name","value":"user_ids"},"value":{"kind":"Variable","name":{"kind":"Name","value":"userIds"}}}],"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":"competence_certificate_weight"}},{"kind":"Field","name":{"kind":"Name","value":"completions"},"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_points_final"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points_deducted"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_max_points"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_passed"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_percent"}},{"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":"course_session"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}}]}}]}},{"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<CompetenceCertificateForUserQueryQuery, CompetenceCertificateForUserQueryQueryVariables>;
 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":"configuration"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"enable_circle_documents"}},{"kind":"Field","name":{"kind":"Name","value":"enable_learning_mentor"}},{"kind":"Field","name":{"kind":"Name","value":"enable_competence_certificates"}}]}}]}},{"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":"optional_attendance"}}]}},{"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"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"user"}},"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":"profiles"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_users"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"user"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"__typename"}},{"kind":"Field","name":{"kind":"Name","value":"chosen_profile"}},{"kind":"Field","name":{"kind":"Name","value":"course_session"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"configuration"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"enable_circle_documents"}},{"kind":"Field","name":{"kind":"Name","value":"enable_learning_mentor"}},{"kind":"Field","name":{"kind":"Name","value":"enable_competence_certificates"}},{"kind":"Field","name":{"kind":"Name","value":"is_uk"}},{"kind":"Field","name":{"kind":"Name","value":"is_vv"}}]}},{"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":"Field","name":{"kind":"Name","value":"profiles"}},{"kind":"Field","name":{"kind":"Name","value":"is_base_circle"}},{"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 acbd08cd..52c569a1 100644
--- a/client/src/graphql/queries.ts
+++ b/client/src/graphql/queries.ts
@@ -1,4 +1,4 @@
-import {graphql} from "@/gql";
+import { graphql } from "@/gql";
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const CoursePageFragment = graphql(`
@@ -90,7 +90,11 @@ export const ASSIGNMENT_COMPLETION_QUERY = graphql(`
 `);
 
 export const COMPETENCE_NAVI_CERTIFICATE_QUERY = graphql(`
-  query competenceCertificateQuery($courseSlug: String!, $courseSessionId: ID!) {
+  query competenceCertificateQuery(
+    $courseSlug: String!
+    $courseSessionId: ID!
+    $userIds: [UUID!]
+  ) {
     competence_certificate_list(course_slug: $courseSlug) {
       ...CoursePageFields
       competence_certificates {
diff --git a/client/src/pages/competence/CompetenceAssignmentRow.vue b/client/src/pages/competence/CompetenceAssignmentRow.vue
index 608a9a4a..e887f53e 100644
--- a/client/src/pages/competence/CompetenceAssignmentRow.vue
+++ b/client/src/pages/competence/CompetenceAssignmentRow.vue
@@ -28,8 +28,8 @@ const getIconName = () => {
 };
 
 const openInCircle = (assignment: CompetenceCertificateAssignment) => {
-  if (assignment.completion?.course_session !== currentCourseSession.value) {
-    switchCourseSessionById(assignment.completion!.course_session.id);
+  if (assignment.completions[0]?.course_session !== currentCourseSession.value) {
+    switchCourseSessionById(assignment.completions[0]!.course_session.id);
   }
   router.push(assignment.frontend_url);
 };
@@ -48,7 +48,7 @@ const openInCircle = (assignment: CompetenceCertificateAssignment) => {
         v-if="showCourseSession"
         :data-cy="`assignment-${assignment.slug}-course-session`"
       >
-        {{ assignment?.completion?.course_session.title }}
+        {{ assignment?.completions[0]?.course_session.title }}
       </p>
       <p class="text-gray-800">
         <button
diff --git a/client/src/pages/competence/CompetenceCertificateComponent.vue b/client/src/pages/competence/CompetenceCertificateComponent.vue
index af6cbd83..41b82013 100644
--- a/client/src/pages/competence/CompetenceCertificateComponent.vue
+++ b/client/src/pages/competence/CompetenceCertificateComponent.vue
@@ -57,7 +57,8 @@ const showCourseSession = computed(() => {
   const currentCourseSession = useCurrentCourseSession();
   return props.competenceCertificate.assignments.some((assignment) => {
     return (
-      assignment.completion?.course_session.title !== currentCourseSession.value.title
+      assignment.completions[0]?.course_session.title !==
+      currentCourseSession.value.title
     );
   });
 });
diff --git a/client/src/pages/competence/CompetenceCertificateDetailPage.vue b/client/src/pages/competence/CompetenceCertificateDetailPage.vue
index 25daf926..cd8b65e1 100644
--- a/client/src/pages/competence/CompetenceCertificateDetailPage.vue
+++ b/client/src/pages/competence/CompetenceCertificateDetailPage.vue
@@ -1,9 +1,8 @@
 <script setup lang="ts">
 import log from "loglevel";
-import {computed} from "vue";
-import type {CompetenceCertificate} from "@/types";
-import {useAllCompetenceCertificates} from "@/composables";
-import {getPreviousRoute} from "@/router/history";
+import { computed } from "vue";
+import { useAllCompetenceCertificates } from "@/composables";
+import { getPreviousRoute } from "@/router/history";
 import CompetenceCertificateComponent from "@/pages/competence/CompetenceCertificateComponent.vue";
 
 const props = defineProps<{
@@ -14,15 +13,7 @@ const props = defineProps<{
 
 log.debug("CompetenceCertificateDetailPage setup", props);
 
-
-const competenceCertificates = computed(() => {
-  return (
-    (certificatesQuery.data.value?.competence_certificate_list
-      ?.competence_certificates as unknown as CompetenceCertificate[]) ?? []
-  );
-});
-
-const {competenceCertificates} = useAllCompetenceCertificates(
+const { competenceCertificates } = useAllCompetenceCertificates(
   props.userId,
   props.courseSlug
 );
diff --git a/client/src/pages/competence/CompetenceCertificateListPage.vue b/client/src/pages/competence/CompetenceCertificateListPage.vue
index db410844..47b50926 100644
--- a/client/src/pages/competence/CompetenceCertificateListPage.vue
+++ b/client/src/pages/competence/CompetenceCertificateListPage.vue
@@ -1,10 +1,13 @@
 <script setup lang="ts">
 import log from "loglevel";
-import {computed, onMounted} from "vue";
-import {useAllCompetenceCertificates} from "@/composables";
+import { computed, onMounted } from "vue";
+import { useAllCompetenceCertificates } from "@/composables";
 import CompetenceCertificateComponent from "@/pages/competence/CompetenceCertificateComponent.vue";
-import {assignmentsUserPoints, calcCompetencesTotalGrade,} from "@/pages/competence/utils";
-import {useRoute} from "vue-router";
+import {
+  assignmentsUserPoints,
+  calcCompetencesTotalGrade,
+} from "@/pages/competence/utils";
+import { useRoute } from "vue-router";
 
 const props = defineProps<{
   courseSlug: string;
@@ -15,8 +18,7 @@ log.debug("CompetenceCertificateListPage setup", props);
 
 const route = useRoute();
 
-
-const {competenceCertificates} = useAllCompetenceCertificates(
+const { competenceCertificates } = useAllCompetenceCertificates(
   props.userId,
   props.courseSlug
 );
diff --git a/client/src/pages/competence/CompetenceIndexPage.vue b/client/src/pages/competence/CompetenceIndexPage.vue
index cabfb931..2707a0d1 100644
--- a/client/src/pages/competence/CompetenceIndexPage.vue
+++ b/client/src/pages/competence/CompetenceIndexPage.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import log from "loglevel";
-import {computed} from "vue";
-import {useAllCompetenceCertificates, useCurrentCourseSession} from "@/composables";
+import { computed } from "vue";
+import { useAllCompetenceCertificates, useCurrentCourseSession } from "@/composables";
 import {
   assignmentsUserPoints,
   calcCompetenceCertificateGrade,
@@ -9,10 +9,9 @@ import {
   competenceCertificateProgressStatusCount,
 } from "@/pages/competence/utils";
 import ItProgress from "@/components/ui/ItProgress.vue";
-import SelfEvaluationAndFeedbackOverview
-  from "@/components/selfEvaluationFeedback/SelfEvaluationAndFeedbackOverview.vue";
-import {useUserStore} from "@/stores/user";
-import {useRouter} from "vue-router";
+import SelfEvaluationAndFeedbackOverview from "@/components/selfEvaluationFeedback/SelfEvaluationAndFeedbackOverview.vue";
+import { useUserStore } from "@/stores/user";
+import { useRouter } from "vue-router";
 
 const props = defineProps<{
   courseSlug: string;
@@ -22,16 +21,7 @@ log.debug("CompetenceIndexPage setup", props);
 
 const user = useUserStore();
 
-const certificatesQuery = useQuery({
-  query: COMPETENCE_NAVI_CERTIFICATE_QUERY,
-  variables: {
-    courseSlug: props.courseSlug,
-    courseSessionId: courseSession.value.id,
-    userIds: user.id,
-  },
-});
-
-const {competenceCertificates, isLoaded} = useAllCompetenceCertificates(
+const { competenceCertificates, isLoaded } = useAllCompetenceCertificates(
   user.id,
   props.courseSlug
 );
diff --git a/client/src/pages/competence/utils.ts b/client/src/pages/competence/utils.ts
index e274fa2a..4488ce60 100644
--- a/client/src/pages/competence/utils.ts
+++ b/client/src/pages/competence/utils.ts
@@ -120,10 +120,10 @@ export function mergeCompetenceCertificates(
         if (!existingAssignment) {
           mergedCertificate.assignments.push(assignment);
         } else if (
-          assignment.completion != null &&
-          (existingAssignment.completion == null ||
-            dayjs(existingAssignment.completion.evaluation_submitted_at).isBefore(
-              assignment.completion.evaluation_submitted_at
+          assignment.completions[0] != null &&
+          (existingAssignment.completions[0] == null ||
+            dayjs(existingAssignment.completions[0].evaluation_submitted_at).isBefore(
+              assignment.completions[0].evaluation_submitted_at
             ))
         ) {
           mergedCertificate.assignments.splice(

From 6978a2de9147a14348e2fe77a1c56c9785b9bf2e Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Sat, 10 Aug 2024 13:37:15 +0200
Subject: [PATCH 37/40] Merge migrations

---
 .../course/migrations/0012_merge_20240810_1336.py    | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 server/vbv_lernwelt/course/migrations/0012_merge_20240810_1336.py

diff --git a/server/vbv_lernwelt/course/migrations/0012_merge_20240810_1336.py b/server/vbv_lernwelt/course/migrations/0012_merge_20240810_1336.py
new file mode 100644
index 00000000..315e04bb
--- /dev/null
+++ b/server/vbv_lernwelt/course/migrations/0012_merge_20240810_1336.py
@@ -0,0 +1,12 @@
+# Generated by Django 4.2.13 on 2024-08-10 11:36
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("course", "0010_merge_20240805_0731"),
+        ("course", "0011_merge_20240807_1317"),
+    ]
+
+    operations = []

From bbc4e3da3f3232e3075adceaed96e7ff8b1bd741 Mon Sep 17 00:00:00 2001
From: Elia Bieri <elia.bieri@iterativ.ch>
Date: Wed, 14 Aug 2024 09:50:00 +0200
Subject: [PATCH 38/40] Fix python tests

---
 .../vbv_lernwelt/course/tests/test_update_course_profile.py   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/vbv_lernwelt/course/tests/test_update_course_profile.py b/server/vbv_lernwelt/course/tests/test_update_course_profile.py
index c4a4b12c..5beb8ed7 100644
--- a/server/vbv_lernwelt/course/tests/test_update_course_profile.py
+++ b/server/vbv_lernwelt/course/tests/test_update_course_profile.py
@@ -19,7 +19,7 @@ class CourseGraphQLTestCase(TestCase):
         create_versicherungsvermittlerin_course()
 
     def test_update_course_profile(self):
-        user = User.objects.get(username="student-vv@eiger-versicherungen.ch")
+        user = User.objects.get(username="test-student-and-mentor2@example.com")
         request = RequestFactory().get("/")
         request.user = user
         client = Client(schema=schema, context_value=request)
@@ -98,7 +98,7 @@ class CourseGraphQLTestCase(TestCase):
         self.assertEqual(chosen_profile, profile)
 
     def test_mentor_profile_view(self):
-        user = User.objects.get(username="test-mentor1@example.com")
+        user = User.objects.get(username="test-student-and-mentor2@example.com")
         request = RequestFactory().get("/")
         request.user = user
         client = Client(schema=schema, context_value=request)

From dbd0f84c5f43cc99c8c8186e0d0c9e2d4fe0af67 Mon Sep 17 00:00:00 2001
From: Elia Bieri <elia.bieri@iterativ.ch>
Date: Wed, 14 Aug 2024 14:28:36 +0200
Subject: [PATCH 39/40] Fix frontend tests

---
 client/src/composables.ts                              | 10 +++-------
 client/src/gql/gql.ts                                  |  4 ++--
 client/src/gql/graphql.ts                              |  2 +-
 client/src/graphql/queries.ts                          |  2 +-
 .../competence/CompetenceCertificateDetailPage.vue     |  4 +++-
 .../pages/competence/CompetenceCertificateListPage.vue |  5 +++--
 6 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/client/src/composables.ts b/client/src/composables.ts
index bd543a5a..773eb773 100644
--- a/client/src/composables.ts
+++ b/client/src/composables.ts
@@ -676,7 +676,7 @@ export function useCourseStatisticsv2(courseSlug: string) {
 }
 
 export function useCertificateQuery(
-  userIds: string[] | undefined,
+  userIds: string[],
   courseSlug: string,
   courseSession: CourseSession
 ) {
@@ -719,15 +719,11 @@ export function useVVByLink() {
   return { href };
 }
 
-export function useAllCompetenceCertificates(
-  userId: string | undefined,
-  courseSlug: string
-) {
+export function useAllCompetenceCertificates(userId: string, courseSlug: string) {
   const courseSessionsStore = useCourseSessionsStore();
   const certificateQueries = courseSessionsStore.allCourseSessions.map(
     (courseSession) => {
-      return useCertificateQuery([userId ?? ""], courseSlug, courseSession)
-        .certificatesQuery;
+      return useCertificateQuery([userId], courseSlug, courseSession).certificatesQuery;
     }
   );
 
diff --git a/client/src/gql/gql.ts b/client/src/gql/gql.ts
index f5aa9ee2..af4b0c5c 100644
--- a/client/src/gql/gql.ts
+++ b/client/src/gql/gql.ts
@@ -19,7 +19,7 @@ const documents = {
     "\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        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_points_deducted\n      evaluation_points_deducted_reason\n      evaluation_points_final\n\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!, $userIds: [UUID!]) {\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          competence_certificate_weight\n          completions(course_session_id: $courseSessionId) {\n            id\n            completion_status\n            submitted_at\n            evaluation_points\n            evaluation_points_deducted\n            evaluation_points_final\n            evaluation_max_points\n            evaluation_passed\n            course_session {\n              id\n              title\n            }\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 competenceCertificateQuery(\n    $courseSlug: String!\n    $courseSessionId: ID!\n    $userIds: [UUID!]\n  ) {\n    competence_certificate_list(course_slug: $courseSlug, user_ids: $userIds) {\n      ...CoursePageFields\n      competence_certificates {\n        ...CoursePageFields\n        assignments {\n          ...CoursePageFields\n          assignment_type\n          max_points\n          competence_certificate_weight\n          completions(course_session_id: $courseSessionId) {\n            id\n            completion_status\n            submitted_at\n            evaluation_points\n            evaluation_points_deducted\n            evaluation_points_final\n            evaluation_max_points\n            evaluation_passed\n            course_session {\n              id\n              title\n            }\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 competenceCertificateForUserQuery(\n    $courseSlug: String!\n    $courseSessionId: ID!\n    $userIds: [UUID!]!\n  ) {\n    competence_certificate_list(course_slug: $courseSlug, user_ids: $userIds) {\n      ...CoursePageFields\n      competence_certificates {\n        ...CoursePageFields\n        assignments {\n          ...CoursePageFields\n          assignment_type\n          max_points\n          competence_certificate_weight\n          completions(course_session_id: $courseSessionId) {\n            id\n            completion_status\n            submitted_at\n            evaluation_points\n            evaluation_points_final\n            evaluation_points_deducted\n            evaluation_max_points\n            evaluation_passed\n            evaluation_percent\n            assignment_user {\n              id\n            }\n            course_session {\n              id\n              title\n            }\n          }\n          learning_content {\n            ...CoursePageFields\n            circle {\n              id\n              title\n              slug\n            }\n          }\n        }\n      }\n    }\n  }\n": types.CompetenceCertificateForUserQueryDocument,
     "\n  query courseSessionDetail($courseSessionId: ID!) {\n    course_session(id: $courseSessionId) {\n      id\n      title\n      course {\n        id\n        title\n        slug\n        configuration {\n          id\n          enable_circle_documents\n          enable_learning_mentor\n          enable_competence_certificates\n        }\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        optional_attendance\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!, $user: String) {\n    course(slug: $slug) {\n      id\n      title\n      slug\n      category_name\n      profiles\n      course_session_users(id: $user) {\n        id\n        __typename\n        chosen_profile\n        course_session {\n          id\n        }\n      }\n      configuration {\n        id\n        enable_circle_documents\n        enable_learning_mentor\n        enable_competence_certificates\n        is_uk\n        is_vv\n      }\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            profiles\n            is_base_circle\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,
@@ -72,7 +72,7 @@ export function graphql(source: "\n  query assignmentCompletionQuery(\n    $assi
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  query competenceCertificateQuery($courseSlug: String!, $courseSessionId: ID!, $userIds: [UUID!]) {\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          competence_certificate_weight\n          completions(course_session_id: $courseSessionId) {\n            id\n            completion_status\n            submitted_at\n            evaluation_points\n            evaluation_points_deducted\n            evaluation_points_final\n            evaluation_max_points\n            evaluation_passed\n            course_session {\n              id\n              title\n            }\n          }\n          learning_content {\n            ...CoursePageFields\n            circle {\n              id\n              title\n              slug\n            }\n          }\n        }\n      }\n    }\n  }\n"): (typeof documents)["\n  query competenceCertificateQuery($courseSlug: String!, $courseSessionId: ID!, $userIds: [UUID!]) {\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          competence_certificate_weight\n          completions(course_session_id: $courseSessionId) {\n            id\n            completion_status\n            submitted_at\n            evaluation_points\n            evaluation_points_deducted\n            evaluation_points_final\n            evaluation_max_points\n            evaluation_passed\n            course_session {\n              id\n              title\n            }\n          }\n          learning_content {\n            ...CoursePageFields\n            circle {\n              id\n              title\n              slug\n            }\n          }\n        }\n      }\n    }\n  }\n"];
+export function graphql(source: "\n  query competenceCertificateQuery(\n    $courseSlug: String!\n    $courseSessionId: ID!\n    $userIds: [UUID!]\n  ) {\n    competence_certificate_list(course_slug: $courseSlug, user_ids: $userIds) {\n      ...CoursePageFields\n      competence_certificates {\n        ...CoursePageFields\n        assignments {\n          ...CoursePageFields\n          assignment_type\n          max_points\n          competence_certificate_weight\n          completions(course_session_id: $courseSessionId) {\n            id\n            completion_status\n            submitted_at\n            evaluation_points\n            evaluation_points_deducted\n            evaluation_points_final\n            evaluation_max_points\n            evaluation_passed\n            course_session {\n              id\n              title\n            }\n          }\n          learning_content {\n            ...CoursePageFields\n            circle {\n              id\n              title\n              slug\n            }\n          }\n        }\n      }\n    }\n  }\n"): (typeof documents)["\n  query competenceCertificateQuery(\n    $courseSlug: String!\n    $courseSessionId: ID!\n    $userIds: [UUID!]\n  ) {\n    competence_certificate_list(course_slug: $courseSlug, user_ids: $userIds) {\n      ...CoursePageFields\n      competence_certificates {\n        ...CoursePageFields\n        assignments {\n          ...CoursePageFields\n          assignment_type\n          max_points\n          competence_certificate_weight\n          completions(course_session_id: $courseSessionId) {\n            id\n            completion_status\n            submitted_at\n            evaluation_points\n            evaluation_points_deducted\n            evaluation_points_final\n            evaluation_max_points\n            evaluation_passed\n            course_session {\n              id\n              title\n            }\n          }\n          learning_content {\n            ...CoursePageFields\n            circle {\n              id\n              title\n              slug\n            }\n          }\n        }\n      }\n    }\n  }\n"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
diff --git a/client/src/gql/graphql.ts b/client/src/gql/graphql.ts
index fafc3106..600b66a0 100644
--- a/client/src/gql/graphql.ts
+++ b/client/src/gql/graphql.ts
@@ -1473,7 +1473,7 @@ export const UpsertAssignmentCompletionDocument = {"kind":"Document","definition
 export const UpdateCourseSessionProfileDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"mutation","name":{"kind":"Name","value":"UpdateCourseSessionProfile"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"input"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"CourseSessionProfileMutationInput"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"update_course_session_profile"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"input"},"value":{"kind":"Variable","name":{"kind":"Name","value":"input"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"clientMutationId"}},{"kind":"Field","name":{"kind":"Name","value":"result"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"__typename"}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateCourseProfileSuccess"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"chosen_profile"}}]}}]}},{"kind":"InlineFragment","typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"UpdateCourseProfileError"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"message"}}]}}]}}]}}]}}]} as unknown as DocumentNode<UpdateCourseSessionProfileMutation, UpdateCourseSessionProfileMutationVariables>;
 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":"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_points_deducted"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points_deducted_reason"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points_final"}},{"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"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"userIds"}},"type":{"kind":"ListType","type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}}],"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":"competence_certificate_weight"}},{"kind":"Field","name":{"kind":"Name","value":"completions"},"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_points_deducted"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points_final"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_max_points"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_passed"}},{"kind":"Field","name":{"kind":"Name","value":"course_session"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}}]}}]}},{"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 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"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"userIds"}},"type":{"kind":"ListType","type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}}],"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"}}},{"kind":"Argument","name":{"kind":"Name","value":"user_ids"},"value":{"kind":"Variable","name":{"kind":"Name","value":"userIds"}}}],"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":"competence_certificate_weight"}},{"kind":"Field","name":{"kind":"Name","value":"completions"},"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_points_deducted"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points_final"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_max_points"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_passed"}},{"kind":"Field","name":{"kind":"Name","value":"course_session"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}}]}}]}},{"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 CompetenceCertificateForUserQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"competenceCertificateForUserQuery"},"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"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"userIds"}},"type":{"kind":"NonNullType","type":{"kind":"ListType","type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}}}}],"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"}}},{"kind":"Argument","name":{"kind":"Name","value":"user_ids"},"value":{"kind":"Variable","name":{"kind":"Name","value":"userIds"}}}],"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":"competence_certificate_weight"}},{"kind":"Field","name":{"kind":"Name","value":"completions"},"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_points_final"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points_deducted"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_max_points"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_passed"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_percent"}},{"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":"course_session"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}}]}}]}},{"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<CompetenceCertificateForUserQueryQuery, CompetenceCertificateForUserQueryQueryVariables>;
 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":"configuration"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"enable_circle_documents"}},{"kind":"Field","name":{"kind":"Name","value":"enable_learning_mentor"}},{"kind":"Field","name":{"kind":"Name","value":"enable_competence_certificates"}}]}}]}},{"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":"optional_attendance"}}]}},{"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"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"user"}},"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":"profiles"}},{"kind":"Field","name":{"kind":"Name","value":"course_session_users"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"user"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"__typename"}},{"kind":"Field","name":{"kind":"Name","value":"chosen_profile"}},{"kind":"Field","name":{"kind":"Name","value":"course_session"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"configuration"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"enable_circle_documents"}},{"kind":"Field","name":{"kind":"Name","value":"enable_learning_mentor"}},{"kind":"Field","name":{"kind":"Name","value":"enable_competence_certificates"}},{"kind":"Field","name":{"kind":"Name","value":"is_uk"}},{"kind":"Field","name":{"kind":"Name","value":"is_vv"}}]}},{"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":"Field","name":{"kind":"Name","value":"profiles"}},{"kind":"Field","name":{"kind":"Name","value":"is_base_circle"}},{"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 52c569a1..c34b6173 100644
--- a/client/src/graphql/queries.ts
+++ b/client/src/graphql/queries.ts
@@ -95,7 +95,7 @@ export const COMPETENCE_NAVI_CERTIFICATE_QUERY = graphql(`
     $courseSessionId: ID!
     $userIds: [UUID!]
   ) {
-    competence_certificate_list(course_slug: $courseSlug) {
+    competence_certificate_list(course_slug: $courseSlug, user_ids: $userIds) {
       ...CoursePageFields
       competence_certificates {
         ...CoursePageFields
diff --git a/client/src/pages/competence/CompetenceCertificateDetailPage.vue b/client/src/pages/competence/CompetenceCertificateDetailPage.vue
index cd8b65e1..7a43d9de 100644
--- a/client/src/pages/competence/CompetenceCertificateDetailPage.vue
+++ b/client/src/pages/competence/CompetenceCertificateDetailPage.vue
@@ -4,6 +4,7 @@ import { computed } from "vue";
 import { useAllCompetenceCertificates } from "@/composables";
 import { getPreviousRoute } from "@/router/history";
 import CompetenceCertificateComponent from "@/pages/competence/CompetenceCertificateComponent.vue";
+import { useUserStore } from "@/stores/user";
 
 const props = defineProps<{
   courseSlug: string;
@@ -13,8 +14,9 @@ const props = defineProps<{
 
 log.debug("CompetenceCertificateDetailPage setup", props);
 
+const { id: currentUserId } = useUserStore();
 const { competenceCertificates } = useAllCompetenceCertificates(
-  props.userId,
+  props.userId ?? currentUserId,
   props.courseSlug
 );
 
diff --git a/client/src/pages/competence/CompetenceCertificateListPage.vue b/client/src/pages/competence/CompetenceCertificateListPage.vue
index 47b50926..d42bcd28 100644
--- a/client/src/pages/competence/CompetenceCertificateListPage.vue
+++ b/client/src/pages/competence/CompetenceCertificateListPage.vue
@@ -8,6 +8,7 @@ import {
   calcCompetencesTotalGrade,
 } from "@/pages/competence/utils";
 import { useRoute } from "vue-router";
+import { useUserStore } from "@/stores/user";
 
 const props = defineProps<{
   courseSlug: string;
@@ -17,9 +18,9 @@ const props = defineProps<{
 log.debug("CompetenceCertificateListPage setup", props);
 
 const route = useRoute();
-
+const { id: currentUserId } = useUserStore();
 const { competenceCertificates } = useAllCompetenceCertificates(
-  props.userId,
+  props.userId ?? currentUserId,
   props.courseSlug
 );
 

From c55be997dc49d189c0b5eeb0aa87741dcaa132da Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Mon, 19 Aug 2024 12:59:58 +0200
Subject: [PATCH 40/40] Fix profiles

---
 .../pages/competence/CompetenceAssignmentRow.vue   |  8 ++++----
 .../competence/CompetenceCertificateComponent.vue  |  4 ++--
 .../competence/CompetenceCertificateListPage.vue   |  2 +-
 client/src/pages/competence/utils.ts               | 14 +++++++-------
 .../src/pages/dashboard/DashboardPersonsPage.vue   |  2 +-
 .../AgentCompetenceGradeDetailPage.vue             |  2 +-
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/client/src/pages/competence/CompetenceAssignmentRow.vue b/client/src/pages/competence/CompetenceAssignmentRow.vue
index e887f53e..c2e09118 100644
--- a/client/src/pages/competence/CompetenceAssignmentRow.vue
+++ b/client/src/pages/competence/CompetenceAssignmentRow.vue
@@ -48,7 +48,7 @@ const openInCircle = (assignment: CompetenceCertificateAssignment) => {
         v-if="showCourseSession"
         :data-cy="`assignment-${assignment.slug}-course-session`"
       >
-        {{ assignment?.completions[0]?.course_session.title }}
+        {{ assignment?.completions?.[0]?.course_session.title }}
       </p>
       <p class="text-gray-800">
         <button
@@ -69,7 +69,7 @@ const openInCircle = (assignment: CompetenceCertificateAssignment) => {
     </div>
     <div class="grow lg:px-8">
       <div
-        v-if="assignment.completions[0]?.completion_status === 'EVALUATION_SUBMITTED'"
+        v-if="assignment.completions?.[0]?.completion_status === 'EVALUATION_SUBMITTED'"
         class="flex items-center"
       >
         <div
@@ -82,7 +82,7 @@ const openInCircle = (assignment: CompetenceCertificateAssignment) => {
       <div
         v-else-if="
           ['EVALUATION_IN_PROGRESS', 'SUBMITTED'].includes(
-            assignment.completions[0]?.completion_status || ''
+            assignment.completions?.[0]?.completion_status || ''
           )
         "
         class="flex items-center"
@@ -97,7 +97,7 @@ const openInCircle = (assignment: CompetenceCertificateAssignment) => {
     </div>
     <div>
       <div
-        v-if="assignment.completions[0]?.completion_status === 'EVALUATION_SUBMITTED'"
+        v-if="assignment.completions?.[0]?.completion_status === 'EVALUATION_SUBMITTED'"
         class="flex flex-col lg:items-center"
       >
         <div class="flex flex-col lg:items-center">
diff --git a/client/src/pages/competence/CompetenceCertificateComponent.vue b/client/src/pages/competence/CompetenceCertificateComponent.vue
index 41b82013..ee1728e0 100644
--- a/client/src/pages/competence/CompetenceCertificateComponent.vue
+++ b/client/src/pages/competence/CompetenceCertificateComponent.vue
@@ -33,7 +33,7 @@ const userGradeRounded2Places = computed(() => {
 
 const numAssignmentsEvaluated = computed(() => {
   return props.competenceCertificate.assignments.filter((a) => {
-    return a.completions[0]?.completion_status === "EVALUATION_SUBMITTED";
+    return a?.completions?.[0]?.completion_status === "EVALUATION_SUBMITTED";
   }).length;
 });
 
@@ -57,7 +57,7 @@ const showCourseSession = computed(() => {
   const currentCourseSession = useCurrentCourseSession();
   return props.competenceCertificate.assignments.some((assignment) => {
     return (
-      assignment.completions[0]?.course_session.title !==
+      assignment.completions?.[0]?.course_session.title !==
       currentCourseSession.value.title
     );
   });
diff --git a/client/src/pages/competence/CompetenceCertificateListPage.vue b/client/src/pages/competence/CompetenceCertificateListPage.vue
index d42bcd28..9a51eb56 100644
--- a/client/src/pages/competence/CompetenceCertificateListPage.vue
+++ b/client/src/pages/competence/CompetenceCertificateListPage.vue
@@ -38,7 +38,7 @@ const userPointsEvaluatedAssignments = computed(() => {
 
 const numAssignmentsEvaluated = computed(() => {
   return (assignments.value ?? []).filter((a) => {
-    return a.completions[0]?.completion_status === "EVALUATION_SUBMITTED";
+    return a.completions?.[0]?.completion_status === "EVALUATION_SUBMITTED";
   }).length;
 });
 
diff --git a/client/src/pages/competence/utils.ts b/client/src/pages/competence/utils.ts
index 4488ce60..2a42d762 100644
--- a/client/src/pages/competence/utils.ts
+++ b/client/src/pages/competence/utils.ts
@@ -17,8 +17,8 @@ export function assignmentsMaxEvaluationPoints(
 export function assignmentsUserPoints(assignments: CompetenceCertificateAssignment[]) {
   return +_.sum(
     assignments
-      .filter((a) => a.completions[0]?.completion_status === "EVALUATION_SUBMITTED")
-      .map((a) => a.completions[0]?.evaluation_points_final ?? 0)
+      .filter((a) => a.completions?.[0]?.completion_status === "EVALUATION_SUBMITTED")
+      .map((a) => a.completions?.[0]?.evaluation_points_final ?? 0)
   ).toFixed(1);
 }
 
@@ -27,12 +27,12 @@ export function calcCompetenceCertificateGrade(
   roundedToHalfGrade = true
 ) {
   const evaluatedAssignments = assignments.filter(
-    (a) => a.completions[0]?.completion_status === "EVALUATION_SUBMITTED"
+    (a) => a.completions?.[0]?.completion_status === "EVALUATION_SUBMITTED"
   );
 
   const adjustedResults = evaluatedAssignments.map((a) => {
     return (
-      ((a.completions[0]?.evaluation_points_final ?? 0) / a.max_points) *
+      ((a.completions?.[0]?.evaluation_points_final ?? 0) / a.max_points) *
       a.competence_certificate_weight
     );
   });
@@ -77,7 +77,7 @@ export function competenceCertificateProgressStatusCount(
   assignments: CompetenceCertificateAssignment[]
 ) {
   const numAssignmentsEvaluated = assignments.filter(
-    (a) => a.completions[0]?.completion_status === "EVALUATION_SUBMITTED"
+    (a) => a.completions?.[0]?.completion_status === "EVALUATION_SUBMITTED"
   ).length;
   return {
     SUCCESS: numAssignmentsEvaluated,
@@ -120,8 +120,8 @@ export function mergeCompetenceCertificates(
         if (!existingAssignment) {
           mergedCertificate.assignments.push(assignment);
         } else if (
-          assignment.completions[0] != null &&
-          (existingAssignment.completions[0] == null ||
+          assignment.completions?.[0] != null &&
+          (existingAssignment.completions?.[0] == null ||
             dayjs(existingAssignment.completions[0].evaluation_submitted_at).isBefore(
               assignment.completions[0].evaluation_submitted_at
             ))
diff --git a/client/src/pages/dashboard/DashboardPersonsPage.vue b/client/src/pages/dashboard/DashboardPersonsPage.vue
index bd7269ff..4d182a08 100644
--- a/client/src/pages/dashboard/DashboardPersonsPage.vue
+++ b/client/src/pages/dashboard/DashboardPersonsPage.vue
@@ -408,7 +408,7 @@ watch(selectedRegion, () => {
                       v-if="
                         (['SUPERVISOR', 'EXPERT'].includes(cs.my_role) &&
                           cs.user_role === 'MEMBER') ||
-                        (cs.my_role === 'LEARNING_MENTOR' &&
+                        (['LEARNING_MENTOR', 'BERUFSBILDNER'].includes(cs.my_role) &&
                           cs.user_role === 'PARTICIPANT')
                       "
                     >
diff --git a/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradeDetailPage.vue b/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradeDetailPage.vue
index a13f0775..0fdf65d7 100644
--- a/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradeDetailPage.vue
+++ b/client/src/pages/dashboard/agentAssignment/AgentCompetenceGradeDetailPage.vue
@@ -42,7 +42,7 @@ function userGrade(userId: string) {
     );
     for (const assignment of assignmentsWithUserCompletions) {
       assignment.completions = assignment.completions?.filter(
-        (c) => c?.assignment_user.id === userId
+        (c) => c?.assignment_user?.id === userId
       );
     }