From 6edb5be0930d588c57a85553e53420c32331ba61 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Tue, 2 Apr 2024 13:03:29 +0200
Subject: [PATCH 01/82] WIP: Add own components

---
 .../dashboard/CompetenceSummary.vue           | 36 +++++++++++++
 .../src/components/dashboard/CoursePanel.vue  | 50 +++++++++++++++++++
 client/src/gql/gql.ts                         |  5 ++
 client/src/gql/graphql.ts                     | 28 +++++++++--
 client/src/gql/schema.graphql                 | 14 +++++-
 client/src/gql/typenames.ts                   |  1 +
 client/src/graphql/queries.ts                 | 11 ++++
 client/src/pages/dashboard/DashboardPage.vue  |  7 +++
 client/src/router/guards.ts                   |  2 +
 client/src/router/index.ts                    | 21 +++++++-
 client/src/services/dashboard.ts              | 19 +++++++
 .../vbv_lernwelt/dashboard/graphql/queries.py | 50 ++++++++++++++++++-
 .../dashboard/graphql/types/dashboard.py      | 18 ++++++-
 13 files changed, 252 insertions(+), 10 deletions(-)
 create mode 100644 client/src/components/dashboard/CompetenceSummary.vue
 create mode 100644 client/src/components/dashboard/CoursePanel.vue

diff --git a/client/src/components/dashboard/CompetenceSummary.vue b/client/src/components/dashboard/CompetenceSummary.vue
new file mode 100644
index 00000000..ba701185
--- /dev/null
+++ b/client/src/components/dashboard/CompetenceSummary.vue
@@ -0,0 +1,36 @@
+<script setup lang="ts">
+import { computed, onMounted, ref, Ref } from "vue";
+import type { ProgressDashboardCompetenceType } from "@/gql/graphql";
+import CompetenceSummaryBox from "@/components/dashboard/CompetenceSummaryBox.vue";
+import { fetchProgressData } from "@/services/dashboard";
+
+const props = defineProps<{
+  courseId: string;
+  courseSlug: string;
+  sessionToContinueId: string;
+}>();
+
+const DEFAULT_COMPETENCE = { total_count: 0, success_count: 0, fail_count: 0 };
+const competence: Ref<ProgressDashboardCompetenceType> = ref(DEFAULT_COMPETENCE);
+
+const competenceCriteriaUrl = computed(() => {
+  return `/course/${props.courseSlug}/competence/self-evaluation-and-feedback?courseSessionId=${props.sessionToContinueId}`;
+});
+
+onMounted(async () => {
+  const some = await fetchProgressData(props.courseId);
+  competence.value = some.competence;
+});
+</script>
+
+<template>
+  <div v-if="competence" class="mb-14 space-y-8">
+    <div class="flex flex-col space-y-7 bg-white p-6">
+      <CompetenceSummaryBox
+        :fail-count="competence.fail_count"
+        :success-count="competence.success_count"
+        :details-link="competenceCriteriaUrl"
+      />
+    </div>
+  </div>
+</template>
diff --git a/client/src/components/dashboard/CoursePanel.vue b/client/src/components/dashboard/CoursePanel.vue
new file mode 100644
index 00000000..19cadce3
--- /dev/null
+++ b/client/src/components/dashboard/CoursePanel.vue
@@ -0,0 +1,50 @@
+<script setup lang="ts">
+import { computed, onMounted, ref } from "vue";
+import type { CourseProgressType } from "@/gql/graphql";
+import { DashboardConfigType } from "@/gql/graphql";
+import { fetchCourseData } from "@/services/dashboard";
+import LearningPathDiagram from "@/components/learningPath/LearningPathDiagram.vue";
+import CompetenceSummary from "@/components/dashboard/CompetenceSummary.vue";
+
+const props = defineProps<{
+  courseConfig: DashboardConfigType;
+}>();
+
+const isLoading = ref(true);
+
+const data = ref<CourseProgressType | null>(null);
+
+const courseSlug = computed(() => props.courseConfig?.slug);
+const courseName = computed(() => props.courseConfig?.name);
+
+onMounted(async () => {
+  data.value = await fetchCourseData(props.courseConfig.id);
+  isLoading.value = false;
+});
+</script>
+
+<template>
+  <div v-if="!isLoading && courseConfig" class="mb-14 space-y-8">
+    <div class="flex flex-col space-y-7 bg-white p-6">
+      <h3>{{ courseName }}</h3>
+      <div v-for="widget in data.widgets" :key="widget.id">
+        {{ widget }}
+        <LearningPathDiagram
+          v-if="
+            widget === 'PROGRESS_WIDGET' && data.session_to_continue_id && courseSlug
+          "
+          :key="courseSlug"
+          :course-slug="courseSlug"
+          :course-session-id="data.session_to_continue_id"
+          diagram-type="horizontal"
+        ></LearningPathDiagram>
+        <CompetenceSummary
+          v-else-if="widget === 'COMPETENCE_WIDGET'"
+          :course-slug="courseSlug"
+          :session-to-continue-id="data.session_to_continue_id"
+          :course-id="courseConfig.id"
+        ></CompetenceSummary>
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/client/src/gql/gql.ts b/client/src/gql/gql.ts
index eb6023e4..66a37920 100644
--- a/client/src/gql/gql.ts
+++ b/client/src/gql/gql.ts
@@ -23,6 +23,7 @@ const documents = {
     "\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      }\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      }\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      widgets\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        }\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  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,
 };
@@ -81,6 +82,10 @@ export function graphql(source: "\n  query dashboardConfig {\n    dashboard_conf
  * 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 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"): (typeof 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"];
+/**
+ * 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 dashboardCourseData($courseId: ID!) {\n    course_progress(course_id: $courseId) {\n      _id\n      course_id\n      session_to_continue_id\n      widgets\n    }\n  }\n"): (typeof documents)["\n  query dashboardCourseData($courseId: ID!) {\n    course_progress(course_id: $courseId) {\n      _id\n      course_id\n      session_to_continue_id\n      widgets\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 e6086ccb..37d161ab 100644
--- a/client/src/gql/graphql.ts
+++ b/client/src/gql/graphql.ts
@@ -361,10 +361,11 @@ export type CoursePageInterface = {
 export type CourseProgressType = {
   __typename?: 'CourseProgressType';
   _id: Scalars['ID']['output'];
-  assignment: ProgressDashboardAssignmentType;
-  competence: ProgressDashboardCompetenceType;
+  assignment?: Maybe<ProgressDashboardAssignmentType>;
+  competence?: Maybe<ProgressDashboardCompetenceType>;
   course_id: Scalars['ID']['output'];
   session_to_continue_id?: Maybe<Scalars['ID']['output']>;
+  widgets: Array<WidgetType>;
 };
 
 export type CourseSessionAssignmentObjectType = {
@@ -907,6 +908,7 @@ export type Query = {
   course_session_attendance_course?: Maybe<CourseSessionAttendanceCourseObjectType>;
   course_statistics?: Maybe<CourseStatisticsType>;
   dashboard_config: Array<DashboardConfigType>;
+  dashboard_data?: Maybe<DashboardConfigType>;
   learning_content_assignment?: Maybe<LearningContentAssignmentObjectType>;
   learning_content_attendance_course?: Maybe<LearningContentAttendanceCourseObjectType>;
   learning_content_document_list?: Maybe<LearningContentDocumentListObjectType>;
@@ -978,6 +980,11 @@ export type QueryCourseStatisticsArgs = {
 };
 
 
+export type QueryDashboardDataArgs = {
+  course_id: Scalars['ID']['input'];
+};
+
+
 export type QueryLearningPathArgs = {
   course_id?: InputMaybe<Scalars['ID']['input']>;
   course_slug?: InputMaybe<Scalars['String']['input']>;
@@ -1046,6 +1053,13 @@ export type UserObjectType = {
   username: Scalars['String']['output'];
 };
 
+export type WidgetType =
+  | 'COMPETENCE_CERTIFICATE_WIDGET'
+  | 'COMPETENCE_WIDGET'
+  | 'MENTEE_WIDGET'
+  | 'MENTOR_TASKS_WIDGET'
+  | 'PROGRESS_WIDGET';
+
 export type AttendanceCheckMutationMutationVariables = Exact<{
   attendanceCourseId: Scalars['ID']['input'];
   attendanceUserList: Array<InputMaybe<AttendanceUserInputType>> | InputMaybe<AttendanceUserInputType>;
@@ -1278,7 +1292,14 @@ export type DashboardProgressQueryVariables = Exact<{
 }>;
 
 
-export type DashboardProgressQuery = { __typename?: 'Query', course_progress?: { __typename?: 'CourseProgressType', _id: string, course_id: string, session_to_continue_id?: string | null, competence: { __typename?: 'ProgressDashboardCompetenceType', _id: string, total_count: number, success_count: number, fail_count: number }, assignment: { __typename?: 'ProgressDashboardAssignmentType', _id: string, total_count: number, points_max_count: number, points_achieved_count: number } } | null };
+export type DashboardProgressQuery = { __typename?: 'Query', course_progress?: { __typename?: 'CourseProgressType', _id: string, course_id: string, session_to_continue_id?: string | null, competence?: { __typename?: 'ProgressDashboardCompetenceType', _id: string, total_count: number, success_count: number, fail_count: number } | null, assignment?: { __typename?: 'ProgressDashboardAssignmentType', _id: string, total_count: number, points_max_count: number, points_achieved_count: number } | null } | null };
+
+export type DashboardCourseDataQueryVariables = Exact<{
+  courseId: Scalars['ID']['input'];
+}>;
+
+
+export type DashboardCourseDataQuery = { __typename?: 'Query', course_progress?: { __typename?: 'CourseProgressType', _id: string, course_id: string, session_to_continue_id?: string | null, widgets: Array<WidgetType> } | null };
 
 export type CourseStatisticsQueryVariables = Exact<{
   courseId: Scalars['ID']['input'];
@@ -1308,5 +1329,6 @@ export const CourseSessionDetailDocument = {"kind":"Document","definitions":[{"k
 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":"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"}}]}}]}}]}}]} 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"}},{"kind":"Field","name":{"kind":"Name","value":"widgets"}}]}}]}}]} 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":"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 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 4c421b9b..7bda685a 100644
--- a/client/src/gql/schema.graphql
+++ b/client/src/gql/schema.graphql
@@ -2,6 +2,7 @@ type Query {
   course_statistics(course_id: ID!): CourseStatisticsType
   course_progress(course_id: ID!): CourseProgressType
   dashboard_config: [DashboardConfigType!]!
+  dashboard_data(course_id: ID!): DashboardConfigType
   learning_path(id: ID, slug: String, course_id: ID, course_slug: String): LearningPathObjectType
   course_session_attendance_course(id: ID!, assignment_user_id: ID): CourseSessionAttendanceCourseObjectType
   course(id: ID, slug: String): CourseObjectType
@@ -177,8 +178,9 @@ type CourseProgressType {
   _id: ID!
   course_id: ID!
   session_to_continue_id: ID
-  competence: ProgressDashboardCompetenceType!
-  assignment: ProgressDashboardAssignmentType!
+  competence: ProgressDashboardCompetenceType
+  assignment: ProgressDashboardAssignmentType
+  widgets: [WidgetType!]!
 }
 
 type ProgressDashboardCompetenceType {
@@ -195,6 +197,14 @@ type ProgressDashboardAssignmentType {
   points_achieved_count: Int!
 }
 
+enum WidgetType {
+  PROGRESS_WIDGET
+  COMPETENCE_WIDGET
+  MENTEE_WIDGET
+  MENTOR_TASKS_WIDGET
+  COMPETENCE_CERTIFICATE_WIDGET
+}
+
 type DashboardConfigType {
   id: ID!
   name: String!
diff --git a/client/src/gql/typenames.ts b/client/src/gql/typenames.ts
index 5fb963dc..732cb885 100644
--- a/client/src/gql/typenames.ts
+++ b/client/src/gql/typenames.ts
@@ -84,3 +84,4 @@ export const String = "String";
 export const TopicObjectType = "TopicObjectType";
 export const UUID = "UUID";
 export const UserObjectType = "UserObjectType";
+export const WidgetType = "WidgetType";
diff --git a/client/src/graphql/queries.ts b/client/src/graphql/queries.ts
index df6f5259..15dc2766 100644
--- a/client/src/graphql/queries.ts
+++ b/client/src/graphql/queries.ts
@@ -331,6 +331,17 @@ export const DASHBOARD_COURSE_SESSION_PROGRESS = graphql(`
   }
 `);
 
+export const DASHBOARD_COURSE_DATA = graphql(`
+  query dashboardCourseData($courseId: ID!) {
+    course_progress(course_id: $courseId) {
+      _id
+      course_id
+      session_to_continue_id
+      widgets
+    }
+  }
+`);
+
 export const DASHBOARD_COURSE_STATISTICS = graphql(`
   query courseStatistics($courseId: ID!) {
     course_statistics(course_id: $courseId) {
diff --git a/client/src/pages/dashboard/DashboardPage.vue b/client/src/pages/dashboard/DashboardPage.vue
index a882818e..cbe936fd 100644
--- a/client/src/pages/dashboard/DashboardPage.vue
+++ b/client/src/pages/dashboard/DashboardPage.vue
@@ -12,6 +12,7 @@ import LoadingSpinner from "@/components/ui/LoadingSpinner.vue";
 import CourseDetailDates from "@/components/dashboard/CourseDetailDates.vue";
 import NoCourseSession from "@/components/dashboard/NoCourseSession.vue";
 import MentorPage from "@/pages/dashboard/MentorPage.vue";
+import CoursePanel from "@/components/dashboard/CoursePanel.vue";
 
 const dashboardStore = useDashboardStore();
 
@@ -50,6 +51,12 @@ onMounted(dashboardStore.loadDashboardDetails);
           ></ItDropdownSelect>
         </div>
 
+        <ul>
+          <li v-for="config in dashboardStore.dashboardConfigs" :key="config.id">
+            <p>{{ config }}</p>
+            <CoursePanel :course-config="config" />
+          </li>
+        </ul>
         <component
           :is="boards[dashboardStore.currentDashboardConfig.dashboard_type].main"
         ></component>
diff --git a/client/src/router/guards.ts b/client/src/router/guards.ts
index 089ac20a..8ee4825a 100644
--- a/client/src/router/guards.ts
+++ b/client/src/router/guards.ts
@@ -62,6 +62,7 @@ export async function handleCurrentCourseSession(to: RouteLocationNormalized) {
       courseSessionsStore._currentCourseSlug = "";
     }
     if (!courseSessionsStore.loaded) {
+      console.log("handleCurrentCourseSession: loadCourseSessionsData");
       await courseSessionsStore.loadCourseSessionsData();
     }
   }
@@ -77,6 +78,7 @@ export async function handleCourseSessionAsQueryParam(to: RouteLocationNormalize
   if (userStore.loggedIn) {
     const courseSessionsStore = useCourseSessionsStore();
     if (!courseSessionsStore.loaded) {
+      console.log("handleCourseSessionAsQueryParam: loadCourseSessionsData");
       await courseSessionsStore.loadCourseSessionsData();
     }
 
diff --git a/client/src/router/index.ts b/client/src/router/index.ts
index 52a39878..14c9eb43 100644
--- a/client/src/router/index.ts
+++ b/client/src/router/index.ts
@@ -387,8 +387,25 @@ router.beforeEach(updateLoggedIn);
 router.beforeEach(redirectToLoginIfRequired);
 
 // register after login hooks
-router.beforeEach(handleCurrentCourseSession);
-router.beforeEach(handleCourseSessionAsQueryParam);
+router.beforeEach(
+  async (to, from) =>
+    await ignoreGuardsForHomeRoute(to, from, handleCurrentCourseSession)
+);
+
+router.beforeEach(
+  async (to, from) =>
+    await ignoreGuardsForHomeRoute(to, from, handleCourseSessionAsQueryParam)
+);
+
+async function ignoreGuardsForHomeRoute(
+  to: RouteLocationNormalized,
+  from: RouteLocationNormalized,
+  guard: NavigationGuardNext
+) {
+  if (to.name !== "home") {
+    return await guard(to, from);
+  }
+}
 
 router.beforeEach(addToHistory);
 
diff --git a/client/src/services/dashboard.ts b/client/src/services/dashboard.ts
index a320774f..b4232d64 100644
--- a/client/src/services/dashboard.ts
+++ b/client/src/services/dashboard.ts
@@ -1,6 +1,7 @@
 import { graphqlClient } from "@/graphql/client";
 import {
   DASHBOARD_CONFIG,
+  DASHBOARD_COURSE_DATA,
   DASHBOARD_COURSE_SESSION_PROGRESS,
   DASHBOARD_COURSE_STATISTICS,
 } from "@/graphql/queries";
@@ -61,3 +62,21 @@ export const fetchDashboardConfig = async (): Promise<DashboardConfigType[] | nu
     return null;
   }
 };
+
+export const fetchCourseData = async (
+  courseId: string
+): Promise<CourseProgressType | null> => {
+  try {
+    const res = await graphqlClient.query(DASHBOARD_COURSE_DATA, {
+      courseId,
+    });
+
+    if (res.error) {
+      console.error("Error fetching data for course ID:", courseId, res.error);
+    }
+    return res.data?.course_progress || null;
+  } catch (error) {
+    console.error(`Error fetching data for course ID: ${courseId}`, error);
+    return null;
+  }
+};
diff --git a/server/vbv_lernwelt/dashboard/graphql/queries.py b/server/vbv_lernwelt/dashboard/graphql/queries.py
index 38c3c71f..72ee4234 100644
--- a/server/vbv_lernwelt/dashboard/graphql/queries.py
+++ b/server/vbv_lernwelt/dashboard/graphql/queries.py
@@ -17,6 +17,7 @@ from vbv_lernwelt.dashboard.graphql.types.dashboard import (
     DashboardType,
     ProgressDashboardAssignmentType,
     ProgressDashboardCompetenceType,
+    WidgetType,
 )
 from vbv_lernwelt.iam.permissions import (
     can_view_course_session,
@@ -39,6 +40,10 @@ class DashboardQuery(graphene.ObjectType):
         graphene.NonNull(DashboardConfigType), required=True
     )
 
+    dashboard_data = graphene.Field(
+        DashboardConfigType, course_id=graphene.ID(required=True)
+    )
+
     def resolve_course_statistics(root, info, course_id: str):  # noqa
         user = info.context.user
         course = Course.objects.get(id=course_id)
@@ -164,8 +169,12 @@ class DashboardQuery(graphene.ObjectType):
                 points_max_count=int(points_max_count),  # noqa
                 points_achieved_count=int(points_achieved_count),  # noqa
             ),
+            widgets=get_widget_for_course(course_id, user),  # noqa
         )
 
+    def resolve_dashboard_data(root, info, course_id: str):
+        return get_widget_for_course(course_id, info.context.user)
+
 
 def get_user_statistics_dashboards(user: User) -> Tuple[List[Dict[str, str]], Set[int]]:
     course_ids = set()
@@ -222,7 +231,6 @@ def get_user_course_session_dashboards(
                sessions of a course, but with varying permissions?
                -> We just show the simple list dashboard for now.
     """
-
     dashboards = []
     course_ids = set()
 
@@ -246,6 +254,7 @@ def get_user_course_session_dashboards(
                 resolved_dashboard_type = DashboardType.SIMPLE_DASHBOARD
             elif course_role == CourseSessionUser.Role.MEMBER:
                 resolved_dashboard_type = DashboardType.PROGRESS_DASHBOARD
+
         else:
             # fallback: just go with simple list dashboard
             resolved_dashboard_type = DashboardType.SIMPLE_DASHBOARD
@@ -263,3 +272,42 @@ def get_user_course_session_dashboards(
         )
 
     return dashboards, course_ids
+
+
+def get_widget_for_course(course_id: str, user: User) -> List[WidgetType]:
+    widgets = []
+
+    course_sessions = CourseSession.objects.filter(course__id=course_id).prefetch_related(
+        "course",
+        "course__configuration",
+    )
+    roles_by_course: Dict[Course, Set[DashboardType]] = {}
+
+    learning_mentors = LearningMentor.objects.filter(mentor=user).values_list(
+        "course_session__course__id", "id"
+    )
+    mentor_course_ids = set([mentor[0] for mentor in learning_mentors])
+
+    # duplicate code
+    for course_session in course_sessions:
+        if can_view_course_session(user=user, course_session=course_session):
+            role = CourseSessionUser.objects.get(
+                course_session=course_session, user=user
+            ).role
+            roles_by_course.setdefault(course_session.course, set())
+            roles_by_course[course_session.course].add(role)
+
+    for course, roles in roles_by_course.items():
+        if len(roles) == 1:
+            course_role = roles.pop()
+
+            # test widgets
+            if course_role == CourseSessionUser.Role.MEMBER:
+                widgets.append(WidgetType.PROGRESS_WIDGET)
+                widgets.append(WidgetType.COMPETENCE_WIDGET)
+                if course.configuration.enable_competence_certificates:
+                    widgets.append(WidgetType.COMPETENCE_CERTIFICATE_WIDGET)
+            if course.id in mentor_course_ids:
+                widgets.append(WidgetType.MENTOR_TASKS_WIDGET)
+                # add KN if has KN
+    return widgets
diff --git a/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py b/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py
index 2ad4d5de..35648f76 100644
--- a/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py
+++ b/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py
@@ -56,6 +56,14 @@ class DashboardType(Enum):
     MENTOR_DASHBOARD = "MentorDashboard"
 
 
+class WidgetType(Enum):
+    PROGRESS_WIDGET = "ProgressWidget"
+    COMPETENCE_WIDGET = "CompetenceWidget"
+    MENTEE_WIDGET = "MenteeWidget"
+    MENTOR_TASKS_WIDGET = "MentorTasksWidget"
+    COMPETENCE_CERTIFICATE_WIDGET = "CompetenceCertificateWidget"
+
+
 class DashboardConfigType(graphene.ObjectType):
     id = graphene.ID(required=True)
     name = graphene.String(required=True)
@@ -64,6 +72,11 @@ class DashboardConfigType(graphene.ObjectType):
     course_configuration = graphene.Field(CourseConfigurationObjectType, required=True)
 
 
+class DashboardDataType(graphene.ObjectType):
+    id = graphene.ID(required=True)
+    widgets = graphene.List(graphene.NonNull(WidgetType), required=True)
+
+
 class ProgressDashboardCompetenceType(graphene.ObjectType):
     _id = graphene.ID(required=True)
     total_count = graphene.Int(required=True)
@@ -82,8 +95,9 @@ class CourseProgressType(graphene.ObjectType):
     _id = graphene.ID(required=True)
     course_id = graphene.ID(required=True)
     session_to_continue_id = graphene.ID(required=False)
-    competence = graphene.Field(ProgressDashboardCompetenceType, required=True)
-    assignment = graphene.Field(ProgressDashboardAssignmentType, required=True)
+    competence = graphene.Field(ProgressDashboardCompetenceType, required=False)
+    assignment = graphene.Field(ProgressDashboardAssignmentType, required=False)
+    widgets = graphene.List(graphene.NonNull(WidgetType), required=True)
 
 
 class CourseStatisticsType(graphene.ObjectType):

From 16ebd23edfd8fe12bd38081e3da60fc9e55e0ed5 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Wed, 3 Apr 2024 06:48:24 +0200
Subject: [PATCH 02/82] Add roles to course_session_permissions

---
 server/vbv_lernwelt/iam/permissions.py | 98 +++++++++++---------------
 1 file changed, 42 insertions(+), 56 deletions(-)

diff --git a/server/vbv_lernwelt/iam/permissions.py b/server/vbv_lernwelt/iam/permissions.py
index b2210c7c..b9b141b0 100644
--- a/server/vbv_lernwelt/iam/permissions.py
+++ b/server/vbv_lernwelt/iam/permissions.py
@@ -48,9 +48,9 @@ def has_course_session_preview(user, course_session_id: int):
     if is_course_session_member(user, course_session_id):
         return False
 
-    return is_learning_mentor(user, course_session_id) or is_course_session_expert(
+    return is_course_session_learning_mentor(
         user, course_session_id
-    )
+    ) or is_course_session_expert(user, course_session_id)
 
 
 def has_media_library(user, course_session_id: int):
@@ -66,7 +66,7 @@ def has_media_library(user, course_session_id: int):
     ).exists()
 
 
-def is_learning_mentor(mentor: User, course_session_id: int):
+def is_course_session_learning_mentor(mentor: User, course_session_id: int):
     course_session = CourseSession.objects.get(id=course_session_id)
 
     if course_session is None:
@@ -92,6 +92,15 @@ def is_learning_mentor_for_user(
     ).exists()
 
 
+def is_course_session_supervisor(user, course_session_id: int):
+    if user.is_superuser:
+        return True
+
+    return CourseSessionGroup.objects.filter(
+        supervisor=user, course_session=course_session_id
+    ).exists()
+
+
 def is_course_session_expert(user, course_session_id: int):
     if user.is_superuser:
         return True
@@ -244,40 +253,6 @@ def has_appointments(user: User, course_session_id: int) -> bool:
     return CourseSessionUser.objects.filter(course_session=course_session_id).exists()
 
 
-def has_learning_mentor(user: User, course_session_id: int) -> bool:
-    course_session = CourseSession.objects.get(id=course_session_id)
-
-    if course_session is None:
-        return False
-
-    if not course_session.course.configuration.enable_learning_mentor:
-        return False
-
-    if is_learning_mentor(user, course_session_id):
-        return True
-
-    if is_course_session_member(user, course_session_id):
-        return True
-
-    return False
-
-
-def can_edit_mentors(user: User, course_session_id: int) -> bool:
-    if not has_learning_mentor(user, course_session_id):
-        return False
-
-    # limit further, since has_learning_mentor is too broad
-    return is_course_session_member(user, course_session_id)
-
-
-def can_guide_members(user: User, course_session_id: int) -> bool:
-    if not has_learning_mentor(user, course_session_id):
-        return False
-
-    # limit further, since has_learning_mentor is too broad
-    return is_learning_mentor(user, course_session_id)
-
-
 def can_view_profile(user: User, profile_user: CourseSessionUser) -> bool:
     if user.is_superuser:
         return True
@@ -311,29 +286,40 @@ def can_view_course_completions(
     )
 
 
-def can_complete_learning_content(user: User, course_session_id: int) -> bool:
-    return is_course_session_member(
-        user, course_session_id
-    ) or is_course_session_expert(user, course_session_id)
-
-
 def course_session_permissions(user: User, course_session_id: int) -> list[str]:
+    course_session = CourseSession.objects.get(id=course_session_id)
+
+    is_supervisor = is_course_session_supervisor(user, course_session_id)
+    is_expert = is_course_session_expert(user, course_session_id)
+    is_member = is_course_session_member(user, course_session_id)
+    is_learning_mentor = is_course_session_learning_mentor(user, course_session_id)
+
+    course_has_learning_mentor = (
+        course_session.course.configuration.enable_learning_mentor
+    )
+    has_learning_mentor = course_has_learning_mentor and (
+        is_member or is_expert or is_learning_mentor
+    )
+
     return _action_list(
         {
-            "learning-mentor": has_learning_mentor(user, course_session_id),
-            "learning-mentor::edit-mentors": can_edit_mentors(user, course_session_id),
-            "learning-mentor::guide-members": can_guide_members(
-                user, course_session_id
-            ),
+            # roles
+            "is_supervisor": is_supervisor,
+            "is_expert": is_expert,
+            "is_member": is_member,
+            "is_learning_mentor": is_learning_mentor,
+            # actions
+            "learning-mentor": has_learning_mentor,
+            "learning-mentor::edit-mentors": has_learning_mentor and is_member,
+            "learning-mentor::guide-members": course_has_learning_mentor
+            and is_learning_mentor,
             "preview": has_course_session_preview(user, course_session_id),
-            "media-library": has_media_library(user, course_session_id),
-            "appointments": has_appointments(user, course_session_id),
-            "expert-cockpit": is_course_session_expert(user, course_session_id),
-            "learning-path": is_course_session_member(user, course_session_id),
-            "competence-navi": is_course_session_member(user, course_session_id),
-            "complete-learning-content": can_complete_learning_content(
-                user, course_session_id
-            ),
+            "media-library": is_supervisor or is_expert or is_member,
+            "appointments": is_supervisor or is_expert or is_member,
+            "expert-cockpit": is_expert,
+            "learning-path": is_member,
+            "competence-navi": is_member,
+            "complete-learning-content": is_expert or is_member,
         }
     )
 

From 2f77bf77341e05600d36ba4bb0469702f59199bf Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Wed, 3 Apr 2024 11:14:44 +0200
Subject: [PATCH 03/82] WIP: Add Praxisbildner switch, move code to type

---
 .../dashboard/AssignmentSummary.vue           |  41 +++++
 .../dashboard/CompetenceSummary.vue           |   4 +-
 .../src/components/dashboard/CoursePanel.vue  |  53 +++++--
 client/src/gql/graphql.ts                     |  10 +-
 client/src/gql/schema.graphql                 |   5 +-
 client/src/pages/dashboard/DashboardPage.vue  |  10 ++
 .../vbv_lernwelt/dashboard/graphql/queries.py |  52 +------
 .../dashboard/graphql/types/dashboard.py      | 143 +++++++++++++++++-
 8 files changed, 244 insertions(+), 74 deletions(-)
 create mode 100644 client/src/components/dashboard/AssignmentSummary.vue

diff --git a/client/src/components/dashboard/AssignmentSummary.vue b/client/src/components/dashboard/AssignmentSummary.vue
new file mode 100644
index 00000000..5ce253e3
--- /dev/null
+++ b/client/src/components/dashboard/AssignmentSummary.vue
@@ -0,0 +1,41 @@
+<script setup lang="ts">
+import { computed, onMounted, ref, Ref } from "vue";
+import { ProgressDashboardAssignmentType } from "@/gql/graphql";
+import { fetchProgressData } from "@/services/dashboard";
+import AssignmentProgressSummaryBox from "@/components/dashboard/AssignmentProgressSummaryBox.vue";
+
+const props = defineProps<{
+  courseId: string;
+  courseSlug: string;
+  sessionToContinueId: string;
+}>();
+
+const DEFAULT_ASSIGNMENT = {
+  points_achieved_count: 0,
+  points_max_count: 0,
+  total_count: 0,
+};
+const assignment: Ref<ProgressDashboardAssignmentType> = ref(DEFAULT_ASSIGNMENT);
+
+const competenceCertificateUrl = computed(() => {
+  return `/course/${props.courseSlug}/competence/certificates?courseSessionId=${props.sessionToContinueId}`;
+});
+
+onMounted(async () => {
+  const data = await fetchProgressData(props.courseId);
+  assignment.value = data?.assignment;
+});
+</script>
+
+<template>
+  <div v-if="assignment" class="mb-14 space-y-8">
+    <div class="flex flex-col space-y-7 bg-white p-6">
+      <AssignmentProgressSummaryBox
+        :total-assignments="assignment.total_count"
+        :achieved-points-count="assignment.points_achieved_count"
+        :max-points-count="assignment.points_max_count"
+        :details-link="competenceCertificateUrl"
+      />
+    </div>
+  </div>
+</template>
diff --git a/client/src/components/dashboard/CompetenceSummary.vue b/client/src/components/dashboard/CompetenceSummary.vue
index ba701185..9d2a9164 100644
--- a/client/src/components/dashboard/CompetenceSummary.vue
+++ b/client/src/components/dashboard/CompetenceSummary.vue
@@ -18,8 +18,8 @@ const competenceCriteriaUrl = computed(() => {
 });
 
 onMounted(async () => {
-  const some = await fetchProgressData(props.courseId);
-  competence.value = some.competence;
+  const data = await fetchProgressData(props.courseId);
+  competence.value = data.competence;
 });
 </script>
 
diff --git a/client/src/components/dashboard/CoursePanel.vue b/client/src/components/dashboard/CoursePanel.vue
index 19cadce3..82faeea2 100644
--- a/client/src/components/dashboard/CoursePanel.vue
+++ b/client/src/components/dashboard/CoursePanel.vue
@@ -1,10 +1,18 @@
 <script setup lang="ts">
 import { computed, onMounted, ref } from "vue";
-import type { CourseProgressType } from "@/gql/graphql";
+import type { CourseProgressType, WidgetType } from "@/gql/graphql";
 import { DashboardConfigType } from "@/gql/graphql";
 import { fetchCourseData } from "@/services/dashboard";
 import LearningPathDiagram from "@/components/learningPath/LearningPathDiagram.vue";
 import CompetenceSummary from "@/components/dashboard/CompetenceSummary.vue";
+import AssignmentSummary from "@/components/dashboard/AssignmentSummary.vue";
+
+const mentorWidgets = [
+  "MENTOR_TASKS_WIDGET",
+  "MENTOR_PERSON_WIDGET",
+  "MENTOR_COMPETENCE_WIDGET",
+];
+const progressWidgets = ["COMPETENCE_WIDGET", "COMPETENCE_CERTIFICATE_WIDGET"];
 
 const props = defineProps<{
   courseConfig: DashboardConfigType;
@@ -16,6 +24,17 @@ const data = ref<CourseProgressType | null>(null);
 
 const courseSlug = computed(() => props.courseConfig?.slug);
 const courseName = computed(() => props.courseConfig?.name);
+const numberOfMentorWidgets = computed(() => {
+  return data.value?.widgets.filter((widget) => mentorWidgets.includes(widget)).length;
+});
+const numberOfProgressWidgets = computed(() => {
+  return data.value?.widgets.filter((widget) => progressWidgets.includes(widget))
+    .length;
+});
+
+function hasWidget(widget: WidgetType) {
+  return data.value?.widgets.includes(widget);
+}
 
 onMounted(async () => {
   data.value = await fetchCourseData(props.courseConfig.id);
@@ -27,23 +46,31 @@ onMounted(async () => {
   <div v-if="!isLoading && courseConfig" class="mb-14 space-y-8">
     <div class="flex flex-col space-y-7 bg-white p-6">
       <h3>{{ courseName }}</h3>
-      <div v-for="widget in data.widgets" :key="widget.id">
-        {{ widget }}
-        <LearningPathDiagram
-          v-if="
-            widget === 'PROGRESS_WIDGET' && data.session_to_continue_id && courseSlug
-          "
-          :key="courseSlug"
-          :course-slug="courseSlug"
-          :course-session-id="data.session_to_continue_id"
-          diagram-type="horizontal"
-        ></LearningPathDiagram>
+      <LearningPathDiagram
+        v-if="hasWidget('PROGRESS_WIDGET') && data.session_to_continue_id && courseSlug"
+        :key="courseSlug"
+        :course-slug="courseSlug"
+        :course-session-id="data.session_to_continue_id"
+        diagram-type="horizontal"
+      ></LearningPathDiagram>
+      <div v-if="numberOfProgressWidgets" class="flex flex-col flex-wrap">
         <CompetenceSummary
-          v-else-if="widget === 'COMPETENCE_WIDGET'"
+          v-if="hasWidget('COMPETENCE_WIDGET')"
           :course-slug="courseSlug"
           :session-to-continue-id="data.session_to_continue_id"
           :course-id="courseConfig.id"
         ></CompetenceSummary>
+        <AssignmentSummary
+          v-if="hasWidget('COMPETENCE_CERTIFICATE_WIDGET')"
+          :course-slug="courseSlug"
+          :session-to-continue-id="data.session_to_continue_id"
+          :course-id="courseConfig.id"
+        />
+      </div>
+      <div v-if="numberOfMentorWidgets > 0" class="flex flex-col flex-wrap">
+        <div v-if="hasWidget('MENTOR_TASKS_WIDGET')">MENTOR_TASKS_WIDGET</div>
+        <div v-if="hasWidget('MENTOR_PERSON_WIDGET')">MENTOR_PERSON_WIDGET</div>
+        <div v-if="hasWidget('MENTOR_COMPETENCE_WIDGET')">MENTOR_COMPETENCE_WIDGET</div>
       </div>
     </div>
   </div>
diff --git a/client/src/gql/graphql.ts b/client/src/gql/graphql.ts
index 37d161ab..6c207a6b 100644
--- a/client/src/gql/graphql.ts
+++ b/client/src/gql/graphql.ts
@@ -466,6 +466,7 @@ export type DashboardConfigType = {
 
 export type DashboardType =
   | 'MENTOR_DASHBOARD'
+  | 'PRAXISBILDNER_DASHBOARD'
   | 'PROGRESS_DASHBOARD'
   | 'SIMPLE_DASHBOARD'
   | 'STATISTICS_DASHBOARD';
@@ -908,7 +909,6 @@ export type Query = {
   course_session_attendance_course?: Maybe<CourseSessionAttendanceCourseObjectType>;
   course_statistics?: Maybe<CourseStatisticsType>;
   dashboard_config: Array<DashboardConfigType>;
-  dashboard_data?: Maybe<DashboardConfigType>;
   learning_content_assignment?: Maybe<LearningContentAssignmentObjectType>;
   learning_content_attendance_course?: Maybe<LearningContentAttendanceCourseObjectType>;
   learning_content_document_list?: Maybe<LearningContentDocumentListObjectType>;
@@ -980,11 +980,6 @@ export type QueryCourseStatisticsArgs = {
 };
 
 
-export type QueryDashboardDataArgs = {
-  course_id: Scalars['ID']['input'];
-};
-
-
 export type QueryLearningPathArgs = {
   course_id?: InputMaybe<Scalars['ID']['input']>;
   course_slug?: InputMaybe<Scalars['String']['input']>;
@@ -1056,7 +1051,8 @@ export type UserObjectType = {
 export type WidgetType =
   | 'COMPETENCE_CERTIFICATE_WIDGET'
   | 'COMPETENCE_WIDGET'
-  | 'MENTEE_WIDGET'
+  | 'MENTOR_COMPETENCE_WIDGET'
+  | 'MENTOR_PERSON_WIDGET'
   | 'MENTOR_TASKS_WIDGET'
   | 'PROGRESS_WIDGET';
 
diff --git a/client/src/gql/schema.graphql b/client/src/gql/schema.graphql
index 7bda685a..fafe2c15 100644
--- a/client/src/gql/schema.graphql
+++ b/client/src/gql/schema.graphql
@@ -2,7 +2,6 @@ type Query {
   course_statistics(course_id: ID!): CourseStatisticsType
   course_progress(course_id: ID!): CourseProgressType
   dashboard_config: [DashboardConfigType!]!
-  dashboard_data(course_id: ID!): DashboardConfigType
   learning_path(id: ID, slug: String, course_id: ID, course_slug: String): LearningPathObjectType
   course_session_attendance_course(id: ID!, assignment_user_id: ID): CourseSessionAttendanceCourseObjectType
   course(id: ID, slug: String): CourseObjectType
@@ -200,8 +199,9 @@ type ProgressDashboardAssignmentType {
 enum WidgetType {
   PROGRESS_WIDGET
   COMPETENCE_WIDGET
-  MENTEE_WIDGET
   MENTOR_TASKS_WIDGET
+  MENTOR_PERSON_WIDGET
+  MENTOR_COMPETENCE_WIDGET
   COMPETENCE_CERTIFICATE_WIDGET
 }
 
@@ -218,6 +218,7 @@ enum DashboardType {
   PROGRESS_DASHBOARD
   SIMPLE_DASHBOARD
   MENTOR_DASHBOARD
+  PRAXISBILDNER_DASHBOARD
 }
 
 type CourseConfigurationObjectType {
diff --git a/client/src/pages/dashboard/DashboardPage.vue b/client/src/pages/dashboard/DashboardPage.vue
index cbe936fd..6031c402 100644
--- a/client/src/pages/dashboard/DashboardPage.vue
+++ b/client/src/pages/dashboard/DashboardPage.vue
@@ -26,6 +26,7 @@ const boards: Record<DashboardType, DashboardPage> = {
   SIMPLE_DASHBOARD: { main: SimpleCoursePage, aside: SimpleDates },
   STATISTICS_DASHBOARD: { main: StatisticPage, aside: CourseDetailDates },
   MENTOR_DASHBOARD: { main: MentorPage, aside: SimpleDates },
+  PRAXISBILDNER_DASHBOARD: { main: CoursePanel, aside: SimpleDates },
 };
 
 onMounted(dashboardStore.loadDashboardDetails);
@@ -57,8 +58,17 @@ onMounted(dashboardStore.loadDashboardDetails);
             <CoursePanel :course-config="config" />
           </li>
         </ul>
+        <!-- keep until we unify the dashboard -->
+        <CoursePanel
+          v-if="
+            dashboardStore.currentDashboardConfig.dashboard_type ===
+            'PRAXISBILDNER_DASHBOARD'
+          "
+          course-config="dashboardStore.currentDashboardConfig"
+        />
         <component
           :is="boards[dashboardStore.currentDashboardConfig.dashboard_type].main"
+          v-else
         ></component>
       </div>
     </main>
diff --git a/server/vbv_lernwelt/dashboard/graphql/queries.py b/server/vbv_lernwelt/dashboard/graphql/queries.py
index 72ee4234..7c42f859 100644
--- a/server/vbv_lernwelt/dashboard/graphql/queries.py
+++ b/server/vbv_lernwelt/dashboard/graphql/queries.py
@@ -15,9 +15,9 @@ from vbv_lernwelt.dashboard.graphql.types.dashboard import (
     CourseStatisticsType,
     DashboardConfigType,
     DashboardType,
+    get_widgets_for_course,
     ProgressDashboardAssignmentType,
     ProgressDashboardCompetenceType,
-    WidgetType,
 )
 from vbv_lernwelt.iam.permissions import (
     can_view_course_session,
@@ -40,10 +40,6 @@ class DashboardQuery(graphene.ObjectType):
         graphene.NonNull(DashboardConfigType), required=True
     )
 
-    dashboard_data = graphene.Field(
-        DashboardConfigType, course_id=graphene.ID(required=True)
-    )
-
     def resolve_course_statistics(root, info, course_id: str):  # noqa
         user = info.context.user
         course = Course.objects.get(id=course_id)
@@ -114,6 +110,8 @@ class DashboardQuery(graphene.ObjectType):
 
         user = info.context.user
         course = Course.objects.get(id=course_id)
+        setattr(info.context, "course", course)
+        return CourseProgressType()
 
         newest: CourseSession | None = None
         course_session_for_user: List[str] = []
@@ -169,12 +167,9 @@ class DashboardQuery(graphene.ObjectType):
                 points_max_count=int(points_max_count),  # noqa
                 points_achieved_count=int(points_achieved_count),  # noqa
             ),
-            widgets=get_widget_for_course(course_id, user),  # noqa
+            widgets=get_widgets_for_course(course, user),  # noqa
         )
 
-    def resolve_dashboard_data(root, info, course_id: str):
-        return get_widget_for_course(course_id, info.context.user)
-
 
 def get_user_statistics_dashboards(user: User) -> Tuple[List[Dict[str, str]], Set[int]]:
     course_ids = set()
@@ -272,42 +267,3 @@ def get_user_course_session_dashboards(
         )
 
     return dashboards, course_ids
-
-
-def get_widget_for_course(course_id: str, user: User) -> List[WidgetType]:
-    widgets = []
-
-    course_sessions = CourseSession.objects.filter(course__id=course_id).prefetch_related(
-        "course",
-        "course__configuration",
-    )
-    roles_by_course: Dict[Course, Set[DashboardType]] = {}
-
-    learning_mentors = LearningMentor.objects.filter(mentor=user).values_list(
-        "course_session__course__id", "id"
-    )
-    mentor_course_ids = set([mentor[0] for mentor in learning_mentors])
-
-    # duplicate code
-    for course_session in course_sessions:
-        if can_view_course_session(user=user, course_session=course_session):
-            role = CourseSessionUser.objects.get(
-                course_session=course_session, user=user
-            ).role
-            roles_by_course.setdefault(course_session.course, set())
-            roles_by_course[course_session.course].add(role)
-
-    for course, roles in roles_by_course.items():
-        if len(roles) == 1:
-            course_role = roles.pop()
-
-            # test widgets
-            if course_role == CourseSessionUser.Role.MEMBER:
-                widgets.append(WidgetType.PROGRESS_WIDGET)
-                widgets.append(WidgetType.COMPETENCE_WIDGET)
-                if course.configuration.enable_competence_certificates:
-                    widgets.append(WidgetType.COMPETENCE_CERTIFICATE_WIDGET)
-            if course.id in mentor_course_ids:
-                widgets.append(WidgetType.MENTOR_TASKS_WIDGET)
-                # add KN if has KN
-    return widgets
diff --git a/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py b/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py
index 35648f76..c070bc7d 100644
--- a/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py
+++ b/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py
@@ -1,8 +1,15 @@
+from typing import Dict, List, Set, Tuple
+
 import graphene
 from graphene import Enum
 
+from vbv_lernwelt.assignment.models import (
+    AssignmentCompletion,
+    AssignmentCompletionStatus,
+)
+from vbv_lernwelt.core.models import User
 from vbv_lernwelt.course.graphql.types import CourseConfigurationObjectType
-from vbv_lernwelt.course.models import CourseSession, CourseSessionUser
+from vbv_lernwelt.course.models import Course, CourseSession, CourseSessionUser
 from vbv_lernwelt.dashboard.graphql.types.assignment import (
     assignments,
     AssignmentsStatisticsType,
@@ -20,6 +27,11 @@ from vbv_lernwelt.dashboard.graphql.types.feedback import (
     feedback_responses,
     FeedbackStatisticsResponsesType,
 )
+from vbv_lernwelt.iam.permissions import (
+    can_view_course_session,
+    can_view_course_session_progress,
+)
+from vbv_lernwelt.learning_mentor.models import LearningMentor
 from vbv_lernwelt.learnpath.models import Circle
 
 
@@ -54,13 +66,15 @@ class DashboardType(Enum):
     PROGRESS_DASHBOARD = "ProgressDashboard"
     SIMPLE_DASHBOARD = "SimpleDashboard"
     MENTOR_DASHBOARD = "MentorDashboard"
+    PRAXISBILDNER_DASHBOARD = "PraxisbildnerDashboard"
 
 
 class WidgetType(Enum):
     PROGRESS_WIDGET = "ProgressWidget"
     COMPETENCE_WIDGET = "CompetenceWidget"
-    MENTEE_WIDGET = "MenteeWidget"
     MENTOR_TASKS_WIDGET = "MentorTasksWidget"
+    MENTOR_PERSON_WIDGET = "MentorPersonWidget"
+    MENTOR_COMPETENCE_WIDGET = "MentorCompetenceWidget"
     COMPETENCE_CERTIFICATE_WIDGET = "CompetenceCertificateWidget"
 
 
@@ -99,6 +113,86 @@ class CourseProgressType(graphene.ObjectType):
     assignment = graphene.Field(ProgressDashboardAssignmentType, required=False)
     widgets = graphene.List(graphene.NonNull(WidgetType), required=True)
 
+    def resolve__id(root, info):
+        return info.context.course.id
+
+    def resolve_course_id(root, info):
+        return info.context.course.id
+
+    def resolve_session_to_continue_id(root, info):
+        newest, _course_session_for_user = root._get_newest_cs_and_cs_for_user(
+            info, info.context.course.id, info.context.user
+        )
+        return newest.id if newest else None
+
+    def resolve_assignment(root, info):
+        evaluation_results = AssignmentCompletion.objects.filter(
+            completion_status=AssignmentCompletionStatus.EVALUATION_SUBMITTED.value,
+            assignment_user=info.context.user,
+            course_session__course=info.context.course,
+        ).values("evaluation_max_points", "evaluation_points")
+
+        evaluation_results = list(evaluation_results)
+        points_max_count = sum(
+            [result.get("evaluation_max_points", 0) for result in evaluation_results]
+        )
+        points_achieved_count = sum(
+            [result.get("evaluation_points", 0) for result in evaluation_results]
+        )
+        return ProgressDashboardAssignmentType(  # noqa
+            _id=info.context.course.id,  # noqa
+            total_count=len(evaluation_results),  # noqa
+            points_max_count=int(points_max_count),  # noqa
+            points_achieved_count=int(points_achieved_count),  # noqa
+        )
+
+    def resolve_competence(root, info):
+        newest, course_session_for_user = root._get_newest_cs_and_cs_for_user(
+            info, info.context.course.id, info.context.user
+        )
+        _, success_total, fail_total = competences(
+            course_slug=str(info.context.course.slug),
+            course_session_selection_ids=course_session_for_user,
+            user_selection_ids=[str(info.context.user.id)],
+        )
+
+        return ProgressDashboardCompetenceType(  # noqa
+            _id=info.context.course.id,  # noqa
+            total_count=success_total + fail_total,  # noqa
+            success_count=success_total,  # noqa
+            fail_count=fail_total,  # noqa
+        )
+
+    def resolve_widgets(root, info):
+        return get_widgets_for_course(info.context.course, info.context.user)
+
+    def _get_newest_cs_and_cs_for_user(
+        root, info, course_id: str, user: User
+    ) -> Tuple[CourseSession, List[str]]:
+        newest: CourseSession | None = getattr(info.context, "newest", None)
+        course_session_for_user: List[str] = getattr(
+            info.context, "course_session_for_user", []
+        )
+
+        if newest is not None and course_session_for_user:
+            return newest, course_session_for_user
+
+        for course_session in CourseSession.objects.filter(course_id=course_id):
+            if can_view_course_session_progress(
+                user=user, course_session=course_session
+            ):
+                course_session_for_user.append(course_session)
+                generation_newest = newest.generation if newest else None
+                if (
+                    generation_newest is None
+                    or course_session.generation > generation_newest
+                ):
+                    newest = course_session
+        # cache for use in other resolvers
+        setattr(info.context, "newest", newest)
+        setattr(info.context, "course_session_for_user", course_session_for_user)
+        return newest, course_session_for_user
+
 
 class CourseStatisticsType(graphene.ObjectType):
     _id = graphene.ID(required=True)
@@ -224,3 +318,48 @@ class CourseStatisticsType(graphene.ObjectType):
             generations=list(generations),  # noqa
             circles=circle_data,  # noqa
         )
+
+
+def get_widgets_for_course(course: Course, user: User) -> List[WidgetType]:
+    widgets = []
+
+    course_sessions = CourseSession.objects.filter(
+        course__id=course.id, coursesessionuser__user=user
+    ).prefetch_related(
+        "course",
+        "course__configuration",
+    )
+
+    roles_by_course: Dict[Course, Set[DashboardType]] = {}
+
+    learning_mentors = LearningMentor.objects.filter(
+        mentor=user, course_session__course__id=course.id
+    ).values_list("course_session__course__id", "id")
+    mentor_course_ids = set([mentor[0] for mentor in learning_mentors])
+
+    # duplicate code
+    for course_session in course_sessions:
+        if can_view_course_session(user=user, course_session=course_session):
+            role = CourseSessionUser.objects.get(
+                course_session=course_session, user=user
+            ).role
+            roles_by_course.setdefault(course_session.course, set())
+            roles_by_course[course_session.course].add(role)
+
+    for course, roles in roles_by_course.items():
+        if len(roles) == 1:
+            course_role = roles.pop()
+
+            # members
+            if course_role == CourseSessionUser.Role.MEMBER:
+                widgets.append(WidgetType.PROGRESS_WIDGET)
+                widgets.append(WidgetType.COMPETENCE_WIDGET)
+                if course.configuration.enable_competence_certificates:
+                    widgets.append(WidgetType.COMPETENCE_CERTIFICATE_WIDGET)
+    # mentors
+    if course.id in mentor_course_ids:
+        widgets.append(WidgetType.MENTOR_TASKS_WIDGET)
+        widgets.append(WidgetType.MENTOR_PERSON_WIDGET)
+        if course.configuration.enable_competence_certificates:
+            widgets.append(WidgetType.MENTOR_COMPETENCE_WIDGET)
+    return widgets

From e13d72eb8a30b751e4c6098fb58bc5729d87ac1c Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Wed, 3 Apr 2024 07:10:13 +0200
Subject: [PATCH 04/82] Add dashboard persons api view

---
 server/config/urls.py                         |  10 +-
 .../assignment/creators/create_assignments.py |  18 ++-
 .../course/creators/test_course.py            | 126 ++++++++++--------
 .../commands/create_default_courses.py        |   2 +-
 server/vbv_lernwelt/course/serializers.py     |   9 +-
 .../dashboard/tests/test_views.py             |  86 ++++++++++++
 server/vbv_lernwelt/dashboard/views.py        |  87 ++++++++++++
 server/vbv_lernwelt/iam/tests/test_actions.py |   5 +-
 8 files changed, 277 insertions(+), 66 deletions(-)
 create mode 100644 server/vbv_lernwelt/dashboard/tests/test_views.py
 create mode 100644 server/vbv_lernwelt/dashboard/views.py

diff --git a/server/config/urls.py b/server/config/urls.py
index 59959ebb..9848a2c1 100644
--- a/server/config/urls.py
+++ b/server/config/urls.py
@@ -10,6 +10,9 @@ from django.views import defaults as default_views
 from django.views.decorators.csrf import csrf_exempt
 from django_ratelimit.exceptions import Ratelimited
 from graphene_django.views import GraphQLView
+from wagtail import urls as wagtail_urls
+from wagtail.admin import urls as wagtailadmin_urls
+from wagtail.documents import urls as media_library_urls
 
 from vbv_lernwelt.api.directory import list_entities
 from vbv_lernwelt.api.user import get_profile, me_user_view, post_avatar
@@ -39,6 +42,7 @@ from vbv_lernwelt.course.views import (
     request_course_completion_for_user,
 )
 from vbv_lernwelt.course_session.views import get_course_session_documents
+from vbv_lernwelt.dashboard.views import get_dashboard_persons
 from vbv_lernwelt.edoniq_test.views import (
     export_students,
     export_students_and_trainers,
@@ -57,9 +61,6 @@ from vbv_lernwelt.importer.views import (
 )
 from vbv_lernwelt.media_files.views import user_image
 from vbv_lernwelt.notify.views import email_notification_settings
-from wagtail import urls as wagtail_urls
-from wagtail.admin import urls as wagtailadmin_urls
-from wagtail.documents import urls as media_library_urls
 
 
 class SignedIntConverter(IntConverter):
@@ -115,6 +116,9 @@ urlpatterns = [
     # notify
     re_path(r"api/notify/email_notification_settings/$", email_notification_settings,
             name='email_notification_settings'),
+    
+    # dashboard
+    path(r"api/dashboard/persons/", get_dashboard_persons, name="get_dashboard_persons"),
 
     # course
     path(r"api/course/sessions/", get_course_sessions, name="get_course_sessions"),
diff --git a/server/vbv_lernwelt/assignment/creators/create_assignments.py b/server/vbv_lernwelt/assignment/creators/create_assignments.py
index 4b30c326..07875a7e 100644
--- a/server/vbv_lernwelt/assignment/creators/create_assignments.py
+++ b/server/vbv_lernwelt/assignment/creators/create_assignments.py
@@ -26,7 +26,9 @@ from wagtail.blocks.list_block import ListBlock, ListValue
 from wagtail.rich_text import RichText
 
 
-def create_uk_fahrzeug_casework(course_id=COURSE_UK, competence_certificate=None):
+def create_uk_fahrzeug_casework(
+    course_id=COURSE_UK, competence_certificate=None, with_documents=False
+):
     assignment_list_page = (
         CoursePage.objects.get(course_id=course_id)
         .get_children()
@@ -40,7 +42,6 @@ def create_uk_fahrzeug_casework(course_id=COURSE_UK, competence_certificate=None
         needs_expert_evaluation=True,
         competence_certificate=competence_certificate,
         effort_required="ca. 5 Stunden",
-        solution_sample=ContentDocument.objects.get(title="Musterlösung Fahrzeug"),
         intro_text=replace_whitespace(
             """
         <h3>Ausgangslage</h3>
@@ -70,6 +71,11 @@ def create_uk_fahrzeug_casework(course_id=COURSE_UK, competence_certificate=None
         evaluation_document_url="/static/media/assignments/UK_03_09_NACH_KN_Beurteilungsraster.pdf",
         evaluation_description="Diese geleitete Fallarbeit wird auf Grund des folgenden Beurteilungsintrument bewertet.",
     )
+    if with_documents:
+        assignment.solution_sample = ContentDocument.objects.get(
+            title="Musterlösung Fahrzeug"
+        )
+        assignment.save()
 
     assignment.evaluation_tasks = []
     assignment.evaluation_tasks.append(
@@ -3591,7 +3597,7 @@ def create_uk_reflection(course_id=COURSE_UK):
     assignment = AssignmentFactory(
         parent=assignment_list_page,
         assignment_type=AssignmentType.REFLECTION.name,
-        title=f"Reflexion",
+        title="Reflexion",
         effort_required="ca. 1 Stunde",
         intro_text=replace_whitespace(
             """
@@ -3747,7 +3753,7 @@ def create_uk_fr_reflection(course_id=COURSE_UK_FR, circle_title="Véhicule"):
     assignment = AssignmentFactory(
         parent=assignment_list_page,
         assignment_type=AssignmentType.REFLECTION.name,
-        title=f"Reflexion",
+        title="Reflexion",
         effort_required="",
         intro_text=replace_whitespace(
             """
@@ -3900,7 +3906,7 @@ def create_uk_it_reflection(course_id=COURSE_UK_FR, circle_title="Véhicule"):
     assignment = AssignmentFactory(
         parent=assignment_list_page,
         assignment_type=AssignmentType.REFLECTION.name,
-        title=f"Riflessione",
+        title="Riflessione",
         effort_required="",
         intro_text=replace_whitespace(
             """
@@ -4053,7 +4059,7 @@ def create_vv_reflection(
     assignment = AssignmentFactory(
         parent=assignment_list_page,
         assignment_type=AssignmentType.REFLECTION.name,
-        title=f"Reflexion",
+        title="Reflexion",
         effort_required="ca. 1 Stunde",
         intro_text=replace_whitespace(
             """
diff --git a/server/vbv_lernwelt/course/creators/test_course.py b/server/vbv_lernwelt/course/creators/test_course.py
index f6532b6d..124f4146 100644
--- a/server/vbv_lernwelt/course/creators/test_course.py
+++ b/server/vbv_lernwelt/course/creators/test_course.py
@@ -97,12 +97,15 @@ from vbv_lernwelt.media_library.tests.media_library_factories import (
 )
 
 
-def create_test_course(include_uk=True, include_vv=True, with_sessions=False):
+def create_test_course(
+    include_uk=True, include_vv=True, with_sessions=False, with_documents=False
+):
     # create_locales_for_wagtail()
     create_default_collections()
-    create_default_content_documents()
-    if UserImage.objects.count() == 0 and ContentImage.objects.count() == 0:
-        create_default_images()
+    if with_documents:
+        create_default_content_documents()
+        if UserImage.objects.count() == 0 and ContentImage.objects.count() == 0:
+            create_default_images()
 
     course: Course = create_test_course_with_categories()
     course.configuration.enable_learning_mentor = False
@@ -118,7 +121,9 @@ def create_test_course(include_uk=True, include_vv=True, with_sessions=False):
 
     if include_uk:
         create_uk_fahrzeug_casework(
-            course_id=COURSE_TEST_ID, competence_certificate=competence_certificate
+            course_id=COURSE_TEST_ID,
+            competence_certificate=competence_certificate,
+            with_documents=with_documents,
         )
         create_uk_fahrzeug_prep_assignment(course_id=COURSE_TEST_ID)
         create_uk_condition_acceptance(course_id=COURSE_TEST_ID)
@@ -132,7 +137,9 @@ def create_test_course(include_uk=True, include_vv=True, with_sessions=False):
     if include_vv:
         create_vv_gewinnen_casework(course_id=COURSE_TEST_ID)
 
-    create_test_learning_path(include_uk=include_uk, include_vv=include_vv)
+    create_test_learning_path(
+        include_uk=include_uk, include_vv=include_vv, with_documents=with_documents
+    )
     create_test_media_library()
 
     if with_sessions:
@@ -187,7 +194,7 @@ def create_test_course(include_uk=True, include_vv=True, with_sessions=False):
         csa = CourseSessionAssignment.objects.create(
             course_session=cs_bern,
             learning_content=LearningContentAssignment.objects.get(
-                slug=f"test-lehrgang-lp-circle-fahrzeug-lc-fahrzeug-mein-erstes-auto"
+                slug="test-lehrgang-lp-circle-fahrzeug-lc-fahrzeug-mein-erstes-auto"
             ),
         )
         next_monday = datetime.now() + relativedelta(weekday=MO(2))
@@ -215,7 +222,7 @@ def create_test_course(include_uk=True, include_vv=True, with_sessions=False):
             _csa = CourseSessionAssignment.objects.create(
                 course_session=cs_bern,
                 learning_content=LearningContentAssignment.objects.get(
-                    slug=f"test-lehrgang-lp-circle-reisen-lc-mein-kundenstamm"
+                    slug="test-lehrgang-lp-circle-reisen-lc-mein-kundenstamm"
                 ),
             )
 
@@ -418,20 +425,22 @@ def create_test_course_with_categories(apps=None, schema_editor=None):
     return course
 
 
-def create_test_learning_path(include_uk=True, include_vv=True):
+def create_test_learning_path(include_uk=True, include_vv=True, with_documents=False):
     course_page = CoursePage.objects.get(course_id=COURSE_TEST_ID)
     lp = LearningPathFactory(title="Test Lernpfad", parent=course_page)
 
     if include_uk:
         TopicFactory(title="Circle ÜK", is_visible=False, parent=lp)
-        create_test_uk_circle_fahrzeug(lp, title="Fahrzeug")
+        create_test_uk_circle_fahrzeug(
+            lp, title="Fahrzeug", with_documents=with_documents
+        )
 
     if include_vv:
         TopicFactory(title="Circle VV", is_visible=False, parent=lp)
         create_test_circle_reisen(lp)
 
 
-def create_test_uk_circle_fahrzeug(lp, title="Fahrzeug"):
+def create_test_uk_circle_fahrzeug(lp, title="Fahrzeug", with_documents=False):
     circle = CircleFactory(
         title=title,
         parent=lp,
@@ -470,21 +479,25 @@ damit du erfolgreich mit deinem Lernpfad (durch-)starten kannst.
         ),
         content_url=f"/course/{lp.get_course().slug}/media/handlungsfelder/{slugify(title)}",
     )
-    LearningContentAssignmentFactory(
-        title="Redlichkeitserklärung",
-        parent=circle,
-        content_assignment=Assignment.objects.get(
-            slug__startswith="test-lehrgang-assignment-redlichkeits"
+    (
+        LearningContentAssignmentFactory(
+            title="Redlichkeitserklärung",
+            parent=circle,
+            content_assignment=Assignment.objects.get(
+                slug__startswith="test-lehrgang-assignment-redlichkeits"
+            ),
         ),
-    ),
-    LearningContentAssignmentFactory(
-        title="Fahrzeug - Mein erstes Auto",
-        assignment_type="PREP_ASSIGNMENT",
-        parent=circle,
-        content_assignment=Assignment.objects.get(
-            slug__startswith="test-lehrgang-assignment-fahrzeug-mein-erstes-auto"
+    )
+    (
+        LearningContentAssignmentFactory(
+            title="Fahrzeug - Mein erstes Auto",
+            assignment_type="PREP_ASSIGNMENT",
+            parent=circle,
+            content_assignment=Assignment.objects.get(
+                slug__startswith="test-lehrgang-assignment-fahrzeug-mein-erstes-auto"
+            ),
         ),
-    ),
+    )
 
     PerformanceCriteriaFactory(
         parent=ActionCompetence.objects.get(competence_id="X1"),
@@ -531,21 +544,24 @@ damit du erfolgreich mit deinem Lernpfad (durch-)starten kannst.
 
     LearningSequenceFactory(title="Transfer", parent=circle, icon="it-icon-ls-end")
     LearningUnitFactory(title="Transfer", parent=circle)
-    LearningContentAssignmentFactory(
-        title="Reflexion",
-        assignment_type="REFLECTION",
-        parent=circle,
-        content_assignment=Assignment.objects.get(
-            slug__startswith=f"test-lehrgang-assignment-reflexion"
+    (
+        LearningContentAssignmentFactory(
+            title="Reflexion",
+            assignment_type="REFLECTION",
+            parent=circle,
+            content_assignment=Assignment.objects.get(
+                slug__startswith="test-lehrgang-assignment-reflexion"
+            ),
         ),
-    ),
+    )
 
     assignment = Assignment.objects.get(
         slug__startswith="test-lehrgang-assignment-überprüfen-einer-motorfahrzeugs"
     )
-    assignment.solution_sample = ContentDocument.objects.get(
-        title="Musterlösung Fahrzeug"
-    )
+    if with_documents:
+        assignment.solution_sample = ContentDocument.objects.get(
+            title="Musterlösung Fahrzeug"
+        )
     assignment.save()
     LearningContentAssignmentFactory(
         title="Überprüfen einer Motorfahrzeug-Versicherungspolice",
@@ -574,9 +590,9 @@ def create_test_circle_reisen(lp):
         description="Willkommen im Lehrgang Versicherungsvermitler VBV",
     )
     LearningContentMediaLibraryFactory(
-        title=f"Mediathek Reisen",
+        title="Mediathek Reisen",
         parent=circle,
-        content_url=f"/course/test-lehrgang/media/handlungsfelder/reisen",
+        content_url="/course/test-lehrgang/media/handlungsfelder/reisen",
     )
 
     LearningSequenceFactory(title="Analyse", parent=circle)
@@ -596,25 +612,27 @@ def create_test_circle_reisen(lp):
         content_url="https://s3.eu-central-1.amazonaws.com/myvbv-wbt.iterativ.ch/emma-und-ayla-campen-durch-amerika-analyse-xapi-FZoZOP9y/index.html",
     )
 
-    LearningContentAssignmentFactory(
-        title="Mein Kundenstamm",
-        assignment_type="PRAXIS_ASSIGNMENT",
-        parent=circle,
-        content_assignment=Assignment.objects.get(
-            slug__startswith="test-lehrgang-assignment-mein-kundenstamm"
+    (
+        LearningContentAssignmentFactory(
+            title="Mein Kundenstamm",
+            assignment_type="PRAXIS_ASSIGNMENT",
+            parent=circle,
+            content_assignment=Assignment.objects.get(
+                slug__startswith="test-lehrgang-assignment-mein-kundenstamm"
+            ),
         ),
-    ),
+    )
 
     PerformanceCriteriaFactory(
         parent=ActionCompetence.objects.get(competence_id="Y1"),
-        competence_id=f"Y1.1",
-        title=f"Ich bin fähig zu Reisen eine Gesprächsführung zu machen",
+        competence_id="Y1.1",
+        title="Ich bin fähig zu Reisen eine Gesprächsführung zu machen",
         learning_unit=lu,
     )
     PerformanceCriteriaFactory(
         parent=ActionCompetence.objects.get(competence_id="Y2"),
-        competence_id=f"Y2.1",
-        title=f"Ich bin fähig zu Reisen eine Analyse zu machen",
+        competence_id="Y2.1",
+        title="Ich bin fähig zu Reisen eine Analyse zu machen",
         learning_unit=lu,
     )
 
@@ -627,7 +645,7 @@ def create_test_circle_reisen(lp):
         parent=parent,
     )
     LearningContentPlaceholderFactory(
-        title=f"Fachcheck Reisen",
+        title="Fachcheck Reisen",
         parent=parent,
     )
     LearningContentKnowledgeAssessmentFactory(
@@ -757,9 +775,9 @@ def create_test_media_library():
             die der Fahrzeugbesitzer und die Fahrzeugbesitzerin in einem grösseren Schadenfall oft nur schwer selbst aufbringen kann.
             """.strip(),
             body=RichText(
-                f"<h2>Lernmedien</h2>"
-                f"<h3>Allgemeines</h3>"
-                f"<ul><li>Mit Risiken im Strassenverkehr umgehen</li><li>Versicherungsschutz</li><li>Vertragsarten</li><li>Zusammenfassung</li></ul>"
+                "<h2>Lernmedien</h2>"
+                "<h3>Allgemeines</h3>"
+                "<ul><li>Mit Risiken im Strassenverkehr umgehen</li><li>Versicherungsschutz</li><li>Vertragsarten</li><li>Zusammenfassung</li></ul>"
             ),
         )
 
@@ -778,9 +796,9 @@ def create_test_media_library():
             title=cat,
             parent=media_lib_allgemeines,
             body=RichText(
-                f"<h2>Lernmedien</h2>"
-                f"<h3>Allgemeines</h3>"
-                f"<ul><li>Mit Risiken im Strassenverkehr umgehen</li><li>Versicherungsschutz</li><li>Vertragsarten</li><li>Zusammenfassung</li></ul>"
+                "<h2>Lernmedien</h2>"
+                "<h3>Allgemeines</h3>"
+                "<ul><li>Mit Risiken im Strassenverkehr umgehen</li><li>Versicherungsschutz</li><li>Vertragsarten</li><li>Zusammenfassung</li></ul>"
             ),
         )
 
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 f9b296d8..0ba564a4 100644
--- a/server/vbv_lernwelt/course/management/commands/create_default_courses.py
+++ b/server/vbv_lernwelt/course/management/commands/create_default_courses.py
@@ -182,7 +182,7 @@ def command(course):
         create_course_uk_it()
 
     if COURSE_TEST_ID in course:
-        create_test_course(with_sessions=True)
+        create_test_course(with_sessions=True, with_documents=True)
 
     if COURSE_UK_TRAINING in course:
         create_course_training_de()
diff --git a/server/vbv_lernwelt/course/serializers.py b/server/vbv_lernwelt/course/serializers.py
index e88133cb..db35a0a6 100644
--- a/server/vbv_lernwelt/course/serializers.py
+++ b/server/vbv_lernwelt/course/serializers.py
@@ -73,16 +73,22 @@ class CourseSessionSerializer(serializers.ModelSerializer):
     course = serializers.SerializerMethodField()
     due_dates = serializers.SerializerMethodField()
     actions = serializers.SerializerMethodField()
+    user_roles = serializers.SerializerMethodField()
 
     def get_course(self, obj):
         return CourseSerializer(obj.course).data
 
     def get_due_dates(self, obj):
         due_dates = DueDate.objects.filter(
-            Q(start__isnull=False) | Q(end__isnull=False), course_session=obj
+            Q(start__isnull=False) | Q(end__isnull=False), course_session_id=obj.id
         )
         return DueDateSerializer(due_dates, many=True).data
 
+    def get_user_roles(self, obj):
+        if hasattr(obj, "roles"):
+            return list(obj.roles)
+        return []
+
     class Meta:
         model = CourseSession
         fields = [
@@ -95,6 +101,7 @@ class CourseSessionSerializer(serializers.ModelSerializer):
             "end_date",
             "due_dates",
             "actions",
+            "user_roles",
         ]
         read_only_fields = ["actions"]
 
diff --git a/server/vbv_lernwelt/dashboard/tests/test_views.py b/server/vbv_lernwelt/dashboard/tests/test_views.py
new file mode 100644
index 00000000..4f9bc491
--- /dev/null
+++ b/server/vbv_lernwelt/dashboard/tests/test_views.py
@@ -0,0 +1,86 @@
+from django.test import TestCase
+
+from vbv_lernwelt.course.creators.test_utils import (
+    create_course,
+    create_course_session,
+    create_user,
+    add_course_session_user,
+    create_course_session_group,
+    add_course_session_group_supervisor,
+)
+from vbv_lernwelt.course.models import CourseSessionUser
+from vbv_lernwelt.dashboard.views import get_course_sessions_with_roles_for_user
+from vbv_lernwelt.learning_mentor.models import LearningMentor
+
+
+class GetCourseSessionsForUserTestCase(TestCase):
+    def setUp(self):
+        self.course, _ = create_course("Test Course")
+        self.course_session = create_course_session(
+            course=self.course, title="Test Session"
+        )
+
+    def test_participant_get_sessions(self):
+        # participant gets all his sessions marked with role "MEMBER"
+        participant = create_user("participant")
+        add_course_session_user(
+            self.course_session,
+            participant,
+            role=CourseSessionUser.Role.MEMBER,
+        )
+
+        # WHEN
+        sessions = get_course_sessions_with_roles_for_user(participant)
+
+        # THEN
+        self.assertEqual(len(sessions), 1)
+        self.assertEqual(sessions[0].title, "Test Session")
+        self.assertSetEqual(sessions[0].roles, {"MEMBER"})
+
+    def test_trainer_get_sessions(self):
+        # GIVEN
+        # trainer gets all his sessions marked with role "EXPERT"
+        trainer = create_user("trainer")
+        add_course_session_user(
+            self.course_session,
+            trainer,
+            role=CourseSessionUser.Role.EXPERT,
+        )
+
+        # WHEN
+        sessions = get_course_sessions_with_roles_for_user(trainer)
+
+        # THEN
+        self.assertEqual(len(sessions), 1)
+        self.assertEqual(sessions[0].title, "Test Session")
+        self.assertSetEqual(sessions[0].roles, {"EXPERT"})
+
+    def test_supervisor_get_sessions(self):
+        supervisor = create_user("supervisor")
+        group = create_course_session_group(course_session=self.course_session)
+        add_course_session_group_supervisor(group=group, user=supervisor)
+
+        sessions = get_course_sessions_with_roles_for_user(supervisor)
+
+        # THEN
+        self.assertEqual(len(sessions), 1)
+        self.assertEqual(sessions[0].title, "Test Session")
+        self.assertEqual(sessions[0].roles, {"SUPERVISOR"})
+
+    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(
+            self.course_session,
+            participant,
+            role=CourseSessionUser.Role.MEMBER,
+        )
+
+        sessions = get_course_sessions_with_roles_for_user(mentor)
+
+        # THEN
+        self.assertEqual(len(sessions), 1)
+        self.assertEqual(sessions[0].title, "Test Session")
+        self.assertEqual(sessions[0].roles, {"LEARNING_MENTOR"})
diff --git a/server/vbv_lernwelt/dashboard/views.py b/server/vbv_lernwelt/dashboard/views.py
new file mode 100644
index 00000000..1e2181c1
--- /dev/null
+++ b/server/vbv_lernwelt/dashboard/views.py
@@ -0,0 +1,87 @@
+from dataclasses import dataclass
+from typing import List, Set
+
+from rest_framework.decorators import api_view
+from rest_framework.exceptions import PermissionDenied
+from rest_framework.response import Response
+
+from vbv_lernwelt.core.models import User
+from vbv_lernwelt.course.models import CourseSession, CourseSessionUser
+from vbv_lernwelt.course.serializers import CourseSessionSerializer
+from vbv_lernwelt.course.views import logger
+from vbv_lernwelt.course_session_group.models import CourseSessionGroup
+from vbv_lernwelt.learning_mentor.models import LearningMentor
+
+
+@dataclass(frozen=True)
+class CourseSessionWithRoles:
+    _original: CourseSession
+    roles: Set[str]
+
+    def __getattr__(self, name: str):
+        # Delegate attribute access to the _original CourseSession object
+        return getattr(self._original, name)
+
+    def save(self, *args, **kwargs):
+        raise NotImplementedError("This proxy object cannot be saved.")
+
+
+def get_course_sessions_with_roles_for_user(user: User) -> List[CourseSessionWithRoles]:
+    result_course_sessions = {}
+
+    # participant/member/expert course sessions
+    csu_qs = CourseSessionUser.objects.filter(user=user).prefetch_related(
+        "course_session", "course_session__course"
+    )
+    for csu in csu_qs:
+        cs = csu.course_session
+        # member/expert is mutually exclusive...
+        cs.roles = {csu.role}
+        result_course_sessions[cs.id] = cs
+
+    # enrich with supervisor course sessions
+    csg_qs = CourseSessionGroup.objects.filter(supervisor=user).prefetch_related(
+        "course_session", "course_session__course"
+    )
+    for csg in csg_qs:
+        for cs in csg.course_session.all():
+            cs.roles = set()
+            cs = result_course_sessions.get(cs.id, cs)
+
+            cs.roles.add("SUPERVISOR")
+            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"
+    )
+    for lm in lm_qs:
+        cs = lm.course_session
+        cs.roles = set()
+        cs = result_course_sessions.get(cs.id, cs)
+
+        cs.roles.add("LEARNING_MENTOR")
+        result_course_sessions[cs.id] = cs
+
+    return [
+        CourseSessionWithRoles(cs, cs.roles) for cs in result_course_sessions.values()
+    ]
+
+
+@api_view(["GET"])
+def get_dashboard_persons(request):
+    try:
+        course_sessions = get_course_sessions_with_roles_for_user(request.user)
+        all_to_serialize = course_sessions
+
+        return Response(
+            status=200,
+            data=CourseSessionSerializer(
+                all_to_serialize, many=True, context={"user": request.user}
+            ).data,
+        )
+    except PermissionDenied as e:
+        raise e
+    except Exception as e:
+        logger.error(e, exc_info=True)
+        return Response({"error": str(e)}, status=404)
diff --git a/server/vbv_lernwelt/iam/tests/test_actions.py b/server/vbv_lernwelt/iam/tests/test_actions.py
index 01b586c3..84d70e5e 100644
--- a/server/vbv_lernwelt/iam/tests/test_actions.py
+++ b/server/vbv_lernwelt/iam/tests/test_actions.py
@@ -48,15 +48,16 @@ class ActionTestCase(TestCase):
         self.assertEqual(
             mentor_actions,
             [
+                "is_learning_mentor",
                 "learning-mentor",
                 "learning-mentor::guide-members",
                 "preview",
-                "appointments",
             ],
         )
         self.assertEqual(
             participant_actions,
             [
+                "is_member",
                 "learning-mentor",
                 "learning-mentor::edit-mentors",
                 "media-library",
@@ -69,6 +70,8 @@ class ActionTestCase(TestCase):
         self.assertEqual(
             trainer_actions,
             [
+                "is_expert",
+                "learning-mentor",
                 "preview",
                 "media-library",
                 "appointments",

From d6885f4e7f9a649e1d419cd7176292cd3e8b3ed6 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Wed, 3 Apr 2024 11:38:00 +0200
Subject: [PATCH 05/82] Add more course config

---
 server/vbv_lernwelt/course/admin.py           |  2 +
 .../migrations/0008_auto_20240403_1132.py     | 67 +++++++++++++++++++
 server/vbv_lernwelt/course/models.py          |  5 +-
 server/vbv_lernwelt/dashboard/views.py        | 10 +++
 4 files changed, 83 insertions(+), 1 deletion(-)
 create mode 100644 server/vbv_lernwelt/course/migrations/0008_auto_20240403_1132.py

diff --git a/server/vbv_lernwelt/course/admin.py b/server/vbv_lernwelt/course/admin.py
index e64c5ada..4a4741f3 100644
--- a/server/vbv_lernwelt/course/admin.py
+++ b/server/vbv_lernwelt/course/admin.py
@@ -23,6 +23,8 @@ class CourseConfigurationAdmin(admin.ModelAdmin):
         "enable_circle_documents",
         "enable_learning_mentor",
         "enable_competence_certificates",
+        "is_vv",
+        "is_uk",
     ]
 
 
diff --git a/server/vbv_lernwelt/course/migrations/0008_auto_20240403_1132.py b/server/vbv_lernwelt/course/migrations/0008_auto_20240403_1132.py
new file mode 100644
index 00000000..7e7c1e21
--- /dev/null
+++ b/server/vbv_lernwelt/course/migrations/0008_auto_20240403_1132.py
@@ -0,0 +1,67 @@
+# Generated by Django 3.2.20 on 2024-04-03 09:32
+
+from django.db import migrations, models
+
+
+TEST_COURSE_ID = -1
+
+UK_COURSE_IDS = [
+    -3,  # uk-de
+    -6,  # uk-training-de
+    -5,  # uk-fr
+    -7,  # uk-training-fr
+    -8,  # uk-it
+    -9,  # uk-training-it
+]
+
+
+VV_COURSE_IDS = [
+    -4,  # vv-de
+    -10,  # vv-fr
+    -11,  # vv-it
+    -12,  # vv-prüfung
+]
+
+
+def forward_migration(apps, schema_editor):
+    Course = apps.get_model("course", "Course")
+    CourseConfiguration = apps.get_model("course", "CourseConfiguration")
+
+    for course in Course.objects.all():
+        config, created = CourseConfiguration.objects.get_or_create(
+            course=course,
+        )
+
+        #  -> disable unnecessary features
+        if course.id in UK_COURSE_IDS:
+            config.is_uk = True
+        elif course.id in VV_COURSE_IDS:
+            config.is_vv = True
+
+        config.save()
+
+
+def backward_migration(apps, schema_editor):
+    pass
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("course", "0007_auto_20240226_1553"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="courseconfiguration",
+            name="is_uk",
+            field=models.BooleanField(default=False, verbose_name="ÜK-Lehrgang"),
+        ),
+        migrations.AddField(
+            model_name="courseconfiguration",
+            name="is_vv",
+            field=models.BooleanField(
+                default=False, verbose_name="Versicherungsvermittler-Lehrgang"
+            ),
+        ),
+        migrations.RunPython(forward_migration, backward_migration),
+    ]
diff --git a/server/vbv_lernwelt/course/models.py b/server/vbv_lernwelt/course/models.py
index 47ed76e2..aa94f21b 100644
--- a/server/vbv_lernwelt/course/models.py
+++ b/server/vbv_lernwelt/course/models.py
@@ -149,7 +149,7 @@ class CourseBasePage(Page):
     def save(self, clean=True, user=None, log_action=False, **kwargs):
         slug_changed = False
 
-        if not self.id is None:
+        if self.id is not None:
             old_record = Page.objects.get(id=self.id).specific
             if old_record.slug != self.slug:
                 self.set_url_path(self.get_parent())
@@ -340,5 +340,8 @@ class CourseConfiguration(models.Model):
         _("Kompetenzweise ein/aus"), default=True
     )
 
+    is_vv = models.BooleanField(_("Versicherungsvermittler-Lehrgang"), default=False)
+    is_uk = models.BooleanField(_("ÜK-Lehrgang"), default=False)
+
     def __str__(self):
         return f"Course Configuration for '{self.course.title}'"
diff --git a/server/vbv_lernwelt/dashboard/views.py b/server/vbv_lernwelt/dashboard/views.py
index 1e2181c1..defa34bc 100644
--- a/server/vbv_lernwelt/dashboard/views.py
+++ b/server/vbv_lernwelt/dashboard/views.py
@@ -72,6 +72,16 @@ def get_course_sessions_with_roles_for_user(user: User) -> List[CourseSessionWit
 def get_dashboard_persons(request):
     try:
         course_sessions = get_course_sessions_with_roles_for_user(request.user)
+
+        persons = []
+        for cs in course_sessions:
+            if {"SUPERVISOR", "EXPERT", "MEMBER"} & cs.roles:
+                persons.extend(
+                    CourseSessionUser.objects.filter(course_session=cs.id).values(
+                        "user"
+                    )
+                )
+
         all_to_serialize = course_sessions
 
         return Response(

From de91814c6abf5699c896a2b108bc94dbee8427fd Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Wed, 3 Apr 2024 12:24:12 +0200
Subject: [PATCH 06/82] Add learning mentor relations to persons view

---
 server/config/urls.py                         |   6 +-
 .../dashboard/tests/test_views.py             |   6 +-
 server/vbv_lernwelt/dashboard/views.py        | 100 ++++++++++++++++--
 3 files changed, 95 insertions(+), 17 deletions(-)

diff --git a/server/config/urls.py b/server/config/urls.py
index 9848a2c1..b18dc421 100644
--- a/server/config/urls.py
+++ b/server/config/urls.py
@@ -10,9 +10,6 @@ from django.views import defaults as default_views
 from django.views.decorators.csrf import csrf_exempt
 from django_ratelimit.exceptions import Ratelimited
 from graphene_django.views import GraphQLView
-from wagtail import urls as wagtail_urls
-from wagtail.admin import urls as wagtailadmin_urls
-from wagtail.documents import urls as media_library_urls
 
 from vbv_lernwelt.api.directory import list_entities
 from vbv_lernwelt.api.user import get_profile, me_user_view, post_avatar
@@ -61,6 +58,9 @@ from vbv_lernwelt.importer.views import (
 )
 from vbv_lernwelt.media_files.views import user_image
 from vbv_lernwelt.notify.views import email_notification_settings
+from wagtail import urls as wagtail_urls
+from wagtail.admin import urls as wagtailadmin_urls
+from wagtail.documents import urls as media_library_urls
 
 
 class SignedIntConverter(IntConverter):
diff --git a/server/vbv_lernwelt/dashboard/tests/test_views.py b/server/vbv_lernwelt/dashboard/tests/test_views.py
index 4f9bc491..4f0a5c99 100644
--- a/server/vbv_lernwelt/dashboard/tests/test_views.py
+++ b/server/vbv_lernwelt/dashboard/tests/test_views.py
@@ -1,12 +1,12 @@
 from django.test import TestCase
 
 from vbv_lernwelt.course.creators.test_utils import (
+    add_course_session_group_supervisor,
+    add_course_session_user,
     create_course,
     create_course_session,
-    create_user,
-    add_course_session_user,
     create_course_session_group,
-    add_course_session_group_supervisor,
+    create_user,
 )
 from vbv_lernwelt.course.models import CourseSessionUser
 from vbv_lernwelt.dashboard.views import get_course_sessions_with_roles_for_user
diff --git a/server/vbv_lernwelt/dashboard/views.py b/server/vbv_lernwelt/dashboard/views.py
index defa34bc..7c5342de 100644
--- a/server/vbv_lernwelt/dashboard/views.py
+++ b/server/vbv_lernwelt/dashboard/views.py
@@ -7,7 +7,6 @@ from rest_framework.response import Response
 
 from vbv_lernwelt.core.models import User
 from vbv_lernwelt.course.models import CourseSession, CourseSessionUser
-from vbv_lernwelt.course.serializers import CourseSessionSerializer
 from vbv_lernwelt.course.views import logger
 from vbv_lernwelt.course_session_group.models import CourseSessionGroup
 from vbv_lernwelt.learning_mentor.models import LearningMentor
@@ -73,22 +72,101 @@ def get_dashboard_persons(request):
     try:
         course_sessions = get_course_sessions_with_roles_for_user(request.user)
 
-        persons = []
+        result_persons = {}
         for cs in course_sessions:
-            if {"SUPERVISOR", "EXPERT", "MEMBER"} & cs.roles:
-                persons.extend(
-                    CourseSessionUser.objects.filter(course_session=cs.id).values(
-                        "user"
-                    )
+            if {
+                "SUPERVISOR",
+                "EXPERT",
+                "MEMBER",
+            } & cs.roles and cs.course.configuration.is_uk:
+                course_session_users = CourseSessionUser.objects.filter(
+                    course_session=cs.id
                 )
+                my_role = (
+                    "SUPERVISOR"
+                    if "SUPERVISOR" in cs.roles
+                    else ("EXPERT" if "EXPERT" in cs.roles else "MEMBER")
+                )
+                for csu in course_session_users:
+                    result_persons[csu.user.id] = {
+                        "user_id": csu.user.id,
+                        "first_name": csu.user.first_name,
+                        "last_name": csu.user.last_name,
+                        "email": csu.user.email,
+                        "course_sessions": [
+                            {
+                                "id": cs.id,
+                                "session_title": cs.title,
+                                "course_id": cs.course.id,
+                                "course_title": cs.course.title,
+                                "user_role": csu.role,
+                                "my_role": my_role,
+                            }
+                        ],
+                    }
 
-        all_to_serialize = course_sessions
+        # add persons where request.user is mentor
+        for cs in course_sessions:
+            if "LEARNING_MENTOR" in cs.roles:
+                lm = LearningMentor.objects.filter(
+                    mentor=request.user, course_session=cs.id
+                ).first()
+
+                for participant in lm.participants.all():
+                    course_session_entry = {
+                        "id": cs.id,
+                        "course_id": cs.course.id,
+                        "session_title": cs.title,
+                        "course_title": cs.course.title,
+                        "user_role": "LEARNING_MENTEE",
+                        "my_role": "LEARNING_MENTOR",
+                    }
+
+                    if participant.user.id not in result_persons:
+                        result_persons[participant.user.id] = {
+                            "user_id": participant.user.id,
+                            "first_name": participant.user.first_name,
+                            "last_name": participant.user.last_name,
+                            "email": participant.user.email,
+                            "course_sessions": [course_session_entry],
+                        }
+                    else:
+                        # user is already in result_persons
+                        result_persons[participant.user.id]["course_sessions"].append(
+                            course_session_entry
+                        )
+
+        # add persons where request.user is mentee
+        mentor_relation_qs = LearningMentor.objects.filter(
+            participants__user=request.user
+        ).prefetch_related("mentor", "course_session")
+        for mentor_relation in mentor_relation_qs:
+            course_session_entry = {
+                "id": mentor_relation.course_session.id,
+                "session_title": mentor_relation.course_session.title,
+                "course_id": mentor_relation.course_session.course.id,
+                "course_title": mentor_relation.course_session.course.title,
+                "user_role": "LEARNING_MENTOR",
+                "my_role": "LEARNING_MENTEE",
+            }
+
+            if mentor_relation.mentor.id not in result_persons:
+                result_persons[mentor_relation.mentor.id] = {
+                    "user_id": mentor_relation.mentor.id,
+                    "first_name": mentor_relation.mentor.first_name,
+                    "last_name": mentor_relation.mentor.last_name,
+                    "email": mentor_relation.mentor.email,
+                    "course_sessions": [course_session_entry],
+                }
+            else:
+                # user is already in result_persons
+                result_persons[mentor_relation.mentor.id]["course_sessions"].append(
+                    course_session_entry
+                )
 
         return Response(
             status=200,
-            data=CourseSessionSerializer(
-                all_to_serialize, many=True, context={"user": request.user}
-            ).data,
+            data=list(result_persons.values()),
         )
     except PermissionDenied as e:
         raise e

From e49a4971ae1b0e44c00e9ade6cda100ab5f1341a Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Wed, 3 Apr 2024 15:15:07 +0200
Subject: [PATCH 07/82] Add simple DashboardPersonsPage which loads data

---
 client/src/composables.ts                     | 27 +++++++++++++++--
 client/src/fetchHelpers.ts                    | 20 ++++++++-----
 .../pages/dashboard/DashboardPersonsPage.vue  | 22 ++++++++++++++
 client/src/router/index.ts                    |  4 +++
 client/src/services/dashboard.ts              | 30 +++++++++++++++++++
 5 files changed, 93 insertions(+), 10 deletions(-)
 create mode 100644 client/src/pages/dashboard/DashboardPersonsPage.vue

diff --git a/client/src/composables.ts b/client/src/composables.ts
index a4989aa0..cbf6dc97 100644
--- a/client/src/composables.ts
+++ b/client/src/composables.ts
@@ -5,8 +5,10 @@ import { COURSE_QUERY, COURSE_SESSION_DETAIL_QUERY } from "@/graphql/queries";
 import {
   circleFlatChildren,
   circleFlatLearningContents,
-  circleFlatLearningUnits,
+  circleFlatLearningUnits
 } from "@/services/circle";
+import type { DashboardPersonType } from "@/services/dashboard";
+import { fetchDashboardPersons } from "@/services/dashboard";
 import { presignUpload, uploadFile } from "@/services/files";
 import { useCompletionStore } from "@/stores/completion";
 import { useCourseSessionsStore } from "@/stores/courseSessions";
@@ -23,7 +25,7 @@ import type {
   LearningMentor,
   LearningPathType,
   LearningUnitPerformanceCriteria,
-  PerformanceCriteria,
+  PerformanceCriteria
 } from "@/types";
 import { useQuery } from "@urql/vue";
 import orderBy from "lodash/orderBy";
@@ -487,3 +489,24 @@ export function useMyLearningMentors() {
     loading,
   };
 }
+
+export function useDashboardPersons() {
+  const dashboardPersons = ref<DashboardPersonType[]>([]);
+  const loading = ref(false);
+
+  const fetchData = async () => {
+    loading.value = true;
+    try {
+      dashboardPersons.value = await fetchDashboardPersons();
+    } finally {
+      loading.value = false;
+    }
+  };
+
+  onMounted(fetchData);
+
+  return {
+    dashboardPersons,
+    loading,
+  };
+}
diff --git a/client/src/fetchHelpers.ts b/client/src/fetchHelpers.ts
index f4ca9ec1..bbdd50db 100644
--- a/client/src/fetchHelpers.ts
+++ b/client/src/fetchHelpers.ts
@@ -20,7 +20,11 @@ export const itFetch = (url: RequestInfo, options: RequestInit) => {
   });
 };
 
-export const itPost = (url: RequestInfo, data: unknown, options: RequestInit = {}) => {
+export const itPost = <T>(
+  url: RequestInfo,
+  data: unknown,
+  options: RequestInit = {}
+) => {
   options = Object.assign({}, options);
 
   const headers = Object.assign(
@@ -56,11 +60,11 @@ export const itPost = (url: RequestInfo, data: unknown, options: RequestInit = {
     return response.json().catch(() => {
       return Promise.resolve(null);
     });
-  });
+  }) as Promise<T>;
 };
 
-export const itGet = (url: RequestInfo) => {
-  return itPost(url, {}, { method: "GET" });
+export const itGet = <T>(url: RequestInfo) => {
+  return itPost<T>(url, {}, { method: "GET" });
 };
 
 export const itDelete = (url: RequestInfo) => {
@@ -81,17 +85,17 @@ export function bustItGetCache(key?: string) {
   }
 }
 
-export const itGetCached = (
+export const itGetCached = <T>(
   url: RequestInfo,
   options = {
     reload: false,
   }
-): Promise<any> => {
+): Promise<T> => {
   if (!itGetPromiseCache.has(url.toString()) || options.reload) {
-    itGetPromiseCache.set(url.toString(), itGet(url));
+    itGetPromiseCache.set(url.toString(), itGet<T>(url));
   }
 
-  return itGetPromiseCache.get(url.toString()) as Promise<any>;
+  return itGetPromiseCache.get(url.toString()) as Promise<T>;
 };
 
 export const useCSRFFetch = createFetch({
diff --git a/client/src/pages/dashboard/DashboardPersonsPage.vue b/client/src/pages/dashboard/DashboardPersonsPage.vue
new file mode 100644
index 00000000..9cf37ccb
--- /dev/null
+++ b/client/src/pages/dashboard/DashboardPersonsPage.vue
@@ -0,0 +1,22 @@
+<script setup lang="ts">
+import LoadingSpinner from "@/components/ui/LoadingSpinner.vue";
+import log from "loglevel";
+import { useDashboardPersons } from "@/composables";
+
+log.debug("DashboardPersonsPage created");
+
+const { loading: loadingPersons, dashboardPersons } = useDashboardPersons();
+</script>
+
+<template>
+  <div>
+    <div v-if="loadingPersons" class="m-8 flex justify-center">
+      <LoadingSpinner />
+    </div>
+    <div v-else class="bg-gray-200">
+      <div class="container-large">
+        {{ dashboardPersons }}
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/client/src/router/index.ts b/client/src/router/index.ts
index 52a39878..78704b5e 100644
--- a/client/src/router/index.ts
+++ b/client/src/router/index.ts
@@ -60,6 +60,10 @@ const router = createRouter({
       name: "home",
       component: DashboardPage,
     },
+    {
+      path: "/dashboard/persons",
+      component: () => import("@/pages/dashboard/DashboardPersonsPage.vue"),
+    },
     {
       path: "/course/:courseSlug/media",
       props: true,
diff --git a/client/src/services/dashboard.ts b/client/src/services/dashboard.ts
index a320774f..e628b7fe 100644
--- a/client/src/services/dashboard.ts
+++ b/client/src/services/dashboard.ts
@@ -5,12 +5,37 @@ import {
   DASHBOARD_COURSE_STATISTICS,
 } from "@/graphql/queries";
 
+import { itGetCached } from "@/fetchHelpers";
 import type {
   CourseProgressType,
   CourseStatisticsType,
   DashboardConfigType,
 } from "@/gql/graphql";
 
+export type DashboardPersonRoleType =
+  | "SUPERVISOR"
+  | "EXPERT"
+  | "MEMBER"
+  | "LEARNING_MENTOR"
+  | "LEARNING_MENTEE";
+
+export type DashboardPersonCourseSessionType = {
+  id: number;
+  session_title: string;
+  course_id: number;
+  course_title: string;
+  user_role: DashboardPersonRoleType;
+  my_role: DashboardPersonRoleType;
+};
+
+export type DashboardPersonType = {
+  user_id: string;
+  first_name: string;
+  last_name: string;
+  email: string;
+  course_sessions: DashboardPersonCourseSessionType[];
+};
+
 export const fetchStatisticData = async (
   courseId: string
 ): Promise<CourseStatisticsType | null> => {
@@ -47,6 +72,7 @@ export const fetchProgressData = async (
     return null;
   }
 };
+
 export const fetchDashboardConfig = async (): Promise<DashboardConfigType[] | null> => {
   try {
     const res = await graphqlClient.query(DASHBOARD_CONFIG, {});
@@ -61,3 +87,7 @@ export const fetchDashboardConfig = async (): Promise<DashboardConfigType[] | nu
     return null;
   }
 };
+
+export async function fetchDashboardPersons() {
+  return await itGetCached<DashboardPersonType[]>("/api/dashboard/persons/");
+}

From 15d6baac81aa35b79997596f3cdd37c9ea7ba84b Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Thu, 4 Apr 2024 11:54:07 +0200
Subject: [PATCH 08/82] Display persons

---
 .../pages/dashboard/DashboardPersonsPage.vue  | 55 ++++++++++++++++++-
 client/src/services/dashboard.ts              |  2 +
 server/vbv_lernwelt/dashboard/views.py        | 15 +++--
 3 files changed, 67 insertions(+), 5 deletions(-)

diff --git a/client/src/pages/dashboard/DashboardPersonsPage.vue b/client/src/pages/dashboard/DashboardPersonsPage.vue
index 9cf37ccb..483b5091 100644
--- a/client/src/pages/dashboard/DashboardPersonsPage.vue
+++ b/client/src/pages/dashboard/DashboardPersonsPage.vue
@@ -15,7 +15,60 @@ const { loading: loadingPersons, dashboardPersons } = useDashboardPersons();
     </div>
     <div v-else class="bg-gray-200">
       <div class="container-large">
-        {{ dashboardPersons }}
+        <div class="bg-white px-4 py-2">
+          <div
+            v-for="person in dashboardPersons"
+            :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">
+              <div class="flex items-center space-x-2">
+                <img
+                  :alt="person.last_name"
+                  class="h-11 w-11 rounded-full"
+                  :src="'/static/avatars/myvbv-default-avatar.png'"
+                />
+                <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-start md:w-2/3">
+              <div
+                v-for="cs in person.course_sessions"
+                :key="cs.id"
+                class="w-full border-b pb-2 pt-2 first:pt-0 last:border-b-0 last:pb-0"
+              >
+                <div class="flex flex-col md:flex-row md:items-center">
+                  <div class="md:w-1/2">
+                    <div class="text-gray-900">{{ cs.course_title }}</div>
+                    <div v-if="cs.is_uk">{{ cs.session_title }}</div>
+                  </div>
+                  <div class="md:w-1/4">
+                    <div>{{ cs.user_role }}</div>
+                  </div>
+                  <div class="md:w-1/4 md:text-right">
+                    <div>action</div>
+                  </div>
+                </div>
+              </div>
+            </div>
+
+            <!--            <button-->
+            <!--              class="underline"-->
+            <!--              data-cy="lm-my-mentor-remove"-->
+            <!--              @click="removeMyMentor(learningMentor.id)"-->
+            <!--            >-->
+            <!--              {{ $t("a.Entfernen") }}-->
+            <!--            </button>-->
+          </div>
+        </div>
       </div>
     </div>
   </div>
diff --git a/client/src/services/dashboard.ts b/client/src/services/dashboard.ts
index e628b7fe..66c9f831 100644
--- a/client/src/services/dashboard.ts
+++ b/client/src/services/dashboard.ts
@@ -26,6 +26,8 @@ export type DashboardPersonCourseSessionType = {
   course_title: string;
   user_role: DashboardPersonRoleType;
   my_role: DashboardPersonRoleType;
+  is_uk: boolean;
+  is_vv: boolean;
 };
 
 export type DashboardPersonType = {
diff --git a/server/vbv_lernwelt/dashboard/views.py b/server/vbv_lernwelt/dashboard/views.py
index 7c5342de..123bb354 100644
--- a/server/vbv_lernwelt/dashboard/views.py
+++ b/server/vbv_lernwelt/dashboard/views.py
@@ -101,6 +101,8 @@ def get_dashboard_persons(request):
                                 "course_title": cs.course.title,
                                 "user_role": csu.role,
                                 "my_role": my_role,
+                                "is_uk": cs.course.configuration.is_uk,
+                                "is_vv": cs.course.configuration.is_vv,
                             }
                         ],
                     }
@@ -120,6 +122,8 @@ def get_dashboard_persons(request):
                         "course_title": cs.course.title,
                         "user_role": "LEARNING_MENTEE",
                         "my_role": "LEARNING_MENTOR",
+                        "is_uk": cs.course.configuration.is_uk,
+                        "is_vv": cs.course.configuration.is_vv,
                     }
 
                     if participant.user.id not in result_persons:
@@ -141,13 +145,16 @@ def get_dashboard_persons(request):
             participants__user=request.user
         ).prefetch_related("mentor", "course_session")
         for mentor_relation in mentor_relation_qs:
+            cs = mentor_relation.course_session
             course_session_entry = {
-                "id": mentor_relation.course_session.id,
-                "session_title": mentor_relation.course_session.title,
-                "course_id": mentor_relation.course_session.course.id,
-                "course_title": mentor_relation.course_session.course.title,
+                "id": cs.id,
+                "session_title": cs.title,
+                "course_id": cs.course.id,
+                "course_title": cs.course.title,
                 "user_role": "LEARNING_MENTOR",
                 "my_role": "LEARNING_MENTEE",
+                "is_uk": cs.course.configuration.is_uk,
+                "is_vv": cs.course.configuration.is_vv,
             }
 
             if mentor_relation.mentor.id not in result_persons:

From 91ee3e605b9c5a7be6a8574fe6a6954b4943d280 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Thu, 4 Apr 2024 12:17:40 +0200
Subject: [PATCH 09/82] Add action link

---
 client/src/composables.ts                        |  4 ++--
 .../src/pages/dashboard/DashboardPersonsPage.vue | 16 +++++++++++++++-
 client/src/router/guards.ts                      |  2 +-
 client/src/services/dashboard.ts                 |  1 +
 server/vbv_lernwelt/dashboard/views.py           |  5 ++++-
 5 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/client/src/composables.ts b/client/src/composables.ts
index cbf6dc97..d778f90c 100644
--- a/client/src/composables.ts
+++ b/client/src/composables.ts
@@ -5,7 +5,7 @@ import { COURSE_QUERY, COURSE_SESSION_DETAIL_QUERY } from "@/graphql/queries";
 import {
   circleFlatChildren,
   circleFlatLearningContents,
-  circleFlatLearningUnits
+  circleFlatLearningUnits,
 } from "@/services/circle";
 import type { DashboardPersonType } from "@/services/dashboard";
 import { fetchDashboardPersons } from "@/services/dashboard";
@@ -25,7 +25,7 @@ import type {
   LearningMentor,
   LearningPathType,
   LearningUnitPerformanceCriteria,
-  PerformanceCriteria
+  PerformanceCriteria,
 } from "@/types";
 import { useQuery } from "@urql/vue";
 import orderBy from "lodash/orderBy";
diff --git a/client/src/pages/dashboard/DashboardPersonsPage.vue b/client/src/pages/dashboard/DashboardPersonsPage.vue
index 483b5091..6813947c 100644
--- a/client/src/pages/dashboard/DashboardPersonsPage.vue
+++ b/client/src/pages/dashboard/DashboardPersonsPage.vue
@@ -54,7 +54,21 @@ const { loading: loadingPersons, dashboardPersons } = useDashboardPersons();
                     <div>{{ cs.user_role }}</div>
                   </div>
                   <div class="md:w-1/4 md:text-right">
-                    <div>action</div>
+                    <div>
+                      <router-link
+                        :to="{
+                          name: 'profileLearningPath',
+                          params: {
+                            userId: person.user_id,
+                            courseSlug: cs.course_slug,
+                          },
+                          query: { courseSessionId: cs.id },
+                        }"
+                        class="link w-full lg:text-right"
+                      >
+                        {{ $t("a.Profil anzeigen") }}
+                      </router-link>
+                    </div>
                   </div>
                 </div>
               </div>
diff --git a/client/src/router/guards.ts b/client/src/router/guards.ts
index 089ac20a..b60e527f 100644
--- a/client/src/router/guards.ts
+++ b/client/src/router/guards.ts
@@ -89,7 +89,7 @@ export async function handleCourseSessionAsQueryParam(to: RouteLocationNormalize
         return {
           path: to.path,
           query: restOfQuery,
-          replace: true,
+          // replace: true,
         };
       } else {
         // courseSessionId is invalid for current user -> redirect to home
diff --git a/client/src/services/dashboard.ts b/client/src/services/dashboard.ts
index 66c9f831..a1ccaa0e 100644
--- a/client/src/services/dashboard.ts
+++ b/client/src/services/dashboard.ts
@@ -24,6 +24,7 @@ export type DashboardPersonCourseSessionType = {
   session_title: string;
   course_id: number;
   course_title: string;
+  course_slug: string;
   user_role: DashboardPersonRoleType;
   my_role: DashboardPersonRoleType;
   is_uk: boolean;
diff --git a/server/vbv_lernwelt/dashboard/views.py b/server/vbv_lernwelt/dashboard/views.py
index 123bb354..0f44b479 100644
--- a/server/vbv_lernwelt/dashboard/views.py
+++ b/server/vbv_lernwelt/dashboard/views.py
@@ -99,6 +99,7 @@ def get_dashboard_persons(request):
                                 "session_title": cs.title,
                                 "course_id": cs.course.id,
                                 "course_title": cs.course.title,
+                                "course_slug": cs.course.slug,
                                 "user_role": csu.role,
                                 "my_role": my_role,
                                 "is_uk": cs.course.configuration.is_uk,
@@ -117,9 +118,10 @@ def get_dashboard_persons(request):
                 for participant in lm.participants.all():
                     course_session_entry = {
                         "id": cs.id,
-                        "course_id": cs.course.id,
                         "session_title": cs.title,
+                        "course_id": cs.course.id,
                         "course_title": cs.course.title,
+                        "course_slug": cs.course.slug,
                         "user_role": "LEARNING_MENTEE",
                         "my_role": "LEARNING_MENTOR",
                         "is_uk": cs.course.configuration.is_uk,
@@ -151,6 +153,7 @@ def get_dashboard_persons(request):
                 "session_title": cs.title,
                 "course_id": cs.course.id,
                 "course_title": cs.course.title,
+                "course_slug": cs.course.slug,
                 "user_role": "LEARNING_MENTOR",
                 "my_role": "LEARNING_MENTEE",
                 "is_uk": cs.course.configuration.is_uk,

From 7473923dacbc02bd581b235a4fa6b72815a6c6c5 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Fri, 5 Apr 2024 15:19:14 +0200
Subject: [PATCH 10/82] Action link not for all

---
 client/src/pages/dashboard/DashboardPersonsPage.vue | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/client/src/pages/dashboard/DashboardPersonsPage.vue b/client/src/pages/dashboard/DashboardPersonsPage.vue
index 6813947c..b4a96cc3 100644
--- a/client/src/pages/dashboard/DashboardPersonsPage.vue
+++ b/client/src/pages/dashboard/DashboardPersonsPage.vue
@@ -52,9 +52,17 @@ const { loading: loadingPersons, dashboardPersons } = useDashboardPersons();
                   </div>
                   <div class="md:w-1/4">
                     <div>{{ cs.user_role }}</div>
+                    <div>my role: {{ cs.my_role }}</div>
                   </div>
                   <div class="md:w-1/4 md:text-right">
-                    <div>
+                    <div
+                      v-if="
+                        (['SUPERVISOR', 'EXPERT'].includes(cs.my_role) &&
+                          cs.user_role === 'MEMBER') ||
+                        (cs.my_role === 'LEARNING_MENTOR' &&
+                          cs.user_role === 'LEARNING_MENTEE')
+                      "
+                    >
                       <router-link
                         :to="{
                           name: 'profileLearningPath',

From 6ea45eff668925b4827e576e7d0759105ae64b22 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Mon, 8 Apr 2024 08:08:12 +0200
Subject: [PATCH 11/82] WIP: Add ui config

---
 .../src/components/dashboard/CoursePanel.vue  | 12 +++--
 client/src/gql/gql.ts                         |  4 +-
 client/src/gql/graphql.ts                     | 28 ++++++++--
 client/src/gql/schema.graphql                 | 19 ++++++-
 client/src/gql/typenames.ts                   |  2 +
 client/src/graphql/queries.ts                 |  7 ++-
 client/src/pages/dashboard/DashboardPage.vue  |  2 +-
 .../vbv_lernwelt/dashboard/graphql/queries.py | 37 +++++++++++--
 .../dashboard/graphql/types/assignment.py     | 10 ++--
 .../dashboard/graphql/types/dashboard.py      | 52 +++++++++++++++----
 10 files changed, 145 insertions(+), 28 deletions(-)

diff --git a/client/src/components/dashboard/CoursePanel.vue b/client/src/components/dashboard/CoursePanel.vue
index 82faeea2..a4926ed0 100644
--- a/client/src/components/dashboard/CoursePanel.vue
+++ b/client/src/components/dashboard/CoursePanel.vue
@@ -25,15 +25,18 @@ const data = ref<CourseProgressType | null>(null);
 const courseSlug = computed(() => props.courseConfig?.slug);
 const courseName = computed(() => props.courseConfig?.name);
 const numberOfMentorWidgets = computed(() => {
-  return data.value?.widgets.filter((widget) => mentorWidgets.includes(widget)).length;
+  return data.value?.ui_config.widgets.filter((widget) =>
+    mentorWidgets.includes(widget)
+  ).length;
 });
 const numberOfProgressWidgets = computed(() => {
-  return data.value?.widgets.filter((widget) => progressWidgets.includes(widget))
-    .length;
+  return data.value?.ui_config.widgets.filter((widget) =>
+    progressWidgets.includes(widget)
+  ).length;
 });
 
 function hasWidget(widget: WidgetType) {
-  return data.value?.widgets.includes(widget);
+  return data.value?.ui_config.widgets.includes(widget);
 }
 
 onMounted(async () => {
@@ -46,6 +49,7 @@ onMounted(async () => {
   <div v-if="!isLoading && courseConfig" class="mb-14 space-y-8">
     <div class="flex flex-col space-y-7 bg-white p-6">
       <h3>{{ courseName }}</h3>
+      <p>{{ data.ui_config.role_key }}</p>
       <LearningPathDiagram
         v-if="hasWidget('PROGRESS_WIDGET') && data.session_to_continue_id && courseSlug"
         :key="courseSlug"
diff --git a/client/src/gql/gql.ts b/client/src/gql/gql.ts
index 66a37920..802e338d 100644
--- a/client/src/gql/gql.ts
+++ b/client/src/gql/gql.ts
@@ -23,7 +23,7 @@ const documents = {
     "\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      }\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      }\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      widgets\n    }\n  }\n": types.DashboardCourseDataDocument,
+    "\n  query dashboardCourseData($courseId: ID!) {\n    course_progress(course_id: $courseId) {\n      _id\n      course_id\n      session_to_continue_id\n      ui_config {\n        _id\n        role_key\n        widgets\n        has_preview\n      }\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        }\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  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,
 };
@@ -85,7 +85,7 @@ export function graphql(source: "\n  query dashboardProgress($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 dashboardCourseData($courseId: ID!) {\n    course_progress(course_id: $courseId) {\n      _id\n      course_id\n      session_to_continue_id\n      widgets\n    }\n  }\n"): (typeof documents)["\n  query dashboardCourseData($courseId: ID!) {\n    course_progress(course_id: $courseId) {\n      _id\n      course_id\n      session_to_continue_id\n      widgets\n    }\n  }\n"];
+export function graphql(source: "\n  query dashboardCourseData($courseId: ID!) {\n    course_progress(course_id: $courseId) {\n      _id\n      course_id\n      session_to_continue_id\n      ui_config {\n        _id\n        role_key\n        widgets\n        has_preview\n      }\n    }\n  }\n"): (typeof documents)["\n  query dashboardCourseData($courseId: ID!) {\n    course_progress(course_id: $courseId) {\n      _id\n      course_id\n      session_to_continue_id\n      ui_config {\n        _id\n        role_key\n        widgets\n        has_preview\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 6c207a6b..5c73331f 100644
--- a/client/src/gql/graphql.ts
+++ b/client/src/gql/graphql.ts
@@ -365,7 +365,7 @@ export type CourseProgressType = {
   competence?: Maybe<ProgressDashboardCompetenceType>;
   course_id: Scalars['ID']['output'];
   session_to_continue_id?: Maybe<Scalars['ID']['output']>;
-  widgets: Array<WidgetType>;
+  ui_config?: Maybe<UiConfigType>;
 };
 
 export type CourseSessionAssignmentObjectType = {
@@ -453,6 +453,7 @@ export type CourseStatisticsType = {
   course_slug: Scalars['String']['output'];
   course_title: Scalars['String']['output'];
   feedback_responses: FeedbackStatisticsResponsesType;
+  user_selection_ids?: Maybe<Array<Maybe<Scalars['ID']['output']>>>;
 };
 
 export type DashboardConfigType = {
@@ -922,6 +923,7 @@ export type Query = {
   learning_content_test?: Maybe<LearningContentEdoniqTestObjectType>;
   learning_content_video?: Maybe<LearningContentVideoObjectType>;
   learning_path?: Maybe<LearningPathObjectType>;
+  mentor_course_statistics?: Maybe<CourseStatisticsType>;
 };
 
 
@@ -987,6 +989,18 @@ export type QueryLearningPathArgs = {
   slug?: InputMaybe<Scalars['String']['input']>;
 };
 
+
+export type QueryMentorCourseStatisticsArgs = {
+  course_id: Scalars['ID']['input'];
+};
+
+export type RoleKeyType =
+  | 'MEMBER'
+  | 'MENTOR_UK'
+  | 'MENTOR_VV'
+  | 'SUPERVISOR'
+  | 'TRAINER';
+
 export type SendFeedbackMutation = {
   __typename?: 'SendFeedbackMutation';
   /** May contain more than one error for same field. */
@@ -1036,6 +1050,14 @@ export type TopicObjectType = CoursePageInterface & {
   translation_key: Scalars['String']['output'];
 };
 
+export type UiConfigType = {
+  __typename?: 'UIConfigType';
+  _id: Scalars['ID']['output'];
+  has_preview?: Maybe<Scalars['Boolean']['output']>;
+  role_key: RoleKeyType;
+  widgets: Array<WidgetType>;
+};
+
 export type UserObjectType = {
   __typename?: 'UserObjectType';
   avatar_url?: Maybe<Scalars['String']['output']>;
@@ -1295,7 +1317,7 @@ export type DashboardCourseDataQueryVariables = Exact<{
 }>;
 
 
-export type DashboardCourseDataQuery = { __typename?: 'Query', course_progress?: { __typename?: 'CourseProgressType', _id: string, course_id: string, session_to_continue_id?: string | null, widgets: Array<WidgetType> } | null };
+export type DashboardCourseDataQuery = { __typename?: 'Query', course_progress?: { __typename?: 'CourseProgressType', _id: string, course_id: string, session_to_continue_id?: string | null, ui_config?: { __typename?: 'UIConfigType', _id: string, role_key: RoleKeyType, widgets: Array<WidgetType>, has_preview?: boolean | null } | null } | null };
 
 export type CourseStatisticsQueryVariables = Exact<{
   courseId: Scalars['ID']['input'];
@@ -1325,6 +1347,6 @@ export const CourseSessionDetailDocument = {"kind":"Document","definitions":[{"k
 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":"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"}}]}}]}}]}}]} 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"}},{"kind":"Field","name":{"kind":"Name","value":"widgets"}}]}}]}}]} as unknown as DocumentNode<DashboardCourseDataQuery, DashboardCourseDataQueryVariables>;
+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"}},{"kind":"Field","name":{"kind":"Name","value":"ui_config"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"role_key"}},{"kind":"Field","name":{"kind":"Name","value":"widgets"}},{"kind":"Field","name":{"kind":"Name","value":"has_preview"}}]}}]}}]}}]} 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":"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 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 fafe2c15..cb6827be 100644
--- a/client/src/gql/schema.graphql
+++ b/client/src/gql/schema.graphql
@@ -1,5 +1,6 @@
 type Query {
   course_statistics(course_id: ID!): CourseStatisticsType
+  mentor_course_statistics(course_id: ID!): CourseStatisticsType
   course_progress(course_id: ID!): CourseProgressType
   dashboard_config: [DashboardConfigType!]!
   learning_path(id: ID, slug: String, course_id: ID, course_slug: String): LearningPathObjectType
@@ -31,6 +32,7 @@ type CourseStatisticsType {
   course_slug: String!
   course_session_properties: StatisticsCourseSessionPropertiesType!
   course_session_selection_ids: [ID]!
+  user_selection_ids: [ID]
   course_session_selection_metrics: StatisticsCourseSessionsSelectionMetricType!
   attendance_day_presences: AttendanceDayPresencesStatisticsType!
   feedback_responses: FeedbackStatisticsResponsesType!
@@ -179,7 +181,7 @@ type CourseProgressType {
   session_to_continue_id: ID
   competence: ProgressDashboardCompetenceType
   assignment: ProgressDashboardAssignmentType
-  widgets: [WidgetType!]!
+  ui_config: UIConfigType
 }
 
 type ProgressDashboardCompetenceType {
@@ -196,6 +198,21 @@ type ProgressDashboardAssignmentType {
   points_achieved_count: Int!
 }
 
+type UIConfigType {
+  _id: ID!
+  role_key: RoleKeyType!
+  widgets: [WidgetType!]!
+  has_preview: Boolean
+}
+
+enum RoleKeyType {
+  MEMBER
+  MENTOR_VV
+  MENTOR_UK
+  SUPERVISOR
+  TRAINER
+}
+
 enum WidgetType {
   PROGRESS_WIDGET
   COMPETENCE_WIDGET
diff --git a/client/src/gql/typenames.ts b/client/src/gql/typenames.ts
index 732cb885..026956b6 100644
--- a/client/src/gql/typenames.ts
+++ b/client/src/gql/typenames.ts
@@ -75,6 +75,7 @@ export const PresenceRecordStatisticsType = "PresenceRecordStatisticsType";
 export const ProgressDashboardAssignmentType = "ProgressDashboardAssignmentType";
 export const ProgressDashboardCompetenceType = "ProgressDashboardCompetenceType";
 export const Query = "Query";
+export const RoleKeyType = "RoleKeyType";
 export const SendFeedbackMutation = "SendFeedbackMutation";
 export const StatisticsCircleDataType = "StatisticsCircleDataType";
 export const StatisticsCourseSessionDataType = "StatisticsCourseSessionDataType";
@@ -82,6 +83,7 @@ export const StatisticsCourseSessionPropertiesType = "StatisticsCourseSessionPro
 export const StatisticsCourseSessionsSelectionMetricType = "StatisticsCourseSessionsSelectionMetricType";
 export const String = "String";
 export const TopicObjectType = "TopicObjectType";
+export const UIConfigType = "UIConfigType";
 export const UUID = "UUID";
 export const UserObjectType = "UserObjectType";
 export const WidgetType = "WidgetType";
diff --git a/client/src/graphql/queries.ts b/client/src/graphql/queries.ts
index 15dc2766..29f174da 100644
--- a/client/src/graphql/queries.ts
+++ b/client/src/graphql/queries.ts
@@ -337,7 +337,12 @@ export const DASHBOARD_COURSE_DATA = graphql(`
       _id
       course_id
       session_to_continue_id
-      widgets
+      ui_config {
+        _id
+        role_key
+        widgets
+        has_preview
+      }
     }
   }
 `);
diff --git a/client/src/pages/dashboard/DashboardPage.vue b/client/src/pages/dashboard/DashboardPage.vue
index 6031c402..8d57ac50 100644
--- a/client/src/pages/dashboard/DashboardPage.vue
+++ b/client/src/pages/dashboard/DashboardPage.vue
@@ -64,7 +64,7 @@ onMounted(dashboardStore.loadDashboardDetails);
             dashboardStore.currentDashboardConfig.dashboard_type ===
             'PRAXISBILDNER_DASHBOARD'
           "
-          course-config="dashboardStore.currentDashboardConfig"
+          :course-config="dashboardStore.currentDashboardConfig"
         />
         <component
           :is="boards[dashboardStore.currentDashboardConfig.dashboard_type].main"
diff --git a/server/vbv_lernwelt/dashboard/graphql/queries.py b/server/vbv_lernwelt/dashboard/graphql/queries.py
index 7c42f859..74b75d55 100644
--- a/server/vbv_lernwelt/dashboard/graphql/queries.py
+++ b/server/vbv_lernwelt/dashboard/graphql/queries.py
@@ -7,6 +7,7 @@ from vbv_lernwelt.assignment.models import (
     AssignmentCompletionStatus,
 )
 from vbv_lernwelt.core.admin import User
+from vbv_lernwelt.course.consts import UK_COURSE_IDS
 from vbv_lernwelt.course.models import Course, CourseSession, CourseSessionUser
 from vbv_lernwelt.course_session_group.models import CourseSessionGroup
 from vbv_lernwelt.dashboard.graphql.types.competence import competences
@@ -15,7 +16,7 @@ from vbv_lernwelt.dashboard.graphql.types.dashboard import (
     CourseStatisticsType,
     DashboardConfigType,
     DashboardType,
-    get_widgets_for_course,
+    get_ui_config_for_course,
     ProgressDashboardAssignmentType,
     ProgressDashboardCompetenceType,
 )
@@ -32,6 +33,10 @@ class DashboardQuery(graphene.ObjectType):
         CourseStatisticsType, course_id=graphene.ID(required=True)
     )
 
+    mentor_course_statistics = graphene.Field(
+        CourseStatisticsType, course_id=graphene.ID(required=True)
+    )
+
     course_progress = graphene.Field(
         CourseProgressType, course_id=graphene.ID(required=True)
     )
@@ -63,6 +68,28 @@ class DashboardQuery(graphene.ObjectType):
             course_session_selection_ids=list(course_session_ids),  # noqa
         )
 
+    def resolve_mentor_course_statistics(root, info, course_id: str):  # noqa
+        user = info.context.user
+        course = Course.objects.get(id=course_id)
+
+        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)
+
+        return CourseStatisticsType(
+            _id=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
+        )
+
     def resolve_dashboard_config(root, info):  # noqa
         user = info.context.user
 
@@ -167,7 +194,7 @@ class DashboardQuery(graphene.ObjectType):
                 points_max_count=int(points_max_count),  # noqa
                 points_achieved_count=int(points_achieved_count),  # noqa
             ),
-            widgets=get_widgets_for_course(course, user),  # noqa
+            widgets=get_ui_config_for_course(course, user),  # noqa
         )
 
 
@@ -205,12 +232,16 @@ def get_learning_mentor_dashboards(
     for mentor in learning_mentor:
         course = mentor.course_session.course
         course_ids.add(course.id)
+        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": DashboardType.MENTOR_DASHBOARD,
+                "dashboard_type": dashboard_type,
                 "course_configuration": course.configuration,
             }
         )
diff --git a/server/vbv_lernwelt/dashboard/graphql/types/assignment.py b/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
index ebf37dd8..df456052 100644
--- a/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
+++ b/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
@@ -74,7 +74,8 @@ def create_assignment_summary(course_id, metrics) -> AssignmentStatisticsSummary
 
 
 def get_assignment_completion_metrics(
-    course_session: CourseSession, assignment: vbv_lernwelt.assignment.models.Assignment
+    course_session: CourseSession, assignment: vbv_lernwelt.assignment.models.Assignment,
+    user_selection_ids: List[str] | None
 ) -> AssignmentCompletionMetricsType:
     course_session_users = CourseSessionUser.objects.filter(
         course_session=course_session,
@@ -111,6 +112,7 @@ def get_assignment_completion_metrics(
 
 def create_record(
     course_session_assignment: CourseSessionAssignment | CourseSessionEdoniqTest,
+    user_selection_ids: List[str] | None
 ) -> AssignmentStatisticsRecordType:
     if isinstance(course_session_assignment, CourseSessionAssignment):
         due_date = course_session_assignment.submission_deadline
@@ -133,6 +135,7 @@ def create_record(
         metrics=get_assignment_completion_metrics(  # noqa
             course_session=course_session_assignment.course_session,  # noqa
             assignment=learning_content.content_assignment,  # noqa
+            user_selection_ids=user_selection_ids,  # noqa
         ),
         details_url=due_date.url_expert,  # noqa
         deadline=due_date.start,  # noqa
@@ -142,6 +145,7 @@ def create_record(
 def assignments(
     course_id: graphene.ID(required=True),
     course_session_selection_ids: graphene.List(graphene.ID),
+    user_selection_ids: List[str] | None = None,
 ) -> AssignmentsStatisticsType:
     course_sessions = CourseSession.objects.filter(
         id__in=course_session_selection_ids,
@@ -156,14 +160,14 @@ def assignments(
             ],
             learning_content__content_assignment__competence_certificate__isnull=False,
         ):
-            record = create_record(course_session_assignment=csa)
+            record = create_record(course_session_assignment=csa, user_selection_ids=user_selection_ids)
             records.append(record)
 
         for cset in CourseSessionEdoniqTest.objects.filter(
             course_session=course_session,
             learning_content__content_assignment__competence_certificate__isnull=False,
         ):
-            record = create_record(course_session_assignment=cset)
+            record = create_record(course_session_assignment=cset, user_selection_ids=user_selection_ids)
             records.append(record)
 
     return AssignmentsStatisticsType(
diff --git a/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py b/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py
index c070bc7d..38da733a 100644
--- a/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py
+++ b/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py
@@ -8,6 +8,7 @@ from vbv_lernwelt.assignment.models import (
     AssignmentCompletionStatus,
 )
 from vbv_lernwelt.core.models import User
+from vbv_lernwelt.course.consts import UK_COURSE_IDS
 from vbv_lernwelt.course.graphql.types import CourseConfigurationObjectType
 from vbv_lernwelt.course.models import Course, CourseSession, CourseSessionUser
 from vbv_lernwelt.dashboard.graphql.types.assignment import (
@@ -78,6 +79,14 @@ class WidgetType(Enum):
     COMPETENCE_CERTIFICATE_WIDGET = "CompetenceCertificateWidget"
 
 
+class RoleKeyType(Enum):
+    MEMBER = "Member"
+    MENTOR_VV = "MentorVV"
+    MENTOR_UK = "MentorUK"
+    SUPERVISOR = "Supervisor"
+    TRAINER = "Trainer"
+
+
 class DashboardConfigType(graphene.ObjectType):
     id = graphene.ID(required=True)
     name = graphene.String(required=True)
@@ -86,11 +95,6 @@ class DashboardConfigType(graphene.ObjectType):
     course_configuration = graphene.Field(CourseConfigurationObjectType, required=True)
 
 
-class DashboardDataType(graphene.ObjectType):
-    id = graphene.ID(required=True)
-    widgets = graphene.List(graphene.NonNull(WidgetType), required=True)
-
-
 class ProgressDashboardCompetenceType(graphene.ObjectType):
     _id = graphene.ID(required=True)
     total_count = graphene.Int(required=True)
@@ -105,13 +109,20 @@ class ProgressDashboardAssignmentType(graphene.ObjectType):
     points_achieved_count = graphene.Int(required=True)
 
 
+class UIConfigType(graphene.ObjectType):
+    _id = graphene.ID(required=True)
+    role_key = graphene.Field(RoleKeyType, required=True)
+    widgets = graphene.List(graphene.NonNull(WidgetType), required=True)
+    has_preview = graphene.Boolean(required=False)
+
+
 class CourseProgressType(graphene.ObjectType):
     _id = graphene.ID(required=True)
     course_id = graphene.ID(required=True)
     session_to_continue_id = graphene.ID(required=False)
     competence = graphene.Field(ProgressDashboardCompetenceType, required=False)
     assignment = graphene.Field(ProgressDashboardAssignmentType, required=False)
-    widgets = graphene.List(graphene.NonNull(WidgetType), required=True)
+    ui_config = graphene.Field(UIConfigType, required=False)
 
     def resolve__id(root, info):
         return info.context.course.id
@@ -163,8 +174,8 @@ class CourseProgressType(graphene.ObjectType):
             fail_count=fail_total,  # noqa
         )
 
-    def resolve_widgets(root, info):
-        return get_widgets_for_course(info.context.course, info.context.user)
+    def resolve_ui_config(root, info):
+        return get_ui_config_for_course(info.context.course, info.context.user)
 
     def _get_newest_cs_and_cs_for_user(
         root, info, course_id: str, user: User
@@ -203,6 +214,7 @@ class CourseStatisticsType(graphene.ObjectType):
         StatisticsCourseSessionPropertiesType, required=True
     )
     course_session_selection_ids = graphene.List(graphene.ID, required=True)
+    user_selection_ids = graphene.List(graphene.ID, required=False)
     course_session_selection_metrics = graphene.Field(
         StatisticsCourseSessionsSelectionMetricType, required=True
     )
@@ -229,11 +241,14 @@ class CourseStatisticsType(graphene.ObjectType):
         )
 
     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
         )
         return CompetencesStatisticsType(
             _id=root._id,  # noqa
@@ -246,9 +261,12 @@ class CourseStatisticsType(graphene.ObjectType):
         )
 
     def resolve_assignments(root, info) -> AssignmentsStatisticsType:
+        user_selection_ids = [str(user) for user in
+                              root.user_selection_ids] if root.user_selection_ids else None  # noqa
         return assignments(
             course_id=root.course_id,
             course_session_selection_ids=root.course_session_selection_ids,
+            user_selection_ids=user_selection_ids,
         )
 
     def resolve_course_session_selection_metrics(
@@ -320,8 +338,10 @@ class CourseStatisticsType(graphene.ObjectType):
         )
 
 
-def get_widgets_for_course(course: Course, user: User) -> List[WidgetType]:
+def get_ui_config_for_course(course: Course, user: User) -> UIConfigType:
     widgets = []
+    role_key = None
+    has_preview = False
 
     course_sessions = CourseSession.objects.filter(
         course__id=course.id, coursesessionuser__user=user
@@ -346,20 +366,32 @@ def get_widgets_for_course(course: Course, user: User) -> List[WidgetType]:
             roles_by_course.setdefault(course_session.course, set())
             roles_by_course[course_session.course].add(role)
 
+    # todo: use permissions
     for course, roles in roles_by_course.items():
         if len(roles) == 1:
             course_role = roles.pop()
 
             # members
             if course_role == CourseSessionUser.Role.MEMBER:
+                role_key = RoleKeyType.MEMBER
                 widgets.append(WidgetType.PROGRESS_WIDGET)
                 widgets.append(WidgetType.COMPETENCE_WIDGET)
                 if course.configuration.enable_competence_certificates:
                     widgets.append(WidgetType.COMPETENCE_CERTIFICATE_WIDGET)
     # mentors
     if course.id in mentor_course_ids:
+        if not role_key:
+            role_key = RoleKeyType.MENTOR_UK if course.id in UK_COURSE_IDS else RoleKeyType.MENTOR_VV
+            has_preview = True
         widgets.append(WidgetType.MENTOR_TASKS_WIDGET)
         widgets.append(WidgetType.MENTOR_PERSON_WIDGET)
         if course.configuration.enable_competence_certificates:
             widgets.append(WidgetType.MENTOR_COMPETENCE_WIDGET)
-    return widgets
+
+    # todo: supervisors
+    return UIConfigType(
+        _id=f"{course.id}_{user.id}",  # noqa
+        role_key=role_key,  # noqa,
+        widgets=widgets,  # noqa
+        has_preview=has_preview,  # noqa
+    )

From 4a982d8af2e9cfc2236dcd8745b4b880fa7a2243 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Mon, 8 Apr 2024 12:47:55 +0200
Subject: [PATCH 12/82] WIP: Use REST endpoint

---
 .../src/components/dashboard/CoursePanel.vue  |  69 ++++----
 client/src/pages/dashboard/DashboardPage.vue  |  20 ++-
 client/src/services/dashboard.ts              |  32 ++++
 server/config/urls.py                         |   5 +-
 .../vbv_lernwelt/dashboard/graphql/queries.py |   5 +-
 .../dashboard/graphql/types/assignment.py     |  15 +-
 .../dashboard/graphql/types/dashboard.py      |  20 ++-
 server/vbv_lernwelt/dashboard/views.py        | 161 ++++++++++++++++--
 8 files changed, 258 insertions(+), 69 deletions(-)

diff --git a/client/src/components/dashboard/CoursePanel.vue b/client/src/components/dashboard/CoursePanel.vue
index a4926ed0..40d133ff 100644
--- a/client/src/components/dashboard/CoursePanel.vue
+++ b/client/src/components/dashboard/CoursePanel.vue
@@ -1,80 +1,71 @@
 <script setup lang="ts">
-import { computed, onMounted, ref } from "vue";
-import type { CourseProgressType, WidgetType } from "@/gql/graphql";
-import { DashboardConfigType } from "@/gql/graphql";
-import { fetchCourseData } from "@/services/dashboard";
+import { computed } from "vue";
+import type { DashboardConfigType, WidgetType } from "@/services/dashboard";
 import LearningPathDiagram from "@/components/learningPath/LearningPathDiagram.vue";
 import CompetenceSummary from "@/components/dashboard/CompetenceSummary.vue";
 import AssignmentSummary from "@/components/dashboard/AssignmentSummary.vue";
 
 const mentorWidgets = [
-  "MENTOR_TASKS_WIDGET",
-  "MENTOR_PERSON_WIDGET",
-  "MENTOR_COMPETENCE_WIDGET",
+  "MentorTasksWidget",
+  "MentorPersonWidget",
+  "MentorCompetenceWidget",
 ];
-const progressWidgets = ["COMPETENCE_WIDGET", "COMPETENCE_CERTIFICATE_WIDGET"];
+const progressWidgets = ["CompetenceWidget", "CompetenceCertificateWidget"];
 
 const props = defineProps<{
   courseConfig: DashboardConfigType;
 }>();
 
-const isLoading = ref(true);
-
-const data = ref<CourseProgressType | null>(null);
-
-const courseSlug = computed(() => props.courseConfig?.slug);
-const courseName = computed(() => props.courseConfig?.name);
+const courseSlug = computed(() => props.courseConfig?.course_slug);
+const courseName = computed(() => props.courseConfig?.course_title);
 const numberOfMentorWidgets = computed(() => {
-  return data.value?.ui_config.widgets.filter((widget) =>
-    mentorWidgets.includes(widget)
-  ).length;
+  return props.courseConfig.widgets.filter((widget) => mentorWidgets.includes(widget))
+    .length;
 });
 const numberOfProgressWidgets = computed(() => {
-  return data.value?.ui_config.widgets.filter((widget) =>
-    progressWidgets.includes(widget)
-  ).length;
+  return props.courseConfig.widgets.filter((widget) => progressWidgets.includes(widget))
+    .length;
 });
 
 function hasWidget(widget: WidgetType) {
-  return data.value?.ui_config.widgets.includes(widget);
+  return props.courseConfig.widgets.includes(widget);
 }
-
-onMounted(async () => {
-  data.value = await fetchCourseData(props.courseConfig.id);
-  isLoading.value = false;
-});
 </script>
 
 <template>
-  <div v-if="!isLoading && courseConfig" class="mb-14 space-y-8">
+  <div v-if="courseConfig" class="mb-14 space-y-8">
     <div class="flex flex-col space-y-7 bg-white p-6">
       <h3>{{ courseName }}</h3>
-      <p>{{ data.ui_config.role_key }}</p>
+      <p>{{ courseConfig.role_key }}</p>
       <LearningPathDiagram
-        v-if="hasWidget('PROGRESS_WIDGET') && data.session_to_continue_id && courseSlug"
+        v-if="
+          hasWidget('ProgressWidget') &&
+          courseConfig.session_to_continue_id &&
+          courseSlug
+        "
         :key="courseSlug"
         :course-slug="courseSlug"
-        :course-session-id="data.session_to_continue_id"
+        :course-session-id="courseConfig.session_to_continue_id"
         diagram-type="horizontal"
       ></LearningPathDiagram>
       <div v-if="numberOfProgressWidgets" class="flex flex-col flex-wrap">
         <CompetenceSummary
-          v-if="hasWidget('COMPETENCE_WIDGET')"
+          v-if="hasWidget('CompetenceWidget')"
           :course-slug="courseSlug"
-          :session-to-continue-id="data.session_to_continue_id"
-          :course-id="courseConfig.id"
+          :session-to-continue-id="courseConfig.session_to_continue_id"
+          :course-id="courseConfig.course_id"
         ></CompetenceSummary>
         <AssignmentSummary
-          v-if="hasWidget('COMPETENCE_CERTIFICATE_WIDGET')"
+          v-if="hasWidget('CompetenceCertificateWidget')"
           :course-slug="courseSlug"
-          :session-to-continue-id="data.session_to_continue_id"
-          :course-id="courseConfig.id"
+          :session-to-continue-id="courseConfig.session_to_continue_id"
+          :course-id="courseConfig.course_id"
         />
       </div>
       <div v-if="numberOfMentorWidgets > 0" class="flex flex-col flex-wrap">
-        <div v-if="hasWidget('MENTOR_TASKS_WIDGET')">MENTOR_TASKS_WIDGET</div>
-        <div v-if="hasWidget('MENTOR_PERSON_WIDGET')">MENTOR_PERSON_WIDGET</div>
-        <div v-if="hasWidget('MENTOR_COMPETENCE_WIDGET')">MENTOR_COMPETENCE_WIDGET</div>
+        <div v-if="hasWidget('MentorTasksWidget')">MENTOR_TASKS_WIDGET</div>
+        <div v-if="hasWidget('MentorPersonWidget')">MENTOR_PERSON_WIDGET</div>
+        <div v-if="hasWidget('MentorCompetenceWidget')">MENTOR_COMPETENCE_WIDGET</div>
       </div>
     </div>
   </div>
diff --git a/client/src/pages/dashboard/DashboardPage.vue b/client/src/pages/dashboard/DashboardPage.vue
index 8d57ac50..40e65e95 100644
--- a/client/src/pages/dashboard/DashboardPage.vue
+++ b/client/src/pages/dashboard/DashboardPage.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import type { Component } from "vue";
-import { onMounted } from "vue";
+import type { Component, Ref } from "vue";
+import { onMounted, ref } from "vue";
 import StatisticPage from "@/pages/dashboard/StatisticPage.vue";
 import ProgressPage from "@/pages/dashboard/ProgressPage.vue";
 import SimpleDates from "@/components/dashboard/SimpleDates.vue";
@@ -13,6 +13,7 @@ import CourseDetailDates from "@/components/dashboard/CourseDetailDates.vue";
 import NoCourseSession from "@/components/dashboard/NoCourseSession.vue";
 import MentorPage from "@/pages/dashboard/MentorPage.vue";
 import CoursePanel from "@/components/dashboard/CoursePanel.vue";
+import { DashboardConfigType, fetchDashboardConfigv2 } from "@/services/dashboard";
 
 const dashboardStore = useDashboardStore();
 
@@ -29,7 +30,16 @@ const boards: Record<DashboardType, DashboardPage> = {
   PRAXISBILDNER_DASHBOARD: { main: CoursePanel, aside: SimpleDates },
 };
 
-onMounted(dashboardStore.loadDashboardDetails);
+const dashboardConfigv2: Ref<DashboardConfigType[]> = ref([]);
+
+onMounted(async () => {
+  dashboardConfigv2.value = await fetchDashboardConfigv2();
+  await dashboardStore.loadDashboardDetails();
+});
+
+function newDashboardConfigForId(id: string) {
+  return dashboardConfigv2.value.find((config) => config.course_id == +id);
+}
 </script>
 
 <template>
@@ -54,8 +64,8 @@ onMounted(dashboardStore.loadDashboardDetails);
 
         <ul>
           <li v-for="config in dashboardStore.dashboardConfigs" :key="config.id">
-            <p>{{ config }}</p>
-            <CoursePanel :course-config="config" />
+            <p>{{ newDashboardConfigForId(config.id) }}</p>
+            <CoursePanel :course-config="newDashboardConfigForId(config.id)" />
           </li>
         </ul>
         <!-- keep until we unify the dashboard -->
diff --git a/client/src/services/dashboard.ts b/client/src/services/dashboard.ts
index 2beaf0a3..6e4c636e 100644
--- a/client/src/services/dashboard.ts
+++ b/client/src/services/dashboard.ts
@@ -20,6 +20,21 @@ export type DashboardPersonRoleType =
   | "LEARNING_MENTOR"
   | "LEARNING_MENTEE";
 
+export type DashboardRoleKeyType =
+  | "Supervisor"
+  | "Expert"
+  | "Member"
+  | "MentorUK"
+  | "MentorVV";
+
+export type WidgetType =
+  | "ProgressWidget"
+  | "CompetenceWidget"
+  | "MentorTasksWidget"
+  | "MentorPersonWidget"
+  | "MentorCompetenceWidget"
+  | "CompetenceCertificateWidget";
+
 export type DashboardPersonCourseSessionType = {
   id: number;
   session_title: string;
@@ -40,6 +55,19 @@ export type DashboardPersonType = {
   course_sessions: DashboardPersonCourseSessionType[];
 };
 
+export type DashboardConfigType = {
+  course_id: string;
+  course_slug: string;
+  course_title: string;
+  role_key: DashboardRoleKeyType;
+  is_uk: boolean;
+  is_vv: boolean;
+  is_mentor: boolean;
+  widgets: WidgetType[];
+  has_preview: boolean;
+  session_to_continue_id: string;
+};
+
 export const fetchStatisticData = async (
   courseId: string
 ): Promise<CourseStatisticsType | null> => {
@@ -113,3 +141,7 @@ export const fetchCourseData = async (
 export async function fetchDashboardPersons() {
   return await itGetCached<DashboardPersonType[]>("/api/dashboard/persons/");
 }
+
+export async function fetchDashboardConfigv2() {
+  return await itGetCached<DashboardConfigType[]>("/api/dashboard/config/");
+}
diff --git a/server/config/urls.py b/server/config/urls.py
index b18dc421..b1a3ba78 100644
--- a/server/config/urls.py
+++ b/server/config/urls.py
@@ -39,7 +39,7 @@ from vbv_lernwelt.course.views import (
     request_course_completion_for_user,
 )
 from vbv_lernwelt.course_session.views import get_course_session_documents
-from vbv_lernwelt.dashboard.views import get_dashboard_persons
+from vbv_lernwelt.dashboard.views import get_dashboard_config, get_dashboard_persons
 from vbv_lernwelt.edoniq_test.views import (
     export_students,
     export_students_and_trainers,
@@ -116,9 +116,10 @@ urlpatterns = [
     # notify
     re_path(r"api/notify/email_notification_settings/$", email_notification_settings,
             name='email_notification_settings'),
-    
+
     # dashboard
     path(r"api/dashboard/persons/", get_dashboard_persons, name="get_dashboard_persons"),
+    path(r"api/dashboard/config/", get_dashboard_config, name="get_dashboard_config"),
 
     # course
     path(r"api/course/sessions/", get_course_sessions, name="get_course_sessions"),
diff --git a/server/vbv_lernwelt/dashboard/graphql/queries.py b/server/vbv_lernwelt/dashboard/graphql/queries.py
index 74b75d55..f760fa5a 100644
--- a/server/vbv_lernwelt/dashboard/graphql/queries.py
+++ b/server/vbv_lernwelt/dashboard/graphql/queries.py
@@ -75,8 +75,9 @@ 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")
+        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)
diff --git a/server/vbv_lernwelt/dashboard/graphql/types/assignment.py b/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
index df456052..ad747b22 100644
--- a/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
+++ b/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
@@ -74,8 +74,9 @@ def create_assignment_summary(course_id, metrics) -> AssignmentStatisticsSummary
 
 
 def get_assignment_completion_metrics(
-    course_session: CourseSession, assignment: vbv_lernwelt.assignment.models.Assignment,
-    user_selection_ids: List[str] | None
+    course_session: CourseSession,
+    assignment: vbv_lernwelt.assignment.models.Assignment,
+    user_selection_ids: List[str] | None,
 ) -> AssignmentCompletionMetricsType:
     course_session_users = CourseSessionUser.objects.filter(
         course_session=course_session,
@@ -112,7 +113,7 @@ def get_assignment_completion_metrics(
 
 def create_record(
     course_session_assignment: CourseSessionAssignment | CourseSessionEdoniqTest,
-    user_selection_ids: List[str] | None
+    user_selection_ids: List[str] | None,
 ) -> AssignmentStatisticsRecordType:
     if isinstance(course_session_assignment, CourseSessionAssignment):
         due_date = course_session_assignment.submission_deadline
@@ -160,14 +161,18 @@ def assignments(
             ],
             learning_content__content_assignment__competence_certificate__isnull=False,
         ):
-            record = create_record(course_session_assignment=csa, user_selection_ids=user_selection_ids)
+            record = create_record(
+                course_session_assignment=csa, user_selection_ids=user_selection_ids
+            )
             records.append(record)
 
         for cset in CourseSessionEdoniqTest.objects.filter(
             course_session=course_session,
             learning_content__content_assignment__competence_certificate__isnull=False,
         ):
-            record = create_record(course_session_assignment=cset, user_selection_ids=user_selection_ids)
+            record = create_record(
+                course_session_assignment=cset, user_selection_ids=user_selection_ids
+            )
             records.append(record)
 
     return AssignmentsStatisticsType(
diff --git a/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py b/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py
index 38da733a..3fa68f93 100644
--- a/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py
+++ b/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py
@@ -241,8 +241,11 @@ class CourseStatisticsType(graphene.ObjectType):
         )
 
     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
+        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=[
@@ -261,8 +264,11 @@ class CourseStatisticsType(graphene.ObjectType):
         )
 
     def resolve_assignments(root, info) -> AssignmentsStatisticsType:
-        user_selection_ids = [str(user) for user in
-                              root.user_selection_ids] if root.user_selection_ids else None  # noqa
+        user_selection_ids = (
+            [str(user) for user in root.user_selection_ids]
+            if root.user_selection_ids
+            else None
+        )  # noqa
         return assignments(
             course_id=root.course_id,
             course_session_selection_ids=root.course_session_selection_ids,
@@ -381,7 +387,11 @@ def get_ui_config_for_course(course: Course, user: User) -> UIConfigType:
     # mentors
     if course.id in mentor_course_ids:
         if not role_key:
-            role_key = RoleKeyType.MENTOR_UK if course.id in UK_COURSE_IDS else RoleKeyType.MENTOR_VV
+            role_key = (
+                RoleKeyType.MENTOR_UK
+                if course.id in UK_COURSE_IDS
+                else RoleKeyType.MENTOR_VV
+            )
             has_preview = True
         widgets.append(WidgetType.MENTOR_TASKS_WIDGET)
         widgets.append(WidgetType.MENTOR_PERSON_WIDGET)
diff --git a/server/vbv_lernwelt/dashboard/views.py b/server/vbv_lernwelt/dashboard/views.py
index 0f44b479..7f3a7eba 100644
--- a/server/vbv_lernwelt/dashboard/views.py
+++ b/server/vbv_lernwelt/dashboard/views.py
@@ -1,4 +1,4 @@
-from dataclasses import dataclass
+from dataclasses import asdict, dataclass
 from typing import List, Set
 
 from rest_framework.decorators import api_view
@@ -9,6 +9,7 @@ from vbv_lernwelt.core.models import User
 from vbv_lernwelt.course.models import CourseSession, CourseSessionUser
 from vbv_lernwelt.course.views import logger
 from vbv_lernwelt.course_session_group.models import CourseSessionGroup
+from vbv_lernwelt.dashboard.graphql.types.dashboard import RoleKeyType, WidgetType
 from vbv_lernwelt.learning_mentor.models import LearningMentor
 
 
@@ -25,6 +26,20 @@ class CourseSessionWithRoles:
         raise NotImplementedError("This proxy object cannot be saved.")
 
 
+@dataclass(frozen=True)
+class CourseConfig:
+    course_id: int
+    course_slug: str
+    course_title: str
+    role_key: str
+    is_uk: bool
+    is_vv: bool
+    is_mentor: bool
+    widgets: List[str]
+    has_preview: bool
+    session_to_continue_id: str | None
+
+
 def get_course_sessions_with_roles_for_user(user: User) -> List[CourseSessionWithRoles]:
     result_course_sessions = {}
 
@@ -67,6 +82,18 @@ def get_course_sessions_with_roles_for_user(user: User) -> List[CourseSessionWit
     ]
 
 
+def has_cs_role(roles: Set[str]) -> bool:
+    return bool(roles & {"SUPERVISOR", "EXPERT", "MEMBER"})
+
+
+def user_role(roles: Set[str]) -> str:
+    return (
+        "SUPERVISOR"
+        if "SUPERVISOR" in roles
+        else ("EXPERT" if "EXPERT" in roles else "MEMBER")
+    )
+
+
 @api_view(["GET"])
 def get_dashboard_persons(request):
     try:
@@ -74,19 +101,11 @@ def get_dashboard_persons(request):
 
         result_persons = {}
         for cs in course_sessions:
-            if {
-                "SUPERVISOR",
-                "EXPERT",
-                "MEMBER",
-            } & cs.roles and cs.course.configuration.is_uk:
+            if has_cs_role(cs.roles) and cs.course.configuration.is_uk:
                 course_session_users = CourseSessionUser.objects.filter(
                     course_session=cs.id
                 )
-                my_role = (
-                    "SUPERVISOR"
-                    if "SUPERVISOR" in cs.roles
-                    else ("EXPERT" if "EXPERT" in cs.roles else "MEMBER")
-                )
+                my_role = user_role(cs.roles)
                 for csu in course_session_users:
                     result_persons[csu.user.id] = {
                         "user_id": csu.user.id,
@@ -183,3 +202,123 @@ def get_dashboard_persons(request):
     except Exception as e:
         logger.error(e, exc_info=True)
         return Response({"error": str(e)}, status=404)
+
+
+def get_widgets_for_course(
+    role_key: RoleKeyType, is_uk: bool, is_vv: bool, is_mentor: bool
+) -> List[str]:
+    widgets = []
+
+    if role_key == RoleKeyType.MEMBER:
+        widgets.append(WidgetType.PROGRESS_WIDGET.value)
+        widgets.append(WidgetType.COMPETENCE_WIDGET.value)
+        if is_uk:
+            widgets.append(WidgetType.COMPETENCE_CERTIFICATE_WIDGET.value)
+
+    if is_mentor:
+        widgets.append(WidgetType.MENTOR_PERSON_WIDGET.value)
+        if is_vv:
+            widgets.append(WidgetType.MENTOR_TASKS_WIDGET.value)
+        if is_uk:
+            widgets.append(WidgetType.MENTOR_COMPETENCE_WIDGET.value)
+
+    return widgets
+
+
+def get_role_and_mentor_key(
+    course_sessions: List[CourseSessionWithRoles], is_uk: bool, is_vv: bool
+) -> tuple[RoleKeyType, bool]:
+    roles = set()
+    role = None
+    for cs in course_sessions:
+        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 is_uk:
+            role = RoleKeyType.MENTOR_UK
+        elif is_vv:
+            role = RoleKeyType.MENTOR_VV
+
+    is_mentor = "LEARNING_MENTOR" in roles
+    return role, is_mentor
+
+
+def sort_course_sessions_by_course(
+    course_sessions: List[CourseSessionWithRoles],
+) -> dict:
+    course_sessions_by_course = {}
+    for cs in course_sessions:
+        if cs.course.id not in course_sessions_by_course:
+            course_sessions_by_course[cs.course.id] = []
+        course_sessions_by_course[cs.course.id].append(cs)
+    return course_sessions_by_course
+
+
+def has_preview(role_key: RoleKeyType) -> bool:
+    return role_key in [RoleKeyType.MENTOR_UK, RoleKeyType.MENTOR_VV]
+
+
+def get_newest_cs(
+    course_sessions: List[CourseSessionWithRoles],
+) -> CourseSessionWithRoles | None:
+    newest: CourseSessionWithRoles | None = None
+
+    for cs in course_sessions:
+        generation_newest = newest.generation if newest else None
+        if generation_newest is None or cs.generation > generation_newest:
+            newest = cs
+
+    return newest
+
+
+def get_course_config(
+    course_sessions: List[CourseSessionWithRoles],
+) -> List[CourseConfig]:
+    course_configs = []
+    cs_by_course = sort_course_sessions_by_course(course_sessions)
+    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_and_mentor_key(cs_in_course, is_uk, is_vv)
+        session_to_continue = get_newest_cs(cs_in_course)
+        course_configs.append(
+            CourseConfig(
+                course_id=cs_in_course[0].course.id,
+                course_slug=cs_in_course[0].course.slug,
+                course_title=cs_in_course[0].course.title,
+                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),
+                has_preview=has_preview(role_key),
+                session_to_continue_id=str(session_to_continue.id)
+                if session_to_continue
+                else None,
+            )
+        )
+
+    return course_configs
+
+
+@api_view(["GET"])
+def get_dashboard_config(request):
+    try:
+        course_sessions = get_course_sessions_with_roles_for_user(request.user)  # noqa
+        course_configs = get_course_config(course_sessions)
+
+        return Response(
+            status=200,
+            data=[asdict(cc) for cc in course_configs],
+        )
+    except PermissionDenied as e:
+        raise e
+    except Exception as e:
+        logger.error(e, exc_info=True)
+        return Response({"error": str(e)}, status=404)

From 265bd01b7915cfc878d7b0d9a8f7448a364a0d20 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Mon, 8 Apr 2024 13:01:36 +0200
Subject: [PATCH 13/82] WIP: Remove GraphQL code

---
 client/src/gql/schema.graphql                 |  25 ---
 .../vbv_lernwelt/dashboard/graphql/queries.py |   3 -
 .../dashboard/graphql/types/dashboard.py      | 183 +-----------------
 server/vbv_lernwelt/dashboard/views.py        |  23 ++-
 4 files changed, 21 insertions(+), 213 deletions(-)

diff --git a/client/src/gql/schema.graphql b/client/src/gql/schema.graphql
index cb6827be..c0dd4f6c 100644
--- a/client/src/gql/schema.graphql
+++ b/client/src/gql/schema.graphql
@@ -181,7 +181,6 @@ type CourseProgressType {
   session_to_continue_id: ID
   competence: ProgressDashboardCompetenceType
   assignment: ProgressDashboardAssignmentType
-  ui_config: UIConfigType
 }
 
 type ProgressDashboardCompetenceType {
@@ -198,30 +197,6 @@ type ProgressDashboardAssignmentType {
   points_achieved_count: Int!
 }
 
-type UIConfigType {
-  _id: ID!
-  role_key: RoleKeyType!
-  widgets: [WidgetType!]!
-  has_preview: Boolean
-}
-
-enum RoleKeyType {
-  MEMBER
-  MENTOR_VV
-  MENTOR_UK
-  SUPERVISOR
-  TRAINER
-}
-
-enum WidgetType {
-  PROGRESS_WIDGET
-  COMPETENCE_WIDGET
-  MENTOR_TASKS_WIDGET
-  MENTOR_PERSON_WIDGET
-  MENTOR_COMPETENCE_WIDGET
-  COMPETENCE_CERTIFICATE_WIDGET
-}
-
 type DashboardConfigType {
   id: ID!
   name: String!
diff --git a/server/vbv_lernwelt/dashboard/graphql/queries.py b/server/vbv_lernwelt/dashboard/graphql/queries.py
index f760fa5a..d41a46af 100644
--- a/server/vbv_lernwelt/dashboard/graphql/queries.py
+++ b/server/vbv_lernwelt/dashboard/graphql/queries.py
@@ -16,7 +16,6 @@ from vbv_lernwelt.dashboard.graphql.types.dashboard import (
     CourseStatisticsType,
     DashboardConfigType,
     DashboardType,
-    get_ui_config_for_course,
     ProgressDashboardAssignmentType,
     ProgressDashboardCompetenceType,
 )
@@ -139,7 +138,6 @@ class DashboardQuery(graphene.ObjectType):
         user = info.context.user
         course = Course.objects.get(id=course_id)
         setattr(info.context, "course", course)
-        return CourseProgressType()
 
         newest: CourseSession | None = None
         course_session_for_user: List[str] = []
@@ -195,7 +193,6 @@ class DashboardQuery(graphene.ObjectType):
                 points_max_count=int(points_max_count),  # noqa
                 points_achieved_count=int(points_achieved_count),  # noqa
             ),
-            widgets=get_ui_config_for_course(course, user),  # noqa
         )
 
 
diff --git a/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py b/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py
index 3fa68f93..affb9a81 100644
--- a/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py
+++ b/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py
@@ -1,16 +1,8 @@
-from typing import Dict, List, Set, Tuple
-
 import graphene
 from graphene import Enum
 
-from vbv_lernwelt.assignment.models import (
-    AssignmentCompletion,
-    AssignmentCompletionStatus,
-)
-from vbv_lernwelt.core.models import User
-from vbv_lernwelt.course.consts import UK_COURSE_IDS
 from vbv_lernwelt.course.graphql.types import CourseConfigurationObjectType
-from vbv_lernwelt.course.models import Course, CourseSession, CourseSessionUser
+from vbv_lernwelt.course.models import CourseSession, CourseSessionUser
 from vbv_lernwelt.dashboard.graphql.types.assignment import (
     assignments,
     AssignmentsStatisticsType,
@@ -28,11 +20,6 @@ from vbv_lernwelt.dashboard.graphql.types.feedback import (
     feedback_responses,
     FeedbackStatisticsResponsesType,
 )
-from vbv_lernwelt.iam.permissions import (
-    can_view_course_session,
-    can_view_course_session_progress,
-)
-from vbv_lernwelt.learning_mentor.models import LearningMentor
 from vbv_lernwelt.learnpath.models import Circle
 
 
@@ -70,23 +57,6 @@ class DashboardType(Enum):
     PRAXISBILDNER_DASHBOARD = "PraxisbildnerDashboard"
 
 
-class WidgetType(Enum):
-    PROGRESS_WIDGET = "ProgressWidget"
-    COMPETENCE_WIDGET = "CompetenceWidget"
-    MENTOR_TASKS_WIDGET = "MentorTasksWidget"
-    MENTOR_PERSON_WIDGET = "MentorPersonWidget"
-    MENTOR_COMPETENCE_WIDGET = "MentorCompetenceWidget"
-    COMPETENCE_CERTIFICATE_WIDGET = "CompetenceCertificateWidget"
-
-
-class RoleKeyType(Enum):
-    MEMBER = "Member"
-    MENTOR_VV = "MentorVV"
-    MENTOR_UK = "MentorUK"
-    SUPERVISOR = "Supervisor"
-    TRAINER = "Trainer"
-
-
 class DashboardConfigType(graphene.ObjectType):
     id = graphene.ID(required=True)
     name = graphene.String(required=True)
@@ -109,100 +79,12 @@ class ProgressDashboardAssignmentType(graphene.ObjectType):
     points_achieved_count = graphene.Int(required=True)
 
 
-class UIConfigType(graphene.ObjectType):
-    _id = graphene.ID(required=True)
-    role_key = graphene.Field(RoleKeyType, required=True)
-    widgets = graphene.List(graphene.NonNull(WidgetType), required=True)
-    has_preview = graphene.Boolean(required=False)
-
-
 class CourseProgressType(graphene.ObjectType):
     _id = graphene.ID(required=True)
     course_id = graphene.ID(required=True)
     session_to_continue_id = graphene.ID(required=False)
     competence = graphene.Field(ProgressDashboardCompetenceType, required=False)
     assignment = graphene.Field(ProgressDashboardAssignmentType, required=False)
-    ui_config = graphene.Field(UIConfigType, required=False)
-
-    def resolve__id(root, info):
-        return info.context.course.id
-
-    def resolve_course_id(root, info):
-        return info.context.course.id
-
-    def resolve_session_to_continue_id(root, info):
-        newest, _course_session_for_user = root._get_newest_cs_and_cs_for_user(
-            info, info.context.course.id, info.context.user
-        )
-        return newest.id if newest else None
-
-    def resolve_assignment(root, info):
-        evaluation_results = AssignmentCompletion.objects.filter(
-            completion_status=AssignmentCompletionStatus.EVALUATION_SUBMITTED.value,
-            assignment_user=info.context.user,
-            course_session__course=info.context.course,
-        ).values("evaluation_max_points", "evaluation_points")
-
-        evaluation_results = list(evaluation_results)
-        points_max_count = sum(
-            [result.get("evaluation_max_points", 0) for result in evaluation_results]
-        )
-        points_achieved_count = sum(
-            [result.get("evaluation_points", 0) for result in evaluation_results]
-        )
-        return ProgressDashboardAssignmentType(  # noqa
-            _id=info.context.course.id,  # noqa
-            total_count=len(evaluation_results),  # noqa
-            points_max_count=int(points_max_count),  # noqa
-            points_achieved_count=int(points_achieved_count),  # noqa
-        )
-
-    def resolve_competence(root, info):
-        newest, course_session_for_user = root._get_newest_cs_and_cs_for_user(
-            info, info.context.course.id, info.context.user
-        )
-        _, success_total, fail_total = competences(
-            course_slug=str(info.context.course.slug),
-            course_session_selection_ids=course_session_for_user,
-            user_selection_ids=[str(info.context.user.id)],
-        )
-
-        return ProgressDashboardCompetenceType(  # noqa
-            _id=info.context.course.id,  # noqa
-            total_count=success_total + fail_total,  # noqa
-            success_count=success_total,  # noqa
-            fail_count=fail_total,  # noqa
-        )
-
-    def resolve_ui_config(root, info):
-        return get_ui_config_for_course(info.context.course, info.context.user)
-
-    def _get_newest_cs_and_cs_for_user(
-        root, info, course_id: str, user: User
-    ) -> Tuple[CourseSession, List[str]]:
-        newest: CourseSession | None = getattr(info.context, "newest", None)
-        course_session_for_user: List[str] = getattr(
-            info.context, "course_session_for_user", []
-        )
-
-        if newest is not None and course_session_for_user:
-            return newest, course_session_for_user
-
-        for course_session in CourseSession.objects.filter(course_id=course_id):
-            if can_view_course_session_progress(
-                user=user, course_session=course_session
-            ):
-                course_session_for_user.append(course_session)
-                generation_newest = newest.generation if newest else None
-                if (
-                    generation_newest is None
-                    or course_session.generation > generation_newest
-                ):
-                    newest = course_session
-        # cache for use in other resolvers
-        setattr(info.context, "newest", newest)
-        setattr(info.context, "course_session_for_user", course_session_for_user)
-        return newest, course_session_for_user
 
 
 class CourseStatisticsType(graphene.ObjectType):
@@ -342,66 +224,3 @@ class CourseStatisticsType(graphene.ObjectType):
             generations=list(generations),  # noqa
             circles=circle_data,  # noqa
         )
-
-
-def get_ui_config_for_course(course: Course, user: User) -> UIConfigType:
-    widgets = []
-    role_key = None
-    has_preview = False
-
-    course_sessions = CourseSession.objects.filter(
-        course__id=course.id, coursesessionuser__user=user
-    ).prefetch_related(
-        "course",
-        "course__configuration",
-    )
-
-    roles_by_course: Dict[Course, Set[DashboardType]] = {}
-
-    learning_mentors = LearningMentor.objects.filter(
-        mentor=user, course_session__course__id=course.id
-    ).values_list("course_session__course__id", "id")
-    mentor_course_ids = set([mentor[0] for mentor in learning_mentors])
-
-    # duplicate code
-    for course_session in course_sessions:
-        if can_view_course_session(user=user, course_session=course_session):
-            role = CourseSessionUser.objects.get(
-                course_session=course_session, user=user
-            ).role
-            roles_by_course.setdefault(course_session.course, set())
-            roles_by_course[course_session.course].add(role)
-
-    # todo: use permissions
-    for course, roles in roles_by_course.items():
-        if len(roles) == 1:
-            course_role = roles.pop()
-
-            # members
-            if course_role == CourseSessionUser.Role.MEMBER:
-                role_key = RoleKeyType.MEMBER
-                widgets.append(WidgetType.PROGRESS_WIDGET)
-                widgets.append(WidgetType.COMPETENCE_WIDGET)
-                if course.configuration.enable_competence_certificates:
-                    widgets.append(WidgetType.COMPETENCE_CERTIFICATE_WIDGET)
-    # mentors
-    if course.id in mentor_course_ids:
-        if not role_key:
-            role_key = (
-                RoleKeyType.MENTOR_UK
-                if course.id in UK_COURSE_IDS
-                else RoleKeyType.MENTOR_VV
-            )
-            has_preview = True
-        widgets.append(WidgetType.MENTOR_TASKS_WIDGET)
-        widgets.append(WidgetType.MENTOR_PERSON_WIDGET)
-        if course.configuration.enable_competence_certificates:
-            widgets.append(WidgetType.MENTOR_COMPETENCE_WIDGET)
-
-    # todo: supervisors
-    return UIConfigType(
-        _id=f"{course.id}_{user.id}",  # noqa
-        role_key=role_key,  # noqa,
-        widgets=widgets,  # noqa
-        has_preview=has_preview,  # noqa
-    )
diff --git a/server/vbv_lernwelt/dashboard/views.py b/server/vbv_lernwelt/dashboard/views.py
index 7f3a7eba..1b9ec323 100644
--- a/server/vbv_lernwelt/dashboard/views.py
+++ b/server/vbv_lernwelt/dashboard/views.py
@@ -1,4 +1,5 @@
 from dataclasses import asdict, dataclass
+from enum import Enum
 from typing import List, Set
 
 from rest_framework.decorators import api_view
@@ -9,10 +10,26 @@ from vbv_lernwelt.core.models import User
 from vbv_lernwelt.course.models import CourseSession, CourseSessionUser
 from vbv_lernwelt.course.views import logger
 from vbv_lernwelt.course_session_group.models import CourseSessionGroup
-from vbv_lernwelt.dashboard.graphql.types.dashboard import RoleKeyType, WidgetType
 from vbv_lernwelt.learning_mentor.models import LearningMentor
 
 
+class WidgetType(Enum):
+    PROGRESS_WIDGET = "ProgressWidget"
+    COMPETENCE_WIDGET = "CompetenceWidget"
+    MENTOR_TASKS_WIDGET = "MentorTasksWidget"
+    MENTOR_PERSON_WIDGET = "MentorPersonWidget"
+    MENTOR_COMPETENCE_WIDGET = "MentorCompetenceWidget"
+    COMPETENCE_CERTIFICATE_WIDGET = "CompetenceCertificateWidget"
+
+
+class RoleKeyType(Enum):
+    MEMBER = "Member"
+    MENTOR_VV = "MentorVV"
+    MENTOR_UK = "MentorUK"
+    SUPERVISOR = "Supervisor"
+    TRAINER = "Trainer"
+
+
 @dataclass(frozen=True)
 class CourseSessionWithRoles:
     _original: CourseSession
@@ -28,7 +45,7 @@ class CourseSessionWithRoles:
 
 @dataclass(frozen=True)
 class CourseConfig:
-    course_id: int
+    course_id: str
     course_slug: str
     course_title: str
     role_key: str
@@ -289,7 +306,7 @@ def get_course_config(
         session_to_continue = get_newest_cs(cs_in_course)
         course_configs.append(
             CourseConfig(
-                course_id=cs_in_course[0].course.id,
+                course_id=str(cs_in_course[0].course.id),
                 course_slug=cs_in_course[0].course.slug,
                 course_title=cs_in_course[0].course.title,
                 role_key=role_key.value,

From d417cf5fe36129d538a615716e71bf3e7c8e1164 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Mon, 8 Apr 2024 13:31:29 +0200
Subject: [PATCH 14/82] WIP: Update schema

---
 client/src/gql/gql.ts                         |  4 +--
 client/src/gql/graphql.ts                     | 30 +++----------------
 client/src/gql/schema.graphql                 |  2 ++
 client/src/gql/typenames.ts                   |  3 --
 client/src/graphql/queries.ts                 |  6 ----
 .../dashboard/graphql/types/assignment.py     |  9 +++++-
 .../dashboard/graphql/types/dashboard.py      |  4 +--
 7 files changed, 18 insertions(+), 40 deletions(-)

diff --git a/client/src/gql/gql.ts b/client/src/gql/gql.ts
index 802e338d..3d3454b4 100644
--- a/client/src/gql/gql.ts
+++ b/client/src/gql/gql.ts
@@ -23,7 +23,7 @@ const documents = {
     "\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      }\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      }\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      ui_config {\n        _id\n        role_key\n        widgets\n        has_preview\n      }\n    }\n  }\n": types.DashboardCourseDataDocument,
+    "\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        }\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  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,
 };
@@ -85,7 +85,7 @@ export function graphql(source: "\n  query dashboardProgress($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 dashboardCourseData($courseId: ID!) {\n    course_progress(course_id: $courseId) {\n      _id\n      course_id\n      session_to_continue_id\n      ui_config {\n        _id\n        role_key\n        widgets\n        has_preview\n      }\n    }\n  }\n"): (typeof documents)["\n  query dashboardCourseData($courseId: ID!) {\n    course_progress(course_id: $courseId) {\n      _id\n      course_id\n      session_to_continue_id\n      ui_config {\n        _id\n        role_key\n        widgets\n        has_preview\n      }\n    }\n  }\n"];
+export function graphql(source: "\n  query dashboardCourseData($courseId: ID!) {\n    course_progress(course_id: $courseId) {\n      _id\n      course_id\n      session_to_continue_id\n    }\n  }\n"): (typeof documents)["\n  query dashboardCourseData($courseId: ID!) {\n    course_progress(course_id: $courseId) {\n      _id\n      course_id\n      session_to_continue_id\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 5c73331f..4186cb4c 100644
--- a/client/src/gql/graphql.ts
+++ b/client/src/gql/graphql.ts
@@ -188,6 +188,8 @@ export type AssignmentStatisticsSummaryType = {
   _id: Scalars['ID']['output'];
   average_passed: Scalars['Float']['output'];
   completed_count: Scalars['Int']['output'];
+  total_failed: Scalars['Int']['output'];
+  total_passed: Scalars['Int']['output'];
 };
 
 export type AssignmentsStatisticsType = {
@@ -365,7 +367,6 @@ export type CourseProgressType = {
   competence?: Maybe<ProgressDashboardCompetenceType>;
   course_id: Scalars['ID']['output'];
   session_to_continue_id?: Maybe<Scalars['ID']['output']>;
-  ui_config?: Maybe<UiConfigType>;
 };
 
 export type CourseSessionAssignmentObjectType = {
@@ -994,13 +995,6 @@ export type QueryMentorCourseStatisticsArgs = {
   course_id: Scalars['ID']['input'];
 };
 
-export type RoleKeyType =
-  | 'MEMBER'
-  | 'MENTOR_UK'
-  | 'MENTOR_VV'
-  | 'SUPERVISOR'
-  | 'TRAINER';
-
 export type SendFeedbackMutation = {
   __typename?: 'SendFeedbackMutation';
   /** May contain more than one error for same field. */
@@ -1050,14 +1044,6 @@ export type TopicObjectType = CoursePageInterface & {
   translation_key: Scalars['String']['output'];
 };
 
-export type UiConfigType = {
-  __typename?: 'UIConfigType';
-  _id: Scalars['ID']['output'];
-  has_preview?: Maybe<Scalars['Boolean']['output']>;
-  role_key: RoleKeyType;
-  widgets: Array<WidgetType>;
-};
-
 export type UserObjectType = {
   __typename?: 'UserObjectType';
   avatar_url?: Maybe<Scalars['String']['output']>;
@@ -1070,14 +1056,6 @@ export type UserObjectType = {
   username: Scalars['String']['output'];
 };
 
-export type WidgetType =
-  | 'COMPETENCE_CERTIFICATE_WIDGET'
-  | 'COMPETENCE_WIDGET'
-  | 'MENTOR_COMPETENCE_WIDGET'
-  | 'MENTOR_PERSON_WIDGET'
-  | 'MENTOR_TASKS_WIDGET'
-  | 'PROGRESS_WIDGET';
-
 export type AttendanceCheckMutationMutationVariables = Exact<{
   attendanceCourseId: Scalars['ID']['input'];
   attendanceUserList: Array<InputMaybe<AttendanceUserInputType>> | InputMaybe<AttendanceUserInputType>;
@@ -1317,7 +1295,7 @@ export type DashboardCourseDataQueryVariables = Exact<{
 }>;
 
 
-export type DashboardCourseDataQuery = { __typename?: 'Query', course_progress?: { __typename?: 'CourseProgressType', _id: string, course_id: string, session_to_continue_id?: string | null, ui_config?: { __typename?: 'UIConfigType', _id: string, role_key: RoleKeyType, widgets: Array<WidgetType>, has_preview?: boolean | null } | null } | null };
+export type DashboardCourseDataQuery = { __typename?: 'Query', course_progress?: { __typename?: 'CourseProgressType', _id: string, course_id: string, session_to_continue_id?: string | null } | null };
 
 export type CourseStatisticsQueryVariables = Exact<{
   courseId: Scalars['ID']['input'];
@@ -1347,6 +1325,6 @@ export const CourseSessionDetailDocument = {"kind":"Document","definitions":[{"k
 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":"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"}}]}}]}}]}}]} 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"}},{"kind":"Field","name":{"kind":"Name","value":"ui_config"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"_id"}},{"kind":"Field","name":{"kind":"Name","value":"role_key"}},{"kind":"Field","name":{"kind":"Name","value":"widgets"}},{"kind":"Field","name":{"kind":"Name","value":"has_preview"}}]}}]}}]}}]} as unknown as DocumentNode<DashboardCourseDataQuery, DashboardCourseDataQueryVariables>;
+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":"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 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 c0dd4f6c..fca2c434 100644
--- a/client/src/gql/schema.graphql
+++ b/client/src/gql/schema.graphql
@@ -150,6 +150,8 @@ type AssignmentStatisticsSummaryType {
   _id: ID!
   completed_count: Int!
   average_passed: Float!
+  total_passed: Int!
+  total_failed: Int!
 }
 
 type CompetencesStatisticsType {
diff --git a/client/src/gql/typenames.ts b/client/src/gql/typenames.ts
index 026956b6..5fb963dc 100644
--- a/client/src/gql/typenames.ts
+++ b/client/src/gql/typenames.ts
@@ -75,7 +75,6 @@ export const PresenceRecordStatisticsType = "PresenceRecordStatisticsType";
 export const ProgressDashboardAssignmentType = "ProgressDashboardAssignmentType";
 export const ProgressDashboardCompetenceType = "ProgressDashboardCompetenceType";
 export const Query = "Query";
-export const RoleKeyType = "RoleKeyType";
 export const SendFeedbackMutation = "SendFeedbackMutation";
 export const StatisticsCircleDataType = "StatisticsCircleDataType";
 export const StatisticsCourseSessionDataType = "StatisticsCourseSessionDataType";
@@ -83,7 +82,5 @@ export const StatisticsCourseSessionPropertiesType = "StatisticsCourseSessionPro
 export const StatisticsCourseSessionsSelectionMetricType = "StatisticsCourseSessionsSelectionMetricType";
 export const String = "String";
 export const TopicObjectType = "TopicObjectType";
-export const UIConfigType = "UIConfigType";
 export const UUID = "UUID";
 export const UserObjectType = "UserObjectType";
-export const WidgetType = "WidgetType";
diff --git a/client/src/graphql/queries.ts b/client/src/graphql/queries.ts
index 29f174da..5ce0b221 100644
--- a/client/src/graphql/queries.ts
+++ b/client/src/graphql/queries.ts
@@ -337,12 +337,6 @@ export const DASHBOARD_COURSE_DATA = graphql(`
       _id
       course_id
       session_to_continue_id
-      ui_config {
-        _id
-        role_key
-        widgets
-        has_preview
-      }
     }
   }
 `);
diff --git a/server/vbv_lernwelt/dashboard/graphql/types/assignment.py b/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
index ad747b22..1cbf7789 100644
--- a/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
+++ b/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
@@ -42,6 +42,8 @@ class AssignmentStatisticsSummaryType(graphene.ObjectType):
     _id = graphene.ID(required=True)
     completed_count = graphene.Int(required=True)
     average_passed = graphene.Float(required=True)
+    total_passed = graphene.Int(required=True)
+    total_failed = graphene.Int(required=True)
 
 
 class AssignmentsStatisticsType(graphene.ObjectType):
@@ -57,7 +59,7 @@ def create_assignment_summary(course_id, metrics) -> AssignmentStatisticsSummary
 
     if not completed_metrics:
         return AssignmentStatisticsSummaryType(
-            _id=course_id, completed_count=0, average_passed=0  # noqa
+            _id=course_id, completed_count=0, average_passed=0, total_passed=0, total_failed=0  # noqa
         )
 
     completed_count = len(completed_metrics)
@@ -66,10 +68,15 @@ def create_assignment_summary(course_id, metrics) -> AssignmentStatisticsSummary
         sum([m.average_passed for m in completed_metrics]) / completed_count
     )
 
+    total_passed = sum([m.passed_count for m in completed_metrics])
+    total_failed = sum([m.failed_count for m in completed_metrics])
+
     return AssignmentStatisticsSummaryType(
         _id=course_id,  # noqa
         completed_count=completed_count,  # noqa
         average_passed=average_passed_completed,  # noqa
+        total_passed=total_passed,  # noqa
+        total_failed=total_failed,  # noqa
     )
 
 
diff --git a/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py b/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py
index affb9a81..ec48d8c9 100644
--- a/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py
+++ b/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py
@@ -79,7 +79,7 @@ class ProgressDashboardAssignmentType(graphene.ObjectType):
     points_achieved_count = graphene.Int(required=True)
 
 
-class CourseProgressType(graphene.ObjectType):
+class öCourseProgressType(graphene.ObjectType):
     _id = graphene.ID(required=True)
     course_id = graphene.ID(required=True)
     session_to_continue_id = graphene.ID(required=False)
@@ -145,7 +145,7 @@ class CourseStatisticsType(graphene.ObjectType):
             ),
         )
 
-    def resolve_assignments(root, info) -> AssignmentsStatisticsType:
+    def resolve_assignments(root, _info) -> AssignmentsStatisticsType:
         user_selection_ids = (
             [str(user) for user in root.user_selection_ids]
             if root.user_selection_ids

From 89fc3a8deb4067fd58cd0c6f0ef1c4862966df48 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Mon, 8 Apr 2024 14:22:33 +0200
Subject: [PATCH 15/82] WIP: Fix types, allow filter for user in stats

---
 client/src/pages/dashboard/DashboardPage.vue         | 12 +++++++++---
 client/src/services/dashboard.ts                     |  4 ++--
 .../dashboard/graphql/types/assignment.py            | 11 +++++++----
 .../dashboard/graphql/types/dashboard.py             |  2 +-
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/client/src/pages/dashboard/DashboardPage.vue b/client/src/pages/dashboard/DashboardPage.vue
index 40e65e95..c06a6289 100644
--- a/client/src/pages/dashboard/DashboardPage.vue
+++ b/client/src/pages/dashboard/DashboardPage.vue
@@ -13,7 +13,11 @@ import CourseDetailDates from "@/components/dashboard/CourseDetailDates.vue";
 import NoCourseSession from "@/components/dashboard/NoCourseSession.vue";
 import MentorPage from "@/pages/dashboard/MentorPage.vue";
 import CoursePanel from "@/components/dashboard/CoursePanel.vue";
-import { DashboardConfigType, fetchDashboardConfigv2 } from "@/services/dashboard";
+import {
+  DashboardConfigType,
+  DashboardCourseConfigType,
+  fetchDashboardConfigv2,
+} from "@/services/dashboard";
 
 const dashboardStore = useDashboardStore();
 
@@ -30,7 +34,7 @@ const boards: Record<DashboardType, DashboardPage> = {
   PRAXISBILDNER_DASHBOARD: { main: CoursePanel, aside: SimpleDates },
 };
 
-const dashboardConfigv2: Ref<DashboardConfigType[]> = ref([]);
+const dashboardConfigv2: Ref<DashboardCourseConfigType[]> = ref([]);
 
 onMounted(async () => {
   dashboardConfigv2.value = await fetchDashboardConfigv2();
@@ -74,7 +78,9 @@ function newDashboardConfigForId(id: string) {
             dashboardStore.currentDashboardConfig.dashboard_type ===
             'PRAXISBILDNER_DASHBOARD'
           "
-          :course-config="dashboardStore.currentDashboardConfig"
+          :course-config="
+            newDashboardConfigForId(dashboardStore.currentDashboardConfig.id)
+          "
         />
         <component
           :is="boards[dashboardStore.currentDashboardConfig.dashboard_type].main"
diff --git a/client/src/services/dashboard.ts b/client/src/services/dashboard.ts
index 6e4c636e..834ca6de 100644
--- a/client/src/services/dashboard.ts
+++ b/client/src/services/dashboard.ts
@@ -55,7 +55,7 @@ export type DashboardPersonType = {
   course_sessions: DashboardPersonCourseSessionType[];
 };
 
-export type DashboardConfigType = {
+export type DashboardCourseConfigType = {
   course_id: string;
   course_slug: string;
   course_title: string;
@@ -143,5 +143,5 @@ export async function fetchDashboardPersons() {
 }
 
 export async function fetchDashboardConfigv2() {
-  return await itGetCached<DashboardConfigType[]>("/api/dashboard/config/");
+  return await itGetCached<DashboardCourseConfigType[]>("/api/dashboard/config/");
 }
diff --git a/server/vbv_lernwelt/dashboard/graphql/types/assignment.py b/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
index 1cbf7789..214fcc4e 100644
--- a/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
+++ b/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
@@ -85,10 +85,13 @@ def get_assignment_completion_metrics(
     assignment: vbv_lernwelt.assignment.models.Assignment,
     user_selection_ids: List[str] | None,
 ) -> AssignmentCompletionMetricsType:
-    course_session_users = CourseSessionUser.objects.filter(
-        course_session=course_session,
-        role=CourseSessionUser.Role.MEMBER,
-    ).values_list("user", flat=True)
+    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)
 
     evaluation_results = AssignmentCompletion.objects.filter(
         completion_status=AssignmentCompletionStatus.EVALUATION_SUBMITTED.value,
diff --git a/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py b/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py
index ec48d8c9..46caa92f 100644
--- a/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py
+++ b/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py
@@ -79,7 +79,7 @@ class ProgressDashboardAssignmentType(graphene.ObjectType):
     points_achieved_count = graphene.Int(required=True)
 
 
-class öCourseProgressType(graphene.ObjectType):
+class CourseProgressType(graphene.ObjectType):
     _id = graphene.ID(required=True)
     course_id = graphene.ID(required=True)
     session_to_continue_id = graphene.ID(required=False)

From eda9829b36c74ff314cea0e49fbdd926ad071358 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Tue, 9 Apr 2024 08:59:44 +0200
Subject: [PATCH 16/82] Add mentor components and basic styling

---
 .../src/components/dashboard/CoursePanel.vue  | 32 +++++++---
 .../dashboard/MentorCompetenceSummary.vue     | 38 +++++++++++
 .../dashboard/MentorMenteeCount.vue           | 29 +++++++++
 .../dashboard/MentorOpenTasksCount.vue        | 29 +++++++++
 client/src/gql/gql.ts                         |  5 ++
 client/src/gql/graphql.ts                     |  8 +++
 client/src/graphql/queries.ts                 | 16 +++++
 client/src/pages/dashboard/DashboardPage.vue  |  2 -
 client/src/services/dashboard.ts              | 23 +++++--
 server/config/urls.py                         | 12 ++--
 server/vbv_lernwelt/dashboard/views.py        | 63 +++++++++++++++++--
 11 files changed, 232 insertions(+), 25 deletions(-)
 create mode 100644 client/src/components/dashboard/MentorCompetenceSummary.vue
 create mode 100644 client/src/components/dashboard/MentorMenteeCount.vue
 create mode 100644 client/src/components/dashboard/MentorOpenTasksCount.vue

diff --git a/client/src/components/dashboard/CoursePanel.vue b/client/src/components/dashboard/CoursePanel.vue
index 40d133ff..dc5d960b 100644
--- a/client/src/components/dashboard/CoursePanel.vue
+++ b/client/src/components/dashboard/CoursePanel.vue
@@ -1,9 +1,12 @@
 <script setup lang="ts">
 import { computed } from "vue";
-import type { DashboardConfigType, WidgetType } from "@/services/dashboard";
+import type { DashboardCourseConfigType, WidgetType } from "@/services/dashboard";
 import LearningPathDiagram from "@/components/learningPath/LearningPathDiagram.vue";
 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 MentorCompetenceSummary from "@/components/dashboard/MentorCompetenceSummary.vue";
 
 const mentorWidgets = [
   "MentorTasksWidget",
@@ -13,7 +16,7 @@ const mentorWidgets = [
 const progressWidgets = ["CompetenceWidget", "CompetenceCertificateWidget"];
 
 const props = defineProps<{
-  courseConfig: DashboardConfigType;
+  courseConfig: DashboardCourseConfigType;
 }>();
 
 const courseSlug = computed(() => props.courseConfig?.course_slug);
@@ -34,9 +37,11 @@ function hasWidget(widget: WidgetType) {
 
 <template>
   <div v-if="courseConfig" class="mb-14 space-y-8">
-    <div class="flex flex-col space-y-7 bg-white p-6">
-      <h3>{{ courseName }}</h3>
-      <p>{{ courseConfig.role_key }}</p>
+    <div class="flex flex-col space-y-4 bg-white p-6">
+      <h3 class="mb-4 text-3xl">{{ courseName }}</h3>
+      <p>
+        <span class="rounded bg-gray-300 px-2 py-1">{{ courseConfig.role_key }}</span>
+      </p>
       <LearningPathDiagram
         v-if="
           hasWidget('ProgressWidget') &&
@@ -62,10 +67,19 @@ function hasWidget(widget: WidgetType) {
           :course-id="courseConfig.course_id"
         />
       </div>
-      <div v-if="numberOfMentorWidgets > 0" class="flex flex-col flex-wrap">
-        <div v-if="hasWidget('MentorTasksWidget')">MENTOR_TASKS_WIDGET</div>
-        <div v-if="hasWidget('MentorPersonWidget')">MENTOR_PERSON_WIDGET</div>
-        <div v-if="hasWidget('MentorCompetenceWidget')">MENTOR_COMPETENCE_WIDGET</div>
+      <div v-if="numberOfMentorWidgets > 0" class="flex flex-col flex-wrap md:flex-row">
+        <MentorOpenTasksCount
+          v-if="hasWidget('MentorTasksWidget')"
+          :course-id="courseConfig.course_id"
+        />
+        <MentorMenteeCount
+          v-if="hasWidget('MentorPersonWidget')"
+          :course-id="courseConfig.course_id"
+        />
+        <MentorCompetenceSummary
+          v-if="hasWidget('MentorCompetenceWidget')"
+          :course-id="courseConfig.course_id"
+        />
       </div>
     </div>
   </div>
diff --git a/client/src/components/dashboard/MentorCompetenceSummary.vue b/client/src/components/dashboard/MentorCompetenceSummary.vue
new file mode 100644
index 00000000..24b4dc4d
--- /dev/null
+++ b/client/src/components/dashboard/MentorCompetenceSummary.vue
@@ -0,0 +1,38 @@
+<script setup lang="ts">
+import { onMounted, ref, Ref } from "vue";
+import { fetchMentorCompetenceSummary } from "@/services/dashboard";
+import { AssignmentsStatisticsType } from "@/gql/graphql";
+
+const props = defineProps<{
+  courseId: string;
+}>();
+
+const summary: Ref<AssignmentsStatisticsType | null> = ref(null);
+
+onMounted(async () => {
+  summary.value = await fetchMentorCompetenceSummary(props.courseId);
+  console.log(summary.value);
+});
+</script>
+
+<template>
+  <div v-if="summary" class="w-[325px]">
+    <div class="flex flex-row space-x-3 bg-white">
+      <div
+        class="flex h-[74px] items-center justify-center px-3 py-1 text-3xl font-bold"
+      >
+        <span>{{ summary.summary.total_passed }}</span>
+      </div>
+      <p class="ml-3 mt-0 leading-[74px]">{{ $t("Bestanden") }}</p>
+    </div>
+    <div class="flex flex-row space-x-3 bg-white pb-6">
+      <div
+        class="flex h-[74px] items-center justify-center px-3 py-1 text-3xl font-bold"
+      >
+        <span>{{ summary.summary.total_failed }}</span>
+      </div>
+      <p class="ml-3 mt-0 leading-[74px]">{{ $t("Nicht bestanden") }}</p>
+    </div>
+    <p>{{ $t("Details anschauen") }}</p>
+  </div>
+</template>
diff --git a/client/src/components/dashboard/MentorMenteeCount.vue b/client/src/components/dashboard/MentorMenteeCount.vue
new file mode 100644
index 00000000..25c8a953
--- /dev/null
+++ b/client/src/components/dashboard/MentorMenteeCount.vue
@@ -0,0 +1,29 @@
+<script setup lang="ts">
+import { onMounted, ref, Ref } from "vue";
+import { fetchMenteeCount } from "@/services/dashboard";
+
+const props = defineProps<{
+  courseId: string;
+}>();
+
+const menteeCount: Ref<number> = ref(0);
+
+onMounted(async () => {
+  const data = await fetchMenteeCount(props.courseId);
+  menteeCount.value = data?.mentee_count;
+});
+</script>
+
+<template>
+  <div class="w-[325px]">
+    <div class="flex flex-row space-x-3 bg-white pb-6">
+      <div
+        class="flex h-[74px] items-center justify-center px-3 py-1 text-3xl font-bold"
+      >
+        <span>{{ menteeCount }}</span>
+      </div>
+      <p class="ml-3 mt-0 leading-[74px]">{{ $t("Personen, die du begleitest") }}</p>
+    </div>
+    <p>{{ $t("Details anschauen") }}</p>
+  </div>
+</template>
diff --git a/client/src/components/dashboard/MentorOpenTasksCount.vue b/client/src/components/dashboard/MentorOpenTasksCount.vue
new file mode 100644
index 00000000..bb310a0f
--- /dev/null
+++ b/client/src/components/dashboard/MentorOpenTasksCount.vue
@@ -0,0 +1,29 @@
+<script setup lang="ts">
+import { onMounted, ref, Ref } from "vue";
+import { fetchOpenTasksCount } from "@/services/dashboard";
+
+const props = defineProps<{
+  courseId: string;
+}>();
+
+const openTaskCount: Ref<number> = ref(0);
+
+onMounted(async () => {
+  const data = await fetchOpenTasksCount(props.courseId);
+  openTaskCount.value = data?.open_task_count;
+});
+</script>
+
+<template>
+  <div class="w-[325px]">
+    <div class="flex flex-row space-x-3 bg-white pb-6">
+      <div
+        class="flex h-[74px] w-[74px] items-center justify-center rounded-full border-2 border-green-500 px-3 py-1 text-3xl font-bold"
+      >
+        <span>{{ openTaskCount }}</span>
+      </div>
+      <p class="ml-3 mt-0 leading-[74px]">{{ $t("Elemente zu erledigen") }}</p>
+    </div>
+    <p>{{ $t("Details anschauen") }}</p>
+  </div>
+</template>
diff --git a/client/src/gql/gql.ts b/client/src/gql/gql.ts
index 3d3454b4..28ab3396 100644
--- a/client/src/gql/gql.ts
+++ b/client/src/gql/gql.ts
@@ -25,6 +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        }\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        }\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      assignments {\n        _id\n        summary {\n          _id\n          total_passed\n          total_failed\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,6 +91,10 @@ 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        }\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        }\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"];
+/**
+ * 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      assignments {\n        _id\n        summary {\n          _id\n          total_passed\n          total_failed\n        }\n      }\n    }\n  }\n"): (typeof documents)["\n  query mentorCourseStatistics($courseId: ID!) {\n    mentor_course_statistics(course_id: $courseId) {\n      _id\n      assignments {\n        _id\n        summary {\n          _id\n          total_passed\n          total_failed\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 4186cb4c..c3e481af 100644
--- a/client/src/gql/graphql.ts
+++ b/client/src/gql/graphql.ts
@@ -1304,6 +1304,13 @@ 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 }, 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 MentorCourseStatisticsQueryVariables = Exact<{
+  courseId: Scalars['ID']['input'];
+}>;
+
+
+export type MentorCourseStatisticsQuery = { __typename?: 'Query', mentor_course_statistics?: { __typename?: 'CourseStatisticsType', _id: string, assignments: { __typename?: 'AssignmentsStatisticsType', _id: string, summary: { __typename?: 'AssignmentStatisticsSummaryType', _id: string, total_passed: number, total_failed: number } } } | null };
+
 export type SendFeedbackMutationMutationVariables = Exact<{
   courseSessionId: Scalars['ID']['input'];
   learningContentId: Scalars['ID']['input'];
@@ -1327,4 +1334,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":"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":"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":"total_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_failed"}}]}}]}}]}}]}}]} 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 5ce0b221..076d2f44 100644
--- a/client/src/graphql/queries.ts
+++ b/client/src/graphql/queries.ts
@@ -452,3 +452,19 @@ export const DASHBOARD_COURSE_STATISTICS = graphql(`
     }
   }
 `);
+
+export const DASHBOARD_MENTOR_COMPETENCE_SUMMARY = graphql(`
+  query mentorCourseStatistics($courseId: ID!) {
+    mentor_course_statistics(course_id: $courseId) {
+      _id
+      assignments {
+        _id
+        summary {
+          _id
+          total_passed
+          total_failed
+        }
+      }
+    }
+  }
+`);
diff --git a/client/src/pages/dashboard/DashboardPage.vue b/client/src/pages/dashboard/DashboardPage.vue
index c06a6289..93bc5898 100644
--- a/client/src/pages/dashboard/DashboardPage.vue
+++ b/client/src/pages/dashboard/DashboardPage.vue
@@ -65,10 +65,8 @@ function newDashboardConfigForId(id: string) {
             @update:model-value="dashboardStore.switchAndLoadDashboardConfig"
           ></ItDropdownSelect>
         </div>
-
         <ul>
           <li v-for="config in dashboardStore.dashboardConfigs" :key="config.id">
-            <p>{{ newDashboardConfigForId(config.id) }}</p>
             <CoursePanel :course-config="newDashboardConfigForId(config.id)" />
           </li>
         </ul>
diff --git a/client/src/services/dashboard.ts b/client/src/services/dashboard.ts
index 834ca6de..7b18955e 100644
--- a/client/src/services/dashboard.ts
+++ b/client/src/services/dashboard.ts
@@ -1,13 +1,14 @@
 import { graphqlClient } from "@/graphql/client";
 import {
   DASHBOARD_CONFIG,
-  DASHBOARD_COURSE_DATA,
   DASHBOARD_COURSE_SESSION_PROGRESS,
   DASHBOARD_COURSE_STATISTICS,
+  DASHBOARD_MENTOR_COMPETENCE_SUMMARY,
 } from "@/graphql/queries";
 
 import { itGetCached } from "@/fetchHelpers";
 import type {
+  AssignmentsStatisticsType,
   CourseProgressType,
   CourseStatisticsType,
   DashboardConfigType,
@@ -120,18 +121,18 @@ export const fetchDashboardConfig = async (): Promise<DashboardConfigType[] | nu
   }
 };
 
-export const fetchCourseData = async (
+export const fetchMentorCompetenceSummary = async (
   courseId: string
-): Promise<CourseProgressType | null> => {
+): Promise<AssignmentsStatisticsType | null> => {
   try {
-    const res = await graphqlClient.query(DASHBOARD_COURSE_DATA, {
+    const res = await graphqlClient.query(DASHBOARD_MENTOR_COMPETENCE_SUMMARY, {
       courseId,
     });
 
     if (res.error) {
       console.error("Error fetching data for course ID:", courseId, res.error);
     }
-    return res.data?.course_progress || null;
+    return res.data?.mentor_course_statistics?.assignments || null;
   } catch (error) {
     console.error(`Error fetching data for course ID: ${courseId}`, error);
     return null;
@@ -145,3 +146,15 @@ export async function fetchDashboardPersons() {
 export async function fetchDashboardConfigv2() {
   return await itGetCached<DashboardCourseConfigType[]>("/api/dashboard/config/");
 }
+
+export async function fetchMenteeCount(courseId: string) {
+  return await itGetCached<{ mentee_count: number }>(
+    `/api/dashboard/course/${courseId}/mentees/`
+  );
+}
+
+export async function fetchOpenTasksCount(courseId: string) {
+  return await itGetCached<{ open_task_count: number }>(
+    `/api/dashboard/course/${courseId}/open_tasks/`
+  );
+}
diff --git a/server/config/urls.py b/server/config/urls.py
index b1a3ba78..582eced0 100644
--- a/server/config/urls.py
+++ b/server/config/urls.py
@@ -10,6 +10,9 @@ from django.views import defaults as default_views
 from django.views.decorators.csrf import csrf_exempt
 from django_ratelimit.exceptions import Ratelimited
 from graphene_django.views import GraphQLView
+from wagtail import urls as wagtail_urls
+from wagtail.admin import urls as wagtailadmin_urls
+from wagtail.documents import urls as media_library_urls
 
 from vbv_lernwelt.api.directory import list_entities
 from vbv_lernwelt.api.user import get_profile, me_user_view, post_avatar
@@ -39,7 +42,8 @@ from vbv_lernwelt.course.views import (
     request_course_completion_for_user,
 )
 from vbv_lernwelt.course_session.views import get_course_session_documents
-from vbv_lernwelt.dashboard.views import get_dashboard_config, get_dashboard_persons
+from vbv_lernwelt.dashboard.views import get_dashboard_config, get_dashboard_persons, get_mentee_count, \
+    get_mentor_open_tasks_count
 from vbv_lernwelt.edoniq_test.views import (
     export_students,
     export_students_and_trainers,
@@ -58,9 +62,6 @@ from vbv_lernwelt.importer.views import (
 )
 from vbv_lernwelt.media_files.views import user_image
 from vbv_lernwelt.notify.views import email_notification_settings
-from wagtail import urls as wagtail_urls
-from wagtail.admin import urls as wagtailadmin_urls
-from wagtail.documents import urls as media_library_urls
 
 
 class SignedIntConverter(IntConverter):
@@ -120,6 +121,9 @@ urlpatterns = [
     # dashboard
     path(r"api/dashboard/persons/", get_dashboard_persons, name="get_dashboard_persons"),
     path(r"api/dashboard/config/", get_dashboard_config, name="get_dashboard_config"),
+    path(r"api/dashboard/course/<str:course_id>/mentees/", get_mentee_count, name="get_mentee_count"),
+    path(r"api/dashboard/course/<str:course_id>/open_tasks/", get_mentor_open_tasks_count,
+         name="get_mentor_open_tasks_count"),
 
     # course
     path(r"api/course/sessions/", get_course_sessions, name="get_course_sessions"),
diff --git a/server/vbv_lernwelt/dashboard/views.py b/server/vbv_lernwelt/dashboard/views.py
index 1b9ec323..7b489862 100644
--- a/server/vbv_lernwelt/dashboard/views.py
+++ b/server/vbv_lernwelt/dashboard/views.py
@@ -6,11 +6,13 @@ from rest_framework.decorators import api_view
 from rest_framework.exceptions import PermissionDenied
 from rest_framework.response import Response
 
+from vbv_lernwelt.assignment.models import AssignmentCompletion, AssignmentCompletionStatus
 from vbv_lernwelt.core.models import User
-from vbv_lernwelt.course.models import CourseSession, CourseSessionUser
+from vbv_lernwelt.course.models import CourseSession, CourseSessionUser, CourseConfiguration
 from vbv_lernwelt.course.views import logger
 from vbv_lernwelt.course_session_group.models import CourseSessionGroup
 from vbv_lernwelt.learning_mentor.models import LearningMentor
+from vbv_lernwelt.self_evaluation_feedback.models import SelfEvaluationFeedback
 
 
 class WidgetType(Enum):
@@ -242,7 +244,7 @@ def get_widgets_for_course(
     return widgets
 
 
-def get_role_and_mentor_key(
+def get_role_key_and_mentor(
     course_sessions: List[CourseSessionWithRoles], is_uk: bool, is_vv: bool
 ) -> tuple[RoleKeyType, bool]:
     roles = set()
@@ -266,7 +268,7 @@ def get_role_and_mentor_key(
     return role, is_mentor
 
 
-def sort_course_sessions_by_course(
+def collect_course_sessions_by_course(
     course_sessions: List[CourseSessionWithRoles],
 ) -> dict:
     course_sessions_by_course = {}
@@ -298,11 +300,11 @@ def get_course_config(
     course_sessions: List[CourseSessionWithRoles],
 ) -> List[CourseConfig]:
     course_configs = []
-    cs_by_course = sort_course_sessions_by_course(course_sessions)
+    cs_by_course = collect_course_sessions_by_course(course_sessions)
     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_and_mentor_key(cs_in_course, is_uk, is_vv)
+        role_key, is_mentor = 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(
@@ -339,3 +341,54 @@ def get_dashboard_config(request):
     except Exception as e:
         logger.error(e, exc_info=True)
         return Response({"error": str(e)}, status=404)
+
+
+@api_view(["GET"])
+def get_mentee_count(request, course_id: str):
+    try:
+        count = CourseSessionUser.objects.filter(
+            participants__mentor=request.user, course_session__course__id=course_id
+        ).count()
+
+        return Response(
+            status=200,
+            data={"mentee_count": count},
+        )
+    except PermissionDenied as e:
+        raise e
+    except Exception as e:
+        logger.error(e, exc_info=True)
+        return Response({"error": str(e)}, status=404)
+
+
+@api_view(["GET"])
+def get_mentor_open_tasks_count(request, course_id: str):
+    try:
+        open_assigment_count = 0
+        open_feedback_count = 0
+
+        course_configuration = CourseConfiguration.objects.get(course_id=course_id)
+
+        if course_configuration.is_vv:
+            open_assigment_count = AssignmentCompletion.objects.filter(
+                course_session__course__id=course_id,
+                completion_status=AssignmentCompletionStatus.SUBMITTED.value,
+                evaluation_user=request.user,  # noqa
+                assignment_user__coursesessionuser__participants__mentor=request.user,
+            ).count()
+
+            open_feedback_count = SelfEvaluationFeedback.objects.filter(
+                feedback_provider_user=request.user,  # noqa
+                feedback_requester_user__coursesessionuser__participants__mentor=request.user,
+                feedback_submitted=False,
+            ).count()
+
+        return Response(
+            status=200,
+            data={"open_task_count": open_assigment_count + open_feedback_count},
+        )
+    except PermissionDenied as e:
+        raise e
+    except Exception as e:
+        logger.error(e, exc_info=True)
+        return Response({"error": str(e)}, status=404)

From 58cf852842a6da8e1ad140f7322daa482fa089e7 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Tue, 9 Apr 2024 11:15:58 +0200
Subject: [PATCH 17/82] WIP: Style components

---
 .../src/components/dashboard/CompetenceSummary.vue | 14 ++++++--------
 client/src/components/dashboard/CoursePanel.vue    | 12 +++++++-----
 .../dashboard/MentorCompetenceSummary.vue          |  9 +++++----
 .../src/components/dashboard/MentorMenteeCount.vue |  3 ++-
 .../components/dashboard/MentorOpenTasksCount.vue  |  1 +
 server/config/urls.py                              | 14 +++++++++-----
 .../dashboard/graphql/types/assignment.py          |  6 +++++-
 server/vbv_lernwelt/dashboard/views.py             | 11 +++++++++--
 8 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/client/src/components/dashboard/CompetenceSummary.vue b/client/src/components/dashboard/CompetenceSummary.vue
index 9d2a9164..6e073e5b 100644
--- a/client/src/components/dashboard/CompetenceSummary.vue
+++ b/client/src/components/dashboard/CompetenceSummary.vue
@@ -24,13 +24,11 @@ onMounted(async () => {
 </script>
 
 <template>
-  <div v-if="competence" class="mb-14 space-y-8">
-    <div class="flex flex-col space-y-7 bg-white p-6">
-      <CompetenceSummaryBox
-        :fail-count="competence.fail_count"
-        :success-count="competence.success_count"
-        :details-link="competenceCriteriaUrl"
-      />
-    </div>
+  <div v-if="competence" class="mb-14">
+    <CompetenceSummaryBox
+      :fail-count="competence.fail_count"
+      :success-count="competence.success_count"
+      :details-link="competenceCriteriaUrl"
+    />
   </div>
 </template>
diff --git a/client/src/components/dashboard/CoursePanel.vue b/client/src/components/dashboard/CoursePanel.vue
index dc5d960b..638b6d17 100644
--- a/client/src/components/dashboard/CoursePanel.vue
+++ b/client/src/components/dashboard/CoursePanel.vue
@@ -37,11 +37,13 @@ function hasWidget(widget: WidgetType) {
 
 <template>
   <div v-if="courseConfig" class="mb-14 space-y-8">
-    <div class="flex flex-col space-y-4 bg-white p-6">
-      <h3 class="mb-4 text-3xl">{{ courseName }}</h3>
-      <p>
-        <span class="rounded bg-gray-300 px-2 py-1">{{ courseConfig.role_key }}</span>
-      </p>
+    <div class="flex flex-col space-y-8 bg-white p-6">
+      <div class="border-b border-gray-300 pb-8">
+        <h3 class="mb-4 text-3xl">{{ courseName }}</h3>
+        <p>
+          <span class="rounded bg-gray-300 px-2 py-1">{{ courseConfig.role_key }}</span>
+        </p>
+      </div>
       <LearningPathDiagram
         v-if="
           hasWidget('ProgressWidget') &&
diff --git a/client/src/components/dashboard/MentorCompetenceSummary.vue b/client/src/components/dashboard/MentorCompetenceSummary.vue
index 24b4dc4d..4a06a135 100644
--- a/client/src/components/dashboard/MentorCompetenceSummary.vue
+++ b/client/src/components/dashboard/MentorCompetenceSummary.vue
@@ -17,21 +17,22 @@ onMounted(async () => {
 
 <template>
   <div v-if="summary" class="w-[325px]">
+    <h3 class="mb-4 text-base">{{ $t("Kompetenznachweise") }}</h3>
     <div class="flex flex-row space-x-3 bg-white">
       <div
-        class="flex h-[74px] items-center justify-center px-3 py-1 text-3xl font-bold"
+        class="flex h-[47px] items-center justify-center py-1 pr-3 text-3xl font-bold"
       >
         <span>{{ summary.summary.total_passed }}</span>
       </div>
-      <p class="ml-3 mt-0 leading-[74px]">{{ $t("Bestanden") }}</p>
+      <p class="ml-3 mt-0 leading-[47px]">{{ $t("Bestanden") }}</p>
     </div>
     <div class="flex flex-row space-x-3 bg-white pb-6">
       <div
-        class="flex h-[74px] items-center justify-center px-3 py-1 text-3xl font-bold"
+        class="flex h-[47px] items-center justify-center py-1 pr-3 text-3xl font-bold"
       >
         <span>{{ summary.summary.total_failed }}</span>
       </div>
-      <p class="ml-3 mt-0 leading-[74px]">{{ $t("Nicht bestanden") }}</p>
+      <p class="ml-3 mt-0 leading-[47px]">{{ $t("Nicht bestanden") }}</p>
     </div>
     <p>{{ $t("Details anschauen") }}</p>
   </div>
diff --git a/client/src/components/dashboard/MentorMenteeCount.vue b/client/src/components/dashboard/MentorMenteeCount.vue
index 25c8a953..79597ff1 100644
--- a/client/src/components/dashboard/MentorMenteeCount.vue
+++ b/client/src/components/dashboard/MentorMenteeCount.vue
@@ -16,9 +16,10 @@ onMounted(async () => {
 
 <template>
   <div class="w-[325px]">
+    <h3 class="mb-4 text-base">{{ $t("Personen") }}</h3>
     <div class="flex flex-row space-x-3 bg-white pb-6">
       <div
-        class="flex h-[74px] items-center justify-center px-3 py-1 text-3xl font-bold"
+        class="flex h-[74px] items-center justify-center py-1 pr-3 text-3xl font-bold"
       >
         <span>{{ menteeCount }}</span>
       </div>
diff --git a/client/src/components/dashboard/MentorOpenTasksCount.vue b/client/src/components/dashboard/MentorOpenTasksCount.vue
index bb310a0f..4136cbf4 100644
--- a/client/src/components/dashboard/MentorOpenTasksCount.vue
+++ b/client/src/components/dashboard/MentorOpenTasksCount.vue
@@ -16,6 +16,7 @@ onMounted(async () => {
 
 <template>
   <div class="w-[325px]">
+    <h3 class="mb-4 text-base">{{ $t("Zu erledigen") }}</h3>
     <div class="flex flex-row space-x-3 bg-white pb-6">
       <div
         class="flex h-[74px] w-[74px] items-center justify-center rounded-full border-2 border-green-500 px-3 py-1 text-3xl font-bold"
diff --git a/server/config/urls.py b/server/config/urls.py
index 582eced0..6155a093 100644
--- a/server/config/urls.py
+++ b/server/config/urls.py
@@ -10,9 +10,6 @@ from django.views import defaults as default_views
 from django.views.decorators.csrf import csrf_exempt
 from django_ratelimit.exceptions import Ratelimited
 from graphene_django.views import GraphQLView
-from wagtail import urls as wagtail_urls
-from wagtail.admin import urls as wagtailadmin_urls
-from wagtail.documents import urls as media_library_urls
 
 from vbv_lernwelt.api.directory import list_entities
 from vbv_lernwelt.api.user import get_profile, me_user_view, post_avatar
@@ -42,8 +39,12 @@ from vbv_lernwelt.course.views import (
     request_course_completion_for_user,
 )
 from vbv_lernwelt.course_session.views import get_course_session_documents
-from vbv_lernwelt.dashboard.views import get_dashboard_config, get_dashboard_persons, get_mentee_count, \
-    get_mentor_open_tasks_count
+from vbv_lernwelt.dashboard.views import (
+    get_dashboard_config,
+    get_dashboard_persons,
+    get_mentee_count,
+    get_mentor_open_tasks_count,
+)
 from vbv_lernwelt.edoniq_test.views import (
     export_students,
     export_students_and_trainers,
@@ -62,6 +63,9 @@ from vbv_lernwelt.importer.views import (
 )
 from vbv_lernwelt.media_files.views import user_image
 from vbv_lernwelt.notify.views import email_notification_settings
+from wagtail import urls as wagtail_urls
+from wagtail.admin import urls as wagtailadmin_urls
+from wagtail.documents import urls as media_library_urls
 
 
 class SignedIntConverter(IntConverter):
diff --git a/server/vbv_lernwelt/dashboard/graphql/types/assignment.py b/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
index 214fcc4e..be2160fc 100644
--- a/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
+++ b/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
@@ -59,7 +59,11 @@ def create_assignment_summary(course_id, metrics) -> AssignmentStatisticsSummary
 
     if not completed_metrics:
         return AssignmentStatisticsSummaryType(
-            _id=course_id, completed_count=0, average_passed=0, total_passed=0, total_failed=0  # noqa
+            _id=course_id,
+            completed_count=0,
+            average_passed=0,
+            total_passed=0,
+            total_failed=0,  # noqa
         )
 
     completed_count = len(completed_metrics)
diff --git a/server/vbv_lernwelt/dashboard/views.py b/server/vbv_lernwelt/dashboard/views.py
index 7b489862..c4d57396 100644
--- a/server/vbv_lernwelt/dashboard/views.py
+++ b/server/vbv_lernwelt/dashboard/views.py
@@ -6,9 +6,16 @@ from rest_framework.decorators import api_view
 from rest_framework.exceptions import PermissionDenied
 from rest_framework.response import Response
 
-from vbv_lernwelt.assignment.models import AssignmentCompletion, AssignmentCompletionStatus
+from vbv_lernwelt.assignment.models import (
+    AssignmentCompletion,
+    AssignmentCompletionStatus,
+)
 from vbv_lernwelt.core.models import User
-from vbv_lernwelt.course.models import CourseSession, CourseSessionUser, CourseConfiguration
+from vbv_lernwelt.course.models import (
+    CourseConfiguration,
+    CourseSession,
+    CourseSessionUser,
+)
 from vbv_lernwelt.course.views import logger
 from vbv_lernwelt.course_session_group.models import CourseSessionGroup
 from vbv_lernwelt.learning_mentor.models import LearningMentor

From a375559670dc011627a8324923b64e417967680c Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Tue, 9 Apr 2024 13:48:44 +0200
Subject: [PATCH 18/82] WIP: Update Lernbegleitung copy [skip ci]

---
 .../cockpit/SubmissionsOverview.vue           |  1 -
 .../components/header/MainNavigationBar.vue   |  5 ++-
 client/src/components/header/MobileMenu.vue   |  5 ++-
 .../components/learningMentor/MyMentors.vue   | 14 +++----
 .../NoMentorInformationPanel.vue              | 11 ++---
 client/src/composables.ts                     | 42 +++++++++++++++++++
 client/src/types.ts                           |  1 +
 server/vbv_lernwelt/course/serializers.py     |  1 +
 8 files changed, 63 insertions(+), 17 deletions(-)

diff --git a/client/src/components/cockpit/SubmissionsOverview.vue b/client/src/components/cockpit/SubmissionsOverview.vue
index a4f894fd..104b66ea 100644
--- a/client/src/components/cockpit/SubmissionsOverview.vue
+++ b/client/src/components/cockpit/SubmissionsOverview.vue
@@ -1,4 +1,3 @@
-2
 <script setup lang="ts">
 import AssignmentSubmissionProgress from "@/components/assignment/AssignmentSubmissionProgress.vue";
 import type {
diff --git a/client/src/components/header/MainNavigationBar.vue b/client/src/components/header/MainNavigationBar.vue
index 59e83de2..3d432ac1 100644
--- a/client/src/components/header/MainNavigationBar.vue
+++ b/client/src/components/header/MainNavigationBar.vue
@@ -22,6 +22,7 @@ import {
   getLearningPathUrl,
   getMediaCenterUrl,
 } from "@/utils/utils";
+import { useMentorTexts } from "@/composables";
 
 log.debug("MainNavigationBar created");
 
@@ -121,6 +122,8 @@ const hasLearningMentor = computed(() => {
   const courseSession = courseSessionsStore.currentCourseSession;
   return courseSession.actions.includes("learning-mentor");
 });
+
+const mentorTabTitle = useMentorTexts().mentorTabTitle;
 </script>
 
 <template>
@@ -265,7 +268,7 @@ const hasLearningMentor = computed(() => {
                     class="nav-item"
                     :class="{ 'nav-item--active': inLearningMentor() }"
                   >
-                    {{ t("a.Lernbegleitung") }}
+                    {{ t(mentorTabTitle) }}
                   </router-link>
                 </div>
               </template>
diff --git a/client/src/components/header/MobileMenu.vue b/client/src/components/header/MobileMenu.vue
index 4e82fdc3..a4e6754a 100644
--- a/client/src/components/header/MobileMenu.vue
+++ b/client/src/components/header/MobileMenu.vue
@@ -10,6 +10,7 @@ import {
   getLearningPathUrl,
   getMediaCenterUrl,
 } from "@/utils/utils";
+import { useMentorTexts } from "@/composables";
 
 const router = useRouter();
 
@@ -36,6 +37,8 @@ const clickLink = (to: string | undefined) => {
     emit("closemodal");
   }
 };
+
+const mentorTabTitle = useMentorTexts().mentorTabTitle;
 </script>
 
 <template>
@@ -97,7 +100,7 @@ const clickLink = (to: string | undefined) => {
                   data-cy="navigation-mobile-mentor-link"
                   @click="clickLink(getLearningMentorUrl(courseSession.course.slug))"
                 >
-                  {{ $t("a.Lernbegleitung") }}
+                  {{ $t(mentorTabTitle) }}
                 </button>
               </li>
 
diff --git a/client/src/components/learningMentor/MyMentors.vue b/client/src/components/learningMentor/MyMentors.vue
index 3e47bbf2..bde21522 100644
--- a/client/src/components/learningMentor/MyMentors.vue
+++ b/client/src/components/learningMentor/MyMentors.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { useCurrentCourseSession } from "@/composables";
+import { useCurrentCourseSession, useMentorTexts } from "@/composables";
 import ItModal from "@/components/ui/ItModal.vue";
 import { computed, ref } from "vue";
 import { useCSRFFetch } from "@/fetchHelpers";
@@ -68,19 +68,21 @@ const inviteMentor = async () => {
   showInvitationModal.value = false;
   inviteeEmail.value = "";
 };
+
+const { myLearningMentors, inviteLearningMentor, noLearningMentors } = useMentorTexts();
 </script>
 
 <template>
   <div v-if="!isLoading" class="bg-gray-200">
     <div class="flex flex-row items-center justify-between py-6">
-      <h2 class="heading-2">{{ $t("a.Meine Lernbegleitung") }}</h2>
+      <h2 class="heading-2">{{ $t(myLearningMentors) }}</h2>
       <div>
         <button
           class="btn-secondary flex items-center"
           @click="showInvitationModal = true"
         >
           <it-icon-add class="it-icon mr-2 h-6 w-6" />
-          {{ $t("a.Neue Lernbegleitung einladen") }}
+          {{ $t(inviteLearningMentor) }}
         </button>
       </div>
     </div>
@@ -143,16 +145,14 @@ const inviteMentor = async () => {
           <div class="j mx-1 my-3 flex w-fit items-center space-x-1 bg-sky-200 p-4">
             <it-icon-info class="it-icon mr-2 h-6 w-6 text-sky-700" />
             <span>
-              {{
-                $t("a.Aktuell hast du noch keine Person als Lernbegleitung eingeladen.")
-              }}
+              {{ $t(noLearningMentors) }}
             </span>
           </div>
         </div>
       </main>
     </div>
     <ItModal v-model="showInvitationModal">
-      <template #title>{{ $t("a.Neue Lernbegleitung einladen") }}</template>
+      <template #title>{{ $t(inviteLearningMentor) }}</template>
       <template #body>
         <div class="flex flex-col">
           <label for="mentor-email">{{ $t("a.E-Mail Adresse") }}</label>
diff --git a/client/src/components/learningMentor/NoMentorInformationPanel.vue b/client/src/components/learningMentor/NoMentorInformationPanel.vue
index f755d216..a3077c04 100644
--- a/client/src/components/learningMentor/NoMentorInformationPanel.vue
+++ b/client/src/components/learningMentor/NoMentorInformationPanel.vue
@@ -1,7 +1,8 @@
 <script setup lang="ts">
-import { useCurrentCourseSession } from "@/composables";
+import { useCurrentCourseSession, useMentorTexts } from "@/composables";
 
 const currentCourseSession = useCurrentCourseSession();
+const { actionNoLearningMentors, inviteLearningMentorShort } = useMentorTexts();
 </script>
 
 <template>
@@ -9,11 +10,7 @@ const currentCourseSession = useCurrentCourseSession();
     <it-icon-info class="it-icon h-6 w-6 text-sky-700" />
     <div>
       <div class="mb-4">
-        {{
-          $t(
-            "a.Aktuell hast du noch keine Person als Lernbegleitung eingeladen. Lade jetzt jemanden ein."
-          )
-        }}
+        {{ $t(actionNoLearningMentors) }}
       </div>
       <router-link
         :to="{
@@ -22,7 +19,7 @@ const currentCourseSession = useCurrentCourseSession();
         }"
         class="btn-blue px-4 py-2 font-bold"
       >
-        {{ $t("a.Lernbegleitung einladen") }}
+        {{ $t(inviteLearningMentorShort) }}
       </router-link>
     </div>
   </div>
diff --git a/client/src/composables.ts b/client/src/composables.ts
index d778f90c..bb37d1de 100644
--- a/client/src/composables.ts
+++ b/client/src/composables.ts
@@ -510,3 +510,45 @@ export function useDashboardPersons() {
     loading,
   };
 }
+
+export function useMentorTexts() {
+  const texts = computed(() => {
+    try {
+      const is_uk =
+        useCourseSessionsStore().currentCourseSession?.course.configuration.is_uk;
+      const mentorTabTitle = is_uk ? "Praxisbildner" : "a.Lernbegleitung";
+      const myLearningMentors = is_uk ? "Meine Praxisbildner" : "Meine Lernbegleiter";
+      const inviteLearningMentor = is_uk
+        ? "Neuen Praxisbildner einladen"
+        : "a.Neue Lernbegleitung einladen";
+      const inviteLearningMentorShort = is_uk
+        ? "Praxisbildner einladen"
+        : "Lernbegleitung einladen";
+      const noLearningMentors = is_uk
+        ? "a.Aktuell hast du noch keine Person als Praxisbildner eingeladen."
+        : "a.Aktuell hast du noch keine Person als Lernbegleitung eingeladen.";
+      const actionNoLearningMentors = is_uk
+        ? "a.Aktuell hast du noch keine Person als Praxisbildner eingeladen. Lade jetzt jemanden ein."
+        : "a.Aktuell hast du noch keine Person als Lernbegleitung eingeladen. Lade jetzt jemanden ein.";
+      return {
+        mentorTabTitle,
+        myLearningMentors,
+        inviteLearningMentor,
+        inviteLearningMentorShort,
+        noLearningMentors,
+        actionNoLearningMentors,
+      };
+    } catch (e) {
+      return {
+        mentorTabTitle: "",
+        myLearningMentors: "",
+        inviteLearningMentor: "",
+        inviteLearningMentorShort: "",
+        noLearningMentors: "",
+        actionNoLearningMentors: "",
+      };
+    }
+  });
+
+  return { ...texts.value };
+}
diff --git a/client/src/types.ts b/client/src/types.ts
index 70abed84..90b75727 100644
--- a/client/src/types.ts
+++ b/client/src/types.ts
@@ -193,6 +193,7 @@ export interface CourseConfiguration {
   enable_circle_documents: boolean;
   enable_learning_mentor: boolean;
   enable_competence_certificates: boolean;
+  is_uk: boolean;
 }
 
 export interface Course {
diff --git a/server/vbv_lernwelt/course/serializers.py b/server/vbv_lernwelt/course/serializers.py
index db35a0a6..7b8bffc7 100644
--- a/server/vbv_lernwelt/course/serializers.py
+++ b/server/vbv_lernwelt/course/serializers.py
@@ -24,6 +24,7 @@ class CourseConfigurationSerializer(serializers.ModelSerializer):
             "enable_circle_documents",
             "enable_learning_mentor",
             "enable_competence_certificates",
+            "is_uk",
         ]
 
 

From 66220cdfcb49e58c605aa76b9ead72b5c3124c98 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Tue, 9 Apr 2024 15:29:46 +0200
Subject: [PATCH 19/82] WIP: Use Basebox

---
 client/src/components/dashboard/BaseBox.vue   |  2 +-
 .../dashboard/MentorCompetenceSummary.vue     | 40 ++++++++++---------
 .../dashboard/MentorMenteeCount.vue           | 26 +++++++-----
 .../dashboard/MentorOpenTasksCount.vue        | 24 ++++++-----
 4 files changed, 53 insertions(+), 39 deletions(-)

diff --git a/client/src/components/dashboard/BaseBox.vue b/client/src/components/dashboard/BaseBox.vue
index e8c3aec3..f05a0bc9 100644
--- a/client/src/components/dashboard/BaseBox.vue
+++ b/client/src/components/dashboard/BaseBox.vue
@@ -5,7 +5,7 @@ defineProps<{
 </script>
 
 <template>
-  <div class="flex flex-col space-y-4 bg-white p-6">
+  <div class="flex flex-col space-y-4 bg-white">
     <h4 class="mb-1 font-bold">
       <slot name="title"></slot>
     </h4>
diff --git a/client/src/components/dashboard/MentorCompetenceSummary.vue b/client/src/components/dashboard/MentorCompetenceSummary.vue
index 4a06a135..1de419b6 100644
--- a/client/src/components/dashboard/MentorCompetenceSummary.vue
+++ b/client/src/components/dashboard/MentorCompetenceSummary.vue
@@ -2,6 +2,7 @@
 import { onMounted, ref, Ref } from "vue";
 import { fetchMentorCompetenceSummary } from "@/services/dashboard";
 import { AssignmentsStatisticsType } from "@/gql/graphql";
+import BaseBox from "@/components/dashboard/BaseBox.vue";
 
 const props = defineProps<{
   courseId: string;
@@ -17,23 +18,26 @@ onMounted(async () => {
 
 <template>
   <div v-if="summary" class="w-[325px]">
-    <h3 class="mb-4 text-base">{{ $t("Kompetenznachweise") }}</h3>
-    <div class="flex flex-row space-x-3 bg-white">
-      <div
-        class="flex h-[47px] items-center justify-center py-1 pr-3 text-3xl font-bold"
-      >
-        <span>{{ summary.summary.total_passed }}</span>
-      </div>
-      <p class="ml-3 mt-0 leading-[47px]">{{ $t("Bestanden") }}</p>
-    </div>
-    <div class="flex flex-row space-x-3 bg-white pb-6">
-      <div
-        class="flex h-[47px] items-center justify-center py-1 pr-3 text-3xl font-bold"
-      >
-        <span>{{ summary.summary.total_failed }}</span>
-      </div>
-      <p class="ml-3 mt-0 leading-[47px]">{{ $t("Nicht bestanden") }}</p>
-    </div>
-    <p>{{ $t("Details anschauen") }}</p>
+    <BaseBox :details-link="'foo'" data-cy="dashboard.mentor.competenceSummary">
+      <template #title>{{ $t("Kompetenznachweise") }}</template>
+      <template #content>
+        <div class="flex flex-row space-x-3 bg-white">
+          <div
+            class="flex h-[47px] items-center justify-center py-1 pr-3 text-3xl font-bold"
+          >
+            <span>{{ summary.summary.total_passed }}</span>
+          </div>
+          <p class="ml-3 mt-0 leading-[47px]">{{ $t("Bestanden") }}</p>
+        </div>
+        <div class="flex flex-row space-x-3 bg-white pb-6">
+          <div
+            class="flex h-[47px] items-center justify-center py-1 pr-3 text-3xl font-bold"
+          >
+            <span>{{ summary.summary.total_failed }}</span>
+          </div>
+          <p class="ml-3 mt-0 leading-[47px]">{{ $t("Nicht bestanden") }}</p>
+        </div>
+      </template>
+    </BaseBox>
   </div>
 </template>
diff --git a/client/src/components/dashboard/MentorMenteeCount.vue b/client/src/components/dashboard/MentorMenteeCount.vue
index 79597ff1..963d2f40 100644
--- a/client/src/components/dashboard/MentorMenteeCount.vue
+++ b/client/src/components/dashboard/MentorMenteeCount.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { onMounted, ref, Ref } from "vue";
 import { fetchMenteeCount } from "@/services/dashboard";
+import BaseBox from "@/components/dashboard/BaseBox.vue";
 
 const props = defineProps<{
   courseId: string;
@@ -16,15 +17,20 @@ onMounted(async () => {
 
 <template>
   <div class="w-[325px]">
-    <h3 class="mb-4 text-base">{{ $t("Personen") }}</h3>
-    <div class="flex flex-row space-x-3 bg-white pb-6">
-      <div
-        class="flex h-[74px] items-center justify-center py-1 pr-3 text-3xl font-bold"
-      >
-        <span>{{ menteeCount }}</span>
-      </div>
-      <p class="ml-3 mt-0 leading-[74px]">{{ $t("Personen, die du begleitest") }}</p>
-    </div>
-    <p>{{ $t("Details anschauen") }}</p>
+    <BaseBox :details-link="'foo'" data-cy="dashboard.mentor.competenceSummary">
+      <template #title>{{ $t("Elemente zu erledigen") }}</template>
+      <template #content>
+        <div class="flex flex-row space-x-3 bg-white pb-6">
+          <div
+            class="flex h-[74px] items-center justify-center py-1 pr-3 text-3xl font-bold"
+          >
+            <span>{{ menteeCount }}</span>
+          </div>
+          <p class="ml-3 mt-0 leading-[74px]">
+            {{ $t("Personen, die du begleitest") }}
+          </p>
+        </div>
+      </template>
+    </BaseBox>
   </div>
 </template>
diff --git a/client/src/components/dashboard/MentorOpenTasksCount.vue b/client/src/components/dashboard/MentorOpenTasksCount.vue
index 4136cbf4..feb9231f 100644
--- a/client/src/components/dashboard/MentorOpenTasksCount.vue
+++ b/client/src/components/dashboard/MentorOpenTasksCount.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { onMounted, ref, Ref } from "vue";
 import { fetchOpenTasksCount } from "@/services/dashboard";
+import BaseBox from "@/components/dashboard/BaseBox.vue";
 
 const props = defineProps<{
   courseId: string;
@@ -16,15 +17,18 @@ onMounted(async () => {
 
 <template>
   <div class="w-[325px]">
-    <h3 class="mb-4 text-base">{{ $t("Zu erledigen") }}</h3>
-    <div class="flex flex-row space-x-3 bg-white pb-6">
-      <div
-        class="flex h-[74px] w-[74px] items-center justify-center rounded-full border-2 border-green-500 px-3 py-1 text-3xl font-bold"
-      >
-        <span>{{ openTaskCount }}</span>
-      </div>
-      <p class="ml-3 mt-0 leading-[74px]">{{ $t("Elemente zu erledigen") }}</p>
-    </div>
-    <p>{{ $t("Details anschauen") }}</p>
+    <BaseBox :details-link="'foo'" data-cy="dashboard.mentor.competenceSummary">
+      <template #title>{{ $t("Zu erledigen") }}</template>
+      <template #content>
+        <div class="flex flex-row space-x-3 bg-white pb-6">
+          <div
+            class="flex h-[74px] w-[74px] items-center justify-center rounded-full border-2 border-green-500 px-3 py-1 text-3xl font-bold"
+          >
+            <span>{{ openTaskCount }}</span>
+          </div>
+          <p class="ml-3 mt-0 leading-[74px]">{{ $t("Elemente zu erledigen") }}</p>
+        </div>
+      </template>
+    </BaseBox>
   </div>
 </template>

From 2865328a8e6eb3e20923a440c6f9c911bd31d475 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Tue, 9 Apr 2024 15:30:26 +0200
Subject: [PATCH 20/82] WIP: Add preview

---
 .../dashboard/CompetenceSummary.vue           |  2 +-
 .../src/components/dashboard/CoursePanel.vue  | 49 ++++++++++++++++---
 server/vbv_lernwelt/dashboard/views.py        |  2 +-
 3 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/client/src/components/dashboard/CompetenceSummary.vue b/client/src/components/dashboard/CompetenceSummary.vue
index 6e073e5b..df9930ea 100644
--- a/client/src/components/dashboard/CompetenceSummary.vue
+++ b/client/src/components/dashboard/CompetenceSummary.vue
@@ -24,7 +24,7 @@ onMounted(async () => {
 </script>
 
 <template>
-  <div v-if="competence" class="mb-14">
+  <div v-if="competence">
     <CompetenceSummaryBox
       :fail-count="competence.fail_count"
       :success-count="competence.success_count"
diff --git a/client/src/components/dashboard/CoursePanel.vue b/client/src/components/dashboard/CoursePanel.vue
index 638b6d17..db5e8054 100644
--- a/client/src/components/dashboard/CoursePanel.vue
+++ b/client/src/components/dashboard/CoursePanel.vue
@@ -7,6 +7,7 @@ import AssignmentSummary from "@/components/dashboard/AssignmentSummary.vue";
 import MentorOpenTasksCount from "@/components/dashboard/MentorOpenTasksCount.vue";
 import MentorMenteeCount from "@/components/dashboard/MentorMenteeCount.vue";
 import MentorCompetenceSummary from "@/components/dashboard/MentorCompetenceSummary.vue";
+import { getLearningPathUrl } from "@/utils/utils";
 
 const mentorWidgets = [
   "MentorTasksWidget",
@@ -33,28 +34,62 @@ const numberOfProgressWidgets = computed(() => {
 function hasWidget(widget: WidgetType) {
   return props.courseConfig.widgets.includes(widget);
 }
+
+function buttonLink(): string {
+  if (props.courseConfig?.role_key === "Member") {
+    return getLearningPathUrl(props.courseConfig?.course_slug);
+  } else if (props.courseConfig?.role_key === "Expert") {
+    return "btn-secondary";
+  } else if (props.courseConfig?.role_key === "Supervisor") {
+    return "btn-secondary";
+  }
+}
+
+function hasActionButton(): boolean {
+  return props.courseConfig.role_key !== "MentorUK";
+}
 </script>
 
 <template>
   <div v-if="courseConfig" class="mb-14 space-y-8">
     <div class="flex flex-col space-y-8 bg-white p-6">
       <div class="border-b border-gray-300 pb-8">
-        <h3 class="mb-4 text-3xl">{{ courseName }}</h3>
+        <div class="flex flex-row justify-between">
+          <h3 class="mb-4 text-3xl">{{ courseName }}</h3>
+          <a v-if="hasActionButton()" :href="buttonLink()" class="btn btn-sm btn-blue">
+            foo
+          </a>
+        </div>
         <p>
           <span class="rounded bg-gray-300 px-2 py-1">{{ courseConfig.role_key }}</span>
+          <router-link
+            v-if="courseConfig.has_preview"
+            :to="getLearningPathUrl(courseConfig.course_slug)"
+            class="inline-block pl-6"
+            target="_blank"
+          >
+            <div class="flex items-center">
+              <span>{{ $t("a.VorschauTeilnehmer") }}</span>
+              <it-icon-external-link class="ml-1 !h-4 !w-4" />
+            </div>
+          </router-link>
         </p>
       </div>
-      <LearningPathDiagram
+      <div
         v-if="
           hasWidget('ProgressWidget') &&
           courseConfig.session_to_continue_id &&
           courseSlug
         "
-        :key="courseSlug"
-        :course-slug="courseSlug"
-        :course-session-id="courseConfig.session_to_continue_id"
-        diagram-type="horizontal"
-      ></LearningPathDiagram>
+        class="border-b border-gray-300 pb-8"
+      >
+        <LearningPathDiagram
+          :key="courseSlug"
+          :course-slug="courseSlug"
+          :course-session-id="courseConfig.session_to_continue_id"
+          diagram-type="horizontal"
+        ></LearningPathDiagram>
+      </div>
       <div v-if="numberOfProgressWidgets" class="flex flex-col flex-wrap">
         <CompetenceSummary
           v-if="hasWidget('CompetenceWidget')"
diff --git a/server/vbv_lernwelt/dashboard/views.py b/server/vbv_lernwelt/dashboard/views.py
index c4d57396..bd76f946 100644
--- a/server/vbv_lernwelt/dashboard/views.py
+++ b/server/vbv_lernwelt/dashboard/views.py
@@ -287,7 +287,7 @@ def collect_course_sessions_by_course(
 
 
 def has_preview(role_key: RoleKeyType) -> bool:
-    return role_key in [RoleKeyType.MENTOR_UK, RoleKeyType.MENTOR_VV]
+    return role_key in [RoleKeyType.MENTOR_VV, RoleKeyType.MENTOR_UK] and not role_key == RoleKeyType.MEMBER
 
 
 def get_newest_cs(

From 14474d1799a7980d6a742ccde9044ce2f5efca7f Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Tue, 9 Apr 2024 16:34:27 +0200
Subject: [PATCH 21/82] WIP: Align widgets [skip ci]

---
 .../AssignmentProgressSummaryBox.vue          |  4 ++--
 .../dashboard/AssignmentSummary.vue           |  4 ++--
 .../dashboard/CompetenceSummary.vue           |  2 +-
 .../dashboard/CompetenceSummaryBox.vue        | 10 ++++++----
 .../src/components/dashboard/CoursePanel.vue  | 19 +++++++++++--------
 client/src/pages/dashboard/DashboardPage.vue  | 12 ++++++++++++
 6 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/client/src/components/dashboard/AssignmentProgressSummaryBox.vue b/client/src/components/dashboard/AssignmentProgressSummaryBox.vue
index b76e0b8b..07dcd27a 100644
--- a/client/src/components/dashboard/AssignmentProgressSummaryBox.vue
+++ b/client/src/components/dashboard/AssignmentProgressSummaryBox.vue
@@ -24,14 +24,14 @@ const progress = computed(() => ({
       <div class="flex items-center">
         <i18next :translation="$t('a.NUMBER Elemente abgeschlossen')">
           <template #NUMBER>
-            <span class="mr-3 text-4xl font-bold">{{ totalAssignments }}</span>
+            <span class="mr-3 text-xl font-bold">{{ totalAssignments }}</span>
           </template>
         </i18next>
       </div>
       <div class="flex items-center">
         <i18next :translation="$t('a.xOfY Punkten erreicht')">
           <template #xOfY>
-            <span class="mr-3 text-4xl font-bold">
+            <span class="mr-3 text-xl font-bold">
               {{
                 $t("a.VALUE von MAXIMUM", {
                   VALUE: props.achievedPointsCount,
diff --git a/client/src/components/dashboard/AssignmentSummary.vue b/client/src/components/dashboard/AssignmentSummary.vue
index 5ce253e3..27839360 100644
--- a/client/src/components/dashboard/AssignmentSummary.vue
+++ b/client/src/components/dashboard/AssignmentSummary.vue
@@ -28,8 +28,8 @@ onMounted(async () => {
 </script>
 
 <template>
-  <div v-if="assignment" class="mb-14 space-y-8">
-    <div class="flex flex-col space-y-7 bg-white p-6">
+  <div v-if="assignment">
+    <div class="w-[395px]">
       <AssignmentProgressSummaryBox
         :total-assignments="assignment.total_count"
         :achieved-points-count="assignment.points_achieved_count"
diff --git a/client/src/components/dashboard/CompetenceSummary.vue b/client/src/components/dashboard/CompetenceSummary.vue
index df9930ea..8de08f99 100644
--- a/client/src/components/dashboard/CompetenceSummary.vue
+++ b/client/src/components/dashboard/CompetenceSummary.vue
@@ -24,7 +24,7 @@ onMounted(async () => {
 </script>
 
 <template>
-  <div v-if="competence">
+  <div v-if="competence" class="w-[395px]">
     <CompetenceSummaryBox
       :fail-count="competence.fail_count"
       :success-count="competence.success_count"
diff --git a/client/src/components/dashboard/CompetenceSummaryBox.vue b/client/src/components/dashboard/CompetenceSummaryBox.vue
index 6c2a7cca..d2166414 100644
--- a/client/src/components/dashboard/CompetenceSummaryBox.vue
+++ b/client/src/components/dashboard/CompetenceSummaryBox.vue
@@ -13,11 +13,11 @@ defineProps<{
     <template #title>{{ $t("a.Selbsteinschätzungen") }}</template>
     <template #content>
       <div class="flex items-center">
-        <it-icon-smiley-happy class="mr-4 h-12 w-12"></it-icon-smiley-happy>
+        <it-icon-smiley-happy class="mr-4 h-[28px] w-[28px]"></it-icon-smiley-happy>
         <i18next :translation="$t('a.{NUMBER} Das kann ich')">
           <template #NUMBER>
             <span
-              class="mr-3 text-4xl font-bold"
+              class="mr-3 text-2xl font-bold"
               data-cy="dashboard.stats.competence.success"
             >
               {{ successCount }}
@@ -26,11 +26,13 @@ defineProps<{
         </i18next>
       </div>
       <div class="flex items-center">
-        <it-icon-smiley-thinking class="mr-4 h-12 w-12"></it-icon-smiley-thinking>
+        <it-icon-smiley-thinking
+          class="mr-4 h-[28px] w-[28px]"
+        ></it-icon-smiley-thinking>
         <i18next :translation="$t('a.{NUMBER} Das will ich nochmals anschauen')">
           <template #NUMBER>
             <span
-              class="mr-3 text-4xl font-bold"
+              class="mr-3 text-2xl font-bold"
               data-cy="dashboard.stats.competence.fail"
             >
               {{ failCount }}
diff --git a/client/src/components/dashboard/CoursePanel.vue b/client/src/components/dashboard/CoursePanel.vue
index db5e8054..ec096663 100644
--- a/client/src/components/dashboard/CoursePanel.vue
+++ b/client/src/components/dashboard/CoursePanel.vue
@@ -81,7 +81,7 @@ function hasActionButton(): boolean {
           courseConfig.session_to_continue_id &&
           courseSlug
         "
-        class="border-b border-gray-300 pb-8"
+        class="border-b border-gray-300 pb-8 last:border-0"
       >
         <LearningPathDiagram
           :key="courseSlug"
@@ -90,19 +90,22 @@ function hasActionButton(): boolean {
           diagram-type="horizontal"
         ></LearningPathDiagram>
       </div>
-      <div v-if="numberOfProgressWidgets" class="flex flex-col flex-wrap">
-        <CompetenceSummary
-          v-if="hasWidget('CompetenceWidget')"
-          :course-slug="courseSlug"
-          :session-to-continue-id="courseConfig.session_to_continue_id"
-          :course-id="courseConfig.course_id"
-        ></CompetenceSummary>
+      <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"
+      >
         <AssignmentSummary
           v-if="hasWidget('CompetenceCertificateWidget')"
           :course-slug="courseSlug"
           :session-to-continue-id="courseConfig.session_to_continue_id"
           :course-id="courseConfig.course_id"
         />
+        <CompetenceSummary
+          v-if="hasWidget('CompetenceWidget')"
+          :course-slug="courseSlug"
+          :session-to-continue-id="courseConfig.session_to_continue_id"
+          :course-id="courseConfig.course_id"
+        ></CompetenceSummary>
       </div>
       <div v-if="numberOfMentorWidgets > 0" class="flex flex-col flex-wrap md:flex-row">
         <MentorOpenTasksCount
diff --git a/client/src/pages/dashboard/DashboardPage.vue b/client/src/pages/dashboard/DashboardPage.vue
index 93bc5898..c8908aaa 100644
--- a/client/src/pages/dashboard/DashboardPage.vue
+++ b/client/src/pages/dashboard/DashboardPage.vue
@@ -65,11 +65,13 @@ function newDashboardConfigForId(id: string) {
             @update:model-value="dashboardStore.switchAndLoadDashboardConfig"
           ></ItDropdownSelect>
         </div>
+        <!-- new way of dashboard -->
         <ul>
           <li v-for="config in dashboardStore.dashboardConfigs" :key="config.id">
             <CoursePanel :course-config="newDashboardConfigForId(config.id)" />
           </li>
         </ul>
+        <!-- end of new way of dashboard -->
         <!-- keep until we unify the dashboard -->
         <CoursePanel
           v-if="
@@ -80,10 +82,20 @@ function newDashboardConfigForId(id: string) {
             newDashboardConfigForId(dashboardStore.currentDashboardConfig.id)
           "
         />
+        <CoursePanel
+          v-else-if="
+            dashboardStore.currentDashboardConfig.dashboard_type ===
+            'PROGRESS_DASHBOARD'
+          "
+          :course-config="
+            newDashboardConfigForId(dashboardStore.currentDashboardConfig.id)
+          "
+        />
         <component
           :is="boards[dashboardStore.currentDashboardConfig.dashboard_type].main"
           v-else
         ></component>
+        <!-- end of old way of dashboard -->
       </div>
     </main>
     <aside class="m-8 lg:order-1 lg:w-[343px]">

From 0206fd4217439754bf74c154626977707f569d20 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Wed, 10 Apr 2024 07:33:55 +0200
Subject: [PATCH 22/82] WIP: Add email templates [skip ci]

---
 server/vbv_lernwelt/dashboard/views.py             | 5 ++++-
 server/vbv_lernwelt/learning_mentor/views.py       | 7 ++++++-
 server/vbv_lernwelt/notify/email/email_services.py | 9 ++++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/server/vbv_lernwelt/dashboard/views.py b/server/vbv_lernwelt/dashboard/views.py
index bd76f946..d370b224 100644
--- a/server/vbv_lernwelt/dashboard/views.py
+++ b/server/vbv_lernwelt/dashboard/views.py
@@ -287,7 +287,10 @@ def collect_course_sessions_by_course(
 
 
 def has_preview(role_key: RoleKeyType) -> bool:
-    return role_key in [RoleKeyType.MENTOR_VV, RoleKeyType.MENTOR_UK] and not role_key == RoleKeyType.MEMBER
+    return (
+        role_key in [RoleKeyType.MENTOR_VV, RoleKeyType.MENTOR_UK]
+        and not role_key == RoleKeyType.MEMBER
+    )
 
 
 def get_newest_cs(
diff --git a/server/vbv_lernwelt/learning_mentor/views.py b/server/vbv_lernwelt/learning_mentor/views.py
index e736a3a2..33a84166 100644
--- a/server/vbv_lernwelt/learning_mentor/views.py
+++ b/server/vbv_lernwelt/learning_mentor/views.py
@@ -140,9 +140,14 @@ def create_invitation(request, course_session_id: int):
     invitation = serializer.save()
     target_url = f"/lernbegleitung/{course_session_id}/invitation/{invitation.id}"
 
+    if course_session.course.configuration.is_uk:
+        template = EmailTemplate.PRAXISBILDNER_INVITATION
+    else:
+        template = EmailTemplate.LEARNING_MENTOR_INVITATION
+
     send_email(
         recipient_email=invitation.email,
-        template=EmailTemplate.LEARNING_MENTOR_INVITATION,
+        template=template,
         template_data={
             "inviter_name": f"{user.first_name} {user.last_name}",
             "inviter_email": user.email,
diff --git a/server/vbv_lernwelt/notify/email/email_services.py b/server/vbv_lernwelt/notify/email/email_services.py
index 3dba1007..118ab720 100644
--- a/server/vbv_lernwelt/notify/email/email_services.py
+++ b/server/vbv_lernwelt/notify/email/email_services.py
@@ -69,13 +69,20 @@ class EmailTemplate(Enum):
         "it": "d-d27db9fc96f34f55a8cacf7640787c4e",
     }
 
-    # VBV - Lernbegleitung Einladung
+    # VV - Lernbegleitung Einladung
     LEARNING_MENTOR_INVITATION = {
         "de": "d-8c862afde62748b6b8410887eeee89d8",
         "fr": "d-7451e3c858954c15a9f410fa9d92dc06",
         "it": "d-30c6aa9accda4973a940dd25703cb4a9",
     }
 
+    # üK - Praxisbildner Einladung
+    PRAXISBILDNER_INVITATION = {
+        "de": "d-480c78cf1ff2471c8b4d230539a206c7",
+        "fr": "d-3e198460d98745799c7ec4b5959ab3d1",
+        "it": "d-b3b5404b627d46b5ba466ce2b57fa681",
+    }
+
     # Fremdeinschätzung (Requester → Provider)
     SELF_EVALUATION_FEEDBACK_REQUESTED = {
         "de": "d-cf9c6681991d4293a7baccaa5b043c5c",

From 8a89bed0ac146885a7410cfe7288376644e55ceb Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Wed, 10 Apr 2024 11:00:38 +0200
Subject: [PATCH 23/82] WIP: Fix typecheck

---
 .../dashboard/AssignmentSummary.vue           |  10 +-
 .../dashboard/CompetenceSummary.vue           |   9 +-
 .../src/components/dashboard/CoursePanel.vue  |  27 +++--
 .../dashboard/MentorCompetenceSummary.vue     |   5 +-
 .../dashboard/MentorMenteeCount.vue           |   3 +-
 .../dashboard/MentorOpenTasksCount.vue        |   3 +-
 .../FeedbackSubmissionProgress.vue            |   2 +-
 client/src/gql/gql.ts                         |  16 +--
 client/src/gql/graphql.ts                     |  31 ++++--
 client/src/gql/schema.graphql                 | 104 ++++++++++--------
 client/src/gql/typenames.ts                   |   1 +
 client/src/graphql/queries.ts                 |  42 +++++++
 client/src/pages/SettingsPage.vue             |   2 +-
 .../cockpit/documentPage/DocumentPage.vue     |   2 +-
 client/src/pages/dashboard/DashboardPage.vue  |  11 +-
 .../circlePage/DocumentSection.vue            |   2 +-
 .../blocks/DocumentListBlock.vue              |   2 +-
 .../blocks/EdoniqTestBlock.vue                |   2 +-
 .../pages/onboarding/vv/CheckoutAddress.vue   |   2 +-
 client/src/router/index.ts                    |   5 +-
 client/src/services/entities.ts               |   2 +-
 client/src/services/files.ts                  |   2 +-
 client/src/services/learningMentees.ts        |   2 +-
 client/src/stores/completion.ts               |   2 +-
 client/src/stores/mediaLibrary.ts             |   2 +-
 client/src/stores/notifications.ts            |   2 +-
 client/src/stores/user.ts                     |   2 +-
 server/vbv_lernwelt/course/graphql/types.py   |   1 +
 .../vbv_lernwelt/dashboard/graphql/queries.py |   3 +-
 .../dashboard/graphql/types/dashboard.py      |  33 +++---
 30 files changed, 207 insertions(+), 125 deletions(-)

diff --git a/client/src/components/dashboard/AssignmentSummary.vue b/client/src/components/dashboard/AssignmentSummary.vue
index 27839360..5ea3c887 100644
--- a/client/src/components/dashboard/AssignmentSummary.vue
+++ b/client/src/components/dashboard/AssignmentSummary.vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
-import { computed, onMounted, ref, Ref } from "vue";
-import { ProgressDashboardAssignmentType } from "@/gql/graphql";
+import type { Ref } from "vue";
+import { computed, onMounted, ref } from "vue";
+import type { ProgressDashboardAssignmentType } from "@/gql/graphql";
 import { fetchProgressData } from "@/services/dashboard";
 import AssignmentProgressSummaryBox from "@/components/dashboard/AssignmentProgressSummaryBox.vue";
 
@@ -11,11 +12,12 @@ const props = defineProps<{
 }>();
 
 const DEFAULT_ASSIGNMENT = {
+  _id: "",
   points_achieved_count: 0,
   points_max_count: 0,
   total_count: 0,
 };
-const assignment: Ref<ProgressDashboardAssignmentType> = ref(DEFAULT_ASSIGNMENT);
+const assignment: Ref<ProgressDashboardAssignmentType | null> = ref(DEFAULT_ASSIGNMENT);
 
 const competenceCertificateUrl = computed(() => {
   return `/course/${props.courseSlug}/competence/certificates?courseSessionId=${props.sessionToContinueId}`;
@@ -23,7 +25,7 @@ const competenceCertificateUrl = computed(() => {
 
 onMounted(async () => {
   const data = await fetchProgressData(props.courseId);
-  assignment.value = data?.assignment;
+  assignment.value = data?.assignment ?? null;
 });
 </script>
 
diff --git a/client/src/components/dashboard/CompetenceSummary.vue b/client/src/components/dashboard/CompetenceSummary.vue
index 8de08f99..2c8c287c 100644
--- a/client/src/components/dashboard/CompetenceSummary.vue
+++ b/client/src/components/dashboard/CompetenceSummary.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
-import { computed, onMounted, ref, Ref } from "vue";
+import type { Ref } from "vue";
+import { computed, onMounted, ref } from "vue";
 import type { ProgressDashboardCompetenceType } from "@/gql/graphql";
 import CompetenceSummaryBox from "@/components/dashboard/CompetenceSummaryBox.vue";
 import { fetchProgressData } from "@/services/dashboard";
@@ -10,8 +11,8 @@ const props = defineProps<{
   sessionToContinueId: string;
 }>();
 
-const DEFAULT_COMPETENCE = { total_count: 0, success_count: 0, fail_count: 0 };
-const competence: Ref<ProgressDashboardCompetenceType> = ref(DEFAULT_COMPETENCE);
+const DEFAULT_COMPETENCE = { _id: "", total_count: 0, success_count: 0, fail_count: 0 };
+const competence: Ref<ProgressDashboardCompetenceType | null> = ref(DEFAULT_COMPETENCE);
 
 const competenceCriteriaUrl = computed(() => {
   return `/course/${props.courseSlug}/competence/self-evaluation-and-feedback?courseSessionId=${props.sessionToContinueId}`;
@@ -19,7 +20,7 @@ const competenceCriteriaUrl = computed(() => {
 
 onMounted(async () => {
   const data = await fetchProgressData(props.courseId);
-  competence.value = data.competence;
+  competence.value = data?.competence ?? null;
 });
 </script>
 
diff --git a/client/src/components/dashboard/CoursePanel.vue b/client/src/components/dashboard/CoursePanel.vue
index ec096663..b6498cd6 100644
--- a/client/src/components/dashboard/CoursePanel.vue
+++ b/client/src/components/dashboard/CoursePanel.vue
@@ -17,36 +17,41 @@ const mentorWidgets = [
 const progressWidgets = ["CompetenceWidget", "CompetenceCertificateWidget"];
 
 const props = defineProps<{
-  courseConfig: DashboardCourseConfigType;
+  courseConfig: DashboardCourseConfigType | undefined;
 }>();
 
-const courseSlug = computed(() => props.courseConfig?.course_slug);
-const courseName = computed(() => props.courseConfig?.course_title);
+const courseSlug = computed(() => props.courseConfig?.course_slug ?? "");
+const courseName = computed(() => props.courseConfig?.course_title ?? "");
 const numberOfMentorWidgets = computed(() => {
-  return props.courseConfig.widgets.filter((widget) => mentorWidgets.includes(widget))
-    .length;
+  return (
+    props.courseConfig?.widgets?.filter((widget) => mentorWidgets.includes(widget))
+      .length ?? 0
+  );
 });
 const numberOfProgressWidgets = computed(() => {
-  return props.courseConfig.widgets.filter((widget) => progressWidgets.includes(widget))
-    .length;
+  return (
+    props.courseConfig?.widgets?.filter((widget) => progressWidgets.includes(widget))
+      .length ?? 0
+  );
 });
 
 function hasWidget(widget: WidgetType) {
-  return props.courseConfig.widgets.includes(widget);
+  return props.courseConfig?.widgets?.includes(widget) ?? false;
 }
 
 function buttonLink(): string {
   if (props.courseConfig?.role_key === "Member") {
     return getLearningPathUrl(props.courseConfig?.course_slug);
   } else if (props.courseConfig?.role_key === "Expert") {
-    return "btn-secondary";
+    return "linktocockpit";
   } else if (props.courseConfig?.role_key === "Supervisor") {
-    return "btn-secondary";
+    return "linktocockpit";
   }
+  return getLearningPathUrl(props.courseConfig?.course_slug);
 }
 
 function hasActionButton(): boolean {
-  return props.courseConfig.role_key !== "MentorUK";
+  return props.courseConfig?.role_key !== "MentorUK";
 }
 </script>
 
diff --git a/client/src/components/dashboard/MentorCompetenceSummary.vue b/client/src/components/dashboard/MentorCompetenceSummary.vue
index 1de419b6..c750eb7a 100644
--- a/client/src/components/dashboard/MentorCompetenceSummary.vue
+++ b/client/src/components/dashboard/MentorCompetenceSummary.vue
@@ -1,7 +1,8 @@
 <script setup lang="ts">
-import { onMounted, ref, Ref } from "vue";
+import type { Ref } from "vue";
+import { onMounted, ref } from "vue";
 import { fetchMentorCompetenceSummary } from "@/services/dashboard";
-import { AssignmentsStatisticsType } from "@/gql/graphql";
+import type { AssignmentsStatisticsType } from "@/gql/graphql";
 import BaseBox from "@/components/dashboard/BaseBox.vue";
 
 const props = defineProps<{
diff --git a/client/src/components/dashboard/MentorMenteeCount.vue b/client/src/components/dashboard/MentorMenteeCount.vue
index 963d2f40..6562a129 100644
--- a/client/src/components/dashboard/MentorMenteeCount.vue
+++ b/client/src/components/dashboard/MentorMenteeCount.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
-import { onMounted, ref, Ref } from "vue";
+import type { Ref } from "vue";
+import { onMounted, ref } from "vue";
 import { fetchMenteeCount } from "@/services/dashboard";
 import BaseBox from "@/components/dashboard/BaseBox.vue";
 
diff --git a/client/src/components/dashboard/MentorOpenTasksCount.vue b/client/src/components/dashboard/MentorOpenTasksCount.vue
index feb9231f..2c42e182 100644
--- a/client/src/components/dashboard/MentorOpenTasksCount.vue
+++ b/client/src/components/dashboard/MentorOpenTasksCount.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
-import { onMounted, ref, Ref } from "vue";
+import type { Ref } from "vue";
+import { onMounted, ref } from "vue";
 import { fetchOpenTasksCount } from "@/services/dashboard";
 import BaseBox from "@/components/dashboard/BaseBox.vue";
 
diff --git a/client/src/components/selfEvaluationFeedback/FeedbackSubmissionProgress.vue b/client/src/components/selfEvaluationFeedback/FeedbackSubmissionProgress.vue
index 111e915f..259d4b3f 100644
--- a/client/src/components/selfEvaluationFeedback/FeedbackSubmissionProgress.vue
+++ b/client/src/components/selfEvaluationFeedback/FeedbackSubmissionProgress.vue
@@ -21,7 +21,7 @@ const numFeedbacks = computed(() => {
 });
 
 onMounted(async () => {
-  const data = await itGet(
+  const data: { amount: number } = await itGet(
     `/api/core/feedback/${props.courseSession.id}/${props.circleId}/`
   );
   completeFeedbacks.value = data.amount;
diff --git a/client/src/gql/gql.ts b/client/src/gql/gql.ts
index 28ab3396..3f2af39a 100644
--- a/client/src/gql/gql.ts
+++ b/client/src/gql/gql.ts
@@ -20,12 +20,12 @@ const documents = {
     "\n  query assignmentCompletionQuery(\n    $assignmentId: ID!\n    $courseSessionId: ID!\n    $learningContentId: ID\n    $assignmentUserId: UUID\n  ) {\n    assignment(id: $assignmentId) {\n      assignment_type\n      needs_expert_evaluation\n      max_points\n      content_type\n      effort_required\n      evaluation_description\n      evaluation_document_url\n      evaluation_tasks\n      id\n      intro_text\n      performance_objectives\n      slug\n      tasks\n      title\n      translation_key\n      solution_sample {\n        id\n        url\n      }\n      competence_certificate {\n        ...CoursePageFields\n      }\n    }\n    assignment_completion(\n      assignment_id: $assignmentId\n      course_session_id: $courseSessionId\n      assignment_user_id: $assignmentUserId\n      learning_content_page_id: $learningContentId\n    ) {\n      id\n      completion_status\n      submitted_at\n      evaluation_submitted_at\n      evaluation_user {\n        id\n        first_name\n        last_name\n      }\n      assignment_user {\n        avatar_url\n        first_name\n        last_name\n        id\n      }\n      evaluation_points\n      evaluation_max_points\n      evaluation_passed\n      edoniq_extended_time_flag\n      completion_data\n      task_completion_data\n    }\n  }\n": types.AssignmentCompletionQueryDocument,
     "\n  query competenceCertificateQuery($courseSlug: String!, $courseSessionId: ID!) {\n    competence_certificate_list(course_slug: $courseSlug) {\n      ...CoursePageFields\n      competence_certificates {\n        ...CoursePageFields\n        assignments {\n          ...CoursePageFields\n          assignment_type\n          max_points\n          completion(course_session_id: $courseSessionId) {\n            id\n            completion_status\n            submitted_at\n            evaluation_points\n            evaluation_max_points\n            evaluation_passed\n          }\n          learning_content {\n            ...CoursePageFields\n            circle {\n              id\n              title\n              slug\n            }\n          }\n        }\n      }\n    }\n  }\n": types.CompetenceCertificateQueryDocument,
     "\n  query courseSessionDetail($courseSessionId: ID!) {\n    course_session(id: $courseSessionId) {\n      id\n      title\n      course {\n        id\n        title\n        slug\n        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      }\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      }\n    }\n  }\n": types.DashboardConfigDocument,
+    "\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,
     "\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        }\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      assignments {\n        _id\n        summary {\n          _id\n          total_passed\n          total_failed\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          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_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      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,
 };
 
@@ -74,11 +74,11 @@ export function graphql(source: "\n  query courseSessionDetail($courseSessionId:
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
-export function graphql(source: "\n  query 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      }\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"): (typeof documents)["\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      }\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"];
+export function graphql(source: "\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"): (typeof documents)["\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"];
 /**
  * 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 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      }\n    }\n  }\n"): (typeof 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      }\n    }\n  }\n"];
+export function graphql(source: "\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"): (typeof 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"];
 /**
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
@@ -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        }\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        }\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          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"];
 /**
  * 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      assignments {\n        _id\n        summary {\n          _id\n          total_passed\n          total_failed\n        }\n      }\n    }\n  }\n"): (typeof documents)["\n  query mentorCourseStatistics($courseId: ID!) {\n    mentor_course_statistics(course_id: $courseId) {\n      _id\n      assignments {\n        _id\n        summary {\n          _id\n          total_passed\n          total_failed\n        }\n      }\n    }\n  }\n"];
+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_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      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_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      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 c3e481af..1dfde50e 100644
--- a/client/src/gql/graphql.ts
+++ b/client/src/gql/graphql.ts
@@ -237,6 +237,18 @@ export type AttendanceUserStatus =
   | 'ABSENT'
   | 'PRESENT';
 
+export type BaseStatisticsType = {
+  __typename?: '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'];
+  user_selection_ids?: Maybe<Array<Maybe<Scalars['ID']['output']>>>;
+};
+
 export type CircleLightObjectType = {
   __typename?: 'CircleLightObjectType';
   id: Scalars['ID']['output'];
@@ -336,6 +348,7 @@ export type CourseConfigurationObjectType = {
   enable_competence_certificates: Scalars['Boolean']['output'];
   enable_learning_mentor: Scalars['Boolean']['output'];
   id: Scalars['ID']['output'];
+  is_uk: Scalars['Boolean']['output'];
 };
 
 export type CourseObjectType = {
@@ -924,7 +937,7 @@ export type Query = {
   learning_content_test?: Maybe<LearningContentEdoniqTestObjectType>;
   learning_content_video?: Maybe<LearningContentVideoObjectType>;
   learning_path?: Maybe<LearningPathObjectType>;
-  mentor_course_statistics?: Maybe<CourseStatisticsType>;
+  mentor_course_statistics?: Maybe<BaseStatisticsType>;
 };
 
 
@@ -1210,7 +1223,7 @@ export type CourseQueryQueryVariables = Exact<{
 }>;
 
 
-export type CourseQueryQuery = { __typename?: 'Query', course?: { __typename?: 'CourseObjectType', id: string, title: string, slug: string, category_name: string, configuration: { __typename?: 'CourseConfigurationObjectType', id: string, enable_circle_documents: boolean, enable_learning_mentor: boolean, enable_competence_certificates: boolean }, action_competences: Array<(
+export type CourseQueryQuery = { __typename?: 'Query', course?: { __typename?: 'CourseObjectType', id: string, title: string, slug: string, category_name: string, configuration: { __typename?: 'CourseConfigurationObjectType', id: string, enable_circle_documents: boolean, enable_learning_mentor: boolean, enable_competence_certificates: boolean, is_uk: boolean }, action_competences: Array<(
       { __typename?: 'ActionCompetenceObjectType', competence_id: string, performance_criteria: Array<(
         { __typename?: 'PerformanceCriteriaObjectType', competence_id: string, learning_unit?: { __typename?: 'LearningUnitObjectType', id: string, slug: string, evaluate_url: string } | null }
         & { ' $fragmentRefs'?: { 'CoursePageFieldsPerformanceCriteriaObjectTypeFragment': CoursePageFieldsPerformanceCriteriaObjectTypeFragment } }
@@ -1281,7 +1294,7 @@ export type CourseQueryQuery = { __typename?: 'Query', course?: { __typename?: '
 export type DashboardConfigQueryVariables = Exact<{ [key: string]: never; }>;
 
 
-export type DashboardConfigQuery = { __typename?: 'Query', dashboard_config: Array<{ __typename?: 'DashboardConfigType', id: string, slug: string, name: string, dashboard_type: DashboardType, course_configuration: { __typename?: 'CourseConfigurationObjectType', id: string, enable_circle_documents: boolean, enable_learning_mentor: boolean, enable_competence_certificates: boolean } }> };
+export type DashboardConfigQuery = { __typename?: 'Query', dashboard_config: Array<{ __typename?: 'DashboardConfigType', id: string, slug: string, name: string, dashboard_type: DashboardType, course_configuration: { __typename?: 'CourseConfigurationObjectType', id: string, enable_circle_documents: boolean, enable_learning_mentor: boolean, enable_competence_certificates: boolean, is_uk: boolean } }> };
 
 export type DashboardProgressQueryVariables = Exact<{
   courseId: Scalars['ID']['input'];
@@ -1302,14 +1315,14 @@ 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 }, 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, 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 MentorCourseStatisticsQueryVariables = Exact<{
   courseId: Scalars['ID']['input'];
 }>;
 
 
-export type MentorCourseStatisticsQuery = { __typename?: 'Query', mentor_course_statistics?: { __typename?: 'CourseStatisticsType', _id: string, assignments: { __typename?: 'AssignmentsStatisticsType', _id: string, summary: { __typename?: 'AssignmentStatisticsSummaryType', _id: string, total_passed: number, total_failed: 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, 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 SendFeedbackMutationMutationVariables = Exact<{
   courseSessionId: Scalars['ID']['input'];
@@ -1329,10 +1342,10 @@ export const AttendanceCheckQueryDocument = {"kind":"Document","definitions":[{"
 export const AssignmentCompletionQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"assignmentCompletionQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"learningContentId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"assignmentUserId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"assignment"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"assignment_type"}},{"kind":"Field","name":{"kind":"Name","value":"needs_expert_evaluation"}},{"kind":"Field","name":{"kind":"Name","value":"max_points"}},{"kind":"Field","name":{"kind":"Name","value":"content_type"}},{"kind":"Field","name":{"kind":"Name","value":"effort_required"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_description"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_document_url"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_tasks"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"intro_text"}},{"kind":"Field","name":{"kind":"Name","value":"performance_objectives"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"tasks"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"translation_key"}},{"kind":"Field","name":{"kind":"Name","value":"solution_sample"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"url"}}]}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignment_completion"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"assignment_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}}},{"kind":"Argument","name":{"kind":"Name","value":"course_session_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}}},{"kind":"Argument","name":{"kind":"Name","value":"assignment_user_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentUserId"}}},{"kind":"Argument","name":{"kind":"Name","value":"learning_content_page_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"learningContentId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"completion_status"}},{"kind":"Field","name":{"kind":"Name","value":"submitted_at"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_submitted_at"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"first_name"}},{"kind":"Field","name":{"kind":"Name","value":"last_name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignment_user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"avatar_url"}},{"kind":"Field","name":{"kind":"Name","value":"first_name"}},{"kind":"Field","name":{"kind":"Name","value":"last_name"}},{"kind":"Field","name":{"kind":"Name","value":"id"}}]}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_max_points"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_passed"}},{"kind":"Field","name":{"kind":"Name","value":"edoniq_extended_time_flag"}},{"kind":"Field","name":{"kind":"Name","value":"completion_data"}},{"kind":"Field","name":{"kind":"Name","value":"task_completion_data"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"CoursePageFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"CoursePageInterface"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"content_type"}},{"kind":"Field","name":{"kind":"Name","value":"frontend_url"}}]}}]} as unknown as DocumentNode<AssignmentCompletionQueryQuery, AssignmentCompletionQueryQueryVariables>;
 export const CompetenceCertificateQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"competenceCertificateQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSlug"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_list"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_slug"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseSlug"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificates"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"assignments"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type"}},{"kind":"Field","name":{"kind":"Name","value":"max_points"}},{"kind":"Field","name":{"kind":"Name","value":"completion"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_session_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"completion_status"}},{"kind":"Field","name":{"kind":"Name","value":"submitted_at"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_max_points"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_passed"}}]}},{"kind":"Field","name":{"kind":"Name","value":"learning_content"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"circle"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}}]}}]}}]}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"CoursePageFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"CoursePageInterface"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"content_type"}},{"kind":"Field","name":{"kind":"Name","value":"frontend_url"}}]}}]} as unknown as DocumentNode<CompetenceCertificateQueryQuery, CompetenceCertificateQueryQueryVariables>;
 export const CourseSessionDetailDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"courseSessionDetail"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course_session"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"course"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"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":"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"}}]}}]}}]}}]} as unknown as DocumentNode<DashboardConfigQuery, DashboardConfigQueryVariables>;
+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>;
 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":"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":"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":"total_passed"}},{"kind":"Field","name":{"kind":"Name","value":"total_failed"}}]}}]}}]}}]}}]} 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":"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_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":"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 fca2c434..50f8d343 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!): CourseStatisticsType
+  mentor_course_statistics(course_id: ID!): BaseStatisticsType
   course_progress(course_id: ID!): CourseProgressType
   dashboard_config: [DashboardConfigType!]!
   learning_path(id: ID, slug: String, course_id: ID, course_slug: String): LearningPathObjectType
@@ -30,13 +30,13 @@ type CourseStatisticsType {
   course_id: ID!
   course_title: String!
   course_slug: String!
-  course_session_properties: StatisticsCourseSessionPropertiesType!
   course_session_selection_ids: [ID]!
+  course_session_properties: StatisticsCourseSessionPropertiesType!
   user_selection_ids: [ID]
+  assignments: AssignmentsStatisticsType!
   course_session_selection_metrics: StatisticsCourseSessionsSelectionMetricType!
   attendance_day_presences: AttendanceDayPresencesStatisticsType!
   feedback_responses: FeedbackStatisticsResponsesType!
-  assignments: AssignmentsStatisticsType!
   competences: CompetencesStatisticsType!
 }
 
@@ -57,6 +57,49 @@ type StatisticsCircleDataType {
   name: String!
 }
 
+type AssignmentsStatisticsType {
+  _id: ID!
+  records: [AssignmentStatisticsRecordType!]!
+  summary: AssignmentStatisticsSummaryType!
+}
+
+type AssignmentStatisticsRecordType {
+  _id: ID!
+  course_session_id: ID!
+  course_session_assignment_id: ID!
+  circle_id: ID!
+  generation: String!
+  assignment_type_translation_key: String!
+  assignment_title: String!
+  deadline: DateTime!
+  metrics: AssignmentCompletionMetricsType!
+  details_url: String!
+}
+
+"""
+The `DateTime` scalar type represents a DateTime
+value as specified by
+[iso8601](https://en.wikipedia.org/wiki/ISO_8601).
+"""
+scalar DateTime
+
+type AssignmentCompletionMetricsType {
+  _id: ID!
+  passed_count: Int!
+  failed_count: Int!
+  unranked_count: Int!
+  ranking_completed: Boolean!
+  average_passed: Float!
+}
+
+type AssignmentStatisticsSummaryType {
+  _id: ID!
+  completed_count: Int!
+  average_passed: Float!
+  total_passed: Int!
+  total_failed: Int!
+}
+
 type StatisticsCourseSessionsSelectionMetricType {
   _id: ID!
   session_count: Int!
@@ -81,13 +124,6 @@ type PresenceRecordStatisticsType {
   details_url: String!
 }
 
-"""
-The `DateTime` scalar type represents a DateTime
-value as specified by
-[iso8601](https://en.wikipedia.org/wiki/ISO_8601).
-"""
-scalar DateTime
-
 type AttendanceSummaryStatisticsType {
   _id: ID!
   days_completed: Int!
@@ -118,42 +154,6 @@ type FeedbackStatisticsSummaryType {
   total_responses: Int!
 }
 
-type AssignmentsStatisticsType {
-  _id: ID!
-  records: [AssignmentStatisticsRecordType!]!
-  summary: AssignmentStatisticsSummaryType!
-}
-
-type AssignmentStatisticsRecordType {
-  _id: ID!
-  course_session_id: ID!
-  course_session_assignment_id: ID!
-  circle_id: ID!
-  generation: String!
-  assignment_type_translation_key: String!
-  assignment_title: String!
-  deadline: DateTime!
-  metrics: AssignmentCompletionMetricsType!
-  details_url: String!
-}
-
-type AssignmentCompletionMetricsType {
-  _id: ID!
-  passed_count: Int!
-  failed_count: Int!
-  unranked_count: Int!
-  ranking_completed: Boolean!
-  average_passed: Float!
-}
-
-type AssignmentStatisticsSummaryType {
-  _id: ID!
-  completed_count: Int!
-  average_passed: Float!
-  total_passed: Int!
-  total_failed: Int!
-}
-
 type CompetencesStatisticsType {
   _id: ID!
   summary: CompetencePerformanceStatisticsSummaryType!
@@ -177,6 +177,17 @@ type CompetenceRecordStatisticsType {
   details_url: String!
 }
 
+type BaseStatisticsType {
+  _id: ID!
+  course_id: ID!
+  course_title: String!
+  course_slug: String!
+  course_session_selection_ids: [ID]!
+  course_session_properties: StatisticsCourseSessionPropertiesType!
+  user_selection_ids: [ID]
+  assignments: AssignmentsStatisticsType!
+}
+
 type CourseProgressType {
   _id: ID!
   course_id: ID!
@@ -220,6 +231,7 @@ type CourseConfigurationObjectType {
   enable_circle_documents: Boolean!
   enable_learning_mentor: Boolean!
   enable_competence_certificates: Boolean!
+  is_uk: Boolean!
 }
 
 type LearningPathObjectType implements CoursePageInterface {
diff --git a/client/src/gql/typenames.ts b/client/src/gql/typenames.ts
index 5fb963dc..36d7ab4c 100644
--- a/client/src/gql/typenames.ts
+++ b/client/src/gql/typenames.ts
@@ -15,6 +15,7 @@ export const AttendanceSummaryStatisticsType = "AttendanceSummaryStatisticsType"
 export const AttendanceUserInputType = "AttendanceUserInputType";
 export const AttendanceUserObjectType = "AttendanceUserObjectType";
 export const AttendanceUserStatus = "AttendanceUserStatus";
+export const BaseStatisticsType = "BaseStatisticsType";
 export const Boolean = "Boolean";
 export const CircleLightObjectType = "CircleLightObjectType";
 export const CircleObjectType = "CircleObjectType";
diff --git a/client/src/graphql/queries.ts b/client/src/graphql/queries.ts
index 076d2f44..685f2bb6 100644
--- a/client/src/graphql/queries.ts
+++ b/client/src/graphql/queries.ts
@@ -220,6 +220,7 @@ export const COURSE_QUERY = graphql(`
         enable_circle_documents
         enable_learning_mentor
         enable_competence_certificates
+        is_uk
       }
       action_competences {
         competence_id
@@ -304,6 +305,7 @@ export const DASHBOARD_CONFIG = graphql(`
         enable_circle_documents
         enable_learning_mentor
         enable_competence_certificates
+        is_uk
       }
     }
   }
@@ -410,6 +412,8 @@ export const DASHBOARD_COURSE_STATISTICS = graphql(`
           _id
           completed_count
           average_passed
+          total_passed
+          total_failed
         }
         records {
           _id
@@ -457,13 +461,51 @@ export const DASHBOARD_MENTOR_COMPETENCE_SUMMARY = graphql(`
   query mentorCourseStatistics($courseId: ID!) {
     mentor_course_statistics(course_id: $courseId) {
       _id
+      course_id
+      course_title
+      course_slug
+      course_session_properties {
+        _id
+        sessions {
+          id
+          name
+        }
+        generations
+        circles {
+          id
+          name
+        }
+      }
+      course_session_selection_ids
+      user_selection_ids
       assignments {
         _id
         summary {
           _id
+          completed_count
+          average_passed
           total_passed
           total_failed
         }
+        records {
+          _id
+          course_session_id
+          course_session_assignment_id
+          circle_id
+          generation
+          assignment_title
+          assignment_type_translation_key
+          details_url
+          deadline
+          metrics {
+            _id
+            passed_count
+            failed_count
+            unranked_count
+            ranking_completed
+            average_passed
+          }
+        }
       }
     }
   }
diff --git a/client/src/pages/SettingsPage.vue b/client/src/pages/SettingsPage.vue
index 076eb52f..2b8dda11 100644
--- a/client/src/pages/SettingsPage.vue
+++ b/client/src/pages/SettingsPage.vue
@@ -40,7 +40,7 @@ const updateItems = async (_items: []) => {
 };
 
 onMounted(async () => {
-  const response = await itGet("/api/notify/email_notification_settings/");
+  const response: any = await itGet("/api/notify/email_notification_settings/");
   items.value = items.value.map((item) => {
     item.checked = response.includes(item.value);
     return item;
diff --git a/client/src/pages/cockpit/documentPage/DocumentPage.vue b/client/src/pages/cockpit/documentPage/DocumentPage.vue
index 0fdb63fb..b7f5064d 100644
--- a/client/src/pages/cockpit/documentPage/DocumentPage.vue
+++ b/client/src/pages/cockpit/documentPage/DocumentPage.vue
@@ -35,7 +35,7 @@ const circleDocumentsResultData = ref<CircleDocument[]>([]);
 let courseSessionDocumentsUrl = "";
 
 async function fetchDocuments() {
-  const result = await fetchCourseSessionDocuments(courseSession.value?.id);
+  const result: any = await fetchCourseSessionDocuments(courseSession.value?.id);
   if (result.length > 0) {
     circleDocumentsResultData.value = result;
   } else {
diff --git a/client/src/pages/dashboard/DashboardPage.vue b/client/src/pages/dashboard/DashboardPage.vue
index c8908aaa..33b3dfaf 100644
--- a/client/src/pages/dashboard/DashboardPage.vue
+++ b/client/src/pages/dashboard/DashboardPage.vue
@@ -7,17 +7,14 @@ import SimpleDates from "@/components/dashboard/SimpleDates.vue";
 import ItDropdownSelect from "@/components/ui/ItDropdownSelect.vue";
 import { useDashboardStore } from "@/stores/dashboard";
 import type { DashboardType } from "@/gql/graphql";
+import type { DashboardCourseConfigType } from "@/services/dashboard";
+import { fetchDashboardConfigv2 } from "@/services/dashboard";
 import SimpleCoursePage from "@/pages/dashboard/SimpleCoursePage.vue";
 import LoadingSpinner from "@/components/ui/LoadingSpinner.vue";
 import CourseDetailDates from "@/components/dashboard/CourseDetailDates.vue";
 import NoCourseSession from "@/components/dashboard/NoCourseSession.vue";
 import MentorPage from "@/pages/dashboard/MentorPage.vue";
 import CoursePanel from "@/components/dashboard/CoursePanel.vue";
-import {
-  DashboardConfigType,
-  DashboardCourseConfigType,
-  fetchDashboardConfigv2,
-} from "@/services/dashboard";
 
 const dashboardStore = useDashboardStore();
 
@@ -41,8 +38,8 @@ onMounted(async () => {
   await dashboardStore.loadDashboardDetails();
 });
 
-function newDashboardConfigForId(id: string) {
-  return dashboardConfigv2.value.find((config) => config.course_id == +id);
+function newDashboardConfigForId(id: string): DashboardCourseConfigType | undefined {
+  return dashboardConfigv2.value.find((config) => config.course_id == id);
 }
 </script>
 
diff --git a/client/src/pages/learningPath/circlePage/DocumentSection.vue b/client/src/pages/learningPath/circlePage/DocumentSection.vue
index b1df0aac..a0540334 100644
--- a/client/src/pages/learningPath/circlePage/DocumentSection.vue
+++ b/client/src/pages/learningPath/circlePage/DocumentSection.vue
@@ -35,7 +35,7 @@ const courseSession = useCurrentCourseSession();
 const circleDocumentsResultData = ref<CircleDocument[]>([]);
 
 async function fetchDocuments() {
-  const result = await fetchCourseSessionDocuments(courseSession.value?.id);
+  const result: any = await fetchCourseSessionDocuments(courseSession.value?.id);
   if (result.length > 0) {
     circleDocumentsResultData.value = result;
   } else {
diff --git a/client/src/pages/learningPath/learningContentPage/blocks/DocumentListBlock.vue b/client/src/pages/learningPath/learningContentPage/blocks/DocumentListBlock.vue
index 9e14634f..9379086b 100644
--- a/client/src/pages/learningPath/learningContentPage/blocks/DocumentListBlock.vue
+++ b/client/src/pages/learningPath/learningContentPage/blocks/DocumentListBlock.vue
@@ -22,7 +22,7 @@ const documents = ref<BlockDocument[]>([]);
 
 onMounted(async () => {
   log.debug("DocumentListBlock mounted");
-  const response = await itGetCached(`/api/course/page/${props.content.slug}/`);
+  const response: any = await itGetCached(`/api/course/page/${props.content.slug}/`);
   documents.value = response.documents;
 });
 </script>
diff --git a/client/src/pages/learningPath/learningContentPage/blocks/EdoniqTestBlock.vue b/client/src/pages/learningPath/learningContentPage/blocks/EdoniqTestBlock.vue
index 6178a35d..c1bf2529 100644
--- a/client/src/pages/learningPath/learningContentPage/blocks/EdoniqTestBlock.vue
+++ b/client/src/pages/learningPath/learningContentPage/blocks/EdoniqTestBlock.vue
@@ -64,7 +64,7 @@ async function startTest() {
     extendedTimeTest.value = true;
   }
 
-  const response = await itPost("/api/core/edoniq-test/redirect/", {
+  const response: any = await itPost("/api/core/edoniq-test/redirect/", {
     learning_content_id: props.content.id,
     extended_time_test: extendedTimeTest.value,
   });
diff --git a/client/src/pages/onboarding/vv/CheckoutAddress.vue b/client/src/pages/onboarding/vv/CheckoutAddress.vue
index 40875d10..6fabc32d 100644
--- a/client/src/pages/onboarding/vv/CheckoutAddress.vue
+++ b/client/src/pages/onboarding/vv/CheckoutAddress.vue
@@ -202,7 +202,7 @@ const executePayment = () => {
     redirect_url: fullHost,
     address: address.value,
     product: props.courseType,
-  }).then((res) => {
+  }).then((res: any) => {
     console.log("Going to next page", res.next_step_url);
     window.location.href = res.next_step_url;
   });
diff --git a/client/src/router/index.ts b/client/src/router/index.ts
index ae99241c..f4d2cd26 100644
--- a/client/src/router/index.ts
+++ b/client/src/router/index.ts
@@ -12,6 +12,7 @@ import {
 } from "@/router/guards";
 import { addToHistory } from "@/router/history";
 import { onboardingRedirect } from "@/router/onboarding";
+import type { RouteLocationNormalized } from "vue-router";
 import { createRouter, createWebHistory } from "vue-router";
 
 const router = createRouter({
@@ -404,10 +405,10 @@ router.beforeEach(
 async function ignoreGuardsForHomeRoute(
   to: RouteLocationNormalized,
   from: RouteLocationNormalized,
-  guard: NavigationGuardNext
+  guard: any
 ) {
   if (to.name !== "home") {
-    return await guard(to, from);
+    return await guard(to);
   }
 }
 
diff --git a/client/src/services/entities.ts b/client/src/services/entities.ts
index c87548c4..3ca68a71 100644
--- a/client/src/services/entities.ts
+++ b/client/src/services/entities.ts
@@ -16,7 +16,7 @@ export function useEntities() {
   const countries: Ref<Country[]> = ref([]);
   const organisations: Ref<Organisation[]> = ref([]);
 
-  itGetCached("/api/core/entities/").then((res) => {
+  itGetCached("/api/core/entities/").then((res: any) => {
     countries.value = res.countries;
     organisations.value = res.organisations;
   });
diff --git a/client/src/services/files.ts b/client/src/services/files.ts
index 169461ff..ec7ad5ce 100644
--- a/client/src/services/files.ts
+++ b/client/src/services/files.ts
@@ -84,7 +84,7 @@ export async function uploadCircleDocument(
     throw new Error("No file selected");
   }
 
-  const startData = await startFileUpload(data, courseSessionId);
+  const startData: any = await startFileUpload(data, courseSessionId);
 
   await uploadFile(startData, data.file);
   const response = itPost(`/api/core/file/finish/`, {
diff --git a/client/src/services/learningMentees.ts b/client/src/services/learningMentees.ts
index 7dcee7d8..6550056f 100644
--- a/client/src/services/learningMentees.ts
+++ b/client/src/services/learningMentees.ts
@@ -69,7 +69,7 @@ export const useLearningMentees = (
     error.value = null;
 
     itGet(`/api/mentor/${courseSessionId}/summary`)
-      .then((response) => {
+      .then((response: any) => {
         summary.value = response;
       })
       .catch((err) => (error.value = err))
diff --git a/client/src/stores/completion.ts b/client/src/stores/completion.ts
index 374a466e..22c46681 100644
--- a/client/src/stores/completion.ts
+++ b/client/src/stores/completion.ts
@@ -46,7 +46,7 @@ export const useCompletionStore = defineStore({
       }
 
       if (courseSessionId) {
-        const completionData = await itPost("/api/course/completion/mark/", {
+        const completionData: any = await itPost("/api/course/completion/mark/", {
           page_id: page.id,
           completion_status: page.completion_status,
           course_session_id: courseSessionId,
diff --git a/client/src/stores/mediaLibrary.ts b/client/src/stores/mediaLibrary.ts
index 11e5fb6d..e417b8d6 100644
--- a/client/src/stores/mediaLibrary.ts
+++ b/client/src/stores/mediaLibrary.ts
@@ -21,7 +21,7 @@ export const useMediaLibraryStore = defineStore({
         return this.mediaLibraryPage;
       }
       log.debug("load mediaLibraryPageData");
-      const mediaLibraryPageData = await itGet(`/api/course/page/${slug}/`);
+      const mediaLibraryPageData: any = await itGet(`/api/course/page/${slug}/`);
 
       if (!mediaLibraryPageData) {
         throw `No mediaLibraryPageData found with: ${slug}`;
diff --git a/client/src/stores/notifications.ts b/client/src/stores/notifications.ts
index 9c23676f..8c0a4476 100644
--- a/client/src/stores/notifications.ts
+++ b/client/src/stores/notifications.ts
@@ -27,7 +27,7 @@ export const useNotificationsStore = defineStore("notifications", () => {
   }
 
   async function updateUnreadCount() {
-    const data = await itGet("/notifications/api/unread_count/");
+    const data: any = await itGet("/notifications/api/unread_count/");
     hasUnread.value = data.unread_count !== 0;
   }
 
diff --git a/client/src/stores/user.ts b/client/src/stores/user.ts
index 548c1f51..602c5eb8 100644
--- a/client/src/stores/user.ts
+++ b/client/src/stores/user.ts
@@ -155,7 +155,7 @@ export const useUserStore = defineStore({
       });
     },
     async fetchUser() {
-      const data = await itGetCached("/api/core/me/");
+      const data: any = await itGetCached("/api/core/me/");
       this.$state = data;
       this.loggedIn = true;
       await setLocale(data.language);
diff --git a/server/vbv_lernwelt/course/graphql/types.py b/server/vbv_lernwelt/course/graphql/types.py
index 1e55dbd8..b4eee50a 100644
--- a/server/vbv_lernwelt/course/graphql/types.py
+++ b/server/vbv_lernwelt/course/graphql/types.py
@@ -95,6 +95,7 @@ class CourseConfigurationObjectType(DjangoObjectType):
             "enable_circle_documents",
             "enable_learning_mentor",
             "enable_competence_certificates",
+            "is_uk",
         )
 
 
diff --git a/server/vbv_lernwelt/dashboard/graphql/queries.py b/server/vbv_lernwelt/dashboard/graphql/queries.py
index d41a46af..d2c2067a 100644
--- a/server/vbv_lernwelt/dashboard/graphql/queries.py
+++ b/server/vbv_lernwelt/dashboard/graphql/queries.py
@@ -12,6 +12,7 @@ from vbv_lernwelt.course.models import Course, CourseSession, CourseSessionUser
 from vbv_lernwelt.course_session_group.models import CourseSessionGroup
 from vbv_lernwelt.dashboard.graphql.types.competence import competences
 from vbv_lernwelt.dashboard.graphql.types.dashboard import (
+    BaseStatisticsType,
     CourseProgressType,
     CourseStatisticsType,
     DashboardConfigType,
@@ -33,7 +34,7 @@ class DashboardQuery(graphene.ObjectType):
     )
 
     mentor_course_statistics = graphene.Field(
-        CourseStatisticsType, course_id=graphene.ID(required=True)
+        BaseStatisticsType, course_id=graphene.ID(required=True)
     )
 
     course_progress = graphene.Field(
diff --git a/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py b/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py
index 46caa92f..83f33993 100644
--- a/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py
+++ b/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py
@@ -87,16 +87,32 @@ class CourseProgressType(graphene.ObjectType):
     assignment = graphene.Field(ProgressDashboardAssignmentType, required=False)
 
 
-class CourseStatisticsType(graphene.ObjectType):
+class BaseStatisticsType(graphene.ObjectType):
     _id = graphene.ID(required=True)
     course_id = graphene.ID(required=True)
     course_title = graphene.String(required=True)
     course_slug = graphene.String(required=True)
+    course_session_selection_ids = graphene.List(graphene.ID, required=True)
     course_session_properties = graphene.Field(
         StatisticsCourseSessionPropertiesType, required=True
     )
-    course_session_selection_ids = graphene.List(graphene.ID, required=True)
     user_selection_ids = graphene.List(graphene.ID, required=False)
+    assignments = graphene.Field(AssignmentsStatisticsType, required=True)
+
+    def resolve_assignments(root, _info) -> AssignmentsStatisticsType:
+        user_selection_ids = (
+            [str(user) for user in root.user_selection_ids]
+            if root.user_selection_ids
+            else None
+        )  # noqa
+        return assignments(
+            course_id=root.course_id,
+            course_session_selection_ids=root.course_session_selection_ids,
+            user_selection_ids=user_selection_ids,
+        )
+
+
+class CourseStatisticsType(BaseStatisticsType):
     course_session_selection_metrics = graphene.Field(
         StatisticsCourseSessionsSelectionMetricType, required=True
     )
@@ -104,7 +120,6 @@ class CourseStatisticsType(graphene.ObjectType):
         AttendanceDayPresencesStatisticsType, required=True
     )
     feedback_responses = graphene.Field(FeedbackStatisticsResponsesType, required=True)
-    assignments = graphene.Field(AssignmentsStatisticsType, required=True)
     competences = graphene.Field(CompetencesStatisticsType, required=True)
 
     def resolve_attendance_day_presences(
@@ -145,18 +160,6 @@ class CourseStatisticsType(graphene.ObjectType):
             ),
         )
 
-    def resolve_assignments(root, _info) -> AssignmentsStatisticsType:
-        user_selection_ids = (
-            [str(user) for user in root.user_selection_ids]
-            if root.user_selection_ids
-            else None
-        )  # noqa
-        return assignments(
-            course_id=root.course_id,
-            course_session_selection_ids=root.course_session_selection_ids,
-            user_selection_ids=user_selection_ids,
-        )
-
     def resolve_course_session_selection_metrics(
         root, info
     ) -> StatisticsCourseSessionsSelectionMetricType:

From 84f803ebf126afb2559d2c6efbd95fe917bafde2 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Wed, 10 Apr 2024 13:48:47 +0200
Subject: [PATCH 24/82] Add dashboard config tests

---
 .../dashboard/tests/test_views.py             | 90 ++++++++++++++++++-
 1 file changed, 89 insertions(+), 1 deletion(-)

diff --git a/server/vbv_lernwelt/dashboard/tests/test_views.py b/server/vbv_lernwelt/dashboard/tests/test_views.py
index 4f0a5c99..395adc35 100644
--- a/server/vbv_lernwelt/dashboard/tests/test_views.py
+++ b/server/vbv_lernwelt/dashboard/tests/test_views.py
@@ -9,7 +9,7 @@ from vbv_lernwelt.course.creators.test_utils import (
     create_user,
 )
 from vbv_lernwelt.course.models import CourseSessionUser
-from vbv_lernwelt.dashboard.views import get_course_sessions_with_roles_for_user
+from vbv_lernwelt.dashboard.views import get_course_sessions_with_roles_for_user, get_course_config
 from vbv_lernwelt.learning_mentor.models import LearningMentor
 
 
@@ -84,3 +84,91 @@ class GetCourseSessionsForUserTestCase(TestCase):
         self.assertEqual(len(sessions), 1)
         self.assertEqual(sessions[0].title, "Test Session")
         self.assertEqual(sessions[0].roles, {"LEARNING_MENTOR"})
+
+
+class GetDashboardConfig(TestCase):
+    def setUp(self):
+        self.course, _ = create_course("Test Course")
+        self.course_session = create_course_session(
+            course=self.course, title="Test Session"
+        )
+
+    def _test_config(self, user, role, is_uk, is_vv, is_mentor, has_preview, widgets):
+        # WHEN
+        sessions = get_course_sessions_with_roles_for_user(user)
+        course_configs = get_course_config(sessions)
+
+        # THEN
+        self.assertEqual(len(course_configs), 1)
+        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)
+
+    def test_participant_uk_get_config(self):
+        participant = create_user("participant")
+        add_course_session_user(
+            self.course_session,
+            participant,
+            role=CourseSessionUser.Role.MEMBER,
+        )
+        self.course.configuration.is_uk = True
+        self.course.configuration.save()
+
+        self._test_config(user=participant, role="Member", is_uk=True, is_vv=False, is_mentor=False, has_preview=False,
+                          widgets=['ProgressWidget', 'CompetenceWidget', 'CompetenceCertificateWidget'])
+
+    def test_participant_vv_get_config(self):
+        participant = create_user("participant")
+        add_course_session_user(
+            self.course_session,
+            participant,
+            role=CourseSessionUser.Role.MEMBER,
+        )
+        self.course.configuration.is_vv = True
+        self.course.configuration.save()
+
+        self._test_config(user=participant, role="Member", is_uk=False, is_vv=True, is_mentor=False, has_preview=False,
+                          widgets=['ProgressWidget', 'CompetenceWidget'])
+
+    def test_mentor_uk_get_config(self):
+        # GIVEN
+        mentor = create_user("mentor")
+        LearningMentor.objects.create(mentor=mentor, course_session=self.course_session)
+
+        self.course.configuration.is_uk = True
+        self.course.configuration.save()
+
+        self._test_config(user=mentor, role="MentorUK", is_uk=True, is_vv=False, is_mentor=True, has_preview=True,
+                          widgets=['MentorPersonWidget', 'MentorCompetenceWidget'])
+
+    def test_mentor_vv_get_config(self):
+        # GIVEN
+        mentor = create_user("mentor")
+        LearningMentor.objects.create(mentor=mentor, course_session=self.course_session)
+
+        self.course.configuration.is_vv = True
+        self.course.configuration.save()
+
+        self._test_config(user=mentor, role="MentorVV", is_uk=False, is_vv=True, is_mentor=True, has_preview=True,
+                          widgets=['MentorPersonWidget', 'MentorTasksWidget'])
+
+    def test_participant_as_mentor_vv_get_config(self):
+        # GIVEN
+        mentor = create_user("mentor")
+        add_course_session_user(
+            self.course_session,
+            mentor,
+            role=CourseSessionUser.Role.MEMBER,
+        )
+        LearningMentor.objects.create(mentor=mentor, course_session=self.course_session)
+
+        self.course.configuration.is_vv = True
+        self.course.configuration.save()
+
+        self._test_config(user=mentor, role="Member", is_uk=False, is_vv=True, is_mentor=True, has_preview=False,
+                          widgets=['ProgressWidget', 'CompetenceWidget', 'MentorPersonWidget', 'MentorTasksWidget'])

From 373703813c01228cdb441cd6b40839a6eeb0824f Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Wed, 10 Apr 2024 15:39:17 +0200
Subject: [PATCH 25/82] Add count tests

---
 .../dashboard/tests/test_views.py             | 298 +++++++++++++++++-
 server/vbv_lernwelt/dashboard/views.py        |  58 ++--
 2 files changed, 318 insertions(+), 38 deletions(-)

diff --git a/server/vbv_lernwelt/dashboard/tests/test_views.py b/server/vbv_lernwelt/dashboard/tests/test_views.py
index 395adc35..5bd2bcf2 100644
--- a/server/vbv_lernwelt/dashboard/tests/test_views.py
+++ b/server/vbv_lernwelt/dashboard/tests/test_views.py
@@ -1,5 +1,10 @@
 from django.test import TestCase
 
+from vbv_lernwelt.assignment.models import (
+    AssignmentCompletion,
+    AssignmentCompletionStatus,
+)
+from vbv_lernwelt.assignment.tests.assignment_factories import AssignmentFactory
 from vbv_lernwelt.course.creators.test_utils import (
     add_course_session_group_supervisor,
     add_course_session_user,
@@ -8,9 +13,21 @@ from vbv_lernwelt.course.creators.test_utils import (
     create_course_session_group,
     create_user,
 )
-from vbv_lernwelt.course.models import CourseSessionUser
-from vbv_lernwelt.dashboard.views import get_course_sessions_with_roles_for_user, get_course_config
+from vbv_lernwelt.course.models import CourseCategory, CoursePage, CourseSessionUser
+from vbv_lernwelt.dashboard.views import (
+    _get_mentee_count,
+    _get_mentor_open_tasks_count,
+    get_course_config,
+    get_course_sessions_with_roles_for_user,
+)
 from vbv_lernwelt.learning_mentor.models import LearningMentor
+from vbv_lernwelt.learnpath.tests.learning_path_factories import (
+    CircleFactory,
+    LearningPathFactory,
+    LearningSequenceFactory,
+    LearningUnitFactory,
+)
+from vbv_lernwelt.self_evaluation_feedback.models import SelfEvaluationFeedback
 
 
 class GetCourseSessionsForUserTestCase(TestCase):
@@ -105,7 +122,9 @@ class GetDashboardConfig(TestCase):
         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].session_to_continue_id, str(self.course_session.id)
+        )
         self.assertEqual(course_configs[0].role_key, role)
         self.assertEqual(course_configs[0].widgets, widgets)
 
@@ -119,8 +138,19 @@ class GetDashboardConfig(TestCase):
         self.course.configuration.is_uk = True
         self.course.configuration.save()
 
-        self._test_config(user=participant, role="Member", is_uk=True, is_vv=False, is_mentor=False, has_preview=False,
-                          widgets=['ProgressWidget', 'CompetenceWidget', 'CompetenceCertificateWidget'])
+        self._test_config(
+            user=participant,
+            role="Member",
+            is_uk=True,
+            is_vv=False,
+            is_mentor=False,
+            has_preview=False,
+            widgets=[
+                "ProgressWidget",
+                "CompetenceWidget",
+                "CompetenceCertificateWidget",
+            ],
+        )
 
     def test_participant_vv_get_config(self):
         participant = create_user("participant")
@@ -132,8 +162,15 @@ class GetDashboardConfig(TestCase):
         self.course.configuration.is_vv = True
         self.course.configuration.save()
 
-        self._test_config(user=participant, role="Member", is_uk=False, is_vv=True, is_mentor=False, has_preview=False,
-                          widgets=['ProgressWidget', 'CompetenceWidget'])
+        self._test_config(
+            user=participant,
+            role="Member",
+            is_uk=False,
+            is_vv=True,
+            is_mentor=False,
+            has_preview=False,
+            widgets=["ProgressWidget", "CompetenceWidget"],
+        )
 
     def test_mentor_uk_get_config(self):
         # GIVEN
@@ -143,8 +180,15 @@ class GetDashboardConfig(TestCase):
         self.course.configuration.is_uk = True
         self.course.configuration.save()
 
-        self._test_config(user=mentor, role="MentorUK", is_uk=True, is_vv=False, is_mentor=True, has_preview=True,
-                          widgets=['MentorPersonWidget', 'MentorCompetenceWidget'])
+        self._test_config(
+            user=mentor,
+            role="MentorUK",
+            is_uk=True,
+            is_vv=False,
+            is_mentor=True,
+            has_preview=True,
+            widgets=["MentorPersonWidget", "MentorCompetenceWidget"],
+        )
 
     def test_mentor_vv_get_config(self):
         # GIVEN
@@ -154,8 +198,15 @@ class GetDashboardConfig(TestCase):
         self.course.configuration.is_vv = True
         self.course.configuration.save()
 
-        self._test_config(user=mentor, role="MentorVV", is_uk=False, is_vv=True, is_mentor=True, has_preview=True,
-                          widgets=['MentorPersonWidget', 'MentorTasksWidget'])
+        self._test_config(
+            user=mentor,
+            role="MentorVV",
+            is_uk=False,
+            is_vv=True,
+            is_mentor=True,
+            has_preview=True,
+            widgets=["MentorPersonWidget", "MentorTasksWidget"],
+        )
 
     def test_participant_as_mentor_vv_get_config(self):
         # GIVEN
@@ -170,5 +221,226 @@ class GetDashboardConfig(TestCase):
         self.course.configuration.is_vv = True
         self.course.configuration.save()
 
-        self._test_config(user=mentor, role="Member", is_uk=False, is_vv=True, is_mentor=True, has_preview=False,
-                          widgets=['ProgressWidget', 'CompetenceWidget', 'MentorPersonWidget', 'MentorTasksWidget'])
+        self._test_config(
+            user=mentor,
+            role="Member",
+            is_uk=False,
+            is_vv=True,
+            is_mentor=True,
+            has_preview=False,
+            widgets=[
+                "ProgressWidget",
+                "CompetenceWidget",
+                "MentorPersonWidget",
+                "MentorTasksWidget",
+            ],
+        )
+
+
+class GetMenteeCountTestCase(TestCase):
+    def setUp(self):
+        self.course, _ = create_course("Test Course")
+        self.course_session = create_course_session(
+            course=self.course, title="Test Session"
+        )
+
+    def test_get_mentee_count(self):
+        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
+        )
+
+        for p in participants_with_mentor:
+            csu = add_course_session_user(
+                self.course_session,
+                p,
+                role=CourseSessionUser.Role.MEMBER,
+            )
+            lm.participants.add(csu)
+
+        add_course_session_user(
+            self.course_session,
+            participant,
+            role=CourseSessionUser.Role.MEMBER,
+        )
+
+        count = _get_mentee_count(str(self.course.id), mentor)
+        self.assertEqual(count, 2)
+
+
+class GetMentorOpenTasksTestCase(TestCase):
+    def setUp(self):
+        self.course, _ = create_course("Test Course")
+        self.course_session = create_course_session(
+            course=self.course, title="Test Session"
+        )
+        course_page = CoursePage.objects.get(course_id=self.course.id)
+        CourseCategory.objects.get_or_create(
+            course=self.course, title="Allgemein", general=True
+        )
+        lp = LearningPathFactory(
+            title="Lernpfad",
+            parent=course_page,
+        )
+        circle = CircleFactory(
+            title="Kickoff",
+            parent=lp,
+            description="bla".strip(),
+            goals="A goal",
+        )
+        LearningSequenceFactory(
+            title="Vorbereitung", parent=circle, icon="it-icon-ls-start"
+        )
+        self.lu = LearningUnitFactory(
+            title="Vorbereitung", title_hidden=True, parent=circle
+        )
+
+        self.course.configuration.is_vv = True
+        self.course.configuration.save()
+
+        self.assignment = AssignmentFactory(parent=course_page)
+
+        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(
+        self, assignment_user, evaluation_user, mentor, completion_status, count
+    ):
+        AssignmentCompletion.objects.create(
+            course_session=self.course_session,
+            assignment_user=assignment_user,
+            assignment=self.assignment,
+            completion_status=completion_status,
+            evaluation_user=evaluation_user,
+        )
+        self.assertEqual(
+            _get_mentor_open_tasks_count(str(self.course.id), mentor), count
+        )
+
+    def test_get_uk_count(self):
+        self.course.configuration.is_uk = True
+        self.course.configuration.save()
+        count = _get_mentor_open_tasks_count(str(self.course.id), self.mentor)
+        self.assertEqual(count, 0)
+
+    def test_get_vv_count_when_assignment_evaluated(self):
+        csu = add_course_session_user(
+            self.course_session,
+            self.participants[0],
+            role=CourseSessionUser.Role.MEMBER,
+        )
+        self.lm.participants.add(csu)
+
+        add_course_session_user(
+            self.course_session,
+            self.participants[1],
+            role=CourseSessionUser.Role.MEMBER,
+        )
+
+        AssignmentCompletion.objects.create(
+            course_session=self.course_session,
+            assignment_user=self.participants[0],
+            evaluation_user=self.participants[0],
+            assignment=self.assignment,
+            completion_status=AssignmentCompletionStatus.SUBMITTED.value,
+        )
+
+        self.create_and_test_count(
+            assignment_user=self.participants[0],
+            mentor=self.mentor,
+            evaluation_user=self.mentor,
+            completion_status=AssignmentCompletionStatus.EVALUATION_SUBMITTED.value,
+            count=0,
+        )
+
+    def test_get_vv_count_when_assignment_submitted(self):
+        csu = add_course_session_user(
+            self.course_session,
+            self.participants[0],
+            role=CourseSessionUser.Role.MEMBER,
+        )
+        self.lm.participants.add(csu)
+
+        add_course_session_user(
+            self.course_session,
+            self.participants[1],
+            role=CourseSessionUser.Role.MEMBER,
+        )
+
+        self.create_and_test_count(
+            assignment_user=self.participants[0],
+            mentor=self.mentor,
+            evaluation_user=self.mentor,
+            completion_status=AssignmentCompletionStatus.SUBMITTED.value,
+            count=1,
+        )
+
+    def test_get_vv_count_with_feedback_not_submitted(self):
+        csu = add_course_session_user(
+            self.course_session,
+            self.participants[0],
+            role=CourseSessionUser.Role.MEMBER,
+        )
+        self.lm.participants.add(csu)
+
+        SelfEvaluationFeedback.objects.create(
+            feedback_submitted=False,
+            feedback_requester_user=self.participants[0],
+            feedback_provider_user=self.mentor,
+            learning_unit=self.lu,
+        )
+        self.create_and_test_count(
+            assignment_user=self.participants[0],
+            mentor=self.mentor,
+            evaluation_user=self.mentor,
+            completion_status=AssignmentCompletionStatus.SUBMITTED.value,
+            count=2,
+        )
+
+    def test_get_vv_count_with_feedback_submitted(self):
+        csu = add_course_session_user(
+            self.course_session,
+            self.participants[0],
+            role=CourseSessionUser.Role.MEMBER,
+        )
+        self.lm.participants.add(csu)
+
+        SelfEvaluationFeedback.objects.create(
+            feedback_submitted=True,
+            feedback_requester_user=self.participants[0],
+            feedback_provider_user=self.mentor,
+            learning_unit=self.lu,
+        )
+        self.create_and_test_count(
+            assignment_user=self.participants[0],
+            mentor=self.mentor,
+            evaluation_user=self.mentor,
+            completion_status=AssignmentCompletionStatus.SUBMITTED.value,
+            count=1,
+        )
+
+    def test_get_vv_count_without_lm(self):
+        csu = add_course_session_user(
+            self.course_session,
+            self.participants[0],
+            role=CourseSessionUser.Role.MEMBER,
+        )
+
+        SelfEvaluationFeedback.objects.create(
+            feedback_submitted=False,
+            feedback_requester_user=self.participants[0],
+            feedback_provider_user=self.mentor,
+            learning_unit=self.lu,
+        )
+        self.create_and_test_count(
+            assignment_user=self.participants[0],
+            mentor=self.mentor,
+            evaluation_user=self.mentor,
+            completion_status=AssignmentCompletionStatus.SUBMITTED.value,
+            count=0,
+        )
diff --git a/server/vbv_lernwelt/dashboard/views.py b/server/vbv_lernwelt/dashboard/views.py
index d370b224..4cfddc6a 100644
--- a/server/vbv_lernwelt/dashboard/views.py
+++ b/server/vbv_lernwelt/dashboard/views.py
@@ -356,13 +356,9 @@ def get_dashboard_config(request):
 @api_view(["GET"])
 def get_mentee_count(request, course_id: str):
     try:
-        count = CourseSessionUser.objects.filter(
-            participants__mentor=request.user, course_session__course__id=course_id
-        ).count()
-
         return Response(
             status=200,
-            data={"mentee_count": count},
+            data={"mentee_count": _get_mentee_count(course_id, request.user)},  # noqa
         )
     except PermissionDenied as e:
         raise e
@@ -371,34 +367,46 @@ def get_mentee_count(request, course_id: str):
         return Response({"error": str(e)}, status=404)
 
 
+def _get_mentee_count(course_id: str, mentor: User) -> int:
+    return CourseSessionUser.objects.filter(
+        participants__mentor=mentor, course_session__course__id=course_id
+    ).count()
+
+
 @api_view(["GET"])
 def get_mentor_open_tasks_count(request, course_id: str):
     try:
-        open_assigment_count = 0
-        open_feedback_count = 0
-
-        course_configuration = CourseConfiguration.objects.get(course_id=course_id)
-
-        if course_configuration.is_vv:
-            open_assigment_count = AssignmentCompletion.objects.filter(
-                course_session__course__id=course_id,
-                completion_status=AssignmentCompletionStatus.SUBMITTED.value,
-                evaluation_user=request.user,  # noqa
-                assignment_user__coursesessionuser__participants__mentor=request.user,
-            ).count()
-
-            open_feedback_count = SelfEvaluationFeedback.objects.filter(
-                feedback_provider_user=request.user,  # noqa
-                feedback_requester_user__coursesessionuser__participants__mentor=request.user,
-                feedback_submitted=False,
-            ).count()
-
         return Response(
             status=200,
-            data={"open_task_count": open_assigment_count + open_feedback_count},
+            data={
+                "open_task_count": _get_mentor_open_tasks_count(course_id, request.user)
+            },  # noqa
         )
     except PermissionDenied as e:
         raise e
     except Exception as e:
         logger.error(e, exc_info=True)
         return Response({"error": str(e)}, status=404)
+
+
+def _get_mentor_open_tasks_count(course_id: str, mentor: User) -> int:
+    open_assigment_count = 0
+    open_feedback_count = 0
+
+    course_configuration = CourseConfiguration.objects.get(course_id=course_id)
+
+    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,
+        ).count()
+
+        open_feedback_count = SelfEvaluationFeedback.objects.filter(
+            feedback_provider_user=mentor,  # noqa
+            feedback_requester_user__coursesessionuser__participants__mentor=mentor,
+            feedback_submitted=False,
+        ).count()
+
+    return open_assigment_count + open_feedback_count

From 97214641614884e98fc4d2a9fe76432350356895 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Thu, 11 Apr 2024 10:43:10 +0200
Subject: [PATCH 26/82] Add mentor stats test

---
 .../tests/graphql/test_mentor_statistics.py   | 77 +++++++++++++++++++
 .../dashboard/tests/test_views.py             | 57 +++++---------
 2 files changed, 98 insertions(+), 36 deletions(-)
 create mode 100644 server/vbv_lernwelt/dashboard/tests/graphql/test_mentor_statistics.py

diff --git a/server/vbv_lernwelt/dashboard/tests/graphql/test_mentor_statistics.py b/server/vbv_lernwelt/dashboard/tests/graphql/test_mentor_statistics.py
new file mode 100644
index 00000000..823fdd09
--- /dev/null
+++ b/server/vbv_lernwelt/dashboard/tests/graphql/test_mentor_statistics.py
@@ -0,0 +1,77 @@
+from graphene_django.utils import GraphQLTestCase
+
+from vbv_lernwelt.assignment.models import (
+    AssignmentCompletion,
+    AssignmentCompletionStatus,
+)
+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
+
+
+class MentorStatisticsTestCase(BaseMentorAssignmentTestCase, GraphQLTestCase):
+    GRAPHQL_URL = "/server/graphql/"
+
+    def setUp(self):
+        super().setUp()
+        self.course.configuration.is_vv = True
+        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,
+                self.participants[i],
+                role=CourseSessionUser.Role.MEMBER,
+            )
+            if has_lb[i]:
+                self.lm.participants.add(csu)
+
+            AssignmentCompletion.objects.create(
+                course_session=self.course_session,
+                assignment_user=self.participants[i],
+                evaluation_user=self.mentor if has_lb[i] else None,
+                assignment=self.assignment,
+                completion_status=AssignmentCompletionStatus.EVALUATION_SUBMITTED.value,
+                evaluation_passed=has_passed[i],
+            )
+        # THEN
+        # WHEN
+        query = f"""query ($courseId: ID!) {{
+            mentor_course_statistics(course_id: $courseId) {{
+              course_session_selection_ids
+              user_selection_ids
+              assignments {{
+                _id
+                summary {{
+                  _id
+                  completed_count
+                  average_passed
+                  total_passed
+                  total_failed
+                }}
+              }}
+            }}
+          }}"""
+
+        # THEN
+        variables = {"courseId": str(self.course.id)}
+        self.client.force_login(self.mentor)
+        response = self.query(query, variables=variables)
+        self.assertResponseNoErrors(response)
+
+        metrics = response.json()["data"]["mentor_course_statistics"]["assignments"][
+            "summary"
+        ]
+        self.assertEqual(metrics["total_passed"], 2)
+        self.assertEqual(metrics["total_failed"], 1)
diff --git a/server/vbv_lernwelt/dashboard/tests/test_views.py b/server/vbv_lernwelt/dashboard/tests/test_views.py
index 5bd2bcf2..50692b86 100644
--- a/server/vbv_lernwelt/dashboard/tests/test_views.py
+++ b/server/vbv_lernwelt/dashboard/tests/test_views.py
@@ -1,10 +1,12 @@
 from django.test import TestCase
 
 from vbv_lernwelt.assignment.models import (
+    Assignment,
     AssignmentCompletion,
     AssignmentCompletionStatus,
 )
-from vbv_lernwelt.assignment.tests.assignment_factories import AssignmentFactory
+from vbv_lernwelt.core.create_default_users import create_default_users
+from vbv_lernwelt.course.creators.test_course import create_test_course
 from vbv_lernwelt.course.creators.test_utils import (
     add_course_session_group_supervisor,
     add_course_session_user,
@@ -13,7 +15,7 @@ from vbv_lernwelt.course.creators.test_utils import (
     create_course_session_group,
     create_user,
 )
-from vbv_lernwelt.course.models import CourseCategory, CoursePage, CourseSessionUser
+from vbv_lernwelt.course.models import Course, CourseSession, CourseSessionUser
 from vbv_lernwelt.dashboard.views import (
     _get_mentee_count,
     _get_mentor_open_tasks_count,
@@ -21,12 +23,7 @@ from vbv_lernwelt.dashboard.views import (
     get_course_sessions_with_roles_for_user,
 )
 from vbv_lernwelt.learning_mentor.models import LearningMentor
-from vbv_lernwelt.learnpath.tests.learning_path_factories import (
-    CircleFactory,
-    LearningPathFactory,
-    LearningSequenceFactory,
-    LearningUnitFactory,
-)
+from vbv_lernwelt.learnpath.models import LearningUnit
 from vbv_lernwelt.self_evaluation_feedback.models import SelfEvaluationFeedback
 
 
@@ -245,6 +242,7 @@ class GetMenteeCountTestCase(TestCase):
         )
 
     def test_get_mentee_count(self):
+        # GIVEN
         participants_with_mentor = [create_user(f"participant{i}") for i in range(2)]
         participant = create_user("participant")
         mentor = create_user("mentor")
@@ -252,6 +250,7 @@ class GetMenteeCountTestCase(TestCase):
             mentor=mentor, course_session=self.course_session
         )
 
+        # WHEN
         for p in participants_with_mentor:
             csu = add_course_session_user(
                 self.course_session,
@@ -266,42 +265,27 @@ class GetMenteeCountTestCase(TestCase):
             role=CourseSessionUser.Role.MEMBER,
         )
 
+        # THEN
         count = _get_mentee_count(str(self.course.id), mentor)
         self.assertEqual(count, 2)
 
 
-class GetMentorOpenTasksTestCase(TestCase):
+class BaseMentorAssignmentTestCase(TestCase):
     def setUp(self):
-        self.course, _ = create_course("Test Course")
-        self.course_session = create_course_session(
-            course=self.course, title="Test Session"
-        )
-        course_page = CoursePage.objects.get(course_id=self.course.id)
-        CourseCategory.objects.get_or_create(
-            course=self.course, title="Allgemein", general=True
-        )
-        lp = LearningPathFactory(
-            title="Lernpfad",
-            parent=course_page,
-        )
-        circle = CircleFactory(
-            title="Kickoff",
-            parent=lp,
-            description="bla".strip(),
-            goals="A goal",
-        )
-        LearningSequenceFactory(
-            title="Vorbereitung", parent=circle, icon="it-icon-ls-start"
-        )
-        self.lu = LearningUnitFactory(
-            title="Vorbereitung", title_hidden=True, parent=circle
-        )
+        create_default_users()
+        create_test_course(include_vv=False, with_sessions=True)
+        self.course = Course.objects.first()
+        self.course_session = CourseSession.objects.first()
+        self.lu = LearningUnit.objects.first()
+        self.assignment = Assignment.objects.first()
 
+
+class GetMentorOpenTasksTestCase(BaseMentorAssignmentTestCase):
+    def setUp(self):
+        super().setUp()
         self.course.configuration.is_vv = True
         self.course.configuration.save()
 
-        self.assignment = AssignmentFactory(parent=course_page)
-
         self.mentor = create_user("mentor")
         self.lm = LearningMentor.objects.create(
             mentor=self.mentor, course_session=self.course_session
@@ -329,6 +313,7 @@ class GetMentorOpenTasksTestCase(TestCase):
         self.assertEqual(count, 0)
 
     def test_get_vv_count_when_assignment_evaluated(self):
+        # GIVEN
         csu = add_course_session_user(
             self.course_session,
             self.participants[0],
@@ -425,7 +410,7 @@ class GetMentorOpenTasksTestCase(TestCase):
         )
 
     def test_get_vv_count_without_lm(self):
-        csu = add_course_session_user(
+        add_course_session_user(
             self.course_session,
             self.participants[0],
             role=CourseSessionUser.Role.MEMBER,

From 93b80895104cee2106432d8b526d5a40c437e068 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Thu, 11 Apr 2024 11:35:16 +0200
Subject: [PATCH 27/82] Fix stats type, set button properties

---
 .../src/components/dashboard/CoursePanel.vue  | 47 ++++++++++++++-----
 client/src/gql/gql.ts                         |  4 +-
 client/src/gql/graphql.ts                     |  5 +-
 client/src/gql/schema.graphql                 | 37 +++++++--------
 client/src/graphql/queries.ts                 | 12 -----
 .../dashboard/graphql/types/dashboard.py      |  6 +--
 6 files changed, 60 insertions(+), 51 deletions(-)

diff --git a/client/src/components/dashboard/CoursePanel.vue b/client/src/components/dashboard/CoursePanel.vue
index b6498cd6..15f2d093 100644
--- a/client/src/components/dashboard/CoursePanel.vue
+++ b/client/src/components/dashboard/CoursePanel.vue
@@ -39,16 +39,34 @@ function hasWidget(widget: WidgetType) {
   return props.courseConfig?.widgets?.includes(widget) ?? false;
 }
 
-function buttonLink(): string {
-  if (props.courseConfig?.role_key === "Member") {
-    return getLearningPathUrl(props.courseConfig?.course_slug);
-  } else if (props.courseConfig?.role_key === "Expert") {
-    return "linktocockpit";
-  } else if (props.courseConfig?.role_key === "Supervisor") {
-    return "linktocockpit";
+const actionButtonProps = computed<{ href: string; text: string; cyKey: string }>(
+  () => {
+    if (props.courseConfig?.role_key === "Member") {
+      return {
+        href: getLearningPathUrl(props.courseConfig?.course_slug),
+        text: "Weiter lernen",
+        cyKey: "progress-dashboard-continue-course-link",
+      };
+    } else if (props.courseConfig?.role_key === "Expert") {
+      return {
+        href: "expertlink",
+        text: "Cockpit anschauen",
+        cyKey: "",
+      };
+    } else if (props.courseConfig?.role_key === "Supervisor") {
+      return {
+        href: "supervisorlink",
+        text: "Cockpit anschauen",
+        cyKey: "Cockpit anschauen",
+      };
+    }
+    return {
+      href: getLearningPathUrl(props.courseConfig?.course_slug),
+      text: "Weiter lernen",
+      cyKey: "progress-dashboard-continue-course-link",
+    };
   }
-  return getLearningPathUrl(props.courseConfig?.course_slug);
-}
+);
 
 function hasActionButton(): boolean {
   return props.courseConfig?.role_key !== "MentorUK";
@@ -59,10 +77,15 @@ function hasActionButton(): boolean {
   <div v-if="courseConfig" class="mb-14 space-y-8">
     <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 justify-between">
+        <div class="flex flex-row items-start justify-between">
           <h3 class="mb-4 text-3xl">{{ courseName }}</h3>
-          <a v-if="hasActionButton()" :href="buttonLink()" class="btn btn-sm btn-blue">
-            foo
+          <a
+            v-if="hasActionButton()"
+            :href="actionButtonProps.href"
+            class="btn-blue"
+            :data-cy="actionButtonProps.cyKey"
+          >
+            {{ actionButtonProps.text }}
           </a>
         </div>
         <p>
diff --git a/client/src/gql/gql.ts b/client/src/gql/gql.ts
index 3f2af39a..9fdb14ae 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        }\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_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      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!) {\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  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!) {\n    mentor_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      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_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      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!) {\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"];
 /**
  * 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 1dfde50e..a4149db6 100644
--- a/client/src/gql/graphql.ts
+++ b/client/src/gql/graphql.ts
@@ -242,7 +242,6 @@ 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'];
@@ -1322,7 +1321,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, 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, 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 SendFeedbackMutationMutationVariables = Exact<{
   courseSessionId: Scalars['ID']['input'];
@@ -1347,5 +1346,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_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":"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"}}}}],"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 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 50f8d343..5df3500c 100644
--- a/client/src/gql/schema.graphql
+++ b/client/src/gql/schema.graphql
@@ -31,32 +31,15 @@ type CourseStatisticsType {
   course_title: String!
   course_slug: String!
   course_session_selection_ids: [ID]!
-  course_session_properties: StatisticsCourseSessionPropertiesType!
   user_selection_ids: [ID]
   assignments: AssignmentsStatisticsType!
+  course_session_properties: StatisticsCourseSessionPropertiesType!
   course_session_selection_metrics: StatisticsCourseSessionsSelectionMetricType!
   attendance_day_presences: AttendanceDayPresencesStatisticsType!
   feedback_responses: FeedbackStatisticsResponsesType!
   competences: CompetencesStatisticsType!
 }
 
-type StatisticsCourseSessionPropertiesType {
-  _id: ID!
-  sessions: [StatisticsCourseSessionDataType!]!
-  generations: [String!]!
-  circles: [StatisticsCircleDataType!]!
-}
-
-type StatisticsCourseSessionDataType {
-  id: ID!
-  name: String!
-}
-
-type StatisticsCircleDataType {
-  id: ID!
-  name: String!
-}
-
 type AssignmentsStatisticsType {
   _id: ID!
   records: [AssignmentStatisticsRecordType!]!
@@ -100,6 +83,23 @@ type AssignmentStatisticsSummaryType {
   total_failed: Int!
 }
 
+type StatisticsCourseSessionPropertiesType {
+  _id: ID!
+  sessions: [StatisticsCourseSessionDataType!]!
+  generations: [String!]!
+  circles: [StatisticsCircleDataType!]!
+}
+
+type StatisticsCourseSessionDataType {
+  id: ID!
+  name: String!
+}
+
+type StatisticsCircleDataType {
+  id: ID!
+  name: String!
+}
+
 type StatisticsCourseSessionsSelectionMetricType {
   _id: ID!
   session_count: Int!
@@ -183,7 +183,6 @@ type BaseStatisticsType {
   course_title: String!
   course_slug: String!
   course_session_selection_ids: [ID]!
-  course_session_properties: StatisticsCourseSessionPropertiesType!
   user_selection_ids: [ID]
   assignments: AssignmentsStatisticsType!
 }
diff --git a/client/src/graphql/queries.ts b/client/src/graphql/queries.ts
index 685f2bb6..a4da79c9 100644
--- a/client/src/graphql/queries.ts
+++ b/client/src/graphql/queries.ts
@@ -464,18 +464,6 @@ export const DASHBOARD_MENTOR_COMPETENCE_SUMMARY = graphql(`
       course_id
       course_title
       course_slug
-      course_session_properties {
-        _id
-        sessions {
-          id
-          name
-        }
-        generations
-        circles {
-          id
-          name
-        }
-      }
       course_session_selection_ids
       user_selection_ids
       assignments {
diff --git a/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py b/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py
index 83f33993..0be1627c 100644
--- a/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py
+++ b/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py
@@ -93,9 +93,6 @@ class BaseStatisticsType(graphene.ObjectType):
     course_title = graphene.String(required=True)
     course_slug = graphene.String(required=True)
     course_session_selection_ids = graphene.List(graphene.ID, required=True)
-    course_session_properties = graphene.Field(
-        StatisticsCourseSessionPropertiesType, required=True
-    )
     user_selection_ids = graphene.List(graphene.ID, required=False)
     assignments = graphene.Field(AssignmentsStatisticsType, required=True)
 
@@ -113,6 +110,9 @@ class BaseStatisticsType(graphene.ObjectType):
 
 
 class CourseStatisticsType(BaseStatisticsType):
+    course_session_properties = graphene.Field(
+        StatisticsCourseSessionPropertiesType, required=True
+    )
     course_session_selection_metrics = graphene.Field(
         StatisticsCourseSessionsSelectionMetricType, required=True
     )

From b19375f336cd621e7479dc7443b111d695c5373e Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Thu, 11 Apr 2024 13:37:14 +0200
Subject: [PATCH 28/82] =?UTF-8?q?Change=20menu=20order,=20hide=20tasks=20f?=
 =?UTF-8?q?or=20=C3=BCK?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../learningMentor/mentor/MentorIndexPage.vue | 24 +++++++++----------
 client/src/router/index.ts                    | 12 +++++-----
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/client/src/pages/learningMentor/mentor/MentorIndexPage.vue b/client/src/pages/learningMentor/mentor/MentorIndexPage.vue
index b4653aea..d73868f6 100644
--- a/client/src/pages/learningMentor/mentor/MentorIndexPage.vue
+++ b/client/src/pages/learningMentor/mentor/MentorIndexPage.vue
@@ -29,7 +29,19 @@ onMounted(() => {
     >
       <ul class="flex flex-col lg:flex-row">
         <li
+          data-cy="lm-mentees-navigation-link"
           class="border-t-2 border-t-transparent"
+          :class="{
+            'border-b-2 border-b-blue-900': route.name === 'mentorsAndParticipants',
+          }"
+        >
+          <router-link :to="{ name: 'mentorsAndParticipants' }" class="block py-3">
+            {{ $t("a.Personen") }}
+          </router-link>
+        </li>
+        <li
+          v-if="!courseSession.course.configuration.is_uk"
+          class="border-t-2 border-t-transparent lg:ml-12"
           :class="{
             'border-b-2 border-b-blue-900': route.name
               ?.toString()
@@ -44,18 +56,6 @@ onMounted(() => {
             {{ $t("a.Übersicht") }}
           </router-link>
         </li>
-
-        <li
-          data-cy="lm-mentees-navigation-link"
-          class="border-t-2 border-t-transparent lg:ml-12"
-          :class="{
-            'border-b-2 border-b-blue-900': route.name === 'mentorsAndParticipants',
-          }"
-        >
-          <router-link :to="{ name: 'mentorsAndParticipants' }" class="block py-3">
-            {{ $t("a.Personen") }}
-          </router-link>
-        </li>
       </ul>
     </nav>
     <main class="container-large">
diff --git a/client/src/router/index.ts b/client/src/router/index.ts
index f4d2cd26..f28e4c92 100644
--- a/client/src/router/index.ts
+++ b/client/src/router/index.ts
@@ -182,16 +182,16 @@ const router = createRouter({
       children: [
         {
           path: "",
-          component: () =>
-            import("@/pages/learningMentor/mentor/MentorOverviewPage.vue"),
-          name: "learningMentorOverview",
-        },
-        {
-          path: "participants",
           component: () =>
             import("@/pages/learningMentor/mentor/MentorParticipantsPage.vue"),
           name: "mentorsAndParticipants",
         },
+        {
+          path: "tasks",
+          component: () =>
+            import("@/pages/learningMentor/mentor/MentorOverviewPage.vue"),
+          name: "learningMentorOverview",
+        },
         {
           path: "self-evaluation-feedback/:learningUnitId",
           component: () =>

From 77c69f12297d7a04e00a440f68dee21538529a89 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Thu, 11 Apr 2024 14:06:18 +0200
Subject: [PATCH 29/82] Add progress text to diagram

---
 .../learningPath/LearningPathDiagram.vue      | 31 ++++++++++++++-----
 client/src/composables.ts                     | 23 +++++++++++++-
 .../learningPathPage/LearningPathPage.vue     | 20 +++---------
 3 files changed, 50 insertions(+), 24 deletions(-)

diff --git a/client/src/components/learningPath/LearningPathDiagram.vue b/client/src/components/learningPath/LearningPathDiagram.vue
index 6fe0235d..ce0c098e 100644
--- a/client/src/components/learningPath/LearningPathDiagram.vue
+++ b/client/src/components/learningPath/LearningPathDiagram.vue
@@ -2,7 +2,7 @@
 import LearningPathCircle from "@/pages/learningPath/learningPathPage/LearningPathCircle.vue";
 import { calculateCircleSectorData } from "@/pages/learningPath/learningPathPage/utils";
 import { computed } from "vue";
-import { useCourseDataWithCompletion } from "@/composables";
+import { useCourseCircleProgress, useCourseDataWithCompletion } from "@/composables";
 
 export type DiagramType = "horizontal" | "horizontalSmall" | "singleSmall";
 
@@ -46,14 +46,31 @@ const wrapperClasses = computed(() => {
   }
   return classes;
 });
+
+const { inProgressCirclesCount, circlesCount } = useCourseCircleProgress(
+  lpQueryResult.circles
+);
 </script>
 
 <template>
-  <div :class="wrapperClasses">
-    <LearningPathCircle
-      v-for="circle in circles"
-      :key="circle.id"
-      :sectors="calculateCircleSectorData(circle)"
-    ></LearningPathCircle>
+  <div>
+    <h4
+      v-if="diagramType === 'horizontal' && circles.length > 0"
+      class="mb-4 font-bold"
+    >
+      {{
+        $t("learningPathPage.progressText", {
+          inProgressCount: inProgressCirclesCount,
+          allCount: circlesCount,
+        })
+      }}
+    </h4>
+    <div :class="wrapperClasses">
+      <LearningPathCircle
+        v-for="circle in circles"
+        :key="circle.id"
+        :sectors="calculateCircleSectorData(circle)"
+      ></LearningPathCircle>
+    </div>
   </div>
 </template>
diff --git a/client/src/composables.ts b/client/src/composables.ts
index bb37d1de..0f0a50f3 100644
--- a/client/src/composables.ts
+++ b/client/src/composables.ts
@@ -6,6 +6,7 @@ import {
   circleFlatChildren,
   circleFlatLearningContents,
   circleFlatLearningUnits,
+  someFinishedInLearningSequence,
 } from "@/services/circle";
 import type { DashboardPersonType } from "@/services/dashboard";
 import { fetchDashboardPersons } from "@/services/dashboard";
@@ -16,6 +17,7 @@ import { useDashboardStore } from "@/stores/dashboard";
 import { useUserStore } from "@/stores/user";
 import type {
   ActionCompetence,
+  CircleType,
   Course,
   CourseCompletion,
   CourseCompletionStatus,
@@ -30,7 +32,7 @@ import type {
 import { useQuery } from "@urql/vue";
 import orderBy from "lodash/orderBy";
 import log from "loglevel";
-import type { ComputedRef } from "vue";
+import type { ComputedRef, Ref } from "vue";
 import { computed, onMounted, ref, watchEffect } from "vue";
 
 export function useCurrentCourseSession() {
@@ -552,3 +554,22 @@ export function useMentorTexts() {
 
   return { ...texts.value };
 }
+
+export function useCourseCircleProgress(circles: Ref<CircleType[] | undefined>) {
+  const inProgressCirclesCount = computed(() => {
+    if (circles.value?.length) {
+      return circles.value.filter(
+        (circle) =>
+          circle.learning_sequences.filter((ls) => someFinishedInLearningSequence(ls))
+            .length
+      ).length;
+    }
+    return 0;
+  });
+
+  const circlesCount = computed(() => {
+    return circles.value?.length ?? 0;
+  });
+
+  return { inProgressCirclesCount, circlesCount };
+}
diff --git a/client/src/pages/learningPath/learningPathPage/LearningPathPage.vue b/client/src/pages/learningPath/learningPathPage/LearningPathPage.vue
index 6e0a4f46..f9a20239 100644
--- a/client/src/pages/learningPath/learningPathPage/LearningPathPage.vue
+++ b/client/src/pages/learningPath/learningPathPage/LearningPathPage.vue
@@ -8,8 +8,7 @@ import type { ViewType } from "@/pages/learningPath/learningPathPage/LearningPat
 import LearningPathViewSwitch from "@/pages/learningPath/learningPathPage/LearningPathViewSwitch.vue";
 import { breakpointsTailwind, useBreakpoints } from "@vueuse/core";
 import { computed, ref } from "vue";
-import { useCourseDataWithCompletion } from "@/composables";
-import { someFinishedInLearningSequence } from "@/services/circle";
+import { useCourseCircleProgress, useCourseDataWithCompletion } from "@/composables";
 
 const props = defineProps<{
   courseSlug: string;
@@ -28,20 +27,9 @@ const lpQueryResult = useCourseDataWithCompletion(props.courseSlug);
 const learningPath = computed(() => lpQueryResult.learningPath.value);
 const course = computed(() => lpQueryResult.course.value);
 
-const circlesCount = computed(() => {
-  return lpQueryResult.circles.value?.length ?? 0;
-});
-
-const inProgressCirclesCount = computed(() => {
-  if (lpQueryResult.circles.value?.length) {
-    return lpQueryResult.circles.value.filter(
-      (circle) =>
-        circle.learning_sequences.filter((ls) => someFinishedInLearningSequence(ls))
-          .length
-    ).length;
-  }
-  return 0;
-});
+const { inProgressCirclesCount, circlesCount } = useCourseCircleProgress(
+  lpQueryResult.circles
+);
 
 const changeViewType = (viewType: ViewType) => {
   selectedView.value = viewType;

From 121f7c227aeac5e2fe8ec6f6513ee13dd5645597 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Thu, 11 Apr 2024 15:09:59 +0200
Subject: [PATCH 30/82] WIP: Add supervisor base dashboard

---
 .../src/components/dashboard/CoursePanel.vue  |  7 ++
 .../src/components/dashboard/UkStatistics.vue | 64 +++++++++++++++++++
 client/src/services/dashboard.ts              |  3 +-
 .../dashboard/tests/test_views.py             |  3 +
 server/vbv_lernwelt/dashboard/views.py        | 10 ++-
 5 files changed, 84 insertions(+), 3 deletions(-)
 create mode 100644 client/src/components/dashboard/UkStatistics.vue

diff --git a/client/src/components/dashboard/CoursePanel.vue b/client/src/components/dashboard/CoursePanel.vue
index 15f2d093..26c04b7d 100644
--- a/client/src/components/dashboard/CoursePanel.vue
+++ b/client/src/components/dashboard/CoursePanel.vue
@@ -8,6 +8,7 @@ import MentorOpenTasksCount from "@/components/dashboard/MentorOpenTasksCount.vu
 import MentorMenteeCount from "@/components/dashboard/MentorMenteeCount.vue";
 import MentorCompetenceSummary from "@/components/dashboard/MentorCompetenceSummary.vue";
 import { getLearningPathUrl } from "@/utils/utils";
+import UkStatistics from "@/components/dashboard/UkStatistics.vue";
 
 const mentorWidgets = [
   "MentorTasksWidget",
@@ -135,6 +136,12 @@ 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-id="courseConfig.course_id" />
+      </div>
       <div v-if="numberOfMentorWidgets > 0" class="flex flex-col flex-wrap md:flex-row">
         <MentorOpenTasksCount
           v-if="hasWidget('MentorTasksWidget')"
diff --git a/client/src/components/dashboard/UkStatistics.vue b/client/src/components/dashboard/UkStatistics.vue
new file mode 100644
index 00000000..5d06641f
--- /dev/null
+++ b/client/src/components/dashboard/UkStatistics.vue
@@ -0,0 +1,64 @@
+<script setup lang="ts">
+import { useDashboardStore } from "@/stores/dashboard";
+import { computed } from "vue";
+import AttendanceSummaryBox from "@/components/dashboard/AttendanceSummaryBox.vue";
+import type { CourseStatisticsType } from "@/gql/graphql";
+import AssignmentSummaryBox from "@/components/dashboard/AssignmentSummaryBox.vue";
+import FeedbackSummaryBox from "@/components/dashboard/FeedbackSummaryBox.vue";
+import CompetenceSummaryBox from "@/components/dashboard/CompetenceSummaryBox.vue";
+
+const dashboardStore = useDashboardStore();
+
+const statistics = computed(() => {
+  return dashboardStore.currentDashBoardData as CourseStatisticsType;
+});
+
+const attendanceDayPresences = computed(() => {
+  return statistics.value.attendance_day_presences.summary;
+});
+
+const assigmentSummary = computed(() => {
+  return statistics.value.assignments.summary;
+});
+
+const competenceSummary = computed(() => {
+  return statistics.value.competences.summary;
+});
+
+const feebackSummary = computed(() => {
+  return statistics.value.feedback_responses.summary;
+});
+</script>
+
+<template>
+  <div v-if="statistics" 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"
+    >
+      <AttendanceSummaryBox
+        class="flex-grow"
+        :days-completed="attendanceDayPresences.days_completed"
+        :avg-participants-present="attendanceDayPresences.participants_present"
+      />
+      <AssignmentSummaryBox
+        class="flex-grow"
+        :assignments-completed="assigmentSummary.completed_count"
+        :avg-passed="assigmentSummary.average_passed"
+      />
+    </div>
+    <div
+      class="flex flex-col flex-wrap gap-x-5 border-b border-gray-300 pb-8 align-top last:border-0 md:flex-row"
+    >
+      <FeedbackSummaryBox
+        :feedback-count="feebackSummary.total_responses"
+        :statisfaction-max="feebackSummary.satisfaction_max"
+        :statisfaction-avg="feebackSummary.satisfaction_average"
+      />
+      <CompetenceSummaryBox
+        :fail-count="competenceSummary.fail_total"
+        :success-count="competenceSummary.success_total"
+        details-link="/statistic/competence"
+      />
+    </div>
+  </div>
+</template>
diff --git a/client/src/services/dashboard.ts b/client/src/services/dashboard.ts
index 7b18955e..04489a51 100644
--- a/client/src/services/dashboard.ts
+++ b/client/src/services/dashboard.ts
@@ -34,7 +34,8 @@ export type WidgetType =
   | "MentorTasksWidget"
   | "MentorPersonWidget"
   | "MentorCompetenceWidget"
-  | "CompetenceCertificateWidget";
+  | "CompetenceCertificateWidget"
+  | "UKStatisticsWidget";
 
 export type DashboardPersonCourseSessionType = {
   id: number;
diff --git a/server/vbv_lernwelt/dashboard/tests/test_views.py b/server/vbv_lernwelt/dashboard/tests/test_views.py
index 50692b86..ddd0d248 100644
--- a/server/vbv_lernwelt/dashboard/tests/test_views.py
+++ b/server/vbv_lernwelt/dashboard/tests/test_views.py
@@ -233,6 +233,9 @@ class GetDashboardConfig(TestCase):
             ],
         )
 
+    # test supervisor
+    # test expert
+
 
 class GetMenteeCountTestCase(TestCase):
     def setUp(self):
diff --git a/server/vbv_lernwelt/dashboard/views.py b/server/vbv_lernwelt/dashboard/views.py
index 4cfddc6a..fa60cac3 100644
--- a/server/vbv_lernwelt/dashboard/views.py
+++ b/server/vbv_lernwelt/dashboard/views.py
@@ -29,6 +29,7 @@ class WidgetType(Enum):
     MENTOR_PERSON_WIDGET = "MentorPersonWidget"
     MENTOR_COMPETENCE_WIDGET = "MentorCompetenceWidget"
     COMPETENCE_CERTIFICATE_WIDGET = "CompetenceCertificateWidget"
+    UK_STATISTICS_WIDGET = "UKStatisticsWidget"
 
 
 class RoleKeyType(Enum):
@@ -241,6 +242,9 @@ def get_widgets_for_course(
         if is_uk:
             widgets.append(WidgetType.COMPETENCE_CERTIFICATE_WIDGET.value)
 
+    if role_key == RoleKeyType.SUPERVISOR:
+        widgets.append(WidgetType.UK_STATISTICS_WIDGET.value)
+
     if is_mentor:
         widgets.append(WidgetType.MENTOR_PERSON_WIDGET.value)
         if is_vv:
@@ -379,8 +383,10 @@ 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:
         raise e

From 68d44f950f5f16b10082e63846f642eba87d17bd Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Mon, 15 Apr 2024 13:48:56 +0200
Subject: [PATCH 31/82] WIP: Filter statistics by circle

---
 .../src/components/dashboard/UkStatistics.vue | 13 ++++++++++---
 client/src/stores/dashboard.ts                |  7 +++++++
 .../vbv_lernwelt/dashboard/graphql/queries.py | 19 ++++++++++++++++++-
 .../dashboard/graphql/types/assignment.py     |  5 +++++
 .../dashboard/graphql/types/attendance.py     |  6 +++++-
 .../dashboard/graphql/types/competence.py     |  7 ++++++-
 .../dashboard/graphql/types/dashboard.py      |  7 +++++++
 .../dashboard/graphql/types/feedback.py       |  4 ++++
 server/vbv_lernwelt/dashboard/views.py        |  2 +-
 9 files changed, 63 insertions(+), 7 deletions(-)

diff --git a/client/src/components/dashboard/UkStatistics.vue b/client/src/components/dashboard/UkStatistics.vue
index 5d06641f..ebd5712f 100644
--- a/client/src/components/dashboard/UkStatistics.vue
+++ b/client/src/components/dashboard/UkStatistics.vue
@@ -1,14 +1,17 @@
 <script setup lang="ts">
 import { useDashboardStore } from "@/stores/dashboard";
-import { computed } from "vue";
+import { computed, onMounted } from "vue";
 import AttendanceSummaryBox from "@/components/dashboard/AttendanceSummaryBox.vue";
 import type { CourseStatisticsType } from "@/gql/graphql";
 import AssignmentSummaryBox from "@/components/dashboard/AssignmentSummaryBox.vue";
 import FeedbackSummaryBox from "@/components/dashboard/FeedbackSummaryBox.vue";
 import CompetenceSummaryBox from "@/components/dashboard/CompetenceSummaryBox.vue";
 
-const dashboardStore = useDashboardStore();
+const props = defineProps<{
+  courseId: string;
+}>();
 
+const dashboardStore = useDashboardStore();
 const statistics = computed(() => {
   return dashboardStore.currentDashBoardData as CourseStatisticsType;
 });
@@ -28,6 +31,10 @@ const competenceSummary = computed(() => {
 const feebackSummary = computed(() => {
   return statistics.value.feedback_responses.summary;
 });
+
+onMounted(async () => {
+  await dashboardStore.loadStatisticsData(props.courseId);
+});
 </script>
 
 <template>
@@ -47,7 +54,7 @@ const feebackSummary = computed(() => {
       />
     </div>
     <div
-      class="flex flex-col flex-wrap gap-x-5 border-b border-gray-300 pb-8 align-top last:border-0 md:flex-row"
+      class="flex flex-col flex-wrap gap-x-5 border-b border-gray-300 align-top last:border-0 md:flex-row"
     >
       <FeedbackSummaryBox
         :feedback-count="feebackSummary.total_responses"
diff --git a/client/src/stores/dashboard.ts b/client/src/stores/dashboard.ts
index 1b011169..10e738b0 100644
--- a/client/src/stores/dashboard.ts
+++ b/client/src/stores/dashboard.ts
@@ -72,6 +72,12 @@ export const useDashboardStore = defineStore("dashboard", () => {
     }
   };
 
+  const loadStatisticsData = async (id: string) => {
+    const data = await fetchStatisticData(id);
+    dashBoardDataCache[id] = data;
+    currentDashBoardData.value = data;
+  };
+
   return {
     dashboardConfigs,
     currentDashboardConfig,
@@ -80,5 +86,6 @@ export const useDashboardStore = defineStore("dashboard", () => {
     loadDashboardDetails,
     currentDashBoardData,
     loading,
+    loadStatisticsData,
   };
 });
diff --git a/server/vbv_lernwelt/dashboard/graphql/queries.py b/server/vbv_lernwelt/dashboard/graphql/queries.py
index d2c2067a..925216c9 100644
--- a/server/vbv_lernwelt/dashboard/graphql/queries.py
+++ b/server/vbv_lernwelt/dashboard/graphql/queries.py
@@ -26,6 +26,7 @@ from vbv_lernwelt.iam.permissions import (
     can_view_course_session_progress,
 )
 from vbv_lernwelt.learning_mentor.models import LearningMentor
+from vbv_lernwelt.learnpath.models import Circle
 
 
 class DashboardQuery(graphene.ObjectType):
@@ -56,9 +57,25 @@ class DashboardQuery(graphene.ObjectType):
                 course_session_ids.update(
                     group.course_session.all().values_list("id", flat=True)
                 )
+        course_session_ids = set()
 
+        # let's assume that users are not supervisors in one region/group and trainer in another
         if not course_session_ids:
-            return None
+            circle_ids = set()
+            circle_ids.update(
+                Circle.objects.filter(
+                    expert__user=user, expert__role=CourseSessionUser.Role.EXPERT
+                ).values_list("id", flat=True)
+            )
+            course_session_ids = CourseSession.objects.filter(
+                course=course,
+                coursesessionuser__user=user,
+                coursesessionuser__role=CourseSessionUser.Role.EXPERT,
+            ).values_list("id", flat=True)
+            setattr(info.context, "circle_ids", list(circle_ids))
+        # get trainer courses & circles
+
+        # return None
 
         return CourseStatisticsType(
             _id=course.id,  # noqa
diff --git a/server/vbv_lernwelt/dashboard/graphql/types/assignment.py b/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
index be2160fc..499ccf61 100644
--- a/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
+++ b/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
@@ -161,6 +161,7 @@ def assignments(
     course_id: graphene.ID(required=True),
     course_session_selection_ids: graphene.List(graphene.ID),
     user_selection_ids: List[str] | None = None,
+    circle_ids: List[graphene.ID] | None = None,
 ) -> AssignmentsStatisticsType:
     course_sessions = CourseSession.objects.filter(
         id__in=course_session_selection_ids,
@@ -175,6 +176,8 @@ def assignments(
             ],
             learning_content__content_assignment__competence_certificate__isnull=False,
         ):
+            if circle_ids and csa.learning_content.get_circle().id not in circle_ids:
+                continue
             record = create_record(
                 course_session_assignment=csa, user_selection_ids=user_selection_ids
             )
@@ -184,6 +187,8 @@ def assignments(
             course_session=course_session,
             learning_content__content_assignment__competence_certificate__isnull=False,
         ):
+            if circle_ids and cset.learning_content.get_circle().id not in circle_ids:
+                continue
             record = create_record(
                 course_session_assignment=cset, user_selection_ids=user_selection_ids
             )
diff --git a/server/vbv_lernwelt/dashboard/graphql/types/attendance.py b/server/vbv_lernwelt/dashboard/graphql/types/attendance.py
index 0ef5de9a..caf6105d 100644
--- a/server/vbv_lernwelt/dashboard/graphql/types/attendance.py
+++ b/server/vbv_lernwelt/dashboard/graphql/types/attendance.py
@@ -37,6 +37,7 @@ class AttendanceDayPresencesStatisticsType(graphene.ObjectType):
 def attendance_day_presences(
     course_id: graphene.ID,
     course_session_selection_ids: graphene.List(graphene.ID),
+    circle_ids: List[graphene.ID] = None,
 ) -> AttendanceDayPresencesStatisticsType:
     completed = CourseSessionAttendanceCourse.objects.filter(
         course_session_id__in=course_session_selection_ids,
@@ -48,6 +49,9 @@ def attendance_day_presences(
     for attendance_day in completed:
         circle = attendance_day.learning_content.get_parent_circle()
 
+        if circle_ids and circle.id not in circle_ids:
+            continue
+
         course_session = attendance_day.course_session
 
         url = f"/course/{course_session.course.slug}/cockpit/attendance?id={attendance_day.learning_content.id}&courseSessionId={course_session.id}"
@@ -85,7 +89,7 @@ def attendance_day_presences(
 
     summary = AttendanceSummaryStatisticsType(
         _id=course_id,  # noqa
-        days_completed=completed.count(),  # noqa
+        days_completed=len(records),  # noqa
         participants_present=calculate_avg_participation(records),  # noqa
     )
 
diff --git a/server/vbv_lernwelt/dashboard/graphql/types/competence.py b/server/vbv_lernwelt/dashboard/graphql/types/competence.py
index e4a2025c..8a8875da 100644
--- a/server/vbv_lernwelt/dashboard/graphql/types/competence.py
+++ b/server/vbv_lernwelt/dashboard/graphql/types/competence.py
@@ -35,6 +35,7 @@ def competences(
     course_session_selection_ids: List[str],
     course_slug: str,
     user_selection_ids: List[str] | None = None,
+    circle_ids: List[str] | None = None,
 ) -> Tuple[List[CompetenceRecordStatisticsType], int, int]:
     completions = CourseCompletion.objects.filter(
         course_session_id__in=course_session_selection_ids,
@@ -54,7 +55,8 @@ def competences(
     circles = {
         lu.id: c
         for lu in learning_units.values()
-        if lu is not None and (c := lu.get_circle()) is not None
+        if (lu is not None and (c := lu.get_circle()) is not None)
+        and (circle_ids is None or c.id in circle_ids)
     }
 
     for completion in completions:
@@ -65,6 +67,9 @@ def competences(
 
         circle = circles.get(learning_unit.id)
 
+        if not circle:
+            continue
+
         combined_id = f"{circle.id}-{completion.course_session.id}"
 
         competence_records.setdefault(combined_id, {}).setdefault(
diff --git a/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py b/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py
index 0be1627c..0e3c59ee 100644
--- a/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py
+++ b/server/vbv_lernwelt/dashboard/graphql/types/dashboard.py
@@ -106,8 +106,12 @@ class BaseStatisticsType(graphene.ObjectType):
             course_id=root.course_id,
             course_session_selection_ids=root.course_session_selection_ids,
             user_selection_ids=user_selection_ids,
+            circle_ids=root.get_circle_ids(_info),
         )
 
+    def get_circle_ids(self, info):
+        return getattr(info.context, "circle_ids", None)
+
 
 class CourseStatisticsType(BaseStatisticsType):
     course_session_properties = graphene.Field(
@@ -128,6 +132,7 @@ class CourseStatisticsType(BaseStatisticsType):
         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),
         )
 
     def resolve_feedback_responses(root, info) -> FeedbackStatisticsResponsesType:
@@ -135,6 +140,7 @@ class CourseStatisticsType(BaseStatisticsType):
             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),
         )
 
     def resolve_competences(root, info) -> CompetencesStatisticsType:
@@ -149,6 +155,7 @@ class CourseStatisticsType(BaseStatisticsType):
                 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
         )
         return CompetencesStatisticsType(
             _id=root._id,  # noqa
diff --git a/server/vbv_lernwelt/dashboard/graphql/types/feedback.py b/server/vbv_lernwelt/dashboard/graphql/types/feedback.py
index f3e4a841..370ce8fe 100644
--- a/server/vbv_lernwelt/dashboard/graphql/types/feedback.py
+++ b/server/vbv_lernwelt/dashboard/graphql/types/feedback.py
@@ -37,6 +37,7 @@ def feedback_responses(
     course_session_selection_ids: graphene.List(graphene.ID),
     course_id: graphene.ID,
     course_slug: graphene.String,
+    circle_ids: List[graphene.ID] = None,
 ) -> FeedbackStatisticsResponsesType:
     # Get all course sessions for this user in the given course
     course_sessions = CourseSession.objects.filter(
@@ -53,6 +54,9 @@ def feedback_responses(
             feedback_user__in=feedback_users(course_session.id),
         )
 
+        if circle_ids and len(circle_ids):
+            fbs = fbs.filter(circle__id__in=circle_ids)
+
         total_responses += len(fbs)
 
         circle_feedbacks.extend(
diff --git a/server/vbv_lernwelt/dashboard/views.py b/server/vbv_lernwelt/dashboard/views.py
index fa60cac3..82caa025 100644
--- a/server/vbv_lernwelt/dashboard/views.py
+++ b/server/vbv_lernwelt/dashboard/views.py
@@ -242,7 +242,7 @@ def get_widgets_for_course(
         if is_uk:
             widgets.append(WidgetType.COMPETENCE_CERTIFICATE_WIDGET.value)
 
-    if role_key == RoleKeyType.SUPERVISOR:
+    if role_key in [RoleKeyType.SUPERVISOR, RoleKeyType.TRAINER] and is_uk:
         widgets.append(WidgetType.UK_STATISTICS_WIDGET.value)
 
     if is_mentor:

From dc6c645c467ea5a8a533340acb1065cd5476c195 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Mon, 15 Apr 2024 16:37:07 +0200
Subject: [PATCH 32/82] Add Trainer statistics tests

---
 .../vbv_lernwelt/dashboard/graphql/queries.py |   3 +-
 .../tests/graphql/test_assignment.py          | 116 ++++++++++++++++++
 2 files changed, 118 insertions(+), 1 deletion(-)

diff --git a/server/vbv_lernwelt/dashboard/graphql/queries.py b/server/vbv_lernwelt/dashboard/graphql/queries.py
index 925216c9..b0896860 100644
--- a/server/vbv_lernwelt/dashboard/graphql/queries.py
+++ b/server/vbv_lernwelt/dashboard/graphql/queries.py
@@ -73,7 +73,8 @@ class DashboardQuery(graphene.ObjectType):
                 coursesessionuser__role=CourseSessionUser.Role.EXPERT,
             ).values_list("id", flat=True)
             setattr(info.context, "circle_ids", list(circle_ids))
-        # get trainer courses & circles
+
+            # todo: if course_session_ids and circles are empty return none or 404 or 401
 
         # return None
 
diff --git a/server/vbv_lernwelt/dashboard/tests/graphql/test_assignment.py b/server/vbv_lernwelt/dashboard/tests/graphql/test_assignment.py
index 35d6b764..a3c53ae2 100644
--- a/server/vbv_lernwelt/dashboard/tests/graphql/test_assignment.py
+++ b/server/vbv_lernwelt/dashboard/tests/graphql/test_assignment.py
@@ -318,6 +318,122 @@ class AssignmentTestCase(GraphQLTestCase):
         self.assertEqual(assignment_3_metrics["average_passed"], 100)
 
 
+class ExpertAssignmentTestCase(AssignmentTestCase):
+    def setUp(self):
+        self.course, self.course_page = create_course("Test Course")
+        self.course_session = create_course_session(course=self.course, title=":)")
+        course_session = create_course_session(course=self.course, title=":(")
+        self.circle, _ = create_circle(title="Circle", course_page=self.course_page)
+        circle, _ = create_circle(title="Other Circle", course_page=self.course_page)
+
+        create_course_session_group(course_session=self.course_session)
+
+        self.m1 = create_user("member_1")
+        add_course_session_user(
+            course_session=self.course_session,
+            user=self.m1,
+            role=CourseSessionUser.Role.MEMBER,
+        )
+
+        self.m2 = create_user("member_2")
+        add_course_session_user(
+            course_session=self.course_session,
+            user=self.m2,
+            role=CourseSessionUser.Role.MEMBER,
+        )
+
+        self.m3 = create_user("member_3")
+        add_course_session_user(
+            course_session=self.course_session,
+            user=self.m3,
+            role=CourseSessionUser.Role.MEMBER,
+        )
+
+        self.e1 = create_user("expert_1")
+        csu = add_course_session_user(
+            course_session=self.course_session,
+            user=self.e1,
+            role=CourseSessionUser.Role.EXPERT,
+        )
+        csu.expert.add(self.circle)
+
+        m4 = create_user("member_4")
+        add_course_session_user(
+            course_session=course_session,
+            user=m4,
+            role=CourseSessionUser.Role.MEMBER,
+        )
+
+        m5 = create_user("member_5")
+        add_course_session_user(
+            course_session=course_session,
+            user=m5,
+            role=CourseSessionUser.Role.MEMBER,
+        )
+
+        # assignments in the other course session should not be included
+        assignment_1, _ = mix_assignment_cocktail(
+            deadline_at=datetime(1990, 4, 1),
+            assignment_type=AssignmentType.CASEWORK,
+            course_session=course_session,
+            circle=self.circle,
+            add_competence_certificate=True,
+        )
+
+        assignment_2, _ = mix_assignment_cocktail(
+            deadline_at=datetime(2000, 4, 1),
+            assignment_type=AssignmentType.EDONIQ_TEST,
+            course_session=course_session,
+            circle=self.circle,
+            add_competence_certificate=True,
+        )
+
+        create_assignment_completion(
+            user=m4,
+            assignment=assignment_1,
+            course_session=course_session,
+            has_passed=True,
+        )
+
+        create_assignment_completion(
+            user=m5,
+            assignment=assignment_2,
+            course_session=course_session,
+        )
+
+        # assignments in the same course session, but in a different circle. Should not be included
+        assignment_3, _ = mix_assignment_cocktail(
+            deadline_at=datetime(1990, 4, 1),
+            assignment_type=AssignmentType.CASEWORK,
+            course_session=self.course_session,
+            circle=circle,
+            add_competence_certificate=True,
+        )
+
+        assignment_4, _ = mix_assignment_cocktail(
+            deadline_at=datetime(2000, 4, 1),
+            assignment_type=AssignmentType.EDONIQ_TEST,
+            course_session=self.course_session,
+            circle=circle,
+            add_competence_certificate=True,
+        )
+
+        create_assignment_completion(
+            user=self.m1,
+            assignment=assignment_1,
+            course_session=self.course_session,
+            has_passed=True,
+        )
+
+        create_assignment_completion(
+            user=self.m1,
+            assignment=assignment_2,
+            course_session=self.course_session,
+        )
+
+        self.client.force_login(self.e1)
+
+
 def mix_assignment_cocktail(
     assignment_type: AssignmentType,
     course_session: CourseSession,

From 41c48bed9d55891772405e408f21d30cb2379c68 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Tue, 16 Apr 2024 07:27:34 +0200
Subject: [PATCH 33/82] Refactor dashboard page

---
 client/src/pages/dashboard/DashboardPage.vue | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/client/src/pages/dashboard/DashboardPage.vue b/client/src/pages/dashboard/DashboardPage.vue
index 33b3dfaf..e41cf95a 100644
--- a/client/src/pages/dashboard/DashboardPage.vue
+++ b/client/src/pages/dashboard/DashboardPage.vue
@@ -72,17 +72,9 @@ function newDashboardConfigForId(id: string): DashboardCourseConfigType | undefi
         <!-- keep until we unify the dashboard -->
         <CoursePanel
           v-if="
-            dashboardStore.currentDashboardConfig.dashboard_type ===
-            'PRAXISBILDNER_DASHBOARD'
-          "
-          :course-config="
-            newDashboardConfigForId(dashboardStore.currentDashboardConfig.id)
-          "
-        />
-        <CoursePanel
-          v-else-if="
-            dashboardStore.currentDashboardConfig.dashboard_type ===
-            'PROGRESS_DASHBOARD'
+            ['PRAXISBILDNER_DASHBOARD', 'PROGRESS_DASHBOARD'].includes(
+              dashboardStore.currentDashboardConfig.dashboard_type
+            )
           "
           :course-config="
             newDashboardConfigForId(dashboardStore.currentDashboardConfig.id)

From 97dd952e4f78652365f4959f330a20a3c5d1d1fe Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Tue, 16 Apr 2024 14:24:03 +0200
Subject: [PATCH 34/82] Hide "old" dashboard content

---
 client/src/pages/dashboard/DashboardPage.vue | 28 ++++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/client/src/pages/dashboard/DashboardPage.vue b/client/src/pages/dashboard/DashboardPage.vue
index e41cf95a..c03f17a2 100644
--- a/client/src/pages/dashboard/DashboardPage.vue
+++ b/client/src/pages/dashboard/DashboardPage.vue
@@ -70,20 +70,20 @@ function newDashboardConfigForId(id: string): DashboardCourseConfigType | undefi
         </ul>
         <!-- end of new way of dashboard -->
         <!-- keep until we unify the dashboard -->
-        <CoursePanel
-          v-if="
-            ['PRAXISBILDNER_DASHBOARD', 'PROGRESS_DASHBOARD'].includes(
-              dashboardStore.currentDashboardConfig.dashboard_type
-            )
-          "
-          :course-config="
-            newDashboardConfigForId(dashboardStore.currentDashboardConfig.id)
-          "
-        />
-        <component
-          :is="boards[dashboardStore.currentDashboardConfig.dashboard_type].main"
-          v-else
-        ></component>
+        <!--        <CoursePanel-->
+        <!--          v-if="-->
+        <!--            ['PRAXISBILDNER_DASHBOARD', 'PROGRESS_DASHBOARD'].includes(-->
+        <!--              dashboardStore.currentDashboardConfig.dashboard_type-->
+        <!--            )-->
+        <!--          "-->
+        <!--          :course-config="-->
+        <!--            newDashboardConfigForId(dashboardStore.currentDashboardConfig.id)-->
+        <!--          "-->
+        <!--        />-->
+        <!--        <component-->
+        <!--          :is="boards[dashboardStore.currentDashboardConfig.dashboard_type].main"-->
+        <!--          v-else-->
+        <!--        ></component>-->
         <!-- end of old way of dashboard -->
       </div>
     </main>

From 70b3138574fc10e0b6e29d7b011c0060797420db Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Tue, 16 Apr 2024 15:04:59 +0200
Subject: [PATCH 35/82] Fix UI issue on passed-label

---
 .../pages/cockpit/assignmentsPage/AssignmentDetails.vue    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue b/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue
index b988ff51..f7b6431f 100644
--- a/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue
+++ b/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue
@@ -73,7 +73,7 @@ function findUserPointsHtml(userId: string) {
       "%)";
 
     if (!gradedUser.passed) {
-      result += ` <span class="my-2 rounded-md bg-error-red-200 px-2.5 py-0.5">${t(
+      result += ` <span class="my-2 rounded-md bg-error-red-200 px-2.5 py-0.5 inline-block leading-5">${t(
         "a.Nicht bestanden"
       )}</span>`;
     }
@@ -157,10 +157,11 @@ function findUserPointsHtml(userId: string) {
               </div>
 
               <!-- eslint-disable vue/no-v-html -->
-              <div
+              <p
                 v-if="findGradedUser(csu.user_id) && !isPraxisAssignment"
+                class="text-left md:text-right"
                 v-html="findUserPointsHtml(csu.user_id)"
-              ></div>
+              ></p>
             </section>
           </template>
           <template #link>

From 54b59ef932a6877a967ab3ded57f12025fc7b91e Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Tue, 16 Apr 2024 16:39:32 +0200
Subject: [PATCH 36/82] WIP: Fix memberonly tests

---
 cypress/e2e/learning_mentor/constants.js | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/cypress/e2e/learning_mentor/constants.js b/cypress/e2e/learning_mentor/constants.js
index 9f34f1f3..b62aaa6a 100644
--- a/cypress/e2e/learning_mentor/constants.js
+++ b/cypress/e2e/learning_mentor/constants.js
@@ -1,11 +1,16 @@
-export const MENTOR_OVERVIEW_URL = "/course/versicherungsvermittler-in/learning-mentor";
-export const MENTOR_MENTEES_URL = "/course/versicherungsvermittler-in/learning-mentor/participants";
+export const MENTOR_OVERVIEW_URL =
+  "/course/versicherungsvermittler-in/learning-mentor/tasks";
+export const MENTOR_MENTEES_URL =
+  "/course/versicherungsvermittler-in/learning-mentor";
 
 export const MENTOR_DASHBOARD_LINK = "[data-cy=lm-dashboard-link]";
-export const MEMBER_DASHBOARD_LINK = "[data-cy=progress-dashboard-continue-course-link]";
+export const MEMBER_DASHBOARD_LINK =
+  "[data-cy=progress-dashboard-continue-course-link]";
 export const MENTOR_MAIN_NAVIGATION = "[data-cy=lm-main-navigation]";
-export const MENTOR_OVERVIEW_NAVIGATION_LINK = "[data-cy=lm-overview-navigation-link]";
-export const MENTOR_MENTEES_NAVIGATION_LINK = "[data-cy=lm-mentees-navigation-link]";
+export const MENTOR_OVERVIEW_NAVIGATION_LINK =
+  "[data-cy=lm-overview-navigation-link]";
+export const MENTOR_MENTEES_NAVIGATION_LINK =
+  "[data-cy=lm-mentees-navigation-link]";
 
 // /participants
 export const MENTOR_MY_MENTEES = "[data-cy=lm-my-mentees]";
@@ -17,7 +22,3 @@ export const MENTOR_MENTEE_PROFILE = "[data-cy=lm-my-mentee-profile]";
 
 export const MENTEE_MENTOR_LIST_ITEM = "[data-cy=lm-my-mentor-list-item]";
 export const MENTEE_MENTOR_REMOVE = "[data-cy=lm-my-mentor-remove]";
-
-
-
-

From b99e86c556c22e958a27ca550e6e2ff3c3696975 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Wed, 17 Apr 2024 08:59:29 +0200
Subject: [PATCH 37/82] WIP: Fix assignment tests

---
 server/vbv_lernwelt/dashboard/graphql/queries.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/server/vbv_lernwelt/dashboard/graphql/queries.py b/server/vbv_lernwelt/dashboard/graphql/queries.py
index b0896860..ce87845f 100644
--- a/server/vbv_lernwelt/dashboard/graphql/queries.py
+++ b/server/vbv_lernwelt/dashboard/graphql/queries.py
@@ -57,7 +57,6 @@ class DashboardQuery(graphene.ObjectType):
                 course_session_ids.update(
                     group.course_session.all().values_list("id", flat=True)
                 )
-        course_session_ids = set()
 
         # let's assume that users are not supervisors in one region/group and trainer in another
         if not course_session_ids:

From 8b6a623f07176a93bf3a32d850ab68a436944d0f Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Wed, 17 Apr 2024 13:48:23 +0200
Subject: [PATCH 38/82] Add expert dashboard test

---
 .../tests/graphql/test_attendance.py          | 140 ++++++++++++++++++
 .../tests/graphql/test_competence.py          | 127 ++++++++++++++++
 .../dashboard/tests/graphql/test_feedback.py  | 121 +++++++++++++++
 3 files changed, 388 insertions(+)

diff --git a/server/vbv_lernwelt/dashboard/tests/graphql/test_attendance.py b/server/vbv_lernwelt/dashboard/tests/graphql/test_attendance.py
index a9f4e9f8..20464b41 100644
--- a/server/vbv_lernwelt/dashboard/tests/graphql/test_attendance.py
+++ b/server/vbv_lernwelt/dashboard/tests/graphql/test_attendance.py
@@ -121,3 +121,143 @@ class DashboardAttendanceTestCase(GraphQLTestCase):
         summary = attendance_day_presences["summary"]
         self.assertEqual(summary["days_completed"], 1)
         self.assertEqual(summary["participants_present"], 34)
+
+
+class DashboardExpertAttendanceTestCase(GraphQLTestCase):
+    GRAPHQL_URL = "/server/graphql/"
+
+    def test_attendance_day_presences(self):
+        # GIVEN
+        course, course_page = create_course("Test Course")
+        course_session1 = create_course_session(course=course, title="Test Bern 2022 a")
+        course_session2 = create_course_session(course=course, title="Test Bern 2022 b")
+        circle1, _ = create_circle(title="Circle", course_page=course_page)
+        circle2, _ = create_circle(title="Other Circle", course_page=course_page)
+
+        m1 = create_user("member_1")
+        add_course_session_user(
+            course_session=course_session1,
+            user=m1,
+            role=CourseSessionUser.Role.MEMBER,
+        )
+
+        m2 = create_user("member_2")
+        add_course_session_user(
+            course_session=course_session1,
+            user=m2,
+            role=CourseSessionUser.Role.MEMBER,
+        )
+
+        m3 = create_user("member_3")
+        add_course_session_user(
+            course_session=course_session1,
+            user=m3,
+            role=CourseSessionUser.Role.MEMBER,
+        )
+
+        m4 = create_user("member_4")
+        add_course_session_user(
+            course_session=course_session2,
+            user=m4,
+            role=CourseSessionUser.Role.MEMBER,
+        )
+
+        m5 = create_user("member_5")
+        add_course_session_user(
+            course_session=course_session2,
+            user=m5,
+            role=CourseSessionUser.Role.MEMBER,
+        )
+
+        e1 = create_user("expert_1")
+        csu = add_course_session_user(
+            course_session=course_session1,
+            user=e1,
+            role=CourseSessionUser.Role.EXPERT,
+        )
+        csu.expert.add(circle1)
+
+        # expert1 circle
+        attendance_user_list = [
+            {"user_id": str(m1.id), "status": AttendanceUserStatus.PRESENT.value},
+            {"user_id": str(m2.id), "status": AttendanceUserStatus.ABSENT.value},
+        ]
+
+        due_date_end = timezone.now() - timedelta(hours=2)
+        attendance_course1 = create_attendance_course(
+            course_session=course_session1,
+            circle=circle1,
+            attendance_user_list=attendance_user_list,
+            due_date_end=due_date_end,
+        )
+
+        # other circle
+        due_date_end = timezone.now() - timedelta(hours=2)
+        attendance_course2 = create_attendance_course(
+            course_session=course_session1,
+            circle=circle2,
+            attendance_user_list=attendance_user_list,
+            due_date_end=due_date_end,
+        )
+
+        # other course session
+        attendance_user_list2 = [
+            {"user_id": str(m4.id), "status": AttendanceUserStatus.PRESENT.value},
+            {"user_id": str(m5.id), "status": AttendanceUserStatus.ABSENT.value},
+        ]
+        due_date_end = timezone.now() - timedelta(hours=2)
+        attendance_course3 = create_attendance_course(
+            course_session=course_session2,
+            circle=circle1,
+            attendance_user_list=attendance_user_list2,
+            due_date_end=due_date_end,
+        )
+
+        self.client.force_login(e1)
+
+        query = f"""
+                query($course_id: ID!) {{
+                    course_statistics(course_id: $course_id) {{
+                        attendance_day_presences{{
+                            summary{{
+                                days_completed
+                                participants_present
+                            }}
+                            records{{
+                                course_session_id
+                                generation
+                                circle_id
+                                due_date
+                                participants_present
+                                participants_total
+                                details_url
+                            }}
+                        }}
+                    }}
+                }}
+                """
+
+        # WHEN
+        response = self.query(query, variables={"course_id": str(course.id)})
+
+        self.assertResponseNoErrors(response)
+
+        data = response.json()["data"]
+
+        attendance_day_presences = data["course_statistics"]["attendance_day_presences"]
+
+        record = attendance_day_presences["records"][0]
+
+        self.assertEqual(record["course_session_id"], str(course_session1.id))
+        self.assertEqual(record["generation"], "2023")
+        self.assertEqual(record["participants_present"], 1)
+        self.assertEqual(record["participants_total"], 3)
+        self.assertEqual(
+            record["details_url"],
+            f"/course/test-lehrgang/cockpit/attendance?id={attendance_course1.learning_content.id}"
+            f"&courseSessionId={course_session1.id}",
+        )
+
+        summary = attendance_day_presences["summary"]
+        self.assertEqual(summary["days_completed"], 1)
+        self.assertEqual(summary["participants_present"], 34)
diff --git a/server/vbv_lernwelt/dashboard/tests/graphql/test_competence.py b/server/vbv_lernwelt/dashboard/tests/graphql/test_competence.py
index 9f5ae505..51d9384f 100644
--- a/server/vbv_lernwelt/dashboard/tests/graphql/test_competence.py
+++ b/server/vbv_lernwelt/dashboard/tests/graphql/test_competence.py
@@ -107,3 +107,130 @@ class DashboardCompetenceTestCase(GraphQLTestCase):
         summary = competences["summary"]
         self.assertEqual(summary["success_total"], 1)
         self.assertEqual(summary["fail_total"], 1)
+
+
+class DashboardExpertCompetenceTestCase(GraphQLTestCase):
+    GRAPHQL_URL = "/server/graphql/"
+
+    def test_competence(self):
+        # GIVEN
+        course, course_page = create_course("Test Course")
+        course_session1 = create_course_session(course=course, title="Test Bern 2022 a")
+        course_session2 = create_course_session(course=course, title="Test Bern 2022 b")
+        circle1, _ = create_circle(title="Circle", course_page=course_page)
+        circle2, _ = create_circle(title="Other Circle", course_page=course_page)
+
+        member_one = create_user("member one")
+        add_course_session_user(
+            course_session=course_session1,
+            user=member_one,
+            role=CourseSessionUser.Role.MEMBER,
+        )
+
+        member_two = create_user("member two")
+        add_course_session_user(
+            course_session=course_session1,
+            user=member_two,
+            role=CourseSessionUser.Role.MEMBER,
+        )
+        add_course_session_user(
+            course_session=course_session2,
+            user=member_two,
+            role=CourseSessionUser.Role.MEMBER,
+        )
+
+        circle1, _ = create_circle(title="Test Circle", course_page=course_page)
+        circle2, _ = create_circle(title="Test Circle2", course_page=course_page)
+
+        e1 = create_user("expert_1")
+        csu = add_course_session_user(
+            course_session=course_session1,
+            user=e1,
+            role=CourseSessionUser.Role.EXPERT,
+        )
+        csu.expert.add(circle1)
+
+        pc1 = create_performance_criteria_page(
+            course=course, course_page=course_page, circle=circle1
+        )
+
+        pc2 = create_performance_criteria_page(
+            course=course, course_page=course_page, circle=circle2
+        )
+
+        mark_course_completion(
+            page=pc1,
+            user=member_one,
+            course_session=course_session1,
+            completion_status="SUCCESS",
+        )
+
+        mark_course_completion(
+            page=pc1,
+            user=member_two,
+            course_session=course_session1,
+            completion_status="FAIL",
+        )
+
+        # not in experts domain (circle or course session)
+        mark_course_completion(
+            page=pc2,
+            user=member_one,
+            course_session=course_session1,
+            completion_status="SUCCESS",
+        )
+
+        mark_course_completion(
+            page=pc1,
+            user=member_two,
+            course_session=course_session2,
+            completion_status="FAIL",
+        )
+
+        self.client.force_login(e1)
+
+        query = f"""query($course_id: ID!) {{
+                    course_statistics(course_id: $course_id) {{
+                        competences {{
+                            records {{
+                                title
+                                course_session_id
+                                generation
+                                circle_id
+                                success_count
+                                fail_count
+                                details_url
+                            }}
+                            summary {{
+                                success_total
+                                fail_total
+                            }}
+                        }}
+                    }}
+                }}
+                                    """
+        variables = {"course_id": str(course.id)}
+
+        # WHEN
+        response = self.query(query, variables=variables)
+
+        # THEN
+        self.assertResponseNoErrors(response)
+
+        competences = response.json()["data"]["course_statistics"]["competences"]
+        records = competences["records"]
+
+        self.assertEqual(records[0]["title"], "Learning Unit")
+        self.assertEqual(records[0]["success_count"], 1)
+        self.assertEqual(records[0]["fail_count"], 1)
+        self.assertEqual(records[0]["circle_id"], str(circle1.id))
+        self.assertEqual(records[0]["course_session_id"], str(course_session1.id))
+        self.assertEqual(records[0]["generation"], "2023")
+        self.assertEqual(
+            records[0]["details_url"],
+            f"/course/{course.slug}/cockpit?courseSessionId={course_session1.id}",
+        )
+
+        summary = competences["summary"]
+        self.assertEqual(summary["success_total"], 1)
+        self.assertEqual(summary["fail_total"], 1)
diff --git a/server/vbv_lernwelt/dashboard/tests/graphql/test_feedback.py b/server/vbv_lernwelt/dashboard/tests/graphql/test_feedback.py
index 9c391dfd..aa03624c 100644
--- a/server/vbv_lernwelt/dashboard/tests/graphql/test_feedback.py
+++ b/server/vbv_lernwelt/dashboard/tests/graphql/test_feedback.py
@@ -140,3 +140,124 @@ class DashboardFeedbackTestCase(GraphQLTestCase):
         self.assertEqual(summary["satisfaction_average"], 2.5)
         self.assertEqual(summary["satisfaction_max"], 4)
         self.assertEqual(summary["total_responses"], 4)
+
+
+class DashboardExpertFeedbackTestCase(GraphQLTestCase):
+    GRAPHQL_URL = "/server/graphql/"
+
+    def test_feedback(self):
+        # GIVEN
+        course, course_page = create_course("Test Course")
+        course_session1 = create_course_session(course=course, title="Test Bern 2022 a")
+        course_session2 = create_course_session(course=course, title="Test Bern 2022 b")
+
+        member = create_user("member")
+        add_course_session_user(
+            course_session=course_session1,
+            user=member,
+            role=CourseSessionUser.Role.MEMBER,
+        )
+
+        circle1, _ = create_circle(title="Test Circle 1", course_page=course_page)
+        circle2, _ = create_circle(title="Test Circle 2", course_page=course_page)
+
+        expert1 = create_circle_expert(
+            course_session=course_session1, circle=circle1, username="Expert 1"
+        )
+        create_circle_expert(
+            course_session=course_session1, circle=circle1, username="Expert 2"
+        )
+
+        FeedbackResponse.objects.create(
+            feedback_user=member,
+            data={"satisfaction": 3},
+            circle=circle1,
+            course_session=course_session1,
+            submitted=True,
+        )
+        FeedbackResponse.objects.create(
+            feedback_user=member,
+            data={"satisfaction": 4},
+            circle=circle1,
+            course_session=course_session1,
+            submitted=True,
+        )
+
+        # Create Feedbacks for circle2
+        FeedbackResponse.objects.create(
+            feedback_user=member,
+            data={"satisfaction": 1},
+            circle=circle2,
+            course_session=course_session1,
+            submitted=True,
+        )
+        FeedbackResponse.objects.create(
+            feedback_user=member,
+            data={"satisfaction": 2},
+            circle=circle2,
+            course_session=course_session1,
+            submitted=True,
+        )
+
+        # Create Feedbacks for course_session2
+        FeedbackResponse.objects.create(
+            feedback_user=member,
+            data={"satisfaction": 3},
+            circle=circle1,
+            course_session=course_session2,
+            submitted=True,
+        )
+
+        self.client.force_login(expert1.user)
+
+        query = f"""query($course_id: ID!) {{
+                    course_statistics(course_id: $course_id) {{
+                        feedback_responses {{
+                            records {{
+                                course_session_id
+                                generation
+                                circle_id
+                                satisfaction_average
+                                satisfaction_max
+                                details_url
+                                experts
+                            }}
+                            summary {{
+                                satisfaction_average
+                                satisfaction_max
+                                total_responses
+                            }}
+                        }}
+                    }}
+                }}
+                                    """
+        variables = {"course_id": str(course.id)}
+
+        # WHEN
+        response = self.query(query, variables=variables)
+
+        # THEN
+        self.assertResponseNoErrors(response)
+
+        course_statistics = response.json()["data"]["course_statistics"]
+        feedback_responses = course_statistics["feedback_responses"]
+
+        records = feedback_responses["records"]
+        self.assertEqual(len(records), 1)
+
+        circle1_record = next(
+            (r for r in records if r["circle_id"] == str(circle1.id)), None
+        )
+        self.assertEqual(circle1_record["satisfaction_average"], 3.5)
+        self.assertEqual(circle1_record["course_session_id"], str(course_session1.id))
+        self.assertEqual(circle1_record["generation"], "2023")
+        self.assertEqual(
+            circle1_record["details_url"],
+            f"/course/{course.slug}/cockpit/feedback/{circle1.id}?courseSessionId={course_session1.id}",
+        )
+        self.assertEqual(circle1_record["experts"], "Test Expert 1, Test Expert 2")
+
+        summary = feedback_responses["summary"]
+        self.assertEqual(summary["satisfaction_average"], 3.5)
+        self.assertEqual(summary["satisfaction_max"], 4)
+        self.assertEqual(summary["total_responses"], 2)

From 1b378fafcc2f5ae720b37a6750fbf3e94dba0273 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Wed, 17 Apr 2024 14:43:29 +0200
Subject: [PATCH 39/82] Fix tests, add links

---
 .../src/components/dashboard/CoursePanel.vue  | 18 ++++++----
 .../e2e/dashboard/dashboardSupervisor.cy.js   |  8 -----
 cypress/e2e/learning_mentor/constants.js      |  2 +-
 .../learning_mentor/overview/memberOnly.cy.js | 14 ++++----
 .../overview/mentorAndMember.cy.js            | 35 +++++++++++--------
 .../learning_mentor/overview/mentorOnly.cy.js | 29 ++++++++-------
 .../course/creators/test_course.py            | 10 +++++-
 .../commands/create_default_courses.py        | 16 +++++++++
 .../vbv_lernwelt/dashboard/graphql/queries.py |  6 ++--
 server/vbv_lernwelt/dashboard/views.py        |  4 +--
 10 files changed, 87 insertions(+), 55 deletions(-)

diff --git a/client/src/components/dashboard/CoursePanel.vue b/client/src/components/dashboard/CoursePanel.vue
index 26c04b7d..a65c26df 100644
--- a/client/src/components/dashboard/CoursePanel.vue
+++ b/client/src/components/dashboard/CoursePanel.vue
@@ -7,7 +7,7 @@ import AssignmentSummary from "@/components/dashboard/AssignmentSummary.vue";
 import MentorOpenTasksCount from "@/components/dashboard/MentorOpenTasksCount.vue";
 import MentorMenteeCount from "@/components/dashboard/MentorMenteeCount.vue";
 import MentorCompetenceSummary from "@/components/dashboard/MentorCompetenceSummary.vue";
-import { getLearningPathUrl } from "@/utils/utils";
+import { getCockpitUrl, getLearningMentorUrl, getLearningPathUrl } from "@/utils/utils";
 import UkStatistics from "@/components/dashboard/UkStatistics.vue";
 
 const mentorWidgets = [
@@ -50,15 +50,21 @@ const actionButtonProps = computed<{ href: string; text: string; cyKey: string }
       };
     } else if (props.courseConfig?.role_key === "Expert") {
       return {
-        href: "expertlink",
+        href: getCockpitUrl(props.courseConfig?.course_slug),
         text: "Cockpit anschauen",
-        cyKey: "",
+        cyKey: "cockpit-dashboard-link",
       };
     } else if (props.courseConfig?.role_key === "Supervisor") {
       return {
-        href: "supervisorlink",
+        href: getCockpitUrl(props.courseConfig?.course_slug),
         text: "Cockpit anschauen",
-        cyKey: "Cockpit anschauen",
+        cyKey: "cockpit-dashboard-link",
+      };
+    } else if (props.courseConfig?.role_key === "MentorVV") {
+      return {
+        href: getLearningMentorUrl(props.courseConfig?.course_slug),
+        text: "a.Übersicht anschauen",
+        cyKey: "lm-dashboard-link",
       };
     }
     return {
@@ -86,7 +92,7 @@ function hasActionButton(): boolean {
             class="btn-blue"
             :data-cy="actionButtonProps.cyKey"
           >
-            {{ actionButtonProps.text }}
+            {{ $t(actionButtonProps.text) }}
           </a>
         </div>
         <p>
diff --git a/cypress/e2e/dashboard/dashboardSupervisor.cy.js b/cypress/e2e/dashboard/dashboardSupervisor.cy.js
index aca8b793..ff7aeb20 100644
--- a/cypress/e2e/dashboard/dashboardSupervisor.cy.js
+++ b/cypress/e2e/dashboard/dashboardSupervisor.cy.js
@@ -63,14 +63,6 @@ describe("dashboardSupervisor.cy.js", () => {
     });
   });
 
-  describe("overall summary box", () => {
-    it("contains correct numbers (members, experts etc.)", () => {
-      getDashboardStatistics("participant.count").should("have.text", "4");
-      getDashboardStatistics("expert.count").should("have.text", "2");
-      getDashboardStatistics("session.count").should("have.text", "2");
-    });
-  });
-
   describe("feedback summary box", () => {
     it("contains correct numbers", () => {
       getDashboardStatistics("feedback.average").should("have.text", "3.3");
diff --git a/cypress/e2e/learning_mentor/constants.js b/cypress/e2e/learning_mentor/constants.js
index b62aaa6a..4c52e97c 100644
--- a/cypress/e2e/learning_mentor/constants.js
+++ b/cypress/e2e/learning_mentor/constants.js
@@ -1,4 +1,4 @@
-export const MENTOR_OVERVIEW_URL =
+export const MENTOR_TASKS_URL =
   "/course/versicherungsvermittler-in/learning-mentor/tasks";
 export const MENTOR_MENTEES_URL =
   "/course/versicherungsvermittler-in/learning-mentor";
diff --git a/cypress/e2e/learning_mentor/overview/memberOnly.cy.js b/cypress/e2e/learning_mentor/overview/memberOnly.cy.js
index 4a65389c..342657ef 100644
--- a/cypress/e2e/learning_mentor/overview/memberOnly.cy.js
+++ b/cypress/e2e/learning_mentor/overview/memberOnly.cy.js
@@ -1,4 +1,4 @@
-import {login} from "../../helpers";
+import { login } from "../../helpers";
 import {
   MEMBER_DASHBOARD_LINK,
   MENTEE_MENTOR_LIST_ITEM,
@@ -8,7 +8,7 @@ import {
   MENTOR_MY_MENTEES,
   MENTOR_MY_MENTORS,
   MENTOR_OVERVIEW_NAVIGATION_LINK,
-  MENTOR_OVERVIEW_URL
+  MENTOR_TASKS_URL,
 } from "../constants";
 
 describe("memberOnly.cy.js", () => {
@@ -23,14 +23,14 @@ describe("memberOnly.cy.js", () => {
   });
 
   it("shows NO mentees navigation link", () => {
-    cy.visit(MENTOR_OVERVIEW_URL);
+    cy.visit(MENTOR_TASKS_URL);
     cy.get(MENTOR_MENTEES_NAVIGATION_LINK).should("not.exist");
-  })
+  });
 
   it("shows NO overview navigation link", () => {
-    cy.visit(MENTOR_OVERVIEW_URL);
+    cy.visit(MENTOR_TASKS_URL);
     cy.get(MENTOR_OVERVIEW_NAVIGATION_LINK).should("not.exist");
-  })
+  });
 
   it("shows NO mentees", () => {
     cy.visit(MENTOR_MENTEES_URL);
@@ -54,5 +54,5 @@ describe("memberOnly.cy.js", () => {
 
     // then
     cy.contains(MENTOR_MY_MENTORS, mentor).should("not.exist");
-  })
+  });
 });
diff --git a/cypress/e2e/learning_mentor/overview/mentorAndMember.cy.js b/cypress/e2e/learning_mentor/overview/mentorAndMember.cy.js
index b7e1accb..9feef47f 100644
--- a/cypress/e2e/learning_mentor/overview/mentorAndMember.cy.js
+++ b/cypress/e2e/learning_mentor/overview/mentorAndMember.cy.js
@@ -1,4 +1,4 @@
-import {login} from "../../helpers";
+import { login } from "../../helpers";
 import {
   MEMBER_DASHBOARD_LINK,
   MENTEE_MENTOR_LIST_ITEM,
@@ -12,7 +12,7 @@ import {
   MENTOR_MY_MENTEES,
   MENTOR_MY_MENTORS,
   MENTOR_OVERVIEW_NAVIGATION_LINK,
-  MENTOR_OVERVIEW_URL
+  MENTOR_TASKS_URL,
 } from "../constants";
 
 describe("mentorAndMember.cy.js", () => {
@@ -27,21 +27,21 @@ describe("mentorAndMember.cy.js", () => {
   });
 
   it("shows the learning mentor navigation", () => {
-    cy.visit(MENTOR_OVERVIEW_URL);
+    cy.visit(MENTOR_TASKS_URL);
     cy.get(MENTOR_MAIN_NAVIGATION).should("exist");
   });
 
   it("shows the mentees navigation link", () => {
-    cy.visit(MENTOR_OVERVIEW_URL);
+    cy.visit(MENTOR_TASKS_URL);
     cy.get(MENTOR_MENTEES_NAVIGATION_LINK).click();
     cy.url().should("include", MENTOR_MENTEES_URL);
-  })
+  });
 
   it("shows the overview navigation link", () => {
-    cy.visit(MENTOR_OVERVIEW_URL);
+    cy.visit(MENTOR_TASKS_URL);
     cy.get(MENTOR_OVERVIEW_NAVIGATION_LINK).click();
-    cy.url().should("include", MENTOR_OVERVIEW_URL);
-  })
+    cy.url().should("include", MENTOR_TASKS_URL);
+  });
 
   it("shows my mentees", () => {
     cy.visit(MENTOR_MENTEES_URL);
@@ -69,10 +69,11 @@ describe("mentorAndMember.cy.js", () => {
       .click();
 
     // then
-    const expectedMenteeProfileUrl = "/course/versicherungsvermittler-in/profile/5ff59857-8de5-415e-a387-4449f9a0337a"
+    const expectedMenteeProfileUrl =
+      "/course/versicherungsvermittler-in/profile/5ff59857-8de5-415e-a387-4449f9a0337a";
     cy.url().should("include", expectedMenteeProfileUrl);
     cy.contains(mentee).should("exist");
-  })
+  });
 
   it("can remove a mentee", () => {
     // given
@@ -86,14 +87,16 @@ describe("mentorAndMember.cy.js", () => {
 
     // then
     cy.contains(MENTOR_MENTEE_LIST_ITEM, mentee).should("not.exist");
-    cy.contains("Aktuell begleitest du niemanden als Lernbegleitung").should("exist");
-  })
+    cy.contains("Aktuell begleitest du niemanden als Lernbegleitung").should(
+      "exist"
+    );
+  });
 
   it("shows the correct mentors", () => {
     const mentor = "Micheala Weber-Mentor";
     cy.visit(MENTOR_MENTEES_URL);
     cy.get(MENTOR_MY_MENTORS).should("contain", mentor);
-  })
+  });
 
   it("can remove a mentor", () => {
     // given
@@ -107,6 +110,8 @@ describe("mentorAndMember.cy.js", () => {
 
     // then
     cy.contains(MENTOR_MY_MENTORS, mentor).should("not.exist");
-    cy.contains("Aktuell hast du noch keine Person als Lernbegleitung eingeladen").should("exist");
-  })
+    cy.contains(
+      "Aktuell hast du noch keine Person als Lernbegleitung eingeladen"
+    ).should("exist");
+  });
 });
diff --git a/cypress/e2e/learning_mentor/overview/mentorOnly.cy.js b/cypress/e2e/learning_mentor/overview/mentorOnly.cy.js
index d0d700ce..1bd55385 100644
--- a/cypress/e2e/learning_mentor/overview/mentorOnly.cy.js
+++ b/cypress/e2e/learning_mentor/overview/mentorOnly.cy.js
@@ -1,4 +1,4 @@
-import {login} from "../../helpers";
+import { login } from "../../helpers";
 import {
   MENTOR_DASHBOARD_LINK,
   MENTOR_MAIN_NAVIGATION,
@@ -10,7 +10,7 @@ import {
   MENTOR_MY_MENTEES,
   MENTOR_MY_MENTORS,
   MENTOR_OVERVIEW_NAVIGATION_LINK,
-  MENTOR_OVERVIEW_URL
+  MENTOR_TASKS_URL,
 } from "../constants";
 
 describe("mentorOnly.cy.js", () => {
@@ -22,25 +22,25 @@ describe("mentorOnly.cy.js", () => {
   it("shows the correct dashboard", () => {
     cy.visit("/");
     cy.get(MENTOR_DASHBOARD_LINK).click();
-    cy.url().should("include", MENTOR_OVERVIEW_URL);
+    cy.url().should("include", MENTOR_MENTEES_URL);
   });
 
   it("shows the learning mentor navigation", () => {
-    cy.visit(MENTOR_OVERVIEW_URL);
+    cy.visit(MENTOR_MENTEES_URL);
     cy.get(MENTOR_MAIN_NAVIGATION).should("exist");
   });
 
   it("shows the mentees navigation link", () => {
-    cy.visit(MENTOR_OVERVIEW_URL);
+    cy.visit(MENTOR_TASKS_URL);
     cy.get(MENTOR_MENTEES_NAVIGATION_LINK).click();
     cy.url().should("include", MENTOR_MENTEES_URL);
-  })
+  });
 
   it("shows the overview navigation link", () => {
-    cy.visit(MENTOR_OVERVIEW_URL);
+    cy.visit(MENTOR_TASKS_URL);
     cy.get(MENTOR_OVERVIEW_NAVIGATION_LINK).click();
-    cy.url().should("include", MENTOR_OVERVIEW_URL);
-  })
+    cy.url().should("include", MENTOR_TASKS_URL);
+  });
 
   it("shows my mentees", () => {
     cy.visit(MENTOR_MENTEES_URL);
@@ -69,10 +69,11 @@ describe("mentorOnly.cy.js", () => {
       .click();
 
     // then
-    const expectedMenteeProfileUrl = "/course/versicherungsvermittler-in/profile/5ff59857-8de5-415e-a387-4449f9a0337a"
+    const expectedMenteeProfileUrl =
+      "/course/versicherungsvermittler-in/profile/5ff59857-8de5-415e-a387-4449f9a0337a";
     cy.url().should("include", expectedMenteeProfileUrl);
     cy.contains(mentee).should("exist");
-  })
+  });
 
   it("can remove a mentee", () => {
     // given
@@ -86,6 +87,8 @@ describe("mentorOnly.cy.js", () => {
 
     // then
     cy.contains(MENTOR_MENTEE_LIST_ITEM, mentee).should("not.exist");
-    cy.contains(MENTOR_MENTEE_LIST_ITEM, "Robert Student-plus-Mentor").should("exist")
-  })
+    cy.contains(MENTOR_MENTEE_LIST_ITEM, "Robert Student-plus-Mentor").should(
+      "exist"
+    );
+  });
 });
diff --git a/server/vbv_lernwelt/course/creators/test_course.py b/server/vbv_lernwelt/course/creators/test_course.py
index 124f4146..2c30840a 100644
--- a/server/vbv_lernwelt/course/creators/test_course.py
+++ b/server/vbv_lernwelt/course/creators/test_course.py
@@ -47,6 +47,7 @@ from vbv_lernwelt.course.factories import CoursePageFactory
 from vbv_lernwelt.course.models import (
     Course,
     CourseCategory,
+    CourseConfiguration,
     CoursePage,
     CourseSession,
     CourseSessionUser,
@@ -109,7 +110,6 @@ def create_test_course(
 
     course: Course = create_test_course_with_categories()
     course.configuration.enable_learning_mentor = False
-    course.configuration.save()
 
     competence_certificate = create_test_competence_navi()
 
@@ -133,9 +133,13 @@ def create_test_course(
             title="Edoniq Wissens- und Verständisfragen - Circle Fahrzeug (Demo)",
             competence_certificate=competence_certificate,
         )
+        course.configuration.is_uk = True
 
     if include_vv:
         create_vv_gewinnen_casework(course_id=COURSE_TEST_ID)
+        course.configuration.is_vv = True
+
+    course.configuration.save()
 
     create_test_learning_path(
         include_uk=include_uk, include_vv=include_vv, with_documents=with_documents
@@ -422,6 +426,10 @@ def create_test_course_with_categories(apps=None, schema_editor=None):
     course.slug = course_page.slug
     course.save()
 
+    config = CourseConfiguration.objects.get_or_create(course=course)[0]
+    config.is_uk = True
+    config.save()
+
     return course
 
 
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 0ba564a4..2798f21e 100644
--- a/server/vbv_lernwelt/course/management/commands/create_default_courses.py
+++ b/server/vbv_lernwelt/course/management/commands/create_default_courses.py
@@ -207,6 +207,8 @@ def create_versicherungsvermittlerin_course(
         course_id=course_id,
         title=names[language],
     )
+    course.configuration.is_vv = True
+    course.configuration.save()
 
     # assignments create assignments parent page
     _assignment_list_page = AssignmentListPageFactory(
@@ -354,6 +356,8 @@ def create_course_uk_de(course_id=COURSE_UK, lang="de"):
         "it": "Corsi interaziendali",
     }
     course = create_course_with_categories(course_id=course_id, title=names[lang])
+    course.configuration.is_uk = True
+    course.configuration.save()
 
     # assignments create assignments parent page
     _assignment_list_page = AssignmentListPageFactory(
@@ -387,6 +391,8 @@ def create_course_uk_de(course_id=COURSE_UK, lang="de"):
 
 def create_course_uk_de_course_sessions():
     course = Course.objects.get(id=COURSE_UK)
+    course.configuration.is_uk = True
+    course.configuration.save()
 
     cs = CourseSession.objects.create(
         course_id=COURSE_UK,
@@ -500,6 +506,8 @@ def create_course_uk_fr():
     course = create_course_with_categories(
         course_id=COURSE_UK_FR, title="Cours interentreprises"
     )
+    course.configuration.is_uk = True
+    course.configuration.save()
 
     # assignments create assignments parent page
     _assignment_list_page = AssignmentListPageFactory(
@@ -550,6 +558,8 @@ def create_course_uk_it():
     course = create_course_with_categories(
         course_id=COURSE_UK_IT, title="Corso interaziendale"
     )
+    course.configuration.is_uk = True
+    course.configuration.save()
 
     # assignments create assignments parent page
     _assignment_list_page = AssignmentListPageFactory(
@@ -651,6 +661,8 @@ def create_course_training_de():
     course = create_course_with_categories(
         course_id=COURSE_UK_TRAINING, title="myVBV Training"
     )
+    course.configuration.is_uk = True
+    course.configuration.save()
 
     # assignments create assignments parent page
     _assignment_list_page = AssignmentListPageFactory(
@@ -741,6 +753,8 @@ def create_course_training_fr():
     course = create_course_with_categories(
         course_id=COURSE_UK_TRAINING_FR, title="myVBV Training (FR)"
     )
+    course.configuration.is_uk = True
+    course.configuration.save()
 
     # assignments create assignments parent page
     _assignment_list_page = AssignmentListPageFactory(
@@ -828,6 +842,8 @@ def create_course_training_it():
     course = create_course_with_categories(
         course_id=COURSE_UK_TRAINING_IT, title="myVBV Training (IT)"
     )
+    course.configuration.is_uk = True
+    course.configuration.save()
 
     # assignments create assignments parent page
     _assignment_list_page = AssignmentListPageFactory(
diff --git a/server/vbv_lernwelt/dashboard/graphql/queries.py b/server/vbv_lernwelt/dashboard/graphql/queries.py
index ce87845f..ad780b42 100644
--- a/server/vbv_lernwelt/dashboard/graphql/queries.py
+++ b/server/vbv_lernwelt/dashboard/graphql/queries.py
@@ -66,6 +66,10 @@ class DashboardQuery(graphene.ObjectType):
                     expert__user=user, expert__role=CourseSessionUser.Role.EXPERT
                 ).values_list("id", flat=True)
             )
+
+            if not circle_ids:
+                return None
+
             course_session_ids = CourseSession.objects.filter(
                 course=course,
                 coursesessionuser__user=user,
@@ -75,8 +79,6 @@ class DashboardQuery(graphene.ObjectType):
 
             # todo: if course_session_ids and circles are empty return none or 404 or 401
 
-        # return None
-
         return CourseStatisticsType(
             _id=course.id,  # noqa
             course_id=course.id,  # noqa
diff --git a/server/vbv_lernwelt/dashboard/views.py b/server/vbv_lernwelt/dashboard/views.py
index 82caa025..fb68f6ce 100644
--- a/server/vbv_lernwelt/dashboard/views.py
+++ b/server/vbv_lernwelt/dashboard/views.py
@@ -247,10 +247,10 @@ def get_widgets_for_course(
 
     if is_mentor:
         widgets.append(WidgetType.MENTOR_PERSON_WIDGET.value)
-        if is_vv:
-            widgets.append(WidgetType.MENTOR_TASKS_WIDGET.value)
         if is_uk:
             widgets.append(WidgetType.MENTOR_COMPETENCE_WIDGET.value)
+        if is_vv:
+            widgets.append(WidgetType.MENTOR_TASKS_WIDGET.value)
 
     return widgets
 

From bc909ae1b680efd98ad75b2aab729cefa20ab33a Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Thu, 18 Apr 2024 08:28:40 +0200
Subject: [PATCH 40/82] Check learning mentor term in uk and vv

---
 .../components/learningMentor/MyMentors.vue   |  3 +-
 cypress/e2e/learning_mentor/constants.js      | 10 +++-
 .../learning_mentor/overview/memberOnly.cy.js | 50 ++++++++++++++++---
 .../overview/mentorAndMember.cy.js            | 28 +++++------
 .../learning_mentor/overview/mentorOnly.cy.js | 26 +++++-----
 .../core/management/commands/cypress_reset.py | 15 ++++++
 6 files changed, 95 insertions(+), 37 deletions(-)

diff --git a/client/src/components/learningMentor/MyMentors.vue b/client/src/components/learningMentor/MyMentors.vue
index bde21522..d7052ac8 100644
--- a/client/src/components/learningMentor/MyMentors.vue
+++ b/client/src/components/learningMentor/MyMentors.vue
@@ -75,10 +75,11 @@ const { myLearningMentors, inviteLearningMentor, noLearningMentors } = useMentor
 <template>
   <div v-if="!isLoading" class="bg-gray-200">
     <div class="flex flex-row items-center justify-between py-6">
-      <h2 class="heading-2">{{ $t(myLearningMentors) }}</h2>
+      <h2 data-cy="lm-my-lms-title" class="heading-2">{{ $t(myLearningMentors) }}</h2>
       <div>
         <button
           class="btn-secondary flex items-center"
+          data-cy="lm-invite-mentor-button"
           @click="showInvitationModal = true"
         >
           <it-icon-add class="it-icon mr-2 h-6 w-6" />
diff --git a/cypress/e2e/learning_mentor/constants.js b/cypress/e2e/learning_mentor/constants.js
index 4c52e97c..24489862 100644
--- a/cypress/e2e/learning_mentor/constants.js
+++ b/cypress/e2e/learning_mentor/constants.js
@@ -1,7 +1,11 @@
-export const MENTOR_TASKS_URL =
+export const MENTOR_TASKS_URL_VV =
   "/course/versicherungsvermittler-in/learning-mentor/tasks";
-export const MENTOR_MENTEES_URL =
+export const MENTOR_MENTEES_URL_VV =
   "/course/versicherungsvermittler-in/learning-mentor";
+export const MENTOR_MENTEES_URL_UK = "/course/test-lehrgang/learning-mentor";
+
+export const MAIN_NAVIGATION_MENTOR_LINK =
+  "[data-cy=navigation-learning-mentor-link]";
 
 export const MENTOR_DASHBOARD_LINK = "[data-cy=lm-dashboard-link]";
 export const MEMBER_DASHBOARD_LINK =
@@ -22,3 +26,5 @@ export const MENTOR_MENTEE_PROFILE = "[data-cy=lm-my-mentee-profile]";
 
 export const MENTEE_MENTOR_LIST_ITEM = "[data-cy=lm-my-mentor-list-item]";
 export const MENTEE_MENTOR_REMOVE = "[data-cy=lm-my-mentor-remove]";
+export const MENTEE_MENTORS_TITLE = "[data-cy=lm-my-lms-title]";
+export const MENTEE_INVITE_MENTOR = "[data-cy=lm-invite-mentor-button]";
diff --git a/cypress/e2e/learning_mentor/overview/memberOnly.cy.js b/cypress/e2e/learning_mentor/overview/memberOnly.cy.js
index 342657ef..271fc467 100644
--- a/cypress/e2e/learning_mentor/overview/memberOnly.cy.js
+++ b/cypress/e2e/learning_mentor/overview/memberOnly.cy.js
@@ -1,14 +1,18 @@
 import { login } from "../../helpers";
 import {
+  MAIN_NAVIGATION_MENTOR_LINK,
   MEMBER_DASHBOARD_LINK,
+  MENTEE_INVITE_MENTOR,
   MENTEE_MENTOR_LIST_ITEM,
   MENTEE_MENTOR_REMOVE,
+  MENTEE_MENTORS_TITLE,
   MENTOR_MENTEES_NAVIGATION_LINK,
-  MENTOR_MENTEES_URL,
+  MENTOR_MENTEES_URL_UK,
+  MENTOR_MENTEES_URL_VV,
   MENTOR_MY_MENTEES,
   MENTOR_MY_MENTORS,
   MENTOR_OVERVIEW_NAVIGATION_LINK,
-  MENTOR_TASKS_URL,
+  MENTOR_TASKS_URL_VV,
 } from "../constants";
 
 describe("memberOnly.cy.js", () => {
@@ -23,22 +27,22 @@ describe("memberOnly.cy.js", () => {
   });
 
   it("shows NO mentees navigation link", () => {
-    cy.visit(MENTOR_TASKS_URL);
+    cy.visit(MENTOR_TASKS_URL_VV);
     cy.get(MENTOR_MENTEES_NAVIGATION_LINK).should("not.exist");
   });
 
   it("shows NO overview navigation link", () => {
-    cy.visit(MENTOR_TASKS_URL);
+    cy.visit(MENTOR_TASKS_URL_VV);
     cy.get(MENTOR_OVERVIEW_NAVIGATION_LINK).should("not.exist");
   });
 
   it("shows NO mentees", () => {
-    cy.visit(MENTOR_MENTEES_URL);
+    cy.visit(MENTOR_MENTEES_URL_VV);
     cy.get(MENTOR_MY_MENTEES).should("not.exist");
   });
 
   it("shows my mentors", () => {
-    cy.visit(MENTOR_MENTEES_URL);
+    cy.visit(MENTOR_MENTEES_URL_VV);
     cy.get(MENTOR_MY_MENTORS).should("exist");
   });
 
@@ -47,7 +51,7 @@ describe("memberOnly.cy.js", () => {
     const mentor = "Micheala Weber-Mentor";
 
     // when
-    cy.visit(MENTOR_MENTEES_URL);
+    cy.visit(MENTOR_MENTEES_URL_VV);
     cy.contains(MENTEE_MENTOR_LIST_ITEM, mentor)
       .find(MENTEE_MENTOR_REMOVE)
       .click();
@@ -55,4 +59,36 @@ describe("memberOnly.cy.js", () => {
     // then
     cy.contains(MENTOR_MY_MENTORS, mentor).should("not.exist");
   });
+
+  it("uses term Lernbegleitung in VV-course", () => {
+    cy.visit(MENTOR_MENTEES_URL_VV);
+    cy.get(MAIN_NAVIGATION_MENTOR_LINK).should("contain", "Lernbegleitung");
+    cy.get(MENTEE_MENTORS_TITLE).should("contain", "Meine Lernbegleiter");
+    cy.get(MENTEE_INVITE_MENTOR).should(
+      "contain",
+      "Neue Lernbegleitung einladen"
+    );
+  });
+});
+
+describe("memberOnly.cy.js üK", () => {
+  beforeEach(() => {
+    cy.manageCommand("cypress_reset --set-only-is-uk-flag");
+    login("test-student1@example.com", "test");
+  });
+
+  it("shows my mentors", () => {
+    cy.visit(MENTOR_MENTEES_URL_UK);
+    cy.get(MENTOR_MY_MENTORS).should("exist");
+  });
+
+  it("uses term Praxisbildner in UK-course", () => {
+    cy.visit(MENTOR_MENTEES_URL_UK);
+    cy.get(MAIN_NAVIGATION_MENTOR_LINK).should("contain", "Praxisbildner");
+    cy.get(MENTEE_MENTORS_TITLE).should("contain", "Meine Praxisbildner");
+    cy.get(MENTEE_INVITE_MENTOR).should(
+      "contain",
+      "Neuen Praxisbildner einladen"
+    );
+  });
 });
diff --git a/cypress/e2e/learning_mentor/overview/mentorAndMember.cy.js b/cypress/e2e/learning_mentor/overview/mentorAndMember.cy.js
index 9feef47f..d3f6da92 100644
--- a/cypress/e2e/learning_mentor/overview/mentorAndMember.cy.js
+++ b/cypress/e2e/learning_mentor/overview/mentorAndMember.cy.js
@@ -8,11 +8,11 @@ import {
   MENTOR_MENTEE_PROFILE,
   MENTOR_MENTEE_REMOVE,
   MENTOR_MENTEES_NAVIGATION_LINK,
-  MENTOR_MENTEES_URL,
+  MENTOR_MENTEES_URL_VV,
   MENTOR_MY_MENTEES,
   MENTOR_MY_MENTORS,
   MENTOR_OVERVIEW_NAVIGATION_LINK,
-  MENTOR_TASKS_URL,
+  MENTOR_TASKS_URL_VV,
 } from "../constants";
 
 describe("mentorAndMember.cy.js", () => {
@@ -27,34 +27,34 @@ describe("mentorAndMember.cy.js", () => {
   });
 
   it("shows the learning mentor navigation", () => {
-    cy.visit(MENTOR_TASKS_URL);
+    cy.visit(MENTOR_TASKS_URL_VV);
     cy.get(MENTOR_MAIN_NAVIGATION).should("exist");
   });
 
   it("shows the mentees navigation link", () => {
-    cy.visit(MENTOR_TASKS_URL);
+    cy.visit(MENTOR_TASKS_URL_VV);
     cy.get(MENTOR_MENTEES_NAVIGATION_LINK).click();
-    cy.url().should("include", MENTOR_MENTEES_URL);
+    cy.url().should("include", MENTOR_MENTEES_URL_VV);
   });
 
   it("shows the overview navigation link", () => {
-    cy.visit(MENTOR_TASKS_URL);
+    cy.visit(MENTOR_TASKS_URL_VV);
     cy.get(MENTOR_OVERVIEW_NAVIGATION_LINK).click();
-    cy.url().should("include", MENTOR_TASKS_URL);
+    cy.url().should("include", MENTOR_TASKS_URL_VV);
   });
 
   it("shows my mentees", () => {
-    cy.visit(MENTOR_MENTEES_URL);
+    cy.visit(MENTOR_MENTEES_URL_VV);
     cy.get(MENTOR_MY_MENTEES).should("exist");
   });
 
   it("shows my mentors", () => {
-    cy.visit(MENTOR_MENTEES_URL);
+    cy.visit(MENTOR_MENTEES_URL_VV);
     cy.get(MENTOR_MY_MENTORS).should("exist");
   });
 
   it("shows the correct mentees", () => {
-    cy.visit(MENTOR_MENTEES_URL);
+    cy.visit(MENTOR_MENTEES_URL_VV);
     cy.get(MENTOR_MY_MENTEES).should("contain", "Viktor Vollgas");
   });
 
@@ -63,7 +63,7 @@ describe("mentorAndMember.cy.js", () => {
     const mentee = "Viktor Vollgas";
 
     // when
-    cy.visit(MENTOR_MENTEES_URL);
+    cy.visit(MENTOR_MENTEES_URL_VV);
     cy.contains(MENTOR_MENTEE_LIST_ITEM, mentee)
       .find(MENTOR_MENTEE_PROFILE)
       .click();
@@ -80,7 +80,7 @@ describe("mentorAndMember.cy.js", () => {
     const mentee = "Viktor Vollgas";
 
     // when
-    cy.visit(MENTOR_MENTEES_URL);
+    cy.visit(MENTOR_MENTEES_URL_VV);
     cy.contains(MENTOR_MENTEE_LIST_ITEM, mentee)
       .find(MENTOR_MENTEE_REMOVE)
       .click();
@@ -94,7 +94,7 @@ describe("mentorAndMember.cy.js", () => {
 
   it("shows the correct mentors", () => {
     const mentor = "Micheala Weber-Mentor";
-    cy.visit(MENTOR_MENTEES_URL);
+    cy.visit(MENTOR_MENTEES_URL_VV);
     cy.get(MENTOR_MY_MENTORS).should("contain", mentor);
   });
 
@@ -103,7 +103,7 @@ describe("mentorAndMember.cy.js", () => {
     const mentor = "Micheala Weber-Mentor";
 
     // when
-    cy.visit(MENTOR_MENTEES_URL);
+    cy.visit(MENTOR_MENTEES_URL_VV);
     cy.contains(MENTEE_MENTOR_LIST_ITEM, mentor)
       .find(MENTEE_MENTOR_REMOVE)
       .click();
diff --git a/cypress/e2e/learning_mentor/overview/mentorOnly.cy.js b/cypress/e2e/learning_mentor/overview/mentorOnly.cy.js
index 1bd55385..ca6baaca 100644
--- a/cypress/e2e/learning_mentor/overview/mentorOnly.cy.js
+++ b/cypress/e2e/learning_mentor/overview/mentorOnly.cy.js
@@ -6,11 +6,11 @@ import {
   MENTOR_MENTEE_PROFILE,
   MENTOR_MENTEE_REMOVE,
   MENTOR_MENTEES_NAVIGATION_LINK,
-  MENTOR_MENTEES_URL,
+  MENTOR_MENTEES_URL_VV,
   MENTOR_MY_MENTEES,
   MENTOR_MY_MENTORS,
   MENTOR_OVERVIEW_NAVIGATION_LINK,
-  MENTOR_TASKS_URL,
+  MENTOR_TASKS_URL_VV,
 } from "../constants";
 
 describe("mentorOnly.cy.js", () => {
@@ -22,38 +22,38 @@ describe("mentorOnly.cy.js", () => {
   it("shows the correct dashboard", () => {
     cy.visit("/");
     cy.get(MENTOR_DASHBOARD_LINK).click();
-    cy.url().should("include", MENTOR_MENTEES_URL);
+    cy.url().should("include", MENTOR_MENTEES_URL_VV);
   });
 
   it("shows the learning mentor navigation", () => {
-    cy.visit(MENTOR_MENTEES_URL);
+    cy.visit(MENTOR_MENTEES_URL_VV);
     cy.get(MENTOR_MAIN_NAVIGATION).should("exist");
   });
 
   it("shows the mentees navigation link", () => {
-    cy.visit(MENTOR_TASKS_URL);
+    cy.visit(MENTOR_TASKS_URL_VV);
     cy.get(MENTOR_MENTEES_NAVIGATION_LINK).click();
-    cy.url().should("include", MENTOR_MENTEES_URL);
+    cy.url().should("include", MENTOR_MENTEES_URL_VV);
   });
 
   it("shows the overview navigation link", () => {
-    cy.visit(MENTOR_TASKS_URL);
+    cy.visit(MENTOR_TASKS_URL_VV);
     cy.get(MENTOR_OVERVIEW_NAVIGATION_LINK).click();
-    cy.url().should("include", MENTOR_TASKS_URL);
+    cy.url().should("include", MENTOR_TASKS_URL_VV);
   });
 
   it("shows my mentees", () => {
-    cy.visit(MENTOR_MENTEES_URL);
+    cy.visit(MENTOR_MENTEES_URL_VV);
     cy.get(MENTOR_MY_MENTEES).should("exist");
   });
 
   it("shows no mentors", () => {
-    cy.visit(MENTOR_MENTEES_URL);
+    cy.visit(MENTOR_MENTEES_URL_VV);
     cy.get(MENTOR_MY_MENTORS).should("not.exist");
   });
 
   it("shows the correct mentees", () => {
-    cy.visit(MENTOR_MENTEES_URL);
+    cy.visit(MENTOR_MENTEES_URL_VV);
     cy.get(MENTOR_MY_MENTEES).should("contain", "Robert Student-plus-Mentor");
     cy.get(MENTOR_MY_MENTEES).should("contain", "Viktor Vollgas");
   });
@@ -63,7 +63,7 @@ describe("mentorOnly.cy.js", () => {
     const mentee = "Viktor Vollgas";
 
     // when
-    cy.visit(MENTOR_MENTEES_URL);
+    cy.visit(MENTOR_MENTEES_URL_VV);
     cy.contains(MENTOR_MENTEE_LIST_ITEM, mentee)
       .find(MENTOR_MENTEE_PROFILE)
       .click();
@@ -80,7 +80,7 @@ describe("mentorOnly.cy.js", () => {
     const mentee = "Viktor Vollgas";
 
     // when
-    cy.visit(MENTOR_MENTEES_URL);
+    cy.visit(MENTOR_MENTEES_URL_VV);
     cy.contains(MENTOR_MENTEE_LIST_ITEM, mentee)
       .find(MENTOR_MENTEE_REMOVE)
       .click();
diff --git a/server/vbv_lernwelt/core/management/commands/cypress_reset.py b/server/vbv_lernwelt/core/management/commands/cypress_reset.py
index 2ac68707..e5f4509e 100644
--- a/server/vbv_lernwelt/core/management/commands/cypress_reset.py
+++ b/server/vbv_lernwelt/core/management/commands/cypress_reset.py
@@ -98,6 +98,11 @@ from vbv_lernwelt.self_evaluation_feedback.models import (
     default=False,
     help="Will create a learning mentor for test user",
 )
+@click.option(
+    "--set-only-is-uk-flag/--no-set-only-is-uk-flag",
+    default=False,
+    help="Will set only the is_uk flag for the test course and enable learning mentors for the course",
+)
 def command(
     create_assignment_completion,
     create_assignment_evaluation,
@@ -108,6 +113,7 @@ def command(
     create_attendance_days,
     enable_circle_documents,
     create_learning_mentor,
+    set_only_is_uk_flag,
 ):
     print("cypress reset data")
     CourseCompletion.objects.all().delete()
@@ -391,4 +397,13 @@ def command(
 
     course = Course.objects.get(id=COURSE_TEST_ID)
     course.configuration.enable_circle_documents = enable_circle_documents
+    course.configuration.is_uk = True
+
+    if set_only_is_uk_flag:
+        course.configuration.is_vv = False
+        course.configuration.enable_learning_mentors = True
+    else:
+        course.configuration.is_vv = True
+        course.configuration.enable_learning_mentors = False
+
     course.configuration.save()

From 1e5db1f0f7e62526f227ecf14665c44770534e0a Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Thu, 18 Apr 2024 08:52:34 +0200
Subject: [PATCH 41/82] Add learning mentor template test, don't allow
 invitations in courses without mentors

---
 .../core/management/commands/cypress_reset.py |  4 +-
 .../learning_mentor/tests/test_invitation.py  | 39 ++++++++++++++++++-
 server/vbv_lernwelt/learning_mentor/views.py  |  6 ++-
 3 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/server/vbv_lernwelt/core/management/commands/cypress_reset.py b/server/vbv_lernwelt/core/management/commands/cypress_reset.py
index e5f4509e..44761445 100644
--- a/server/vbv_lernwelt/core/management/commands/cypress_reset.py
+++ b/server/vbv_lernwelt/core/management/commands/cypress_reset.py
@@ -401,9 +401,9 @@ def command(
 
     if set_only_is_uk_flag:
         course.configuration.is_vv = False
-        course.configuration.enable_learning_mentors = True
+        course.configuration.enable_learning_mentor = True
     else:
         course.configuration.is_vv = True
-        course.configuration.enable_learning_mentors = False
+        course.configuration.enable_learning_mentor = False
 
     course.configuration.save()
diff --git a/server/vbv_lernwelt/learning_mentor/tests/test_invitation.py b/server/vbv_lernwelt/learning_mentor/tests/test_invitation.py
index 115a8f18..950c25a0 100644
--- a/server/vbv_lernwelt/learning_mentor/tests/test_invitation.py
+++ b/server/vbv_lernwelt/learning_mentor/tests/test_invitation.py
@@ -64,7 +64,21 @@ class LearningMentorInvitationTest(APITestCase):
         )
 
     @patch("vbv_lernwelt.learning_mentor.views.send_email")
-    def test_create_invitation(self, mock_send_mail) -> None:
+    def test_create_invitation_vv(self, mock_send_mail) -> None:
+        self._test_create_invitation(
+            EmailTemplate.LEARNING_MENTOR_INVITATION, mock_send_mail
+        )
+
+    @patch("vbv_lernwelt.learning_mentor.views.send_email")
+    def test_create_invitation_uk(self, mock_send_mail) -> None:
+        self.course_session.course.configuration.is_uk = True
+        self.course_session.course.configuration.is_vv = False
+        self.course_session.course.configuration.save()
+        self._test_create_invitation(
+            EmailTemplate.PRAXISBILDNER_INVITATION, mock_send_mail
+        )
+
+    def _test_create_invitation(self, email_template, mock_send_mail) -> None:
         # GIVEN
         self.client.force_login(self.participant)
         add_course_session_user(
@@ -92,7 +106,7 @@ class LearningMentorInvitationTest(APITestCase):
 
         mock_send_mail.assert_called_once_with(
             recipient_email=email,
-            template=EmailTemplate.LEARNING_MENTOR_INVITATION,
+            template=email_template,
             template_data={
                 "inviter_name": f"{self.participant.first_name} {self.participant.last_name}",
                 "inviter_email": self.participant.email,
@@ -102,6 +116,27 @@ class LearningMentorInvitationTest(APITestCase):
             fail_silently=True,
         )
 
+    def test_cannot_create_invitation_if_learning_mentor_disabled(self) -> None:
+        # GIVEN
+        self.course_session.course.configuration.enable_learning_mentor = False
+        self.course_session.course.configuration.save()
+
+        self.client.force_login(self.participant)
+        add_course_session_user(
+            self.course_session,
+            self.participant,
+            role=CourseSessionUser.Role.MEMBER,
+        )
+        invite_url = reverse(
+            "create_invitation", kwargs={"course_session_id": self.course_session.id}
+        )
+        email = "test@example.com"
+        # WHEN
+        response = self.client.post(invite_url, data={"email": email})
+
+        # THEN
+        self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)
+
     def test_list_invitations(self) -> None:
         # GIVEN
         self.client.force_login(self.participant)
diff --git a/server/vbv_lernwelt/learning_mentor/views.py b/server/vbv_lernwelt/learning_mentor/views.py
index 33a84166..4713a218 100644
--- a/server/vbv_lernwelt/learning_mentor/views.py
+++ b/server/vbv_lernwelt/learning_mentor/views.py
@@ -119,7 +119,11 @@ def delete_invitation(request, course_session_id: int, invitation_id: UUID):
 def create_invitation(request, course_session_id: int):
     user = request.user
 
-    course_session = get_object_or_404(CourseSession, id=course_session_id)
+    course_session = get_object_or_404(
+        CourseSession,
+        id=course_session_id,
+        course__configuration__enable_learning_mentor=True,
+    )
     course_session_user = get_object_or_404(
         CourseSessionUser, user=user, course_session=course_session
     )

From b58bceb14d34f57448611ed03afcc5c98320a7e1 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Thu, 18 Apr 2024 15:43:19 +0200
Subject: [PATCH 42/82] WIP: Adding courseId to statistics page

---
 .../dashboard/AssignmentSummaryBox.vue        |  3 +-
 .../dashboard/AttendanceSummaryBox.vue        |  6 +-
 .../src/components/dashboard/CoursePanel.vue  |  2 +-
 .../src/components/dashboard/UkStatistics.vue | 17 +++--
 client/src/composables.ts                     | 23 ++++++-
 client/src/pages/dashboard/DashboardPage.vue  | 17 +++--
 .../dashboard/statistic/AssignmentList.vue    | 65 +++++++++++++------
 .../dashboard/statistic/AttendanceList.vue    | 28 ++++----
 .../dashboard/statistic/CompetenceList.vue    | 25 ++++---
 .../statistic/StatisticParentPage.vue         | 17 ++++-
 client/src/router/index.ts                    |  2 +-
 client/src/services/dashboard.ts              |  8 +++
 client/src/stores/dashboard.ts                | 17 ++++-
 13 files changed, 169 insertions(+), 61 deletions(-)

diff --git a/client/src/components/dashboard/AssignmentSummaryBox.vue b/client/src/components/dashboard/AssignmentSummaryBox.vue
index 4d9754e2..263bca4d 100644
--- a/client/src/components/dashboard/AssignmentSummaryBox.vue
+++ b/client/src/components/dashboard/AssignmentSummaryBox.vue
@@ -6,6 +6,7 @@ import BaseBox from "@/components/dashboard/BaseBox.vue";
 const props = defineProps<{
   assignmentsCompleted: number;
   avgPassed: number;
+  courseSlug: string;
 }>();
 
 const progress = computed(() => {
@@ -19,7 +20,7 @@ const progress = computed(() => {
 
 <template>
   <BaseBox
-    :details-link="'/statistic/assignment'"
+    :details-link="`/statistic/${courseSlug}/assignment`"
     data-cy="dashboard.stats.assignments"
   >
     <template #title>{{ $t("a.Kompetenznachweis-Elemente") }}</template>
diff --git a/client/src/components/dashboard/AttendanceSummaryBox.vue b/client/src/components/dashboard/AttendanceSummaryBox.vue
index ffd86316..cfed811b 100644
--- a/client/src/components/dashboard/AttendanceSummaryBox.vue
+++ b/client/src/components/dashboard/AttendanceSummaryBox.vue
@@ -6,6 +6,7 @@ import BaseBox from "@/components/dashboard/BaseBox.vue";
 const props = defineProps<{
   daysCompleted: number;
   avgParticipantsPresent: number;
+  courseSlug: string;
 }>();
 
 const progressRecord = computed(() => {
@@ -18,7 +19,10 @@ const progressRecord = computed(() => {
 </script>
 
 <template>
-  <BaseBox :details-link="'/statistic/attendance'" data-cy="dashboard.stats.attendance">
+  <BaseBox
+    :details-link="`/statistic/${props.courseSlug}/attendance`"
+    data-cy="dashboard.stats.attendance"
+  >
     <template #title>{{ $t("a.Anwesenheit") }}</template>
     <template #content>
       <div class="flex items-center">
diff --git a/client/src/components/dashboard/CoursePanel.vue b/client/src/components/dashboard/CoursePanel.vue
index a65c26df..05e3d4a6 100644
--- a/client/src/components/dashboard/CoursePanel.vue
+++ b/client/src/components/dashboard/CoursePanel.vue
@@ -146,7 +146,7 @@ function hasActionButton(): boolean {
         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-id="courseConfig.course_id" />
+        <UkStatistics :course-slug="courseSlug" :course-id="courseConfig.course_id" />
       </div>
       <div v-if="numberOfMentorWidgets > 0" class="flex flex-col flex-wrap md:flex-row">
         <MentorOpenTasksCount
diff --git a/client/src/components/dashboard/UkStatistics.vue b/client/src/components/dashboard/UkStatistics.vue
index ebd5712f..15084d74 100644
--- a/client/src/components/dashboard/UkStatistics.vue
+++ b/client/src/components/dashboard/UkStatistics.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { useDashboardStore } from "@/stores/dashboard";
-import { computed, onMounted } from "vue";
+import { computed, onMounted, ref } from "vue";
 import AttendanceSummaryBox from "@/components/dashboard/AttendanceSummaryBox.vue";
 import type { CourseStatisticsType } from "@/gql/graphql";
 import AssignmentSummaryBox from "@/components/dashboard/AssignmentSummaryBox.vue";
@@ -9,12 +9,12 @@ import CompetenceSummaryBox from "@/components/dashboard/CompetenceSummaryBox.vu
 
 const props = defineProps<{
   courseId: string;
+  courseSlug: string;
 }>();
 
+const statistics = ref<CourseStatisticsType | null>(null);
+
 const dashboardStore = useDashboardStore();
-const statistics = computed(() => {
-  return dashboardStore.currentDashBoardData as CourseStatisticsType;
-});
 
 const attendanceDayPresences = computed(() => {
   return statistics.value.attendance_day_presences.summary;
@@ -33,7 +33,8 @@ const feebackSummary = computed(() => {
 });
 
 onMounted(async () => {
-  await dashboardStore.loadStatisticsData(props.courseId);
+  statistics.value = await dashboardStore.loadStatisticsDatav2(props.courseId);
+  //await dashboardStore.loadStatisticsData(props.courseId);
 });
 </script>
 
@@ -46,11 +47,13 @@ onMounted(async () => {
         class="flex-grow"
         :days-completed="attendanceDayPresences.days_completed"
         :avg-participants-present="attendanceDayPresences.participants_present"
+        :course-slug="props.courseSlug"
       />
       <AssignmentSummaryBox
         class="flex-grow"
         :assignments-completed="assigmentSummary.completed_count"
         :avg-passed="assigmentSummary.average_passed"
+        :course-slug="props.courseSlug"
       />
     </div>
     <div
@@ -60,11 +63,13 @@ onMounted(async () => {
         :feedback-count="feebackSummary.total_responses"
         :statisfaction-max="feebackSummary.satisfaction_max"
         :statisfaction-avg="feebackSummary.satisfaction_average"
+        :course-slug="props.courseSlug"
       />
       <CompetenceSummaryBox
         :fail-count="competenceSummary.fail_total"
         :success-count="competenceSummary.success_total"
-        details-link="/statistic/competence"
+        :details-link="`/statistic/${courseSlug}/competence`"
+        :course-slug="props.courseSlug"
       />
     </div>
   </div>
diff --git a/client/src/composables.ts b/client/src/composables.ts
index 0f0a50f3..645fa01e 100644
--- a/client/src/composables.ts
+++ b/client/src/composables.ts
@@ -9,7 +9,7 @@ import {
   someFinishedInLearningSequence,
 } from "@/services/circle";
 import type { DashboardPersonType } from "@/services/dashboard";
-import { fetchDashboardPersons } from "@/services/dashboard";
+import { fetchDashboardPersons, fetchStatisticData } from "@/services/dashboard";
 import { presignUpload, uploadFile } from "@/services/files";
 import { useCompletionStore } from "@/stores/completion";
 import { useCourseSessionsStore } from "@/stores/courseSessions";
@@ -573,3 +573,24 @@ export function useCourseCircleProgress(circles: Ref<CircleType[] | undefined>)
 
   return { inProgressCirclesCount, circlesCount };
 }
+
+export function useCourseStatisticsv2(courseId: string) {
+  const courseStatistics = ref<CourseStatisticsType[] | null>(null);
+  const loading = ref(false);
+
+  const fetchData = async () => {
+    loading.value = true;
+    try {
+      courseStatistics.value = await fetchStatisticData(courseId);
+    } finally {
+      loading.value = false;
+    }
+  };
+
+  onMounted(fetchData);
+
+  return {
+    courseStatistics,
+    loading,
+  };
+}
diff --git a/client/src/pages/dashboard/DashboardPage.vue b/client/src/pages/dashboard/DashboardPage.vue
index c03f17a2..e5875897 100644
--- a/client/src/pages/dashboard/DashboardPage.vue
+++ b/client/src/pages/dashboard/DashboardPage.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import type { Component, Ref } from "vue";
-import { onMounted, ref } from "vue";
+import type { Component } from "vue";
+import { onMounted } from "vue";
 import StatisticPage from "@/pages/dashboard/StatisticPage.vue";
 import ProgressPage from "@/pages/dashboard/ProgressPage.vue";
 import SimpleDates from "@/components/dashboard/SimpleDates.vue";
@@ -8,7 +8,6 @@ import ItDropdownSelect from "@/components/ui/ItDropdownSelect.vue";
 import { useDashboardStore } from "@/stores/dashboard";
 import type { DashboardType } from "@/gql/graphql";
 import type { DashboardCourseConfigType } from "@/services/dashboard";
-import { fetchDashboardConfigv2 } from "@/services/dashboard";
 import SimpleCoursePage from "@/pages/dashboard/SimpleCoursePage.vue";
 import LoadingSpinner from "@/components/ui/LoadingSpinner.vue";
 import CourseDetailDates from "@/components/dashboard/CourseDetailDates.vue";
@@ -31,15 +30,12 @@ const boards: Record<DashboardType, DashboardPage> = {
   PRAXISBILDNER_DASHBOARD: { main: CoursePanel, aside: SimpleDates },
 };
 
-const dashboardConfigv2: Ref<DashboardCourseConfigType[]> = ref([]);
-
 onMounted(async () => {
-  dashboardConfigv2.value = await fetchDashboardConfigv2();
   await dashboardStore.loadDashboardDetails();
 });
 
 function newDashboardConfigForId(id: string): DashboardCourseConfigType | undefined {
-  return dashboardConfigv2.value.find((config) => config.course_id == id);
+  return dashboardStore.dashboardConfigsv2.find((config) => config.course_id == id);
 }
 </script>
 
@@ -64,8 +60,11 @@ function newDashboardConfigForId(id: string): DashboardCourseConfigType | undefi
         </div>
         <!-- new way of dashboard -->
         <ul>
-          <li v-for="config in dashboardStore.dashboardConfigs" :key="config.id">
-            <CoursePanel :course-config="newDashboardConfigForId(config.id)" />
+          <li
+            v-for="config in dashboardStore.dashboardConfigsv2"
+            :key="config.course_id"
+          >
+            <CoursePanel :course-config="newDashboardConfigForId(config.course_id)" />
           </li>
         </ul>
         <!-- end of new way of dashboard -->
diff --git a/client/src/pages/dashboard/statistic/AssignmentList.vue b/client/src/pages/dashboard/statistic/AssignmentList.vue
index 1519629f..5d59c62d 100644
--- a/client/src/pages/dashboard/statistic/AssignmentList.vue
+++ b/client/src/pages/dashboard/statistic/AssignmentList.vue
@@ -1,23 +1,39 @@
 <script setup lang="ts">
 import { useDashboardStore } from "@/stores/dashboard";
-import ItDropdownSelect from "@/components/ui/ItDropdownSelect.vue";
-import { computed } from "vue";
+import { onMounted, ref } from "vue";
 import type {
   AssignmentCompletionMetricsType,
   AssignmentStatisticsRecordType,
   CourseStatisticsType,
 } from "@/gql/graphql";
 import StatisticFilterList from "@/components/dashboard/StatisticFilterList.vue";
-import { useCourseStatistics } from "@/composables";
-import ItProgress from "@/components/ui/ItProgress.vue";
+import { useCourseStatistics, useCourseStatisticsv2 } from "@/composables";
 import { getDateString } from "@/components/dueDates/dueDatesUtils";
 import dayjs from "dayjs";
+import { courseIdForCourseSlug } from "@/services/dashboard";
+import ItProgress from "@/components/ui/ItProgress.vue";
+
+const props = defineProps<{
+  courseSlug: string;
+}>();
 
 const dashboardStore = useDashboardStore();
 
-const statistics = computed(() => {
-  return dashboardStore.currentDashBoardData as CourseStatisticsType;
-});
+const statistics = ref<CourseStatisticsType | null>(null);
+// const statistics = reactive<CourseStatisticsType>({
+//   course_session_properties: {
+//     sessions: [],
+//     generations: [],
+//     circles: [],
+//   },
+//   assignments: { records: [] },
+// });
+
+const courseId = courseIdForCourseSlug(
+  dashboardStore.dashboardConfigsv2,
+  props.courseSlug
+);
+const { courseStatistics, loading } = useCourseStatisticsv2(courseId);
 
 const { courseSessionName, circleMeta } = useCourseStatistics();
 
@@ -40,23 +56,34 @@ const assignmentStats = (metrics: AssignmentCompletionMetricsType) => {
 const total = (metrics: AssignmentCompletionMetricsType) => {
   return metrics.passed_count + metrics.failed_count + metrics.unranked_count;
 };
+
+onMounted(async () => {
+  console.log("onMount AssignmentList", courseId, props.courseSlug, statistics);
+  if (!courseId) {
+    return;
+  }
+  // statistics.value = await dashboardStore.loadStatisticsDatav2(courseId);
+  // const some = await courseStatistics.loadStatisticsDatav2(courseId);
+  // console.log("some", some.course_session_properties);
+  // statistics.value = some;
+  // console.log("other", statistics.value.course_session_properties);
+  // statistics.course_session_properties = some.course_session_properties;
+  // statistics.assignments = some.assignments;
+  // statistics.console.log(statistics.value);
+});
 </script>
 
 <template>
-  <main v-if="statistics">
+  {{ loading }}
+  <main v-if="!loading">
     <div class="mb-10 flex items-center justify-between">
       <h3>{{ $t("a.Kompetenznachweis-Elemente") }}</h3>
-      <ItDropdownSelect
-        :model-value="dashboardStore.currentDashboardConfig"
-        class="mt-4 w-full lg:mt-0 lg:w-96"
-        :items="dashboardStore.dashboardConfigs"
-        @update:model-value="dashboardStore.switchAndLoadDashboardConfig"
-      ></ItDropdownSelect>
     </div>
-    <div v-if="statistics.assignments.records" class="mt-8 bg-white">
+    <div v-if="courseStatistics?.assignments.records" class="mt-8 bg-white">
       <StatisticFilterList
-        :course-session-properties="statistics.course_session_properties"
-        :items="statistics.assignments.records"
+        v-if="courseStatistics?.course_session_properties"
+        :course-session-properties="courseStatistics.course_session_properties"
+        :items="courseStatistics.assignments.records"
       >
         <template #default="{ item }">
           <div class="flex justify-between">
@@ -89,8 +116,8 @@ const total = (metrics: AssignmentCompletionMetricsType) => {
               <div v-else>Noch nicht bestätigt</div>
               <ItProgress
                 :status-count="
-                  assignmentStats((item as AssignmentStatisticsRecordType).metrics)
-                "
+                                assignmentStats((item as AssignmentStatisticsRecordType).metrics)
+                              "
               ></ItProgress>
               <router-link
                 class="underline"
diff --git a/client/src/pages/dashboard/statistic/AttendanceList.vue b/client/src/pages/dashboard/statistic/AttendanceList.vue
index 2d1ad523..a5ebf5b4 100644
--- a/client/src/pages/dashboard/statistic/AttendanceList.vue
+++ b/client/src/pages/dashboard/statistic/AttendanceList.vue
@@ -1,19 +1,26 @@
 <script setup lang="ts">
 import { useDashboardStore } from "@/stores/dashboard";
-import ItDropdownSelect from "@/components/ui/ItDropdownSelect.vue";
-import { computed } from "vue";
+import { onMounted, ref } from "vue";
 import type { CourseStatisticsType, PresenceRecordStatisticsType } from "@/gql/graphql";
 import StatisticFilterList from "@/components/dashboard/StatisticFilterList.vue";
 import ItProgress from "@/components/ui/ItProgress.vue";
 import { useCourseStatistics } from "@/composables";
 import { getDateString } from "@/components/dueDates/dueDatesUtils";
 import dayjs from "dayjs";
+import { courseIdForCourseSlug } from "@/services/dashboard";
+
+const props = defineProps<{
+  courseSlug: string;
+}>();
 
 const dashboardStore = useDashboardStore();
 
-const statistics = computed(() => {
-  return dashboardStore.currentDashBoardData as CourseStatisticsType;
-});
+const statistics = ref<CourseStatisticsType | null>(null);
+
+const courseId = courseIdForCourseSlug(
+  dashboardStore.dashboardConfigsv2,
+  props.courseSlug
+);
 
 const { courseSessionName, circleMeta } = useCourseStatistics();
 
@@ -24,18 +31,17 @@ const attendanceStats = (present: number, total: number) => {
     UNKNOWN: 0,
   };
 };
+
+onMounted(async () => {
+  console.log("onMount AttendanceList", courseId, props.courseSlug, statistics);
+  statistics.value = await dashboardStore.loadStatisticsDatav2(courseId);
+});
 </script>
 
 <template>
   <main v-if="statistics">
     <div class="mb-10 flex items-center justify-between">
       <h3>{{ $t("Anwesenheit") }}</h3>
-      <ItDropdownSelect
-        :model-value="dashboardStore.currentDashboardConfig"
-        class="mt-4 w-full lg:mt-0 lg:w-96"
-        :items="dashboardStore.dashboardConfigs"
-        @update:model-value="dashboardStore.switchAndLoadDashboardConfig"
-      ></ItDropdownSelect>
     </div>
     <div v-if="statistics.attendance_day_presences.records" class="mt-8 bg-white">
       <StatisticFilterList
diff --git a/client/src/pages/dashboard/statistic/CompetenceList.vue b/client/src/pages/dashboard/statistic/CompetenceList.vue
index 660d9f91..6239d086 100644
--- a/client/src/pages/dashboard/statistic/CompetenceList.vue
+++ b/client/src/pages/dashboard/statistic/CompetenceList.vue
@@ -1,21 +1,30 @@
 <script setup lang="ts">
 import { useDashboardStore } from "@/stores/dashboard";
 import ItDropdownSelect from "@/components/ui/ItDropdownSelect.vue";
-import { computed } from "vue";
-import type {
-  CompetenceRecordStatisticsType,
-  CourseStatisticsType,
-} from "@/gql/graphql";
+import { onMounted, ref } from "vue";
+import type { CompetenceRecordStatisticsType } from "@/gql/graphql";
+import { CourseStatisticsType } from "@/gql/graphql";
 import StatisticFilterList from "@/components/dashboard/StatisticFilterList.vue";
 import { useCourseStatistics } from "@/composables";
+import { courseIdForCourseSlug } from "@/services/dashboard";
+
+const props = defineProps<{
+  courseSlug: string;
+}>();
 
 const dashboardStore = useDashboardStore();
+const statistics = ref<CourseStatisticsType | null>(null);
 
-const statistics = computed(() => {
-  return dashboardStore.currentDashBoardData as CourseStatisticsType;
-});
+const courseId = courseIdForCourseSlug(
+  dashboardStore.dashboardConfigsv2,
+  props.courseSlug
+);
 
 const { courseSessionName, circleMeta } = useCourseStatistics();
+
+onMounted(async () => {
+  statistics.value = await dashboardStore.loadStatisticsDatav2(courseId);
+});
 </script>
 
 <template>
diff --git a/client/src/pages/dashboard/statistic/StatisticParentPage.vue b/client/src/pages/dashboard/statistic/StatisticParentPage.vue
index db9f5724..2c814d7e 100644
--- a/client/src/pages/dashboard/statistic/StatisticParentPage.vue
+++ b/client/src/pages/dashboard/statistic/StatisticParentPage.vue
@@ -1,10 +1,23 @@
 <script setup lang="ts">
 import { useDashboardStore } from "@/stores/dashboard";
-import { onMounted } from "vue";
+import { computed, onMounted, watch } from "vue";
 import LoadingSpinner from "@/components/ui/LoadingSpinner.vue";
 
 const dashboardStore = useDashboardStore();
-onMounted(dashboardStore.loadDashboardDetails);
+dashboardStore.loading = true;
+
+const some = computed(() => {
+  return dashboardStore.loading;
+});
+
+watch(some, () => {
+  console.log("watch loading", dashboardStore.loading);
+});
+
+onMounted(async () => {
+  console.log("onMount StatisticParentPage", dashboardStore.loading);
+  await dashboardStore.loadDashboardDetails();
+});
 </script>
 
 <template>
diff --git a/client/src/router/index.ts b/client/src/router/index.ts
index f28e4c92..cf027b4c 100644
--- a/client/src/router/index.ts
+++ b/client/src/router/index.ts
@@ -269,7 +269,7 @@ const router = createRouter({
       ],
     },
     {
-      path: "/statistic",
+      path: "/statistic/:courseSlug",
       props: true,
       component: () => import("@/pages/dashboard/statistic/StatisticParentPage.vue"),
       children: [
diff --git a/client/src/services/dashboard.ts b/client/src/services/dashboard.ts
index 04489a51..fae8181e 100644
--- a/client/src/services/dashboard.ts
+++ b/client/src/services/dashboard.ts
@@ -159,3 +159,11 @@ export async function fetchOpenTasksCount(courseId: string) {
     `/api/dashboard/course/${courseId}/open_tasks/`
   );
 }
+
+export function courseIdForCourseSlug(
+  dashboardConfigs: DashboardCourseConfigType[],
+  courseSlug: string
+) {
+  const config = dashboardConfigs.find((config) => config.course_slug === courseSlug);
+  return config?.course_id;
+}
diff --git a/client/src/stores/dashboard.ts b/client/src/stores/dashboard.ts
index 10e738b0..8a4a9c92 100644
--- a/client/src/stores/dashboard.ts
+++ b/client/src/stores/dashboard.ts
@@ -4,8 +4,10 @@ import type {
   DashboardConfigType,
   DashboardType,
 } from "@/gql/graphql";
+import type { DashboardCourseConfigType } from "@/services/dashboard";
 import {
   fetchDashboardConfig,
+  fetchDashboardConfigv2,
   fetchProgressData,
   fetchStatisticData,
 } from "@/services/dashboard";
@@ -15,6 +17,7 @@ import { ref } from "vue";
 
 export const useDashboardStore = defineStore("dashboard", () => {
   const dashboardConfigs: Ref<DashboardConfigType[]> = ref([]);
+  const dashboardConfigsv2: Ref<DashboardCourseConfigType[]> = ref([]);
   const currentDashboardConfig: Ref<DashboardConfigType | undefined> = ref();
   const dashBoardDataCache: Record<
     string,
@@ -56,6 +59,8 @@ export const useDashboardStore = defineStore("dashboard", () => {
 
   const loadDashboardDetails = async () => {
     loading.value = true;
+    dashboardConfigsv2.value = await fetchDashboardConfigv2();
+    console.log("got dashboard config v2: ", dashboardConfigsv2.value);
     try {
       if (!currentDashboardConfig.value) {
         await loadDashboardConfig();
@@ -66,8 +71,9 @@ export const useDashboardStore = defineStore("dashboard", () => {
         currentDashBoardData.value = dashBoardDataCache[id];
         return;
       }
-      await loadDashboardData(dashboard_type, id);
+      // await loadDashboardData(dashboard_type, id);
     } finally {
+      console.log("done loading dashboard details");
       loading.value = false;
     }
   };
@@ -78,8 +84,16 @@ export const useDashboardStore = defineStore("dashboard", () => {
     currentDashBoardData.value = data;
   };
 
+  const loadStatisticsDatav2 = async (id: string) => {
+    console.log("fetching statistics v2 for course ID: ", id);
+    const data = await fetchStatisticData(id);
+    dashBoardDataCache[id] = data;
+    return data;
+  };
+
   return {
     dashboardConfigs,
+    dashboardConfigsv2,
     currentDashboardConfig,
     switchAndLoadDashboardConfig,
     loadDashboardConfig,
@@ -87,5 +101,6 @@ export const useDashboardStore = defineStore("dashboard", () => {
     currentDashBoardData,
     loading,
     loadStatisticsData,
+    loadStatisticsDatav2,
   };
 });

From 49bd67f3e0239e088fa0baf982a457049bf0e80a Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Thu, 18 Apr 2024 17:22:44 +0200
Subject: [PATCH 43/82] WIP: Fix statistic pages

---
 client/src/composables.ts                     | 14 +++++++
 .../dashboard/statistic/AssignmentList.vue    | 38 ++-----------------
 .../dashboard/statistic/AttendanceList.vue    | 27 ++++++-------
 .../dashboard/statistic/CompetenceList.vue    | 20 ++++------
 .../statistic/StatisticParentPage.vue         | 10 +----
 5 files changed, 37 insertions(+), 72 deletions(-)

diff --git a/client/src/composables.ts b/client/src/composables.ts
index 645fa01e..ca61ea2a 100644
--- a/client/src/composables.ts
+++ b/client/src/composables.ts
@@ -587,10 +587,24 @@ export function useCourseStatisticsv2(courseId: string) {
     }
   };
 
+  const courseSessionName = (courseSessionId: string) => {
+    return courseStatistics.value.course_session_properties.sessions.find(
+      (session) => session.id === courseSessionId
+    )?.name;
+  };
+
+  const circleMeta = (circleId: string) => {
+    return courseStatistics.value.course_session_properties.circles.find(
+      (circle) => circle.id === circleId
+    );
+  };
+
   onMounted(fetchData);
 
   return {
     courseStatistics,
     loading,
+    courseSessionName,
+    circleMeta,
   };
 }
diff --git a/client/src/pages/dashboard/statistic/AssignmentList.vue b/client/src/pages/dashboard/statistic/AssignmentList.vue
index 5d59c62d..179a2843 100644
--- a/client/src/pages/dashboard/statistic/AssignmentList.vue
+++ b/client/src/pages/dashboard/statistic/AssignmentList.vue
@@ -1,13 +1,11 @@
 <script setup lang="ts">
 import { useDashboardStore } from "@/stores/dashboard";
-import { onMounted, ref } from "vue";
 import type {
   AssignmentCompletionMetricsType,
   AssignmentStatisticsRecordType,
-  CourseStatisticsType,
 } from "@/gql/graphql";
 import StatisticFilterList from "@/components/dashboard/StatisticFilterList.vue";
-import { useCourseStatistics, useCourseStatisticsv2 } from "@/composables";
+import { useCourseStatisticsv2 } from "@/composables";
 import { getDateString } from "@/components/dueDates/dueDatesUtils";
 import dayjs from "dayjs";
 import { courseIdForCourseSlug } from "@/services/dashboard";
@@ -19,23 +17,12 @@ const props = defineProps<{
 
 const dashboardStore = useDashboardStore();
 
-const statistics = ref<CourseStatisticsType | null>(null);
-// const statistics = reactive<CourseStatisticsType>({
-//   course_session_properties: {
-//     sessions: [],
-//     generations: [],
-//     circles: [],
-//   },
-//   assignments: { records: [] },
-// });
-
 const courseId = courseIdForCourseSlug(
   dashboardStore.dashboardConfigsv2,
   props.courseSlug
 );
-const { courseStatistics, loading } = useCourseStatisticsv2(courseId);
-
-const { courseSessionName, circleMeta } = useCourseStatistics();
+const { courseStatistics, loading, courseSessionName, circleMeta } =
+  useCourseStatisticsv2(courseId);
 
 const assignmentStats = (metrics: AssignmentCompletionMetricsType) => {
   if (!metrics.ranking_completed) {
@@ -56,33 +43,16 @@ const assignmentStats = (metrics: AssignmentCompletionMetricsType) => {
 const total = (metrics: AssignmentCompletionMetricsType) => {
   return metrics.passed_count + metrics.failed_count + metrics.unranked_count;
 };
-
-onMounted(async () => {
-  console.log("onMount AssignmentList", courseId, props.courseSlug, statistics);
-  if (!courseId) {
-    return;
-  }
-  // statistics.value = await dashboardStore.loadStatisticsDatav2(courseId);
-  // const some = await courseStatistics.loadStatisticsDatav2(courseId);
-  // console.log("some", some.course_session_properties);
-  // statistics.value = some;
-  // console.log("other", statistics.value.course_session_properties);
-  // statistics.course_session_properties = some.course_session_properties;
-  // statistics.assignments = some.assignments;
-  // statistics.console.log(statistics.value);
-});
 </script>
 
 <template>
-  {{ loading }}
   <main v-if="!loading">
     <div class="mb-10 flex items-center justify-between">
       <h3>{{ $t("a.Kompetenznachweis-Elemente") }}</h3>
     </div>
     <div v-if="courseStatistics?.assignments.records" class="mt-8 bg-white">
       <StatisticFilterList
-        v-if="courseStatistics?.course_session_properties"
-        :course-session-properties="courseStatistics.course_session_properties"
+        :course-session-properties="courseStatistics?.course_session_properties"
         :items="courseStatistics.assignments.records"
       >
         <template #default="{ item }">
diff --git a/client/src/pages/dashboard/statistic/AttendanceList.vue b/client/src/pages/dashboard/statistic/AttendanceList.vue
index a5ebf5b4..b6ae8b26 100644
--- a/client/src/pages/dashboard/statistic/AttendanceList.vue
+++ b/client/src/pages/dashboard/statistic/AttendanceList.vue
@@ -1,10 +1,9 @@
 <script setup lang="ts">
 import { useDashboardStore } from "@/stores/dashboard";
-import { onMounted, ref } from "vue";
-import type { CourseStatisticsType, PresenceRecordStatisticsType } from "@/gql/graphql";
+import type { PresenceRecordStatisticsType } from "@/gql/graphql";
 import StatisticFilterList from "@/components/dashboard/StatisticFilterList.vue";
 import ItProgress from "@/components/ui/ItProgress.vue";
-import { useCourseStatistics } from "@/composables";
+import { useCourseStatisticsv2 } from "@/composables";
 import { getDateString } from "@/components/dueDates/dueDatesUtils";
 import dayjs from "dayjs";
 import { courseIdForCourseSlug } from "@/services/dashboard";
@@ -15,14 +14,12 @@ const props = defineProps<{
 
 const dashboardStore = useDashboardStore();
 
-const statistics = ref<CourseStatisticsType | null>(null);
-
 const courseId = courseIdForCourseSlug(
   dashboardStore.dashboardConfigsv2,
   props.courseSlug
 );
-
-const { courseSessionName, circleMeta } = useCourseStatistics();
+const { courseStatistics, loading, courseSessionName, circleMeta } =
+  useCourseStatisticsv2(courseId);
 
 const attendanceStats = (present: number, total: number) => {
   return {
@@ -31,22 +28,20 @@ const attendanceStats = (present: number, total: number) => {
     UNKNOWN: 0,
   };
 };
-
-onMounted(async () => {
-  console.log("onMount AttendanceList", courseId, props.courseSlug, statistics);
-  statistics.value = await dashboardStore.loadStatisticsDatav2(courseId);
-});
 </script>
 
 <template>
-  <main v-if="statistics">
+  <main v-if="!loading">
     <div class="mb-10 flex items-center justify-between">
       <h3>{{ $t("Anwesenheit") }}</h3>
     </div>
-    <div v-if="statistics.attendance_day_presences.records" class="mt-8 bg-white">
+    <div
+      v-if="courseStatistics?.attendance_day_presences.records"
+      class="mt-8 bg-white"
+    >
       <StatisticFilterList
-        :course-session-properties="statistics.course_session_properties"
-        :items="statistics.attendance_day_presences.records"
+        :course-session-properties="courseStatistics.course_session_properties"
+        :items="courseStatistics.attendance_day_presences.records"
       >
         <template #default="{ item }">
           <div class="flex justify-between">
diff --git a/client/src/pages/dashboard/statistic/CompetenceList.vue b/client/src/pages/dashboard/statistic/CompetenceList.vue
index 6239d086..c95fc2d4 100644
--- a/client/src/pages/dashboard/statistic/CompetenceList.vue
+++ b/client/src/pages/dashboard/statistic/CompetenceList.vue
@@ -1,11 +1,9 @@
 <script setup lang="ts">
 import { useDashboardStore } from "@/stores/dashboard";
 import ItDropdownSelect from "@/components/ui/ItDropdownSelect.vue";
-import { onMounted, ref } from "vue";
 import type { CompetenceRecordStatisticsType } from "@/gql/graphql";
-import { CourseStatisticsType } from "@/gql/graphql";
 import StatisticFilterList from "@/components/dashboard/StatisticFilterList.vue";
-import { useCourseStatistics } from "@/composables";
+import { useCourseStatisticsv2 } from "@/composables";
 import { courseIdForCourseSlug } from "@/services/dashboard";
 
 const props = defineProps<{
@@ -13,22 +11,18 @@ const props = defineProps<{
 }>();
 
 const dashboardStore = useDashboardStore();
-const statistics = ref<CourseStatisticsType | null>(null);
 
 const courseId = courseIdForCourseSlug(
   dashboardStore.dashboardConfigsv2,
   props.courseSlug
 );
 
-const { courseSessionName, circleMeta } = useCourseStatistics();
-
-onMounted(async () => {
-  statistics.value = await dashboardStore.loadStatisticsDatav2(courseId);
-});
+const { courseStatistics, loading, courseSessionName, circleMeta } =
+  useCourseStatisticsv2(courseId);
 </script>
 
 <template>
-  <main v-if="statistics">
+  <main v-if="courseStatistics">
     <div class="mb-10 flex items-center justify-between">
       <h3>{{ $t("a.Selbsteinschätzung") }}</h3>
       <ItDropdownSelect
@@ -38,10 +32,10 @@ onMounted(async () => {
         @update:model-value="dashboardStore.switchAndLoadDashboardConfig"
       ></ItDropdownSelect>
     </div>
-    <div v-if="statistics.competences.records" class="mt-8 bg-white">
+    <div v-if="courseStatistics?.competences.records" class="mt-8 bg-white">
       <StatisticFilterList
-        :course-session-properties="statistics.course_session_properties"
-        :items="statistics.competences.records"
+        :course-session-properties="courseStatistics.course_session_properties"
+        :items="courseStatistics.competences.records"
       >
         <template #default="{ item }">
           <div class="flex justify-between">
diff --git a/client/src/pages/dashboard/statistic/StatisticParentPage.vue b/client/src/pages/dashboard/statistic/StatisticParentPage.vue
index 2c814d7e..25ac2985 100644
--- a/client/src/pages/dashboard/statistic/StatisticParentPage.vue
+++ b/client/src/pages/dashboard/statistic/StatisticParentPage.vue
@@ -1,19 +1,11 @@
 <script setup lang="ts">
 import { useDashboardStore } from "@/stores/dashboard";
-import { computed, onMounted, watch } from "vue";
+import { onMounted } from "vue";
 import LoadingSpinner from "@/components/ui/LoadingSpinner.vue";
 
 const dashboardStore = useDashboardStore();
 dashboardStore.loading = true;
 
-const some = computed(() => {
-  return dashboardStore.loading;
-});
-
-watch(some, () => {
-  console.log("watch loading", dashboardStore.loading);
-});
-
 onMounted(async () => {
   console.log("onMount StatisticParentPage", dashboardStore.loading);
   await dashboardStore.loadDashboardDetails();

From 46a2f6a3ba868c6a27eac8149c467a6b38067b90 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Thu, 18 Apr 2024 16:15:30 +0200
Subject: [PATCH 44/82] Add filters to dashboard person table

---
 .../pages/dashboard/DashboardPersonsPage.vue  | 142 ++++++++++++++++--
 1 file changed, 131 insertions(+), 11 deletions(-)

diff --git a/client/src/pages/dashboard/DashboardPersonsPage.vue b/client/src/pages/dashboard/DashboardPersonsPage.vue
index b4a96cc3..ac944f5a 100644
--- a/client/src/pages/dashboard/DashboardPersonsPage.vue
+++ b/client/src/pages/dashboard/DashboardPersonsPage.vue
@@ -2,10 +2,117 @@
 import LoadingSpinner from "@/components/ui/LoadingSpinner.vue";
 import log from "loglevel";
 import { useDashboardPersons } from "@/composables";
+import ItDropdownSelect from "@/components/ui/ItDropdownSelect.vue";
+import { computed, ref, watch } from "vue";
+import { useTranslation } from "i18next-vue";
+import _ from "lodash";
+import type { DashboardPersonCourseSessionType } from "@/services/dashboard";
 
 log.debug("DashboardPersonsPage created");
 
+const UNFILTERED = 0;
+
+type MenuItem = {
+  id: number;
+  name: string;
+};
+
+const { t } = useTranslation();
+
 const { loading: loadingPersons, dashboardPersons } = useDashboardPersons();
+
+const courses = computed(() => {
+  return [
+    {
+      id: UNFILTERED,
+      name: t("a.Alle Lehrgänge"),
+    },
+    ..._(dashboardPersons.value)
+      .flatMap((person) => person.course_sessions)
+      .map((cs) => {
+        return { name: cs.course_title, id: cs.course_id };
+      })
+      .uniqBy("id")
+      .orderBy("name")
+      .value(),
+  ];
+});
+
+const selectedCourse = ref<MenuItem>(courses.value[0]);
+
+const courseSessions = computed(() => {
+  let sessions = _(dashboardPersons.value)
+    .flatMap((person) => person.course_sessions)
+    .map((cs) => {
+      return Object.assign({}, cs, { name: cs.session_title, id: cs.id });
+    })
+    .uniqBy("id")
+    .orderBy("name")
+    .value();
+
+  // filter by selected course
+  if (selectedCourse.value.id !== UNFILTERED) {
+    sessions = sessions.filter((cs) => cs.course_id === selectedCourse.value.id);
+  }
+
+  return [
+    {
+      id: UNFILTERED,
+      name: t("a.AlleDurchführungen"),
+    },
+    ...sessions,
+  ];
+});
+
+watch(selectedCourse, () => {
+  selectedSession.value = courseSessions.value[0];
+});
+
+const selectedSession = ref<MenuItem>(courseSessions.value[0]);
+
+const filteredPersons = computed(() => {
+  return _.orderBy(
+    dashboardPersons.value
+      .filter((person) => {
+        if (selectedCourse.value.id === UNFILTERED) {
+          return true;
+        }
+        return person.course_sessions.some(
+          (cs) => cs.course_id === selectedCourse.value.id
+        );
+      })
+      .filter((person) => {
+        if (selectedSession.value.id === UNFILTERED) {
+          return true;
+        }
+        return person.course_sessions.some((cs) => cs.id === selectedSession.value.id);
+      }),
+    ["last_name", "first_name"]
+  );
+});
+
+const filtersVisible = computed(() => {
+  return courses.value.length > 2 || courseSessions.value.length > 2;
+});
+
+function personRoleDisplayValue(personCourseSession: DashboardPersonCourseSessionType) {
+  if (personCourseSession.is_uk) {
+    if (personCourseSession.user_role === "EXPERT") {
+      return t("a.Trainer");
+    }
+    if (personCourseSession.user_role === "LEARNING_MENTOR") {
+      return t("a.Praxisbildner");
+    }
+  }
+
+  if (personCourseSession.is_vv) {
+    if (personCourseSession.user_role === "LEARNING_MENTOR") {
+      return t("a.Lernbegleitung");
+    }
+  }
+
+  return "";
+}
 </script>
 
 <template>
@@ -16,8 +123,28 @@ const { loading: loadingPersons, dashboardPersons } = useDashboardPersons();
     <div v-else class="bg-gray-200">
       <div class="container-large">
         <div class="bg-white px-4 py-2">
+          <section
+            v-if="filtersVisible"
+            class="flex flex-col space-x-0 border-b bg-white lg:flex-row lg:space-x-3"
+          >
+            <ItDropdownSelect
+              v-if="courses.length > 2"
+              v-model="selectedCourse"
+              data-cy="session-select"
+              :items="courses"
+              borderless
+            ></ItDropdownSelect>
+
+            <ItDropdownSelect
+              v-if="courseSessions.length > 2"
+              v-model="selectedSession"
+              data-cy="session-select"
+              :items="courseSessions"
+              borderless
+            ></ItDropdownSelect>
+          </section>
           <div
-            v-for="person in dashboardPersons"
+            v-for="person in filteredPersons"
             :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"
@@ -51,8 +178,9 @@ const { loading: loadingPersons, dashboardPersons } = useDashboardPersons();
                     <div v-if="cs.is_uk">{{ cs.session_title }}</div>
                   </div>
                   <div class="md:w-1/4">
-                    <div>{{ cs.user_role }}</div>
-                    <div>my role: {{ cs.my_role }}</div>
+                    <!--                    <div>{{ cs.user_role }}</div>-->
+                    <!--                    <div>my role: {{ cs.my_role }}</div>-->
+                    {{ personRoleDisplayValue(cs) }}
                   </div>
                   <div class="md:w-1/4 md:text-right">
                     <div
@@ -81,14 +209,6 @@ const { loading: loadingPersons, dashboardPersons } = useDashboardPersons();
                 </div>
               </div>
             </div>
-
-            <!--            <button-->
-            <!--              class="underline"-->
-            <!--              data-cy="lm-my-mentor-remove"-->
-            <!--              @click="removeMyMentor(learningMentor.id)"-->
-            <!--            >-->
-            <!--              {{ $t("a.Entfernen") }}-->
-            <!--            </button>-->
           </div>
         </div>
       </div>

From bfdacfec62ae5d1c393c871e3304fe374fda6063 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Thu, 18 Apr 2024 17:39:58 +0200
Subject: [PATCH 45/82] User course_session and course `id`s as string

---
 .../pages/dashboard/DashboardPersonsPage.vue  |  4 +--
 client/src/services/dashboard.ts              |  4 +--
 server/vbv_lernwelt/dashboard/views.py        | 24 ++++++++++----
 server/vbv_lernwelt/duedate/models.py         | 33 -------------------
 4 files changed, 22 insertions(+), 43 deletions(-)

diff --git a/client/src/pages/dashboard/DashboardPersonsPage.vue b/client/src/pages/dashboard/DashboardPersonsPage.vue
index ac944f5a..821302e9 100644
--- a/client/src/pages/dashboard/DashboardPersonsPage.vue
+++ b/client/src/pages/dashboard/DashboardPersonsPage.vue
@@ -10,10 +10,10 @@ import type { DashboardPersonCourseSessionType } from "@/services/dashboard";
 
 log.debug("DashboardPersonsPage created");
 
-const UNFILTERED = 0;
+const UNFILTERED = Number.MAX_SAFE_INTEGER.toString();
 
 type MenuItem = {
-  id: number;
+  id: string;
   name: string;
 };
 
diff --git a/client/src/services/dashboard.ts b/client/src/services/dashboard.ts
index fae8181e..18d3526b 100644
--- a/client/src/services/dashboard.ts
+++ b/client/src/services/dashboard.ts
@@ -38,9 +38,9 @@ export type WidgetType =
   | "UKStatisticsWidget";
 
 export type DashboardPersonCourseSessionType = {
-  id: number;
+  id: string;
   session_title: string;
-  course_id: number;
+  course_id: string;
   course_title: string;
   course_slug: string;
   user_role: DashboardPersonRoleType;
diff --git a/server/vbv_lernwelt/dashboard/views.py b/server/vbv_lernwelt/dashboard/views.py
index fb68f6ce..ca57631e 100644
--- a/server/vbv_lernwelt/dashboard/views.py
+++ b/server/vbv_lernwelt/dashboard/views.py
@@ -141,9 +141,9 @@ def get_dashboard_persons(request):
                         "email": csu.user.email,
                         "course_sessions": [
                             {
-                                "id": cs.id,
+                                "id": str(cs.id),
                                 "session_title": cs.title,
-                                "course_id": cs.course.id,
+                                "course_id": str(cs.course.id),
                                 "course_title": cs.course.title,
                                 "course_slug": cs.course.slug,
                                 "user_role": csu.role,
@@ -163,9 +163,9 @@ def get_dashboard_persons(request):
 
                 for participant in lm.participants.all():
                     course_session_entry = {
-                        "id": cs.id,
+                        "id": str(cs.id),
                         "session_title": cs.title,
-                        "course_id": cs.course.id,
+                        "course_id": str(cs.course.id),
                         "course_title": cs.course.title,
                         "course_slug": cs.course.slug,
                         "user_role": "LEARNING_MENTEE",
@@ -195,9 +195,9 @@ def get_dashboard_persons(request):
         for mentor_relation in mentor_relation_qs:
             cs = mentor_relation.course_session
             course_session_entry = {
-                "id": cs.id,
+                "id": str(cs.id),
                 "session_title": cs.title,
-                "course_id": cs.course.id,
+                "course_id": str(cs.course.id),
                 "course_title": cs.course.title,
                 "course_slug": cs.course.slug,
                 "user_role": "LEARNING_MENTOR",
@@ -231,6 +231,18 @@ def get_dashboard_persons(request):
         return Response({"error": str(e)}, status=404)
 
 
+@api_view(["GET"])
+def get_dashboard_due_dates(request):
+    try:
+        course_sessions = get_course_sessions_with_roles_for_user(request.user)
+
+    except PermissionDenied as e:
+        raise e
+    except Exception as e:
+        logger.error(e, exc_info=True)
+        return Response({"error": str(e)}, status=404)
+
+
 def get_widgets_for_course(
     role_key: RoleKeyType, is_uk: bool, is_vv: bool, is_mentor: bool
 ) -> List[str]:
diff --git a/server/vbv_lernwelt/duedate/models.py b/server/vbv_lernwelt/duedate/models.py
index 14e2f9d6..3bfe6ee5 100644
--- a/server/vbv_lernwelt/duedate/models.py
+++ b/server/vbv_lernwelt/duedate/models.py
@@ -4,9 +4,6 @@ from django.db import models
 from django.utils import timezone
 from wagtail.models import Page
 
-from vbv_lernwelt.core.models import User
-from vbv_lernwelt.course.models import CourseSession
-
 
 class DueDate(models.Model):
     start = models.DateTimeField(
@@ -125,33 +122,3 @@ class DueDate(models.Model):
         except Exception:
             # noop
             return None
-
-    @classmethod
-    def get_users_next_events_qs(
-        cls, user: User, course_session: CourseSession = None, limit=10
-    ):
-        """
-        Returns a queryset of all due dates that are relevant for the given user.
-        If course_session is given, only due dates for that course_session are returned.
-        The user is determined by via a course session user of a course_assignment.
-
-        """
-        qs = cls.get_next_due_dates_qs()
-
-        if course_session:
-            qs = qs.filter(
-                course_session=course_session,
-                course_session__course_assignment__user=user,
-            )
-        else:
-            qs = qs.filter(course_session__course_assignment__user=user)
-
-        qs = qs.order_by("start")[:limit]
-
-        return qs
-
-    @classmethod
-    def get_next_due_dates_qs(cls):
-        now = timezone.now()
-        qs = cls.objects.filter(start__gte=now)
-        return qs

From 50c35b71003f6f567c2ccedafedcb2fc9362570b Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Thu, 18 Apr 2024 18:07:57 +0200
Subject: [PATCH 46/82] Add due_dates rest endpoint for dashboard

---
 server/config/urls.py                  |  2 +
 server/vbv_lernwelt/dashboard/views.py | 54 ++++++++++++++++++++++++--
 2 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/server/config/urls.py b/server/config/urls.py
index 6155a093..716d4747 100644
--- a/server/config/urls.py
+++ b/server/config/urls.py
@@ -44,6 +44,7 @@ from vbv_lernwelt.dashboard.views import (
     get_dashboard_persons,
     get_mentee_count,
     get_mentor_open_tasks_count,
+    get_dashboard_due_dates,
 )
 from vbv_lernwelt.edoniq_test.views import (
     export_students,
@@ -124,6 +125,7 @@ urlpatterns = [
 
     # dashboard
     path(r"api/dashboard/persons/", get_dashboard_persons, name="get_dashboard_persons"),
+    path(r"api/dashboard/duedates/", get_dashboard_due_dates, name="get_dashboard_due_dates"),
     path(r"api/dashboard/config/", get_dashboard_config, name="get_dashboard_config"),
     path(r"api/dashboard/course/<str:course_id>/mentees/", get_mentee_count, name="get_mentee_count"),
     path(r"api/dashboard/course/<str:course_id>/open_tasks/", get_mentor_open_tasks_count,
diff --git a/server/vbv_lernwelt/dashboard/views.py b/server/vbv_lernwelt/dashboard/views.py
index ca57631e..63cd447e 100644
--- a/server/vbv_lernwelt/dashboard/views.py
+++ b/server/vbv_lernwelt/dashboard/views.py
@@ -1,4 +1,5 @@
 from dataclasses import asdict, dataclass
+from datetime import date
 from enum import Enum
 from typing import List, Set
 
@@ -18,6 +19,8 @@ from vbv_lernwelt.course.models import (
 )
 from vbv_lernwelt.course.views import logger
 from vbv_lernwelt.course_session_group.models import CourseSessionGroup
+from vbv_lernwelt.duedate.models import DueDate
+from vbv_lernwelt.duedate.serializers import DueDateSerializer
 from vbv_lernwelt.learning_mentor.models import LearningMentor
 from vbv_lernwelt.self_evaluation_feedback.models import SelfEvaluationFeedback
 
@@ -235,6 +238,53 @@ def get_dashboard_persons(request):
 def get_dashboard_due_dates(request):
     try:
         course_sessions = get_course_sessions_with_roles_for_user(request.user)
+        course_session_ids = [cs.id for cs in course_sessions]
+
+        all_due_dates = DueDate.objects.filter(
+            course_session__id__in=course_session_ids
+        )
+
+        # filter only future due dates
+        due_dates = []
+        today = date.today()
+        for due_date in all_due_dates:
+            if due_date.end:
+                if due_date.end.date() >= today:
+                    due_dates.append(due_date)
+            elif due_date.start:
+                if due_date.start.date() >= today:
+                    due_dates.append(due_date)
+
+        due_dates.sort(key=lambda x: x.start)
+
+        # find course session by id in `course_sessions`
+
+        result_due_dates = []
+        for due_date in due_dates:
+            data = DueDateSerializer(due_date).data
+
+            cs = next(
+                course_session
+                for course_session in course_sessions
+                if course_session.id == due_date.course_session.id
+            )
+            if cs:
+                data["course_session"] = {
+                    "id": str(cs.id),
+                    "session_title": cs.title,
+                    "course_id": str(cs.course.id),
+                    "course_title": cs.course.title,
+                    "course_slug": cs.course.slug,
+                    "user_role": user_role(cs.roles),
+                    "is_uk": cs.course.configuration.is_uk,
+                    "is_vv": cs.course.configuration.is_vv,
+                }
+            result_due_dates.append(data)
+
+        return Response(
+            status=200,
+            data=result_due_dates,
+        )
 
     except PermissionDenied as e:
         raise e
@@ -395,9 +445,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 102196a290778ce4eb7d514160a1cc11a804e282 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Thu, 18 Apr 2024 18:48:53 +0200
Subject: [PATCH 47/82] Add new DashboardDueDatesPage

---
 .../src/components/dueDates/DueDateSingle.vue |  31 ++-
 client/src/composables.ts                     |  28 ++-
 .../pages/dashboard/DashboardDueDatesPage.vue | 234 ++++++++++++++++++
 .../pages/dashboard/DashboardPersonsPage.vue  |  12 +-
 client/src/router/index.ts                    |   4 +
 client/src/services/dashboard.ts              |  10 +
 server/vbv_lernwelt/dashboard/views.py        |   6 +-
 7 files changed, 298 insertions(+), 27 deletions(-)
 create mode 100644 client/src/pages/dashboard/DashboardDueDatesPage.vue

diff --git a/client/src/components/dueDates/DueDateSingle.vue b/client/src/components/dueDates/DueDateSingle.vue
index c7a14785..aa4a54a7 100644
--- a/client/src/components/dueDates/DueDateSingle.vue
+++ b/client/src/components/dueDates/DueDateSingle.vue
@@ -2,8 +2,8 @@
 import type { CourseSession, DueDate } from "@/types";
 import { useCourseSessionsStore } from "@/stores/courseSessions";
 import { useTranslation } from "i18next-vue";
-import dayjs from "dayjs";
 import { computed } from "vue";
+import dayjs from "dayjs";
 
 const props = defineProps<{
   dueDate: DueDate;
@@ -48,24 +48,23 @@ const courseSessionTitle = computed(() => {
       <div>
         <a class="underline" :href="url">
           <span class="text-bold">
-            {{ dayjs(props.dueDate.start).format("D. MMMM YYYY") }}:
-            <template v-if="dateType">
-              {{ dateType }}
-            </template>
-            <template v-else>
-              {{ assignmentType }}
-            </template>
-            {{ " " }}
+            {{ dayjs(props.dueDate.start).format("dddd D. MMMM YYYY") }}
           </span>
-          <template v-if="assignmentType && dateType">
-            {{ assignmentType }}:
-            {{ props.dueDate.title }}
-          </template>
-          <template v-else>
-            {{ props.dueDate.title }}
-          </template>
         </a>
       </div>
+      <div class="flex gap-1">
+        <div v-if="dateType">
+          {{ dateType }}
+        </div>
+
+        <div v-if="assignmentType && !props.dueDate.title.startsWith(assignmentType)">
+          {{ assignmentType }}
+        </div>
+
+        <div v-if="props.dueDate.title">
+          {{ props.dueDate.title }}
+        </div>
+      </div>
       <div class="text-small text-gray-900">
         <div>
           <span v-if="props.showCourseSession ?? courseSessionTitle">
diff --git a/client/src/composables.ts b/client/src/composables.ts
index ca61ea2a..8cc0f03e 100644
--- a/client/src/composables.ts
+++ b/client/src/composables.ts
@@ -8,8 +8,12 @@ import {
   circleFlatLearningUnits,
   someFinishedInLearningSequence,
 } from "@/services/circle";
-import type { DashboardPersonType } from "@/services/dashboard";
-import { fetchDashboardPersons, fetchStatisticData } from "@/services/dashboard";
+import type { DashboardDueDate, DashboardPersonType } from "@/services/dashboard";
+import {
+  fetchDashboardDueDates,
+  fetchDashboardPersons,
+  fetchStatisticData,
+} from "@/services/dashboard";
 import { presignUpload, uploadFile } from "@/services/files";
 import { useCompletionStore } from "@/stores/completion";
 import { useCourseSessionsStore } from "@/stores/courseSessions";
@@ -30,6 +34,7 @@ import type {
   PerformanceCriteria,
 } from "@/types";
 import { useQuery } from "@urql/vue";
+import { t } from "i18next";
 import orderBy from "lodash/orderBy";
 import log from "loglevel";
 import type { ComputedRef, Ref } from "vue";
@@ -494,12 +499,28 @@ export function useMyLearningMentors() {
 
 export function useDashboardPersons() {
   const dashboardPersons = ref<DashboardPersonType[]>([]);
+  const dashboardDueDates = ref<DashboardDueDate[]>([]);
   const loading = ref(false);
 
   const fetchData = async () => {
     loading.value = true;
     try {
-      dashboardPersons.value = await fetchDashboardPersons();
+      const [persons, dueDates] = await Promise.all([
+        fetchDashboardPersons(),
+        fetchDashboardDueDates(),
+      ]);
+      dashboardPersons.value = persons;
+      dashboardDueDates.value = dueDates.map((dueDate) => {
+        const dateType = t(dueDate.date_type_translation_key);
+        const assignmentType = t(dueDate.assignment_type_translation_key);
+        dueDate.translatedType = dateType;
+        if (assignmentType) {
+          dueDate.translatedType += " " + assignmentType;
+        }
+        return dueDate;
+      });
+    } catch (error) {
+      console.error("Error fetching data:", error);
     } finally {
       loading.value = false;
     }
@@ -509,6 +530,7 @@ export function useDashboardPersons() {
 
   return {
     dashboardPersons,
+    dashboardDueDates,
     loading,
   };
 }
diff --git a/client/src/pages/dashboard/DashboardDueDatesPage.vue b/client/src/pages/dashboard/DashboardDueDatesPage.vue
new file mode 100644
index 00000000..3d0496ee
--- /dev/null
+++ b/client/src/pages/dashboard/DashboardDueDatesPage.vue
@@ -0,0 +1,234 @@
+<script setup lang="ts">
+import LoadingSpinner from "@/components/ui/LoadingSpinner.vue";
+import log from "loglevel";
+import { useCourseData, useDashboardPersons } from "@/composables";
+import ItDropdownSelect from "@/components/ui/ItDropdownSelect.vue";
+import { computed, ref, watch } from "vue";
+import { useTranslation } from "i18next-vue";
+import _ from "lodash";
+import DueDatesList from "@/components/dueDates/DueDatesList.vue";
+
+log.debug("DashboardPersonsPage created");
+
+const UNFILTERED = Number.MAX_SAFE_INTEGER.toString();
+
+type DropboxItem = {
+  id: string;
+  name: string;
+};
+
+type CourseItem = DropboxItem & {
+  slug: string;
+};
+
+const { t } = useTranslation();
+
+const { loading, dashboardDueDates } = useDashboardPersons();
+
+const courses = computed(() => {
+  return [
+    {
+      id: UNFILTERED,
+      name: t("a.Alle Lehrgänge"),
+      slug: "",
+    },
+    ..._(dashboardDueDates.value)
+      .map((dueDate) => {
+        return {
+          name: dueDate.course_session.course_title,
+          id: dueDate.course_session.course_id,
+          slug: dueDate.course_session.course_slug,
+        };
+      })
+      .uniqBy("id")
+      .orderBy("name")
+      .value(),
+  ];
+});
+
+const selectedCourse = ref<CourseItem>(courses.value[0]);
+
+const courseSessions = computed(() => {
+  let sessions = _(dashboardDueDates.value)
+    .map((dueDate) => {
+      return Object.assign({}, dueDate.course_session, {
+        name: dueDate.course_session.session_title,
+        id: dueDate.course_session.id,
+      });
+    })
+    .uniqBy("id")
+    .orderBy("name")
+    .value();
+
+  // filter by selected course
+  if (selectedCourse.value.id !== UNFILTERED) {
+    sessions = sessions.filter((cs) => cs.course_id === selectedCourse.value.id);
+  }
+
+  return [
+    {
+      id: UNFILTERED,
+      name: t("a.AlleDurchführungen"),
+    },
+    ...sessions,
+  ];
+});
+
+const selectedSession = ref<DropboxItem>(courseSessions.value[0]);
+
+const filteredDueDates = computed(() => {
+  return _.orderBy(
+    dashboardDueDates.value
+      .filter((dueDate) => {
+        if (selectedCourse.value.id === UNFILTERED) {
+          return true;
+        }
+        return dueDate.course_session.course_id === selectedCourse.value.id;
+      })
+      .filter((dueDate) => {
+        if (selectedSession.value.id === UNFILTERED) {
+          return true;
+        }
+        return dueDate.course_session.id === selectedSession.value.id;
+      })
+      .filter((dueDate) => {
+        if (selectedCircle.value.id === UNFILTERED) {
+          return true;
+        }
+        return dueDate.circle?.id === selectedCircle.value.id;
+      })
+      .filter((dueDate) => {
+        if (selectedType.value.id === UNFILTERED) {
+          return true;
+        }
+        return dueDate.translatedType === selectedType.value.id;
+      }),
+
+    ["start"]
+  );
+});
+
+const filtersVisible = computed(() => {
+  return (
+    courses.value.length > 2 ||
+    courseSessions.value.length > 2 ||
+    circles.value.length > 2 ||
+    dueDateTypes.value.length > 2
+  );
+});
+
+const initialItemCircle: DropboxItem = {
+  id: UNFILTERED,
+  name: t("a.AlleCircle"),
+};
+const circles = ref<DropboxItem[]>([initialItemCircle]);
+const selectedCircle = ref<DropboxItem>(circles.value[0]);
+
+async function loadCircleValues() {
+  if (selectedCourse.value && selectedCourse.value.slug) {
+    const learningPathQuery = useCourseData(selectedCourse.value.slug);
+    await learningPathQuery.resultPromise;
+    circles.value = [
+      initialItemCircle,
+      ...(learningPathQuery.circles.value ?? []).map((circle) => ({
+        id: circle.id,
+        name: circle.title,
+      })),
+    ];
+  } else {
+    circles.value = [initialItemCircle];
+  }
+
+  selectedCircle.value = circles.value[0];
+}
+
+const dueDateTypes = computed(() => {
+  const types = _(dashboardDueDates.value)
+    .map((dueDate) => {
+      return {
+        name: dueDate.translatedType,
+        id: dueDate.translatedType,
+      };
+    })
+    .uniqBy("id")
+    .orderBy("name")
+    .value();
+
+  return [
+    {
+      id: UNFILTERED,
+      name: t("a.AlleTypen"),
+    },
+    ...types,
+  ];
+});
+
+const selectedType = ref<DropboxItem>(dueDateTypes.value[0]);
+
+watch(selectedCourse, async () => {
+  selectedSession.value = courseSessions.value[0];
+  await loadCircleValues();
+});
+</script>
+
+<template>
+  <div>
+    <div v-if="loading" class="m-8 flex justify-center">
+      <LoadingSpinner />
+    </div>
+    <div v-else class="bg-gray-200">
+      <div class="container-large">
+        <div class="bg-white px-4 py-2">
+          <section
+            v-if="filtersVisible"
+            class="flex flex-col space-x-0 border-b bg-white lg:flex-row lg:space-x-3"
+          >
+            <ItDropdownSelect
+              v-if="courses.length > 2"
+              v-model="selectedCourse"
+              data-cy="session-select"
+              :items="courses"
+              borderless
+            ></ItDropdownSelect>
+
+            <ItDropdownSelect
+              v-if="courseSessions.length > 2"
+              v-model="selectedSession"
+              data-cy="session-select"
+              :items="courseSessions"
+              borderless
+            ></ItDropdownSelect>
+
+            <ItDropdownSelect
+              v-if="circles.length > 2"
+              v-model="selectedCircle"
+              data-cy="appointments-circle-select"
+              :items="circles"
+              borderless
+            ></ItDropdownSelect>
+
+            <ItDropdownSelect
+              v-if="dueDateTypes.length > 2"
+              v-model="selectedType"
+              data-cy="appointments-type-select"
+              :items="dueDateTypes"
+              borderless
+            ></ItDropdownSelect>
+          </section>
+
+          <section>
+            <DueDatesList
+              :show-top-border="false"
+              :show-bottom-border="false"
+              :due-dates="filteredDueDates"
+              :show-all-due-dates-link="false"
+              :max-count="100"
+              data-cy="due-date-list"
+              :show-course-session="true"
+            />
+          </section>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/client/src/pages/dashboard/DashboardPersonsPage.vue b/client/src/pages/dashboard/DashboardPersonsPage.vue
index 821302e9..1a2f6610 100644
--- a/client/src/pages/dashboard/DashboardPersonsPage.vue
+++ b/client/src/pages/dashboard/DashboardPersonsPage.vue
@@ -19,7 +19,7 @@ type MenuItem = {
 
 const { t } = useTranslation();
 
-const { loading: loadingPersons, dashboardPersons } = useDashboardPersons();
+const { loading, dashboardPersons } = useDashboardPersons();
 
 const courses = computed(() => {
   return [
@@ -64,10 +64,6 @@ const courseSessions = computed(() => {
   ];
 });
 
-watch(selectedCourse, () => {
-  selectedSession.value = courseSessions.value[0];
-});
-
 const selectedSession = ref<MenuItem>(courseSessions.value[0]);
 
 const filteredPersons = computed(() => {
@@ -113,11 +109,15 @@ function personRoleDisplayValue(personCourseSession: DashboardPersonCourseSessio
 
   return "";
 }
+
+watch(selectedCourse, () => {
+  selectedSession.value = courseSessions.value[0];
+});
 </script>
 
 <template>
   <div>
-    <div v-if="loadingPersons" class="m-8 flex justify-center">
+    <div v-if="loading" class="m-8 flex justify-center">
       <LoadingSpinner />
     </div>
     <div v-else class="bg-gray-200">
diff --git a/client/src/router/index.ts b/client/src/router/index.ts
index cf027b4c..bf6758dd 100644
--- a/client/src/router/index.ts
+++ b/client/src/router/index.ts
@@ -65,6 +65,10 @@ const router = createRouter({
       path: "/dashboard/persons",
       component: () => import("@/pages/dashboard/DashboardPersonsPage.vue"),
     },
+    {
+      path: "/dashboard/duedates",
+      component: () => import("@/pages/dashboard/DashboardDueDatesPage.vue"),
+    },
     {
       path: "/course/:courseSlug/media",
       props: true,
diff --git a/client/src/services/dashboard.ts b/client/src/services/dashboard.ts
index 18d3526b..8367824f 100644
--- a/client/src/services/dashboard.ts
+++ b/client/src/services/dashboard.ts
@@ -13,6 +13,7 @@ import type {
   CourseStatisticsType,
   DashboardConfigType,
 } from "@/gql/graphql";
+import type { DueDate } from "@/types";
 
 export type DashboardPersonRoleType =
   | "SUPERVISOR"
@@ -70,6 +71,11 @@ export type DashboardCourseConfigType = {
   session_to_continue_id: string;
 };
 
+export type DashboardDueDate = DueDate & {
+  course_session: DashboardPersonCourseSessionType;
+  translatedType: string;
+};
+
 export const fetchStatisticData = async (
   courseId: string
 ): Promise<CourseStatisticsType | null> => {
@@ -144,6 +150,10 @@ export async function fetchDashboardPersons() {
   return await itGetCached<DashboardPersonType[]>("/api/dashboard/persons/");
 }
 
+export async function fetchDashboardDueDates() {
+  return await itGetCached<DashboardDueDate[]>("/api/dashboard/duedates/");
+}
+
 export async function fetchDashboardConfigv2() {
   return await itGetCached<DashboardCourseConfigType[]>("/api/dashboard/config/");
 }
diff --git a/server/vbv_lernwelt/dashboard/views.py b/server/vbv_lernwelt/dashboard/views.py
index 63cd447e..4a74ff53 100644
--- a/server/vbv_lernwelt/dashboard/views.py
+++ b/server/vbv_lernwelt/dashboard/views.py
@@ -275,7 +275,7 @@ def get_dashboard_due_dates(request):
                     "course_id": str(cs.course.id),
                     "course_title": cs.course.title,
                     "course_slug": cs.course.slug,
-                    "user_role": user_role(cs.roles),
+                    "my_role": user_role(cs.roles),
                     "is_uk": cs.course.configuration.is_uk,
                     "is_vv": cs.course.configuration.is_vv,
                 }
@@ -445,7 +445,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 905d7a5290c6528a5645bc1ca9e1eab8cd30099b Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Fri, 19 Apr 2024 10:13:55 +0200
Subject: [PATCH 48/82] Add new DashboardAsideWidget

---
 .../pages/dashboard/DashboardAsideDueDate.vue | 37 +++++++++++++++
 .../pages/dashboard/DashboardAsideWidget.vue  | 47 +++++++++++++++++++
 .../pages/dashboard/DashboardDueDatesPage.vue | 10 ++++
 client/src/pages/dashboard/DashboardPage.vue  |  7 ++-
 .../pages/dashboard/DashboardPersonsPage.vue  |  9 ++++
 .../learningPathPage/LearningPathPage.vue     |  2 +-
 client/src/router/index.ts                    |  2 +-
 7 files changed, 108 insertions(+), 6 deletions(-)
 create mode 100644 client/src/pages/dashboard/DashboardAsideDueDate.vue
 create mode 100644 client/src/pages/dashboard/DashboardAsideWidget.vue

diff --git a/client/src/pages/dashboard/DashboardAsideDueDate.vue b/client/src/pages/dashboard/DashboardAsideDueDate.vue
new file mode 100644
index 00000000..c9cfa81b
--- /dev/null
+++ b/client/src/pages/dashboard/DashboardAsideDueDate.vue
@@ -0,0 +1,37 @@
+<script lang="ts" setup>
+import { useTranslation } from "i18next-vue";
+import type { DashboardDueDate } from "@/services/dashboard";
+import dayjs from "dayjs";
+
+const props = defineProps<{
+  dueDate: DashboardDueDate;
+}>();
+
+const { t } = useTranslation();
+const dateType = t(props.dueDate.date_type_translation_key);
+const assignmentType = t(props.dueDate.assignment_type_translation_key);
+</script>
+
+<template>
+  <article class="my-4">
+    <div class="text-bold text-gray-900">
+      {{ dayjs(props.dueDate.start).format("dd. DD. MMMM YYYY") }}
+    </div>
+
+    <div v-if="dateType" class="text-bold">
+      {{ dateType }}
+      <span v-if="assignmentType && !props.dueDate.title.startsWith(assignmentType)">
+        {{ assignmentType }}
+      </span>
+    </div>
+
+    <div v-if="props.dueDate.title">
+      {{ props.dueDate.title }}
+    </div>
+
+    <div v-if="props.dueDate.course_session.is_uk" class="text-gray-900">
+      {{ props.dueDate.course_session.session_title }}
+      {{ props.dueDate.circle?.title ?? "" }}
+    </div>
+  </article>
+</template>
diff --git a/client/src/pages/dashboard/DashboardAsideWidget.vue b/client/src/pages/dashboard/DashboardAsideWidget.vue
new file mode 100644
index 00000000..a64676d8
--- /dev/null
+++ b/client/src/pages/dashboard/DashboardAsideWidget.vue
@@ -0,0 +1,47 @@
+<script setup lang="ts">
+import LoadingSpinner from "@/components/ui/LoadingSpinner.vue";
+import log from "loglevel";
+import { useDashboardPersons } from "@/composables";
+import { computed } from "vue";
+import _ from "lodash";
+import DashboardAsideDueDate from "@/pages/dashboard/DashboardAsideDueDate.vue";
+
+log.debug("DashboardAsideWidget created");
+
+const { loading, dashboardPersons, dashboardDueDates } = useDashboardPersons();
+
+const displayDueDates = computed(() => {
+  return _.take(dashboardDueDates.value, 6);
+});
+</script>
+
+<template>
+  <div>
+    <div v-if="loading" class="m-8 flex justify-center">
+      <LoadingSpinner />
+    </div>
+    <div v-else>
+      <section class="border-b p-8">
+        <h3 class="mb-4">{{ dashboardPersons.length }} {{ $t("a.Personen") }}</h3>
+        <div>
+          <router-link class="btn-secondary" to="/dashboard/persons">
+            {{ $t("a.Alle Personen anzeigen") }}
+          </router-link>
+        </div>
+      </section>
+      <section class="p-8">
+        <h3>{{ $t("a.Termine") }}</h3>
+
+        <div v-for="dueDate in displayDueDates" :key="dueDate.id">
+          <div class="border-b">
+            <DashboardAsideDueDate :due-date="dueDate" />
+          </div>
+        </div>
+
+        <router-link class="btn-secondary mt-4" to="/dashboard/due-dates">
+          {{ $t("a.Alle Termine anzeigen") }}
+        </router-link>
+      </section>
+    </div>
+  </div>
+</template>
diff --git a/client/src/pages/dashboard/DashboardDueDatesPage.vue b/client/src/pages/dashboard/DashboardDueDatesPage.vue
index 3d0496ee..c3962067 100644
--- a/client/src/pages/dashboard/DashboardDueDatesPage.vue
+++ b/client/src/pages/dashboard/DashboardDueDatesPage.vue
@@ -178,6 +178,16 @@ watch(selectedCourse, async () => {
     </div>
     <div v-else class="bg-gray-200">
       <div class="container-large">
+        <router-link
+          :to="`/`"
+          class="btn-text inline-flex items-center p-0"
+          data-cy="back-to-learning-path-button"
+        >
+          <it-icon-arrow-left class="-ml-1 mr-1 h-5 w-5"></it-icon-arrow-left>
+          <span class="inline">{{ $t("general.back") }}</span>
+        </router-link>
+
+        <h2 class="my-4">{{ $t("a.Termine") }}</h2>
         <div class="bg-white px-4 py-2">
           <section
             v-if="filtersVisible"
diff --git a/client/src/pages/dashboard/DashboardPage.vue b/client/src/pages/dashboard/DashboardPage.vue
index e5875897..e01c7dec 100644
--- a/client/src/pages/dashboard/DashboardPage.vue
+++ b/client/src/pages/dashboard/DashboardPage.vue
@@ -14,6 +14,7 @@ import CourseDetailDates from "@/components/dashboard/CourseDetailDates.vue";
 import NoCourseSession from "@/components/dashboard/NoCourseSession.vue";
 import MentorPage from "@/pages/dashboard/MentorPage.vue";
 import CoursePanel from "@/components/dashboard/CoursePanel.vue";
+import DashboardAsideWidget from "@/pages/dashboard/DashboardAsideWidget.vue";
 
 const dashboardStore = useDashboardStore();
 
@@ -86,10 +87,8 @@ function newDashboardConfigForId(id: string): DashboardCourseConfigType | undefi
         <!-- end of old way of dashboard -->
       </div>
     </main>
-    <aside class="m-8 lg:order-1 lg:w-[343px]">
-      <component
-        :is="boards[dashboardStore.currentDashboardConfig.dashboard_type].aside"
-      ></component>
+    <aside class="lg:order-2 lg:w-[384px] xl:w-[512px]">
+      <DashboardAsideWidget />
     </aside>
   </div>
   <NoCourseSession v-else class="container-medium mt-14" />
diff --git a/client/src/pages/dashboard/DashboardPersonsPage.vue b/client/src/pages/dashboard/DashboardPersonsPage.vue
index 1a2f6610..cff500dd 100644
--- a/client/src/pages/dashboard/DashboardPersonsPage.vue
+++ b/client/src/pages/dashboard/DashboardPersonsPage.vue
@@ -122,6 +122,15 @@ watch(selectedCourse, () => {
     </div>
     <div v-else class="bg-gray-200">
       <div class="container-large">
+        <router-link
+          :to="`/`"
+          class="btn-text inline-flex items-center p-0"
+          data-cy="back-to-learning-path-button"
+        >
+          <it-icon-arrow-left class="-ml-1 mr-1 h-5 w-5"></it-icon-arrow-left>
+          <span class="inline">{{ $t("general.back") }}</span>
+        </router-link>
+        <h2 class="my-4">{{ $t("a.Personen") }}</h2>
         <div class="bg-white px-4 py-2">
           <section
             v-if="filtersVisible"
diff --git a/client/src/pages/learningPath/learningPathPage/LearningPathPage.vue b/client/src/pages/learningPath/learningPathPage/LearningPathPage.vue
index f9a20239..0242498a 100644
--- a/client/src/pages/learningPath/learningPathPage/LearningPathPage.vue
+++ b/client/src/pages/learningPath/learningPathPage/LearningPathPage.vue
@@ -61,7 +61,7 @@ const changeViewType = (viewType: ViewType) => {
       <!-- Right -->
       <div v-if="!useMobileLayout" class="flex-grow">
         <div class="text-bold pb-3">
-          {{ $t("learningPathPage.nextDueDates") }}
+          {{ $t("a.Nächste Termine") }}
         </div>
         <DueDatesShortList :max-count="2" :show-top-border="true"></DueDatesShortList>
       </div>
diff --git a/client/src/router/index.ts b/client/src/router/index.ts
index bf6758dd..2e9f94d7 100644
--- a/client/src/router/index.ts
+++ b/client/src/router/index.ts
@@ -66,7 +66,7 @@ const router = createRouter({
       component: () => import("@/pages/dashboard/DashboardPersonsPage.vue"),
     },
     {
-      path: "/dashboard/duedates",
+      path: "/dashboard/due-dates",
       component: () => import("@/pages/dashboard/DashboardDueDatesPage.vue"),
     },
     {

From 4925c1a178ea53e4a9703e16c1b749954abc6c45 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Fri, 19 Apr 2024 11:00:00 +0200
Subject: [PATCH 49/82] Cleanup dates/appointments handling in app

---
 .../dashboard/CourseDetailDates.vue           | 45 -----------
 .../src/components/dashboard/SimpleDates.vue  | 19 -----
 .../src/components/dueDates/DueDateSingle.vue | 72 ++++++++----------
 .../src/components/dueDates/DueDatesList.vue  |  4 +-
 .../pages/dashboard/DashboardAsideDueDate.vue | 37 ---------
 .../pages/dashboard/DashboardAsideWidget.vue  |  4 +-
 .../pages/dashboard/DashboardDueDatesPage.vue | 76 ++++++++++++-------
 client/src/pages/dashboard/DashboardPage.vue  | 38 ----------
 server/vbv_lernwelt/dashboard/views.py        | 13 ++--
 9 files changed, 92 insertions(+), 216 deletions(-)
 delete mode 100644 client/src/components/dashboard/CourseDetailDates.vue
 delete mode 100644 client/src/components/dashboard/SimpleDates.vue
 delete mode 100644 client/src/pages/dashboard/DashboardAsideDueDate.vue

diff --git a/client/src/components/dashboard/CourseDetailDates.vue b/client/src/components/dashboard/CourseDetailDates.vue
deleted file mode 100644
index 3eb2d107..00000000
--- a/client/src/components/dashboard/CourseDetailDates.vue
+++ /dev/null
@@ -1,45 +0,0 @@
-<script setup lang="ts">
-import DueDatesList from "@/components/dueDates/DueDatesList.vue";
-import { useCourseSessionsStore } from "@/stores/courseSessions";
-import { useDashboardStore } from "@/stores/dashboard";
-import { getCockpitUrl } from "@/utils/utils";
-
-const dashboardStore = useDashboardStore();
-const courseSessionsStore = useCourseSessionsStore();
-const allDueDates = courseSessionsStore.allDueDates();
-</script>
-
-<template>
-  <template v-if="dashboardStore.currentDashboardConfig">
-    <h4 class="mb-6 text-xl font-bold">{{ $t("a.Aktueller Lehrgang") }}</h4>
-
-    <div class="mb-6 border border-gray-300 p-6">
-      <h3 class="mb-6">{{ dashboardStore.currentDashboardConfig.name }}</h3>
-      <router-link
-        class="btn-blue"
-        target="_blank"
-        :to="getCockpitUrl(dashboardStore.currentDashboardConfig.slug)"
-      >
-        {{ $t("a.Cockpit anschauen") }}
-      </router-link>
-    </div>
-  </template>
-
-  <router-link
-    v-if="dashboardStore.dashboardConfigs.length > 1"
-    class="block text-sm underline"
-    to="/statistic/list"
-  >
-    {{ $t("a.Alle Lehrgänge anzeigen") }}
-  </router-link>
-
-  <h3 class="mb-6 mt-16 text-xl font-bold">{{ $t("a.AlleTermine") }}</h3>
-  <DueDatesList
-    :due-dates="allDueDates"
-    :max-count="13"
-    :show-top-border="true"
-    :show-all-due-dates-link="true"
-    :show-bottom-border="true"
-    :show-course-session="true"
-  ></DueDatesList>
-</template>
diff --git a/client/src/components/dashboard/SimpleDates.vue b/client/src/components/dashboard/SimpleDates.vue
deleted file mode 100644
index 09f1bd9a..00000000
--- a/client/src/components/dashboard/SimpleDates.vue
+++ /dev/null
@@ -1,19 +0,0 @@
-<script setup lang="ts">
-import DueDatesList from "@/components/dueDates/DueDatesList.vue";
-import { useCourseSessionsStore } from "@/stores/courseSessions";
-
-const courseSessionsStore = useCourseSessionsStore();
-const allDueDates = courseSessionsStore.allDueDates();
-</script>
-
-<template>
-  <h4 class="mb-6 text-xl font-bold">{{ $t("a.AlleTermine") }}</h4>
-  <DueDatesList
-    :due-dates="allDueDates"
-    :max-count="13"
-    :show-top-border="true"
-    :show-all-due-dates-link="true"
-    :show-bottom-border="true"
-    :show-course-session="true"
-  ></DueDatesList>
-</template>
diff --git a/client/src/components/dueDates/DueDateSingle.vue b/client/src/components/dueDates/DueDateSingle.vue
index aa4a54a7..8da00e6c 100644
--- a/client/src/components/dueDates/DueDateSingle.vue
+++ b/client/src/components/dueDates/DueDateSingle.vue
@@ -1,12 +1,11 @@
 <script lang="ts" setup>
-import type { CourseSession, DueDate } from "@/types";
-import { useCourseSessionsStore } from "@/stores/courseSessions";
 import { useTranslation } from "i18next-vue";
+import type { DashboardDueDate } from "@/services/dashboard";
 import { computed } from "vue";
 import dayjs from "dayjs";
 
 const props = defineProps<{
-  dueDate: DueDate;
+  dueDate: DashboardDueDate;
   singleLine?: boolean;
   showCourseSession?: boolean;
 }>();
@@ -15,27 +14,28 @@ const { t } = useTranslation();
 const dateType = t(props.dueDate.date_type_translation_key);
 const assignmentType = t(props.dueDate.assignment_type_translation_key);
 
-const courseSessionsStore = useCourseSessionsStore();
-const courseSession = courseSessionsStore.allCourseSessions.find(
-  (cs: CourseSession) => cs.id === props.dueDate.course_session_id
-);
-
-if (!courseSession) {
-  throw new Error("Course session not found");
-}
-
-const url = courseSession.actions.includes("expert-cockpit")
-  ? props.dueDate.url_expert
-  : props.dueDate.url;
-
-const courseSessionTitle = computed(() => {
-  if (props.dueDate.course_session_id) {
-    return (
-      courseSessionsStore.getCourseSessionById(props.dueDate.course_session_id)
-        ?.title ?? ""
-    );
+const urlText = computed(() => {
+  let result = "";
+  if (dateType) {
+    result += dateType;
   }
-  return "";
+
+  if (assignmentType && !props.dueDate.title.startsWith(assignmentType)) {
+    result += " " + assignmentType;
+  }
+
+  if (props.dueDate.title) {
+    result += " " + props.dueDate.title;
+  }
+
+  return result.trim();
+});
+
+const url = computed(() => {
+  if (["SUPERVISOR", "EXPERT"].includes(props.dueDate.course_session.my_role)) {
+    return props.dueDate.url_expert;
+  }
+  return props.dueDate.url;
 });
 </script>
 
@@ -46,29 +46,23 @@ const courseSessionTitle = computed(() => {
   >
     <div class="space-y-1">
       <div>
-        <a class="underline" :href="url">
-          <span class="text-bold">
+        <a :href="url">
+          <span class="text-bold text-gray-900">
             {{ dayjs(props.dueDate.start).format("dddd D. MMMM YYYY") }}
           </span>
         </a>
       </div>
-      <div class="flex gap-1">
-        <div v-if="dateType">
-          {{ dateType }}
-        </div>
-
-        <div v-if="assignmentType && !props.dueDate.title.startsWith(assignmentType)">
-          {{ assignmentType }}
-        </div>
-
-        <div v-if="props.dueDate.title">
-          {{ props.dueDate.title }}
-        </div>
+      <div>
+        <a class="underline" :href="url">
+          <span class="text-bold">
+            {{ urlText }}
+          </span>
+        </a>
       </div>
       <div class="text-small text-gray-900">
         <div>
-          <span v-if="props.showCourseSession ?? courseSessionTitle">
-            {{ courseSessionTitle }}:
+          <span v-if="props.dueDate.course_session.is_uk">
+            {{ props.dueDate.course_session.session_title }}:
           </span>
           {{ $t("a.Circle") }} «{{ props.dueDate.circle?.title }}»
         </div>
diff --git a/client/src/components/dueDates/DueDatesList.vue b/client/src/components/dueDates/DueDatesList.vue
index f5ce0702..f8a0328e 100644
--- a/client/src/components/dueDates/DueDatesList.vue
+++ b/client/src/components/dueDates/DueDatesList.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup>
 import DueDateSingle from "@/components/dueDates/DueDateSingle.vue";
-import type { DueDate } from "@/types";
 import { computed } from "vue";
+import type { DashboardDueDate } from "@/services/dashboard";
 
 const props = defineProps<{
   maxCount: number;
-  dueDates: DueDate[];
+  dueDates: DashboardDueDate[];
   showTopBorder: boolean;
   showBottomBorder: boolean;
   showAllDueDatesLink: boolean;
diff --git a/client/src/pages/dashboard/DashboardAsideDueDate.vue b/client/src/pages/dashboard/DashboardAsideDueDate.vue
deleted file mode 100644
index c9cfa81b..00000000
--- a/client/src/pages/dashboard/DashboardAsideDueDate.vue
+++ /dev/null
@@ -1,37 +0,0 @@
-<script lang="ts" setup>
-import { useTranslation } from "i18next-vue";
-import type { DashboardDueDate } from "@/services/dashboard";
-import dayjs from "dayjs";
-
-const props = defineProps<{
-  dueDate: DashboardDueDate;
-}>();
-
-const { t } = useTranslation();
-const dateType = t(props.dueDate.date_type_translation_key);
-const assignmentType = t(props.dueDate.assignment_type_translation_key);
-</script>
-
-<template>
-  <article class="my-4">
-    <div class="text-bold text-gray-900">
-      {{ dayjs(props.dueDate.start).format("dd. DD. MMMM YYYY") }}
-    </div>
-
-    <div v-if="dateType" class="text-bold">
-      {{ dateType }}
-      <span v-if="assignmentType && !props.dueDate.title.startsWith(assignmentType)">
-        {{ assignmentType }}
-      </span>
-    </div>
-
-    <div v-if="props.dueDate.title">
-      {{ props.dueDate.title }}
-    </div>
-
-    <div v-if="props.dueDate.course_session.is_uk" class="text-gray-900">
-      {{ props.dueDate.course_session.session_title }}
-      {{ props.dueDate.circle?.title ?? "" }}
-    </div>
-  </article>
-</template>
diff --git a/client/src/pages/dashboard/DashboardAsideWidget.vue b/client/src/pages/dashboard/DashboardAsideWidget.vue
index a64676d8..934fd7eb 100644
--- a/client/src/pages/dashboard/DashboardAsideWidget.vue
+++ b/client/src/pages/dashboard/DashboardAsideWidget.vue
@@ -4,7 +4,7 @@ import log from "loglevel";
 import { useDashboardPersons } from "@/composables";
 import { computed } from "vue";
 import _ from "lodash";
-import DashboardAsideDueDate from "@/pages/dashboard/DashboardAsideDueDate.vue";
+import DueDateSingle from "@/components/dueDates/DueDateSingle.vue";
 
 log.debug("DashboardAsideWidget created");
 
@@ -34,7 +34,7 @@ const displayDueDates = computed(() => {
 
         <div v-for="dueDate in displayDueDates" :key="dueDate.id">
           <div class="border-b">
-            <DashboardAsideDueDate :due-date="dueDate" />
+            <DueDateSingle :due-date="dueDate" />
           </div>
         </div>
 
diff --git a/client/src/pages/dashboard/DashboardDueDatesPage.vue b/client/src/pages/dashboard/DashboardDueDatesPage.vue
index c3962067..dcfa1135 100644
--- a/client/src/pages/dashboard/DashboardDueDatesPage.vue
+++ b/client/src/pages/dashboard/DashboardDueDatesPage.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import LoadingSpinner from "@/components/ui/LoadingSpinner.vue";
 import log from "loglevel";
-import { useCourseData, useDashboardPersons } from "@/composables";
+import { useDashboardPersons } from "@/composables";
 import ItDropdownSelect from "@/components/ui/ItDropdownSelect.vue";
 import { computed, ref, watch } from "vue";
 import { useTranslation } from "i18next-vue";
@@ -117,30 +117,54 @@ const filtersVisible = computed(() => {
   );
 });
 
-const initialItemCircle: DropboxItem = {
-  id: UNFILTERED,
-  name: t("a.AlleCircle"),
-};
-const circles = ref<DropboxItem[]>([initialItemCircle]);
+const circles = computed(() => {
+  const dueDatesBySelectedCourse = dashboardDueDates.value.filter((dueDate) => {
+    if (selectedCourse.value.id === UNFILTERED) {
+      return true;
+    }
+    return dueDate.course_session.course_id === selectedCourse.value.id;
+  });
+  const circleList = _(dueDatesBySelectedCourse)
+    .filter((dueDate) => {
+      return !!dueDate.circle;
+    })
+    .map((dueDate) => {
+      return {
+        name: dueDate.circle?.title ?? "",
+        id: dueDate.circle?.id ?? "",
+      };
+    })
+    .uniqBy("id")
+    .orderBy("name")
+    .value();
+
+  return [
+    {
+      id: UNFILTERED,
+      name: t("a.AlleCircle"),
+    },
+    ...circleList,
+  ];
+});
 const selectedCircle = ref<DropboxItem>(circles.value[0]);
 
-async function loadCircleValues() {
-  if (selectedCourse.value && selectedCourse.value.slug) {
-    const learningPathQuery = useCourseData(selectedCourse.value.slug);
-    await learningPathQuery.resultPromise;
-    circles.value = [
-      initialItemCircle,
-      ...(learningPathQuery.circles.value ?? []).map((circle) => ({
-        id: circle.id,
-        name: circle.title,
-      })),
-    ];
-  } else {
-    circles.value = [initialItemCircle];
-  }
-
-  selectedCircle.value = circles.value[0];
-}
+// async function loadCircleValues() {
+//   if (selectedCourse.value && selectedCourse.value.slug) {
+//     const learningPathQuery = useCourseData(selectedCourse.value.slug);
+//     await learningPathQuery.resultPromise;
+//     circles.value = [
+//       initialItemCircle,
+//       ...(learningPathQuery.circles.value ?? []).map((circle) => ({
+//         id: circle.id,
+//         name: circle.title,
+//       })),
+//     ];
+//   } else {
+//     circles.value = [initialItemCircle];
+//   }
+//
+//   selectedCircle.value = circles.value[0];
+// }
 
 const dueDateTypes = computed(() => {
   const types = _(dashboardDueDates.value)
@@ -167,7 +191,7 @@ const selectedType = ref<DropboxItem>(dueDateTypes.value[0]);
 
 watch(selectedCourse, async () => {
   selectedSession.value = courseSessions.value[0];
-  await loadCircleValues();
+  selectedCircle.value = circles.value[0];
 });
 </script>
 
@@ -194,7 +218,6 @@ watch(selectedCourse, async () => {
             class="flex flex-col space-x-0 border-b bg-white lg:flex-row lg:space-x-3"
           >
             <ItDropdownSelect
-              v-if="courses.length > 2"
               v-model="selectedCourse"
               data-cy="session-select"
               :items="courses"
@@ -202,7 +225,6 @@ watch(selectedCourse, async () => {
             ></ItDropdownSelect>
 
             <ItDropdownSelect
-              v-if="courseSessions.length > 2"
               v-model="selectedSession"
               data-cy="session-select"
               :items="courseSessions"
@@ -210,7 +232,6 @@ watch(selectedCourse, async () => {
             ></ItDropdownSelect>
 
             <ItDropdownSelect
-              v-if="circles.length > 2"
               v-model="selectedCircle"
               data-cy="appointments-circle-select"
               :items="circles"
@@ -218,7 +239,6 @@ watch(selectedCourse, async () => {
             ></ItDropdownSelect>
 
             <ItDropdownSelect
-              v-if="dueDateTypes.length > 2"
               v-model="selectedType"
               data-cy="appointments-type-select"
               :items="dueDateTypes"
diff --git a/client/src/pages/dashboard/DashboardPage.vue b/client/src/pages/dashboard/DashboardPage.vue
index e01c7dec..8fb4e28c 100644
--- a/client/src/pages/dashboard/DashboardPage.vue
+++ b/client/src/pages/dashboard/DashboardPage.vue
@@ -1,36 +1,15 @@
 <script setup lang="ts">
-import type { Component } from "vue";
 import { onMounted } from "vue";
-import StatisticPage from "@/pages/dashboard/StatisticPage.vue";
-import ProgressPage from "@/pages/dashboard/ProgressPage.vue";
-import SimpleDates from "@/components/dashboard/SimpleDates.vue";
 import ItDropdownSelect from "@/components/ui/ItDropdownSelect.vue";
 import { useDashboardStore } from "@/stores/dashboard";
-import type { DashboardType } from "@/gql/graphql";
 import type { DashboardCourseConfigType } from "@/services/dashboard";
-import SimpleCoursePage from "@/pages/dashboard/SimpleCoursePage.vue";
 import LoadingSpinner from "@/components/ui/LoadingSpinner.vue";
-import CourseDetailDates from "@/components/dashboard/CourseDetailDates.vue";
 import NoCourseSession from "@/components/dashboard/NoCourseSession.vue";
-import MentorPage from "@/pages/dashboard/MentorPage.vue";
 import CoursePanel from "@/components/dashboard/CoursePanel.vue";
 import DashboardAsideWidget from "@/pages/dashboard/DashboardAsideWidget.vue";
 
 const dashboardStore = useDashboardStore();
 
-interface DashboardPage {
-  main: Component;
-  aside: Component;
-}
-
-const boards: Record<DashboardType, DashboardPage> = {
-  PROGRESS_DASHBOARD: { main: ProgressPage, aside: SimpleDates },
-  SIMPLE_DASHBOARD: { main: SimpleCoursePage, aside: SimpleDates },
-  STATISTICS_DASHBOARD: { main: StatisticPage, aside: CourseDetailDates },
-  MENTOR_DASHBOARD: { main: MentorPage, aside: SimpleDates },
-  PRAXISBILDNER_DASHBOARD: { main: CoursePanel, aside: SimpleDates },
-};
-
 onMounted(async () => {
   await dashboardStore.loadDashboardDetails();
 });
@@ -68,23 +47,6 @@ function newDashboardConfigForId(id: string): DashboardCourseConfigType | undefi
             <CoursePanel :course-config="newDashboardConfigForId(config.course_id)" />
           </li>
         </ul>
-        <!-- end of new way of dashboard -->
-        <!-- keep until we unify the dashboard -->
-        <!--        <CoursePanel-->
-        <!--          v-if="-->
-        <!--            ['PRAXISBILDNER_DASHBOARD', 'PROGRESS_DASHBOARD'].includes(-->
-        <!--              dashboardStore.currentDashboardConfig.dashboard_type-->
-        <!--            )-->
-        <!--          "-->
-        <!--          :course-config="-->
-        <!--            newDashboardConfigForId(dashboardStore.currentDashboardConfig.id)-->
-        <!--          "-->
-        <!--        />-->
-        <!--        <component-->
-        <!--          :is="boards[dashboardStore.currentDashboardConfig.dashboard_type].main"-->
-        <!--          v-else-->
-        <!--        ></component>-->
-        <!-- end of old way of dashboard -->
       </div>
     </main>
     <aside class="lg:order-2 lg:w-[384px] xl:w-[512px]">
diff --git a/server/vbv_lernwelt/dashboard/views.py b/server/vbv_lernwelt/dashboard/views.py
index 4a74ff53..6011354a 100644
--- a/server/vbv_lernwelt/dashboard/views.py
+++ b/server/vbv_lernwelt/dashboard/views.py
@@ -248,12 +248,13 @@ def get_dashboard_due_dates(request):
         due_dates = []
         today = date.today()
         for due_date in all_due_dates:
-            if due_date.end:
-                if due_date.end.date() >= today:
-                    due_dates.append(due_date)
-            elif due_date.start:
-                if due_date.start.date() >= today:
-                    due_dates.append(due_date)
+            due_dates.append(due_date)
+            # if due_date.end:
+            #     if due_date.end.date() >= today:
+            #         due_dates.append(due_date)
+            # elif due_date.start:
+            #     if due_date.start.date() >= today:
+            #         due_dates.append(due_date)
 
         due_dates.sort(key=lambda x: x.start)
 

From e7ea2f892294f2b5aff38f1316956288084e7115 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Fri, 19 Apr 2024 11:38:28 +0200
Subject: [PATCH 50/82] Selecte courseSession from route query for dueDates

---
 .../src/components/dueDates/DueDateSingle.vue |  1 -
 .../pages/dashboard/DashboardDueDatesPage.vue | 36 +++++++++++++------
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/client/src/components/dueDates/DueDateSingle.vue b/client/src/components/dueDates/DueDateSingle.vue
index 8da00e6c..47f659d7 100644
--- a/client/src/components/dueDates/DueDateSingle.vue
+++ b/client/src/components/dueDates/DueDateSingle.vue
@@ -7,7 +7,6 @@ import dayjs from "dayjs";
 const props = defineProps<{
   dueDate: DashboardDueDate;
   singleLine?: boolean;
-  showCourseSession?: boolean;
 }>();
 
 const { t } = useTranslation();
diff --git a/client/src/pages/dashboard/DashboardDueDatesPage.vue b/client/src/pages/dashboard/DashboardDueDatesPage.vue
index dcfa1135..f427ee25 100644
--- a/client/src/pages/dashboard/DashboardDueDatesPage.vue
+++ b/client/src/pages/dashboard/DashboardDueDatesPage.vue
@@ -6,11 +6,12 @@ import ItDropdownSelect from "@/components/ui/ItDropdownSelect.vue";
 import { computed, ref, watch } from "vue";
 import { useTranslation } from "i18next-vue";
 import _ from "lodash";
-import DueDatesList from "@/components/dueDates/DueDatesList.vue";
+import { useRouteQuery } from "@vueuse/router";
+import DueDateSingle from "@/components/dueDates/DueDateSingle.vue";
 
 log.debug("DashboardPersonsPage created");
 
-const UNFILTERED = Number.MAX_SAFE_INTEGER.toString();
+const UNFILTERED = "0";
 
 type DropboxItem = {
   id: string;
@@ -74,8 +75,27 @@ const courseSessions = computed(() => {
   ];
 });
 
+const selectedSessionRouteQuery = useRouteQuery("session");
 const selectedSession = ref<DropboxItem>(courseSessions.value[0]);
 
+watch(selectedSession, () => {
+  selectedSessionRouteQuery.value = selectedSession.value.id;
+});
+
+watch(courseSessions, () => {
+  if (courseSessions.value.length > 0 && selectedSessionRouteQuery.value) {
+    // preselect session from route query
+    const selectedSessionFromRoute = courseSessions.value.find(
+      (cs) => cs.id === selectedSessionRouteQuery.value
+    );
+    if (selectedSessionFromRoute) {
+      selectedSession.value = selectedSessionFromRoute;
+      return;
+    }
+  }
+  selectedSession.value = courseSessions.value[0];
+});
+
 const filteredDueDates = computed(() => {
   return _.orderBy(
     dashboardDueDates.value
@@ -247,15 +267,9 @@ watch(selectedCourse, async () => {
           </section>
 
           <section>
-            <DueDatesList
-              :show-top-border="false"
-              :show-bottom-border="false"
-              :due-dates="filteredDueDates"
-              :show-all-due-dates-link="false"
-              :max-count="100"
-              data-cy="due-date-list"
-              :show-course-session="true"
-            />
+            <div v-for="dueDate in filteredDueDates" :key="dueDate.id" class="border-b">
+              <DueDateSingle :single-line="true" :due-date="dueDate"></DueDateSingle>
+            </div>
           </section>
         </div>
       </div>

From 9a3af24f722d22a43b61c3b1e646956c07d4838b Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Fri, 19 Apr 2024 12:34:28 +0200
Subject: [PATCH 51/82] Only show future appointments

---
 .../src/components/cockpit/CockpitDates.vue   | 33 +++++++++++++++----
 client/src/composables.ts                     | 17 ++++++++++
 .../pages/dashboard/DashboardDueDatesPage.vue |  2 +-
 server/vbv_lernwelt/dashboard/views.py        | 14 ++++----
 4 files changed, 51 insertions(+), 15 deletions(-)

diff --git a/client/src/components/cockpit/CockpitDates.vue b/client/src/components/cockpit/CockpitDates.vue
index 2eb89c32..fa672504 100644
--- a/client/src/components/cockpit/CockpitDates.vue
+++ b/client/src/components/cockpit/CockpitDates.vue
@@ -1,31 +1,50 @@
 <script setup lang="ts">
-import { useCurrentCourseSession } from "@/composables";
+import { useCurrentCourseSession, useDashboardPersons } from "@/composables";
 import DueDateSingle from "@/components/dueDates/DueDateSingle.vue";
 import { computed } from "vue";
 import { useExpertCockpitStore } from "@/stores/expertCockpit";
+import _ from "lodash";
+import LoadingSpinner from "@/components/ui/LoadingSpinner.vue";
 
 const expertCockpitStore = useExpertCockpitStore();
 const courseSession = useCurrentCourseSession();
 
+const courseSessionId = courseSession.value.id;
+
+const { loading: loadingDates, currentDueDates } = useDashboardPersons();
+
 const circleDates = computed(() => {
-  const dueDates = courseSession.value.due_dates.filter((dueDate) => {
-    if (!expertCockpitStore.currentCircle) return false;
-    return expertCockpitStore.currentCircle.id == dueDate?.circle?.id;
+  const courseSessionId = courseSession.value.id;
+  const circleId = expertCockpitStore.currentCircle?.id ?? "0";
+  const dueDates = currentDueDates.value.filter((dueDate) => {
+    return (
+      dueDate.course_session_id === courseSessionId && dueDate.circle?.id === circleId
+    );
   });
-  return dueDates.slice(0, 4);
+  return _.take(dueDates, 3);
 });
 </script>
 
 <template>
-  <div class="flex flex-col space-y-2">
+  <div v-if="loadingDates" class="m-8 flex justify-center">
+    <LoadingSpinner />
+  </div>
+  <div v-else class="flex flex-col space-y-2">
     <h3 class="heading-3">{{ $t("Nächste Termine") }}</h3>
     <div
       v-for="dueDate in circleDates"
       :key="dueDate.id"
       class="border-t border-gray-500 pt-2"
     >
-      <DueDateSingle :due-date="dueDate" :single-line="true"></DueDateSingle>
+      <DueDateSingle :due-date="dueDate"></DueDateSingle>
     </div>
     <div v-if="circleDates.length === 0">{{ $t("dueDates.noDueDatesAvailable") }}</div>
   </div>
+
+  <router-link
+    class="btn-secondary mt-4"
+    :to="`/dashboard/due-dates?session=${courseSessionId}`"
+  >
+    {{ $t("a.Alle Termine anzeigen") }}
+  </router-link>
 </template>
diff --git a/client/src/composables.ts b/client/src/composables.ts
index 8cc0f03e..c733f092 100644
--- a/client/src/composables.ts
+++ b/client/src/composables.ts
@@ -34,6 +34,7 @@ import type {
   PerformanceCriteria,
 } from "@/types";
 import { useQuery } from "@urql/vue";
+import dayjs from "dayjs";
 import { t } from "i18next";
 import orderBy from "lodash/orderBy";
 import log from "loglevel";
@@ -502,6 +503,9 @@ export function useDashboardPersons() {
   const dashboardDueDates = ref<DashboardDueDate[]>([]);
   const loading = ref(false);
 
+  // due dates from today to the next year
+  const currentDueDates = ref<DashboardDueDate[]>([]);
+
   const fetchData = async () => {
     loading.value = true;
     try {
@@ -519,6 +523,18 @@ export function useDashboardPersons() {
         }
         return dueDate;
       });
+
+      currentDueDates.value = dashboardDueDates.value.filter((dueDate) => {
+        let refDate = dayjs(dueDate.start);
+        if (dueDate.end) {
+          refDate = dayjs(dueDate.end);
+        }
+
+        return (
+          refDate >= dayjs().startOf("day") &&
+          refDate <= dayjs().add(1, "year").endOf("day")
+        );
+      });
     } catch (error) {
       console.error("Error fetching data:", error);
     } finally {
@@ -531,6 +547,7 @@ export function useDashboardPersons() {
   return {
     dashboardPersons,
     dashboardDueDates,
+    currentDueDates,
     loading,
   };
 }
diff --git a/client/src/pages/dashboard/DashboardDueDatesPage.vue b/client/src/pages/dashboard/DashboardDueDatesPage.vue
index f427ee25..cb1397b7 100644
--- a/client/src/pages/dashboard/DashboardDueDatesPage.vue
+++ b/client/src/pages/dashboard/DashboardDueDatesPage.vue
@@ -24,7 +24,7 @@ type CourseItem = DropboxItem & {
 
 const { t } = useTranslation();
 
-const { loading, dashboardDueDates } = useDashboardPersons();
+const { loading, currentDueDates: dashboardDueDates } = useDashboardPersons();
 
 const courses = computed(() => {
   return [
diff --git a/server/vbv_lernwelt/dashboard/views.py b/server/vbv_lernwelt/dashboard/views.py
index 6011354a..bac8875f 100644
--- a/server/vbv_lernwelt/dashboard/views.py
+++ b/server/vbv_lernwelt/dashboard/views.py
@@ -248,13 +248,13 @@ def get_dashboard_due_dates(request):
         due_dates = []
         today = date.today()
         for due_date in all_due_dates:
-            due_dates.append(due_date)
-            # if due_date.end:
-            #     if due_date.end.date() >= today:
-            #         due_dates.append(due_date)
-            # elif due_date.start:
-            #     if due_date.start.date() >= today:
-            #         due_dates.append(due_date)
+            # due_dates.append(due_date)
+            if due_date.end:
+                if due_date.end.date() >= today:
+                    due_dates.append(due_date)
+            elif due_date.start:
+                if due_date.start.date() >= today:
+                    due_dates.append(due_date)
 
         due_dates.sort(key=lambda x: x.start)
 

From 7847191d9792b7934a2ff2ac4b05607cb0921501 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Fri, 19 Apr 2024 12:46:38 +0200
Subject: [PATCH 52/82] Fix `ignoreGuardsForHomeRoute` workaround...

---
 .../components/header/MainNavigationBar.vue   |  2 +-
 client/src/router/guards.ts                   |  9 ++++++--
 client/src/router/index.ts                    | 23 ++++---------------
 server/config/urls.py                         |  2 +-
 4 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/client/src/components/header/MainNavigationBar.vue b/client/src/components/header/MainNavigationBar.vue
index 3d432ac1..6d9ba7ea 100644
--- a/client/src/components/header/MainNavigationBar.vue
+++ b/client/src/components/header/MainNavigationBar.vue
@@ -60,7 +60,7 @@ const selectedCourseSessionTitle = computed(() => {
 const appointmentsUrl = computed(() => {
   const currentCourseSession = courseSessionsStore.currentCourseSession;
   if (currentCourseSession) {
-    return `/course/${currentCourseSession.course.slug}/appointments`;
+    return `/course/dashboard/due-dates`;
   } else {
     return `/appointments`;
   }
diff --git a/client/src/router/guards.ts b/client/src/router/guards.ts
index 7e8b1ed6..ea3e8504 100644
--- a/client/src/router/guards.ts
+++ b/client/src/router/guards.ts
@@ -51,7 +51,10 @@ const loginRequired = (to: RouteLocationNormalized) => {
   return !to.meta?.public;
 };
 
-export async function handleCurrentCourseSession(to: RouteLocationNormalized) {
+export async function handleCurrentCourseSession(
+  to: RouteLocationNormalized,
+  options?: { unset?: boolean }
+) {
   // register after login hooks
   const userStore = useUserStore();
   if (userStore.loggedIn) {
@@ -59,7 +62,9 @@ export async function handleCurrentCourseSession(to: RouteLocationNormalized) {
     if (to.params.courseSlug) {
       courseSessionsStore._currentCourseSlug = to.params.courseSlug as string;
     } else {
-      courseSessionsStore._currentCourseSlug = "";
+      if (options?.unset) {
+        courseSessionsStore._currentCourseSlug = "";
+      }
     }
     if (!courseSessionsStore.loaded) {
       console.log("handleCurrentCourseSession: loadCourseSessionsData");
diff --git a/client/src/router/index.ts b/client/src/router/index.ts
index 2e9f94d7..992d884a 100644
--- a/client/src/router/index.ts
+++ b/client/src/router/index.ts
@@ -12,7 +12,6 @@ import {
 } from "@/router/guards";
 import { addToHistory } from "@/router/history";
 import { onboardingRedirect } from "@/router/onboarding";
-import type { RouteLocationNormalized } from "vue-router";
 import { createRouter, createWebHistory } from "vue-router";
 
 const router = createRouter({
@@ -396,26 +395,14 @@ router.beforeEach(updateLoggedIn);
 router.beforeEach(redirectToLoginIfRequired);
 
 // register after login hooks
-router.beforeEach(
-  async (to, from) =>
-    await ignoreGuardsForHomeRoute(to, from, handleCurrentCourseSession)
-);
+router.beforeEach(async (to, from) => await handleCurrentCourseSession(to));
+router.beforeEach(async (to, from) => await handleCourseSessionAsQueryParam(to));
 
-router.beforeEach(
-  async (to, from) =>
-    await ignoreGuardsForHomeRoute(to, from, handleCourseSessionAsQueryParam)
+// only unset the current course session in the after hook
+router.afterEach(
+  async (to, from) => await handleCurrentCourseSession(to, { unset: true })
 );
 
-async function ignoreGuardsForHomeRoute(
-  to: RouteLocationNormalized,
-  from: RouteLocationNormalized,
-  guard: any
-) {
-  if (to.name !== "home") {
-    return await guard(to);
-  }
-}
-
 router.beforeEach(addToHistory);
 
 export default router;
diff --git a/server/config/urls.py b/server/config/urls.py
index 716d4747..1bd57c20 100644
--- a/server/config/urls.py
+++ b/server/config/urls.py
@@ -41,10 +41,10 @@ from vbv_lernwelt.course.views import (
 from vbv_lernwelt.course_session.views import get_course_session_documents
 from vbv_lernwelt.dashboard.views import (
     get_dashboard_config,
+    get_dashboard_due_dates,
     get_dashboard_persons,
     get_mentee_count,
     get_mentor_open_tasks_count,
-    get_dashboard_due_dates,
 )
 from vbv_lernwelt.edoniq_test.views import (
     export_students,

From 41b0d3ae4d20b7b4ecd6b092bbc4f6407be372ce Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Fri, 19 Apr 2024 15:28:19 +0200
Subject: [PATCH 53/82] Improve history management

---
 .../pages/dashboard/DashboardDueDatesPage.vue  |  9 ++++++---
 client/src/router/history.ts                   | 18 +++++++++++++++++-
 client/src/router/index.ts                     | 16 +++++++++++++++-
 3 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/client/src/pages/dashboard/DashboardDueDatesPage.vue b/client/src/pages/dashboard/DashboardDueDatesPage.vue
index cb1397b7..95196346 100644
--- a/client/src/pages/dashboard/DashboardDueDatesPage.vue
+++ b/client/src/pages/dashboard/DashboardDueDatesPage.vue
@@ -8,6 +8,7 @@ import { useTranslation } from "i18next-vue";
 import _ from "lodash";
 import { useRouteQuery } from "@vueuse/router";
 import DueDateSingle from "@/components/dueDates/DueDateSingle.vue";
+import { getPreviousRoute } from "@/router/history";
 
 log.debug("DashboardPersonsPage created");
 
@@ -75,7 +76,9 @@ const courseSessions = computed(() => {
   ];
 });
 
-const selectedSessionRouteQuery = useRouteQuery("session");
+const selectedSessionRouteQuery = useRouteQuery("session", UNFILTERED, {
+  mode: "replace",
+});
 const selectedSession = ref<DropboxItem>(courseSessions.value[0]);
 
 watch(selectedSession, () => {
@@ -223,9 +226,9 @@ watch(selectedCourse, async () => {
     <div v-else class="bg-gray-200">
       <div class="container-large">
         <router-link
-          :to="`/`"
+          :to="getPreviousRoute() || '/'"
           class="btn-text inline-flex items-center p-0"
-          data-cy="back-to-learning-path-button"
+          data-cy="back-button"
         >
           <it-icon-arrow-left class="-ml-1 mr-1 h-5 w-5"></it-icon-arrow-left>
           <span class="inline">{{ $t("general.back") }}</span>
diff --git a/client/src/router/history.ts b/client/src/router/history.ts
index 7c0880d5..b3ce26d1 100644
--- a/client/src/router/history.ts
+++ b/client/src/router/history.ts
@@ -10,16 +10,32 @@ const routeHistory: RouteLocationNormalized[] = [];
 const MAX_HISTORY = 10; // for example, store the last 10 visited routes
 let isFirstNavigation = true;
 
+// Variable to track the type of the last navigation
+let lastNavigationWasPush = false;
+
+// Function to set the state
+export function setLastNavigationWasPush(value: boolean) {
+  lastNavigationWasPush = value;
+}
+
+// Function to get the current state
+export function getLastNavigationWasPush() {
+  return lastNavigationWasPush;
+}
+
 export const addToHistory: NavigationGuard = (to, from, next) => {
   // Add the current route to the history, and ensure it doesn't exceed the maximum length
   if (isFirstNavigation) {
     isFirstNavigation = false;
-  } else {
+  } else if (lastNavigationWasPush) {
     routeHistory.push(from);
   }
+
   if (routeHistory.length > MAX_HISTORY) {
     routeHistory.shift();
   }
+
+  lastNavigationWasPush = false;
   next();
 };
 
diff --git a/client/src/router/index.ts b/client/src/router/index.ts
index 992d884a..899822df 100644
--- a/client/src/router/index.ts
+++ b/client/src/router/index.ts
@@ -10,7 +10,7 @@ import {
   redirectToLoginIfRequired,
   updateLoggedIn,
 } from "@/router/guards";
-import { addToHistory } from "@/router/history";
+import { addToHistory, setLastNavigationWasPush } from "@/router/history";
 import { onboardingRedirect } from "@/router/onboarding";
 import { createRouter, createWebHistory } from "vue-router";
 
@@ -405,4 +405,18 @@ router.afterEach(
 
 router.beforeEach(addToHistory);
 
+// Wrap router.replace to track when it's called
+const originalReplace = router.replace;
+router.replace = function (to) {
+  setLastNavigationWasPush(false);
+  return originalReplace.call(this, to);
+};
+
+// Wrap router.push to track when it's called
+const originalPush = router.push;
+router.push = function (to) {
+  setLastNavigationWasPush(true);
+  return originalPush.call(this, to);
+};
+
 export default router;

From 8cb00b0976f54c9fcd1c3933b2f29a926ebe7da2 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Fri, 19 Apr 2024 15:57:47 +0200
Subject: [PATCH 54/82] Replace dueDate code

---
 .../src/components/cockpit/CockpitDates.vue   |  50 -----
 .../dueDates/CourseSessionDueDatesList.vue    |  61 ++++++
 .../src/components/dueDates/DueDatesList.vue  |  54 ------
 .../components/dueDates/DueDatesShortList.vue |  25 ---
 .../components/header/MainNavigationBar.vue   |   4 +-
 client/src/pages/AppointmentsPage.vue         | 179 ------------------
 client/src/pages/LoginPage.vue                |   4 +-
 .../cockpit/cockpitPage/CockpitExpertPage.vue |   8 +-
 .../pages/dashboard/DashboardDueDatesPage.vue |   1 +
 client/src/pages/dashboard/DashboardPage.vue  |  12 +-
 .../learningPathPage/LearningPathPage.vue     |  18 +-
 client/src/router/history.ts                  |   5 +-
 client/src/router/index.ts                    |   8 -
 client/src/stores/courseSessions.ts           |  35 +---
 client/src/stores/dashboard.ts                |  20 +-
 client/src/types.ts                           |   1 -
 server/vbv_lernwelt/course/serializers.py     |  11 --
 .../course/tests/test_course_session_api.py   |  43 -----
 .../vbv_lernwelt/dashboard/graphql/queries.py |   1 +
 19 files changed, 98 insertions(+), 442 deletions(-)
 delete mode 100644 client/src/components/cockpit/CockpitDates.vue
 create mode 100644 client/src/components/dueDates/CourseSessionDueDatesList.vue
 delete mode 100644 client/src/components/dueDates/DueDatesList.vue
 delete mode 100644 client/src/components/dueDates/DueDatesShortList.vue
 delete mode 100644 client/src/pages/AppointmentsPage.vue

diff --git a/client/src/components/cockpit/CockpitDates.vue b/client/src/components/cockpit/CockpitDates.vue
deleted file mode 100644
index fa672504..00000000
--- a/client/src/components/cockpit/CockpitDates.vue
+++ /dev/null
@@ -1,50 +0,0 @@
-<script setup lang="ts">
-import { useCurrentCourseSession, useDashboardPersons } from "@/composables";
-import DueDateSingle from "@/components/dueDates/DueDateSingle.vue";
-import { computed } from "vue";
-import { useExpertCockpitStore } from "@/stores/expertCockpit";
-import _ from "lodash";
-import LoadingSpinner from "@/components/ui/LoadingSpinner.vue";
-
-const expertCockpitStore = useExpertCockpitStore();
-const courseSession = useCurrentCourseSession();
-
-const courseSessionId = courseSession.value.id;
-
-const { loading: loadingDates, currentDueDates } = useDashboardPersons();
-
-const circleDates = computed(() => {
-  const courseSessionId = courseSession.value.id;
-  const circleId = expertCockpitStore.currentCircle?.id ?? "0";
-  const dueDates = currentDueDates.value.filter((dueDate) => {
-    return (
-      dueDate.course_session_id === courseSessionId && dueDate.circle?.id === circleId
-    );
-  });
-  return _.take(dueDates, 3);
-});
-</script>
-
-<template>
-  <div v-if="loadingDates" class="m-8 flex justify-center">
-    <LoadingSpinner />
-  </div>
-  <div v-else class="flex flex-col space-y-2">
-    <h3 class="heading-3">{{ $t("Nächste Termine") }}</h3>
-    <div
-      v-for="dueDate in circleDates"
-      :key="dueDate.id"
-      class="border-t border-gray-500 pt-2"
-    >
-      <DueDateSingle :due-date="dueDate"></DueDateSingle>
-    </div>
-    <div v-if="circleDates.length === 0">{{ $t("dueDates.noDueDatesAvailable") }}</div>
-  </div>
-
-  <router-link
-    class="btn-secondary mt-4"
-    :to="`/dashboard/due-dates?session=${courseSessionId}`"
-  >
-    {{ $t("a.Alle Termine anzeigen") }}
-  </router-link>
-</template>
diff --git a/client/src/components/dueDates/CourseSessionDueDatesList.vue b/client/src/components/dueDates/CourseSessionDueDatesList.vue
new file mode 100644
index 00000000..3adff9d8
--- /dev/null
+++ b/client/src/components/dueDates/CourseSessionDueDatesList.vue
@@ -0,0 +1,61 @@
+<script lang="ts" setup>
+import { useDashboardPersons } from "@/composables";
+import { computed } from "vue";
+import _ from "lodash";
+import LoadingSpinner from "@/components/ui/LoadingSpinner.vue";
+import DueDateSingle from "@/components/dueDates/DueDateSingle.vue";
+
+const props = withDefaults(
+  defineProps<{
+    courseSessionId: string;
+    circleId?: string;
+    maxCount?: number;
+    showAllButton?: boolean;
+  }>(),
+  {
+    maxCount: 3,
+    circleId: undefined,
+    showAllButton: false,
+  }
+);
+
+const { loading, currentDueDates } = useDashboardPersons();
+
+const filteredDueDates = computed(() => {
+  let dueDates = currentDueDates.value.filter(
+    (dueDate) => dueDate.course_session_id === props.courseSessionId
+  );
+
+  if (props.circleId) {
+    dueDates = dueDates.filter((dueDate) => dueDate.circle?.id === props.circleId);
+  }
+  return _.take(dueDates, props.maxCount);
+});
+</script>
+
+<template>
+  <div v-if="loading" class="m-8 flex justify-center">
+    <LoadingSpinner />
+  </div>
+  <div v-else class="flex flex-col space-y-2">
+    <h3 class="heading-3">{{ $t("Nächste Termine") }}</h3>
+    <div
+      v-for="dueDate in filteredDueDates"
+      :key="dueDate.id"
+      class="border-t border-gray-500 pt-2"
+    >
+      <DueDateSingle :due-date="dueDate"></DueDateSingle>
+    </div>
+    <div v-if="filteredDueDates.length === 0">
+      {{ $t("dueDates.noDueDatesAvailable") }}
+    </div>
+  </div>
+
+  <router-link
+    v-if="showAllButton"
+    class="btn-secondary mt-4"
+    :to="`/dashboard/due-dates?session=${courseSessionId}`"
+  >
+    {{ $t("a.Alle Termine anzeigen") }}
+  </router-link>
+</template>
diff --git a/client/src/components/dueDates/DueDatesList.vue b/client/src/components/dueDates/DueDatesList.vue
deleted file mode 100644
index f8a0328e..00000000
--- a/client/src/components/dueDates/DueDatesList.vue
+++ /dev/null
@@ -1,54 +0,0 @@
-<script lang="ts" setup>
-import DueDateSingle from "@/components/dueDates/DueDateSingle.vue";
-import { computed } from "vue";
-import type { DashboardDueDate } from "@/services/dashboard";
-
-const props = defineProps<{
-  maxCount: number;
-  dueDates: DashboardDueDate[];
-  showTopBorder: boolean;
-  showBottomBorder: boolean;
-  showAllDueDatesLink: boolean;
-  showCourseSession: boolean;
-}>();
-
-const allDueDates = computed(() => {
-  return props.dueDates;
-});
-
-const dueDatesDisplayed = computed(() => {
-  return props.dueDates.slice(0, props.maxCount);
-});
-</script>
-
-<template>
-  <div>
-    <ul :class="showBottomBorder ? '' : 'no-border-last'">
-      <li
-        v-for="dueDate in dueDatesDisplayed"
-        :key="dueDate.id"
-        class="cy-single-due-date"
-        :class="{ 'first:border-t': props.showTopBorder, 'border-b': true }"
-      >
-        <DueDateSingle
-          :due-date="dueDate"
-          :show-course-session="props.showCourseSession"
-        ></DueDateSingle>
-      </li>
-    </ul>
-    <div v-if="allDueDates.length === 0">{{ $t("dueDates.noDueDatesAvailable") }}</div>
-    <div
-      v-if="showAllDueDatesLink && allDueDates.length > 0"
-      class="flex items-center pt-6"
-    >
-      <a href="/appointments">{{ $t("dueDates.showAllDueDates") }}</a>
-      <it-icon-arrow-right />
-    </div>
-  </div>
-</template>
-
-<style lang="postcss" scoped>
-.no-border-last li:last-child {
-  border-bottom: none !important;
-}
-</style>
diff --git a/client/src/components/dueDates/DueDatesShortList.vue b/client/src/components/dueDates/DueDatesShortList.vue
deleted file mode 100644
index 48bb324f..00000000
--- a/client/src/components/dueDates/DueDatesShortList.vue
+++ /dev/null
@@ -1,25 +0,0 @@
-<template>
-  <div>
-    <DueDatesList
-      :due-dates="allDueDates"
-      :max-count="props.maxCount"
-      :show-top-border="props.showTopBorder"
-      show-all-due-dates-link
-      show-bottom-border
-      :show-course-session="false"
-    ></DueDatesList>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import DueDatesList from "@/components/dueDates/DueDatesList.vue";
-import { useCurrentCourseSession } from "@/composables";
-
-const props = defineProps<{
-  maxCount: number;
-  showTopBorder: boolean;
-}>();
-
-const courseSession = useCurrentCourseSession();
-const allDueDates = courseSession.value.due_dates;
-</script>
diff --git a/client/src/components/header/MainNavigationBar.vue b/client/src/components/header/MainNavigationBar.vue
index 6d9ba7ea..64e9a6fe 100644
--- a/client/src/components/header/MainNavigationBar.vue
+++ b/client/src/components/header/MainNavigationBar.vue
@@ -60,9 +60,9 @@ const selectedCourseSessionTitle = computed(() => {
 const appointmentsUrl = computed(() => {
   const currentCourseSession = courseSessionsStore.currentCourseSession;
   if (currentCourseSession) {
-    return `/course/dashboard/due-dates`;
+    return `/dashboard/due-dates?session=${currentCourseSession.id}`;
   } else {
-    return `/appointments`;
+    return `/dashboard/due-dates`;
   }
 });
 
diff --git a/client/src/pages/AppointmentsPage.vue b/client/src/pages/AppointmentsPage.vue
deleted file mode 100644
index aafdc19c..00000000
--- a/client/src/pages/AppointmentsPage.vue
+++ /dev/null
@@ -1,179 +0,0 @@
-<script setup lang="ts">
-import { computed, onMounted, ref, watch } from "vue";
-import { useCourseSessionsStore } from "@/stores/courseSessions";
-import { useTranslation } from "i18next-vue";
-import ItDropdownSelect from "@/components/ui/ItDropdownSelect.vue";
-import type { DueDate } from "@/types";
-import DueDatesList from "@/components/dueDates/DueDatesList.vue";
-import { useCourseData } from "@/composables";
-
-const { t } = useTranslation();
-
-const UNFILTERED = Number.MAX_SAFE_INTEGER.toString();
-const courseSessionsStore = useCourseSessionsStore();
-
-type Item = {
-  id: string;
-  name: string;
-};
-
-type CourseItem = Item & {
-  slug: string;
-};
-
-const courses: CourseItem[] = courseSessionsStore.uniqueCourseSessionsByCourse.map(
-  (cs) => ({
-    id: cs.course.id,
-    name: cs.course.title,
-    slug: cs.course.slug,
-  })
-);
-const selectedCourse = ref<CourseItem>(courses[0]);
-
-const courseSessions = computed(() => {
-  return [
-    {
-      id: UNFILTERED,
-      name: t("a.AlleDurchführungen"),
-    },
-    ...courseSessionsStore.allCourseSessions
-      .filter((cs) => cs.course.id === selectedCourse.value.id)
-      .map((cs) => ({ id: cs.id, name: cs.title })),
-  ];
-});
-const selectedSession = ref<Item>(courseSessions.value[0]);
-
-// pre-select course and session if we are in a course session
-if (courseSessionsStore.currentCourseSession) {
-  const session = courseSessionsStore.currentCourseSession;
-  const { id: courseId, title: courseName, slug: courseSlug } = session.course;
-  selectedCourse.value = { id: courseId, name: courseName, slug: courseSlug };
-  const { id: sessionId, title: sessionName } = session;
-  selectedSession.value = { id: sessionId, name: sessionName };
-}
-
-const initialItemCircle: Item = {
-  id: UNFILTERED,
-  name: t("a.AlleCircle"),
-};
-const circles = ref<Item[]>([initialItemCircle]);
-const selectedCircle = ref<Item>(circles.value[0]);
-
-async function loadCircleValues() {
-  if (selectedCourse.value) {
-    const learningPathQuery = useCourseData(selectedCourse.value.slug);
-    await learningPathQuery.resultPromise;
-    circles.value = [
-      initialItemCircle,
-      ...(learningPathQuery.circles.value ?? []).map((circle) => ({
-        id: circle.id,
-        name: circle.title,
-      })),
-    ];
-  } else {
-    circles.value = [initialItemCircle];
-  }
-
-  selectedCircle.value = circles.value[0];
-}
-
-watch(selectedCourse, async () => {
-  selectedSession.value = courseSessions.value[0];
-  await loadCircleValues();
-});
-
-onMounted(async () => {
-  await loadCircleValues();
-});
-
-const appointments = computed(() => {
-  return courseSessionsStore
-    .allDueDates()
-    .filter(
-      (dueDate) =>
-        isMatchingCourse(dueDate) &&
-        isMatchingSession(dueDate) &&
-        isMatchingCircle(dueDate)
-    );
-});
-
-const isMatchingSession = (dueDate: DueDate) =>
-  selectedSession.value.id === UNFILTERED ||
-  dueDate.course_session_id === selectedSession.value.id;
-
-const isMatchingCircle = (dueDate: DueDate) =>
-  selectedCircle.value.id === UNFILTERED ||
-  dueDate.circle?.id === selectedCircle.value.id;
-
-const isMatchingCourse = (dueDate: DueDate) =>
-  courseSessions.value.map((cs) => cs.id).includes(dueDate.course_session_id);
-
-const numAppointmentsToShow = ref(7);
-const canLoadMore = computed(() => {
-  return numAppointmentsToShow.value < appointments.value.length;
-});
-
-async function loadAdditionalAppointments() {
-  numAppointmentsToShow.value *= 2;
-}
-</script>
-
-<template>
-  <div class="bg-gray-200">
-    <div class="container-large px-8 py-8">
-      <header class="mb-6 flex flex-col lg:flex-row lg:items-center lg:justify-between">
-        <h1>{{ $t("a.AlleTermine") }}</h1>
-        <div>
-          <ItDropdownSelect
-            v-model="selectedCourse"
-            data-cy="appointments-course-select"
-            :items="courses"
-          ></ItDropdownSelect>
-        </div>
-      </header>
-      <main>
-        <div class="flex flex-col space-y-2">
-          <div class="flex flex-col space-x-0 bg-white lg:flex-row lg:space-x-3">
-            <ItDropdownSelect
-              v-model="selectedSession"
-              data-cy="appointments-session-select"
-              :items="courseSessions"
-              borderless
-            ></ItDropdownSelect>
-            <ItDropdownSelect
-              v-model="selectedCircle"
-              data-cy="appointments-circle-select"
-              :items="circles"
-              borderless
-            ></ItDropdownSelect>
-          </div>
-          <div class="bg-white px-5">
-            <DueDatesList
-              :show-top-border="false"
-              :show-bottom-border="canLoadMore"
-              :due-dates="appointments"
-              :show-all-due-dates-link="false"
-              :max-count="numAppointmentsToShow"
-              data-cy="appointments-list"
-              :show-course-session="true"
-            />
-            <button
-              v-if="canLoadMore"
-              class="py-4 underline"
-              data-cy="load-more-notifications"
-              @click="loadAdditionalAppointments()"
-            >
-              {{ $t("notifications.load_more") }}
-            </button>
-          </div>
-        </div>
-      </main>
-    </div>
-  </div>
-</template>
-
-<style lang="postcss" scoped>
-.no-border-last li:last-child {
-  border-bottom: none !important;
-}
-</style>
diff --git a/client/src/pages/LoginPage.vue b/client/src/pages/LoginPage.vue
index d65cb57d..21f0228d 100644
--- a/client/src/pages/LoginPage.vue
+++ b/client/src/pages/LoginPage.vue
@@ -41,8 +41,8 @@ const userStore = useUserStore();
         class="bg-white p-4 lg:p-8"
         @submit.prevent="
           userStore.handleLogin(
-            state.username,
-            state.password,
+            state.username.trim(),
+            state.password.trim(),
             route.query.next as string
           )
         "
diff --git a/client/src/pages/cockpit/cockpitPage/CockpitExpertPage.vue b/client/src/pages/cockpit/cockpitPage/CockpitExpertPage.vue
index 6cbd4203..864d9af2 100644
--- a/client/src/pages/cockpit/cockpitPage/CockpitExpertPage.vue
+++ b/client/src/pages/cockpit/cockpitPage/CockpitExpertPage.vue
@@ -6,10 +6,10 @@ import { useCourseSessionDetailQuery, useCurrentCourseSession } from "@/composab
 import SubmissionsOverview from "@/components/cockpit/SubmissionsOverview.vue";
 import { useExpertCockpitStore } from "@/stores/expertCockpit";
 import log from "loglevel";
-import CockpitDates from "@/components/cockpit/CockpitDates.vue";
 import ItDropdownSelect from "@/components/ui/ItDropdownSelect.vue";
 import UserStatusCount from "@/components/cockpit/UserStatusCount.vue";
 import { useExpertCockpitPageData } from "@/pages/cockpit/cockpitPage/composables";
+import CourseSessionDueDatesList from "@/components/dueDates/CourseSessionDueDatesList.vue";
 
 const props = defineProps<{
   courseSlug: string;
@@ -105,7 +105,11 @@ const courseSessionDetailResult = useCourseSessionDetailQuery();
         </div>
 
         <div class="mb-4 bg-white p-6">
-          <CockpitDates></CockpitDates>
+          <CourseSessionDueDatesList
+            :course-session-id="courseSession.id"
+            :circle-id="expertCockpitStore.currentCircle.id"
+            :max-count="4"
+          ></CourseSessionDueDatesList>
         </div>
         <SubmissionsOverview
           :course-session="courseSession"
diff --git a/client/src/pages/dashboard/DashboardDueDatesPage.vue b/client/src/pages/dashboard/DashboardDueDatesPage.vue
index 95196346..4be29fc4 100644
--- a/client/src/pages/dashboard/DashboardDueDatesPage.vue
+++ b/client/src/pages/dashboard/DashboardDueDatesPage.vue
@@ -82,6 +82,7 @@ const selectedSessionRouteQuery = useRouteQuery("session", UNFILTERED, {
 const selectedSession = ref<DropboxItem>(courseSessions.value[0]);
 
 watch(selectedSession, () => {
+  // @ts-ignore
   selectedSessionRouteQuery.value = selectedSession.value.id;
 });
 
diff --git a/client/src/pages/dashboard/DashboardPage.vue b/client/src/pages/dashboard/DashboardPage.vue
index 8fb4e28c..7b0923b2 100644
--- a/client/src/pages/dashboard/DashboardPage.vue
+++ b/client/src/pages/dashboard/DashboardPage.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import { onMounted } from "vue";
-import ItDropdownSelect from "@/components/ui/ItDropdownSelect.vue";
 import { useDashboardStore } from "@/stores/dashboard";
 import type { DashboardCourseConfigType } from "@/services/dashboard";
 import LoadingSpinner from "@/components/ui/LoadingSpinner.vue";
@@ -24,20 +23,11 @@ function newDashboardConfigForId(id: string): DashboardCourseConfigType | undefi
     <LoadingSpinner />
   </div>
   <div
-    v-else-if="dashboardStore.currentDashboardConfig"
+    v-else-if="dashboardStore.dashboardConfigsv2.length"
     class="flex flex-col lg:flex-row"
   >
     <main class="grow bg-gray-200 lg:order-2">
       <div class="m-8">
-        <div class="mb-10 flex items-center justify-between">
-          <h1 data-cy="dashboard-title">Dashboard</h1>
-          <ItDropdownSelect
-            :model-value="dashboardStore.currentDashboardConfig"
-            class="mt-4 w-full lg:mt-0 lg:w-96"
-            :items="dashboardStore.dashboardConfigs"
-            @update:model-value="dashboardStore.switchAndLoadDashboardConfig"
-          ></ItDropdownSelect>
-        </div>
         <!-- new way of dashboard -->
         <ul>
           <li
diff --git a/client/src/pages/learningPath/learningPathPage/LearningPathPage.vue b/client/src/pages/learningPath/learningPathPage/LearningPathPage.vue
index 0242498a..0e051681 100644
--- a/client/src/pages/learningPath/learningPathPage/LearningPathPage.vue
+++ b/client/src/pages/learningPath/learningPathPage/LearningPathPage.vue
@@ -1,5 +1,4 @@
 <script setup lang="ts">
-import DueDatesShortList from "@/components/dueDates/DueDatesShortList.vue";
 import LearningPathListView from "@/pages/learningPath/learningPathPage/LearningPathListView.vue";
 import LearningPathPathView from "@/pages/learningPath/learningPathPage/LearningPathPathView.vue";
 import CircleProgress from "@/pages/learningPath/learningPathPage/LearningPathProgress.vue";
@@ -8,7 +7,12 @@ import type { ViewType } from "@/pages/learningPath/learningPathPage/LearningPat
 import LearningPathViewSwitch from "@/pages/learningPath/learningPathPage/LearningPathViewSwitch.vue";
 import { breakpointsTailwind, useBreakpoints } from "@vueuse/core";
 import { computed, ref } from "vue";
-import { useCourseCircleProgress, useCourseDataWithCompletion } from "@/composables";
+import {
+  useCourseCircleProgress,
+  useCourseDataWithCompletion,
+  useCurrentCourseSession,
+} from "@/composables";
+import CourseSessionDueDatesList from "@/components/dueDates/CourseSessionDueDatesList.vue";
 
 const props = defineProps<{
   courseSlug: string;
@@ -27,6 +31,8 @@ const lpQueryResult = useCourseDataWithCompletion(props.courseSlug);
 const learningPath = computed(() => lpQueryResult.learningPath.value);
 const course = computed(() => lpQueryResult.course.value);
 
+const courseSession = useCurrentCourseSession();
+
 const { inProgressCirclesCount, circlesCount } = useCourseCircleProgress(
   lpQueryResult.circles
 );
@@ -60,10 +66,10 @@ const changeViewType = (viewType: ViewType) => {
 
       <!-- Right -->
       <div v-if="!useMobileLayout" class="flex-grow">
-        <div class="text-bold pb-3">
-          {{ $t("a.Nächste Termine") }}
-        </div>
-        <DueDatesShortList :max-count="2" :show-top-border="true"></DueDatesShortList>
+        <CourseSessionDueDatesList
+          :course-session-id="courseSession.id"
+          :max-count="2"
+        ></CourseSessionDueDatesList>
       </div>
     </div>
 
diff --git a/client/src/router/history.ts b/client/src/router/history.ts
index b3ce26d1..cc96179d 100644
--- a/client/src/router/history.ts
+++ b/client/src/router/history.ts
@@ -7,18 +7,15 @@ import type {
 } from "vue-router";
 
 const routeHistory: RouteLocationNormalized[] = [];
-const MAX_HISTORY = 10; // for example, store the last 10 visited routes
+const MAX_HISTORY = 10;
 let isFirstNavigation = true;
 
-// Variable to track the type of the last navigation
 let lastNavigationWasPush = false;
 
-// Function to set the state
 export function setLastNavigationWasPush(value: boolean) {
   lastNavigationWasPush = value;
 }
 
-// Function to get the current state
 export function getLastNavigationWasPush() {
   return lastNavigationWasPush;
 }
diff --git a/client/src/router/index.ts b/client/src/router/index.ts
index 899822df..b4dcf96d 100644
--- a/client/src/router/index.ts
+++ b/client/src/router/index.ts
@@ -324,14 +324,6 @@ const router = createRouter({
       path: "/notifications",
       component: () => import("@/pages/NotificationsPage.vue"),
     },
-    {
-      path: "/appointments",
-      component: () => import("@/pages/AppointmentsPage.vue"),
-    },
-    {
-      path: "/course/:courseSlug/appointments",
-      component: () => import("@/pages/AppointmentsPage.vue"),
-    },
     {
       path: "/onboarding/:courseType",
       props: true,
diff --git a/client/src/stores/courseSessions.ts b/client/src/stores/courseSessions.ts
index 0310af45..98dc3e33 100644
--- a/client/src/stores/courseSessions.ts
+++ b/client/src/stores/courseSessions.ts
@@ -1,9 +1,8 @@
 import { itGetCached } from "@/fetchHelpers";
-import type { CourseSession, DueDate } from "@/types";
+import type { CourseSession } from "@/types";
 import eventBus from "@/utils/eventBus";
 import { useRouteLookups } from "@/utils/route";
 import { useLocalStorage } from "@vueuse/core";
-import dayjs from "dayjs";
 import uniqBy from "lodash/uniqBy";
 import log from "loglevel";
 import { defineStore } from "pinia";
@@ -25,13 +24,6 @@ export const useCourseSessionsStore = defineStore("courseSessions", () => {
 
     const userStore = useUserStore();
     if (userStore.loggedIn) {
-      // TODO: refactor after implementing of Klassenkonzept
-      await Promise.all(
-        allCourseSessions.value.map(async (cs) => {
-          sortDueDates(cs.due_dates);
-        })
-      );
-
       if (!allCourseSessions.value) {
         throw `No courseSessionData found for user`;
       }
@@ -137,37 +129,12 @@ export const useCourseSessionsStore = defineStore("courseSessions", () => {
     return Boolean(hasPreview && (inLearningPath() || inCompetenceProfile()));
   });
 
-  function allDueDates() {
-    const allDueDatesReturn: DueDate[] = [];
-
-    allCourseSessions.value?.forEach((cs) => {
-      allDueDatesReturn.push(...cs.due_dates);
-    });
-
-    sortDueDates(allDueDatesReturn);
-    return allDueDatesReturn;
-  }
-
-  function sortDueDates(dueDates: DueDate[]) {
-    dueDates.sort((a, b) => {
-      const dateA = dayjs(a.start);
-      const dateB = dayjs(b.start);
-
-      if (!dateA.isValid() && !dateB.isValid()) return 0; // If both are invalid, they are equal
-      if (!dateA.isValid()) return 1; // If dateA is invalid, it goes after dateB
-      if (!dateB.isValid()) return -1; // If dateB is invalid, it goes after dateA
-
-      return dateA.diff(dateB); // sort by `start`
-    });
-  }
-
   return {
     uniqueCourseSessionsByCourse,
     allCurrentCourseSessions,
     getCourseSessionById,
     switchCourseSessionById,
     isCourseSessionPreviewActive,
-    allDueDates,
 
     // use `useCurrentCourseSession` whenever possible
     currentCourseSession,
diff --git a/client/src/stores/dashboard.ts b/client/src/stores/dashboard.ts
index 8a4a9c92..d172c77e 100644
--- a/client/src/stores/dashboard.ts
+++ b/client/src/stores/dashboard.ts
@@ -62,16 +62,16 @@ export const useDashboardStore = defineStore("dashboard", () => {
     dashboardConfigsv2.value = await fetchDashboardConfigv2();
     console.log("got dashboard config v2: ", dashboardConfigsv2.value);
     try {
-      if (!currentDashboardConfig.value) {
-        await loadDashboardConfig();
-        return;
-      }
-      const { id, dashboard_type } = currentDashboardConfig.value;
-      if (dashBoardDataCache[id]) {
-        currentDashBoardData.value = dashBoardDataCache[id];
-        return;
-      }
-      // await loadDashboardData(dashboard_type, id);
+      // if (!currentDashboardConfig.value) {
+      //   await loadDashboardConfig();
+      //   return;
+      // }
+      // const { id, dashboard_type } = currentDashboardConfig.value;
+      // if (dashBoardDataCache[id]) {
+      //   currentDashBoardData.value = dashBoardDataCache[id];
+      //   return;
+      // }
+      // // await loadDashboardData(dashboard_type, id);
     } finally {
       console.log("done loading dashboard details");
       loading.value = false;
diff --git a/client/src/types.ts b/client/src/types.ts
index 90b75727..e5cc501d 100644
--- a/client/src/types.ts
+++ b/client/src/types.ts
@@ -452,7 +452,6 @@ export interface CourseSession {
   title: string;
   start_date: string;
   end_date: string;
-  due_dates: DueDate[];
   actions: string[];
 }
 
diff --git a/server/vbv_lernwelt/course/serializers.py b/server/vbv_lernwelt/course/serializers.py
index 7b8bffc7..bfa97dc0 100644
--- a/server/vbv_lernwelt/course/serializers.py
+++ b/server/vbv_lernwelt/course/serializers.py
@@ -1,4 +1,3 @@
-from django.db.models import Q
 from rest_framework import serializers
 
 from vbv_lernwelt.core.utils import StringIDField
@@ -10,8 +9,6 @@ from vbv_lernwelt.course.models import (
     CourseConfiguration,
     CourseSession,
 )
-from vbv_lernwelt.duedate.models import DueDate
-from vbv_lernwelt.duedate.serializers import DueDateSerializer
 from vbv_lernwelt.iam.permissions import course_session_permissions
 
 
@@ -72,19 +69,12 @@ class CourseSessionSerializer(serializers.ModelSerializer):
     id = StringIDField()
 
     course = serializers.SerializerMethodField()
-    due_dates = serializers.SerializerMethodField()
     actions = serializers.SerializerMethodField()
     user_roles = serializers.SerializerMethodField()
 
     def get_course(self, obj):
         return CourseSerializer(obj.course).data
 
-    def get_due_dates(self, obj):
-        due_dates = DueDate.objects.filter(
-            Q(start__isnull=False) | Q(end__isnull=False), course_session_id=obj.id
-        )
-        return DueDateSerializer(due_dates, many=True).data
-
     def get_user_roles(self, obj):
         if hasattr(obj, "roles"):
             return list(obj.roles)
@@ -100,7 +90,6 @@ class CourseSessionSerializer(serializers.ModelSerializer):
             "title",
             "start_date",
             "end_date",
-            "due_dates",
             "actions",
             "user_roles",
         ]
diff --git a/server/vbv_lernwelt/course/tests/test_course_session_api.py b/server/vbv_lernwelt/course/tests/test_course_session_api.py
index 97580c48..0737cc32 100644
--- a/server/vbv_lernwelt/course/tests/test_course_session_api.py
+++ b/server/vbv_lernwelt/course/tests/test_course_session_api.py
@@ -1,7 +1,5 @@
 import json
-from datetime import datetime
 
-from django.utils import timezone
 from rest_framework.test import APITestCase
 
 from vbv_lernwelt.core.create_default_users import create_default_users
@@ -9,9 +7,6 @@ from vbv_lernwelt.core.models import User
 from vbv_lernwelt.course.consts import COURSE_TEST_ID
 from vbv_lernwelt.course.creators.test_course import create_test_course
 from vbv_lernwelt.course.models import CourseSession, CourseSessionUser
-from vbv_lernwelt.course_session.models import CourseSessionAssignment
-from vbv_lernwelt.duedate.factories import DueDateFactory
-from vbv_lernwelt.learnpath.models import LearningContentAssignment
 
 
 class CourseCompletionApiTestCase(APITestCase):
@@ -56,41 +51,3 @@ class CourseCompletionApiTestCase(APITestCase):
 
         print(json.dumps(response.json(), indent=4))
         self.assertEqual(response.json()[0]["id"], str(self.course_session.id))
-
-    def test_api_hasNoDueDates(self):
-        self.client.login(username="admin", password="test")
-        response = self.client.get(f"/api/course/sessions/")
-
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(len(response.json()), 1)
-
-        print(json.dumps(response.json(), indent=4))
-        self.assertEqual(response.json()[0]["due_dates"], [])
-
-    def test_api_hasDueDates(self):
-        cs = CourseSession.objects.first()
-
-        due_date = DueDateFactory(
-            start=timezone.make_aware(datetime.now()),
-            course_session=cs,
-            title="Test Due Date",
-        )
-        csa = CourseSessionAssignment.objects.create(
-            course_session=cs,
-            learning_content=LearningContentAssignment.objects.get(
-                slug=f"test-lehrgang-lp-circle-reisen-lc-mein-kundenstamm"
-            ),
-        )
-
-        csa.submission_deadline = due_date
-
-        csa.save()
-        self.client.login(username="admin", password="test")
-        response = self.client.get(f"/api/course/sessions/")
-
-        self.assertEqual(response.status_code, 200)
-        print(json.dumps(response.json(), indent=4))
-        self.assertEqual(len(response.json()), 1)
-
-        self.assertEqual(len(response.json()[0]["due_dates"]), 1)
-        self.assertEqual(response.json()[0]["due_dates"][0]["title"], "Test Due Date")
diff --git a/server/vbv_lernwelt/dashboard/graphql/queries.py b/server/vbv_lernwelt/dashboard/graphql/queries.py
index ad780b42..6e8bea1b 100644
--- a/server/vbv_lernwelt/dashboard/graphql/queries.py
+++ b/server/vbv_lernwelt/dashboard/graphql/queries.py
@@ -52,6 +52,7 @@ class DashboardQuery(graphene.ObjectType):
 
         course_session_ids = set()
 
+        # supervisors
         for group in CourseSessionGroup.objects.filter(course=course):
             if can_view_course_session_group_statistics(user=user, group=group):
                 course_session_ids.update(

From bfdb992d6009238321afd9bd65ba28790de7b421 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Thu, 18 Apr 2024 17:48:37 +0200
Subject: [PATCH 55/82] WIP: Update feedback statistics page

---
 .../dashboard/FeedbackSummaryBox.vue          |  6 ++++-
 .../dashboard/statistic/CompetenceList.vue    |  2 +-
 .../dashboard/statistic/FeedbackList.vue      | 27 +++++++++++--------
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/client/src/components/dashboard/FeedbackSummaryBox.vue b/client/src/components/dashboard/FeedbackSummaryBox.vue
index 0c80d5cf..c5dc7849 100644
--- a/client/src/components/dashboard/FeedbackSummaryBox.vue
+++ b/client/src/components/dashboard/FeedbackSummaryBox.vue
@@ -7,6 +7,7 @@ const props = defineProps<{
   feedbackCount: number;
   statisfactionMax: number;
   statisfactionAvg: number;
+  courseSlug: string;
 }>();
 
 const satisfactionColor = computed(() => {
@@ -15,7 +16,10 @@ const satisfactionColor = computed(() => {
 </script>
 
 <template>
-  <BaseBox :details-link="'/statistic/feedback'" data-cy="dashboard.stats.feedback">
+  <BaseBox
+    :details-link="`/statistic/${courseSlug}/feedback`"
+    data-cy="dashboard.stats.feedback"
+  >
     <template #title>{{ $t("a.Feedback Teilnehmer") }}</template>
     <template #content>
       <div class="flex items-center">
diff --git a/client/src/pages/dashboard/statistic/CompetenceList.vue b/client/src/pages/dashboard/statistic/CompetenceList.vue
index c95fc2d4..ea0a64bc 100644
--- a/client/src/pages/dashboard/statistic/CompetenceList.vue
+++ b/client/src/pages/dashboard/statistic/CompetenceList.vue
@@ -22,7 +22,7 @@ const { courseStatistics, loading, courseSessionName, circleMeta } =
 </script>
 
 <template>
-  <main v-if="courseStatistics">
+  <main v-if="!loading">
     <div class="mb-10 flex items-center justify-between">
       <h3>{{ $t("a.Selbsteinschätzung") }}</h3>
       <ItDropdownSelect
diff --git a/client/src/pages/dashboard/statistic/FeedbackList.vue b/client/src/pages/dashboard/statistic/FeedbackList.vue
index bca9d3c1..6ab8ddaf 100644
--- a/client/src/pages/dashboard/statistic/FeedbackList.vue
+++ b/client/src/pages/dashboard/statistic/FeedbackList.vue
@@ -1,27 +1,32 @@
 <script setup lang="ts">
 import { useDashboardStore } from "@/stores/dashboard";
 import ItDropdownSelect from "@/components/ui/ItDropdownSelect.vue";
-import { computed } from "vue";
 import type {
-  CourseStatisticsType,
   FeedbackStatisticsRecordType,
   PresenceRecordStatisticsType,
 } from "@/gql/graphql";
 import StatisticFilterList from "@/components/dashboard/StatisticFilterList.vue";
-import { useCourseStatistics } from "@/composables";
+import { useCourseStatisticsv2 } from "@/composables";
 import { getBlendedColorForRating } from "@/utils/ratingToColor";
+import { courseIdForCourseSlug } from "@/services/dashboard";
+
+const props = defineProps<{
+  courseSlug: string;
+}>();
 
 const dashboardStore = useDashboardStore();
 
-const statistics = computed(() => {
-  return dashboardStore.currentDashBoardData as CourseStatisticsType;
-});
+const courseId = courseIdForCourseSlug(
+  dashboardStore.dashboardConfigsv2,
+  props.courseSlug
+);
 
-const { courseSessionName, circleMeta } = useCourseStatistics();
+const { courseStatistics, loading, courseSessionName, circleMeta } =
+  useCourseStatisticsv2(courseId);
 </script>
 
 <template>
-  <main v-if="statistics">
+  <main v-if="!loading">
     <div class="mb-10 flex items-center justify-between">
       <h3>{{ $t("a.Feedback Teilnehmer") }}</h3>
       <ItDropdownSelect
@@ -31,10 +36,10 @@ const { courseSessionName, circleMeta } = useCourseStatistics();
         @update:model-value="dashboardStore.switchAndLoadDashboardConfig"
       ></ItDropdownSelect>
     </div>
-    <div v-if="statistics.feedback_responses.records" class="mt-8 bg-white">
+    <div v-if="courseStatistics?.feedback_responses.records" class="mt-8 bg-white">
       <StatisticFilterList
-        :course-session-properties="statistics.course_session_properties"
-        :items="statistics.feedback_responses.records"
+        :course-session-properties="courseStatistics.course_session_properties"
+        :items="courseStatistics.feedback_responses.records"
       >
         <template #default="{ item }">
           <div class="flex justify-between">

From 3cc46f70a570b9ab5335794ea074c54dc3773532 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Fri, 19 Apr 2024 18:24:54 +0200
Subject: [PATCH 56/82] wip: Move code to composable

---
 client/src/composables.ts                      |  7 ++++++-
 .../dashboard/statistic/AssignmentList.vue     | 10 +---------
 .../dashboard/statistic/AttendanceList.vue     | 10 +---------
 .../dashboard/statistic/CompetenceList.vue     | 18 +-----------------
 .../pages/dashboard/statistic/FeedbackList.vue | 11 +----------
 5 files changed, 10 insertions(+), 46 deletions(-)

diff --git a/client/src/composables.ts b/client/src/composables.ts
index c733f092..6b6dc469 100644
--- a/client/src/composables.ts
+++ b/client/src/composables.ts
@@ -10,6 +10,7 @@ import {
 } from "@/services/circle";
 import type { DashboardDueDate, DashboardPersonType } from "@/services/dashboard";
 import {
+  courseIdForCourseSlug,
   fetchDashboardDueDates,
   fetchDashboardPersons,
   fetchStatisticData,
@@ -613,10 +614,13 @@ export function useCourseCircleProgress(circles: Ref<CircleType[] | undefined>)
   return { inProgressCirclesCount, circlesCount };
 }
 
-export function useCourseStatisticsv2(courseId: string) {
+export function useCourseStatisticsv2(courseSlug: string) {
+  const dashboardStore = useDashboardStore();
   const courseStatistics = ref<CourseStatisticsType[] | null>(null);
   const loading = ref(false);
 
+  const courseId = courseIdForCourseSlug(dashboardStore.dashboardConfigsv2, courseSlug);
+
   const fetchData = async () => {
     loading.value = true;
     try {
@@ -645,5 +649,6 @@ export function useCourseStatisticsv2(courseId: string) {
     loading,
     courseSessionName,
     circleMeta,
+    courseId,
   };
 }
diff --git a/client/src/pages/dashboard/statistic/AssignmentList.vue b/client/src/pages/dashboard/statistic/AssignmentList.vue
index 179a2843..2b539e8a 100644
--- a/client/src/pages/dashboard/statistic/AssignmentList.vue
+++ b/client/src/pages/dashboard/statistic/AssignmentList.vue
@@ -1,5 +1,4 @@
 <script setup lang="ts">
-import { useDashboardStore } from "@/stores/dashboard";
 import type {
   AssignmentCompletionMetricsType,
   AssignmentStatisticsRecordType,
@@ -8,21 +7,14 @@ import StatisticFilterList from "@/components/dashboard/StatisticFilterList.vue"
 import { useCourseStatisticsv2 } from "@/composables";
 import { getDateString } from "@/components/dueDates/dueDatesUtils";
 import dayjs from "dayjs";
-import { courseIdForCourseSlug } from "@/services/dashboard";
 import ItProgress from "@/components/ui/ItProgress.vue";
 
 const props = defineProps<{
   courseSlug: string;
 }>();
 
-const dashboardStore = useDashboardStore();
-
-const courseId = courseIdForCourseSlug(
-  dashboardStore.dashboardConfigsv2,
-  props.courseSlug
-);
 const { courseStatistics, loading, courseSessionName, circleMeta } =
-  useCourseStatisticsv2(courseId);
+  useCourseStatisticsv2(props.courseSlug);
 
 const assignmentStats = (metrics: AssignmentCompletionMetricsType) => {
   if (!metrics.ranking_completed) {
diff --git a/client/src/pages/dashboard/statistic/AttendanceList.vue b/client/src/pages/dashboard/statistic/AttendanceList.vue
index b6ae8b26..53ec8c28 100644
--- a/client/src/pages/dashboard/statistic/AttendanceList.vue
+++ b/client/src/pages/dashboard/statistic/AttendanceList.vue
@@ -1,25 +1,17 @@
 <script setup lang="ts">
-import { useDashboardStore } from "@/stores/dashboard";
 import type { PresenceRecordStatisticsType } from "@/gql/graphql";
 import StatisticFilterList from "@/components/dashboard/StatisticFilterList.vue";
 import ItProgress from "@/components/ui/ItProgress.vue";
 import { useCourseStatisticsv2 } from "@/composables";
 import { getDateString } from "@/components/dueDates/dueDatesUtils";
 import dayjs from "dayjs";
-import { courseIdForCourseSlug } from "@/services/dashboard";
 
 const props = defineProps<{
   courseSlug: string;
 }>();
 
-const dashboardStore = useDashboardStore();
-
-const courseId = courseIdForCourseSlug(
-  dashboardStore.dashboardConfigsv2,
-  props.courseSlug
-);
 const { courseStatistics, loading, courseSessionName, circleMeta } =
-  useCourseStatisticsv2(courseId);
+  useCourseStatisticsv2(props.courseSlug);
 
 const attendanceStats = (present: number, total: number) => {
   return {
diff --git a/client/src/pages/dashboard/statistic/CompetenceList.vue b/client/src/pages/dashboard/statistic/CompetenceList.vue
index ea0a64bc..d585464c 100644
--- a/client/src/pages/dashboard/statistic/CompetenceList.vue
+++ b/client/src/pages/dashboard/statistic/CompetenceList.vue
@@ -1,36 +1,20 @@
 <script setup lang="ts">
-import { useDashboardStore } from "@/stores/dashboard";
-import ItDropdownSelect from "@/components/ui/ItDropdownSelect.vue";
 import type { CompetenceRecordStatisticsType } from "@/gql/graphql";
 import StatisticFilterList from "@/components/dashboard/StatisticFilterList.vue";
 import { useCourseStatisticsv2 } from "@/composables";
-import { courseIdForCourseSlug } from "@/services/dashboard";
 
 const props = defineProps<{
   courseSlug: string;
 }>();
 
-const dashboardStore = useDashboardStore();
-
-const courseId = courseIdForCourseSlug(
-  dashboardStore.dashboardConfigsv2,
-  props.courseSlug
-);
-
 const { courseStatistics, loading, courseSessionName, circleMeta } =
-  useCourseStatisticsv2(courseId);
+  useCourseStatisticsv2(props.courseSlug);
 </script>
 
 <template>
   <main v-if="!loading">
     <div class="mb-10 flex items-center justify-between">
       <h3>{{ $t("a.Selbsteinschätzung") }}</h3>
-      <ItDropdownSelect
-        :model-value="dashboardStore.currentDashboardConfig"
-        class="mt-4 w-full lg:mt-0 lg:w-96"
-        :items="dashboardStore.dashboardConfigs"
-        @update:model-value="dashboardStore.switchAndLoadDashboardConfig"
-      ></ItDropdownSelect>
     </div>
     <div v-if="courseStatistics?.competences.records" class="mt-8 bg-white">
       <StatisticFilterList
diff --git a/client/src/pages/dashboard/statistic/FeedbackList.vue b/client/src/pages/dashboard/statistic/FeedbackList.vue
index 6ab8ddaf..69be5d73 100644
--- a/client/src/pages/dashboard/statistic/FeedbackList.vue
+++ b/client/src/pages/dashboard/statistic/FeedbackList.vue
@@ -1,5 +1,4 @@
 <script setup lang="ts">
-import { useDashboardStore } from "@/stores/dashboard";
 import ItDropdownSelect from "@/components/ui/ItDropdownSelect.vue";
 import type {
   FeedbackStatisticsRecordType,
@@ -8,21 +7,13 @@ import type {
 import StatisticFilterList from "@/components/dashboard/StatisticFilterList.vue";
 import { useCourseStatisticsv2 } from "@/composables";
 import { getBlendedColorForRating } from "@/utils/ratingToColor";
-import { courseIdForCourseSlug } from "@/services/dashboard";
 
 const props = defineProps<{
   courseSlug: string;
 }>();
 
-const dashboardStore = useDashboardStore();
-
-const courseId = courseIdForCourseSlug(
-  dashboardStore.dashboardConfigsv2,
-  props.courseSlug
-);
-
 const { courseStatistics, loading, courseSessionName, circleMeta } =
-  useCourseStatisticsv2(courseId);
+  useCourseStatisticsv2(props.courseSlug);
 </script>
 
 <template>

From d8316b177d4e1503c657a7ec0c445cba6dd7d47b Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Fri, 19 Apr 2024 19:04:53 +0200
Subject: [PATCH 57/82] wip: Move loading of data to parent component

---
 client/src/composables.ts                     |  8 ++++---
 .../dashboard/statistic/AssignmentList.vue    |  9 ++++----
 .../dashboard/statistic/AttendanceList.vue    |  9 ++++----
 .../dashboard/statistic/CompetenceList.vue    |  9 ++++----
 .../dashboard/statistic/FeedbackList.vue      | 16 ++++----------
 .../statistic/StatisticParentPage.vue         | 22 ++++++++++---------
 6 files changed, 33 insertions(+), 40 deletions(-)

diff --git a/client/src/composables.ts b/client/src/composables.ts
index 6b6dc469..b0b0bfc1 100644
--- a/client/src/composables.ts
+++ b/client/src/composables.ts
@@ -619,10 +619,13 @@ export function useCourseStatisticsv2(courseSlug: string) {
   const courseStatistics = ref<CourseStatisticsType[] | null>(null);
   const loading = ref(false);
 
-  const courseId = courseIdForCourseSlug(dashboardStore.dashboardConfigsv2, courseSlug);
-
   const fetchData = async () => {
     loading.value = true;
+    await dashboardStore.loadDashboardDetails();
+    const courseId = courseIdForCourseSlug(
+      dashboardStore.dashboardConfigsv2,
+      courseSlug
+    );
     try {
       courseStatistics.value = await fetchStatisticData(courseId);
     } finally {
@@ -649,6 +652,5 @@ export function useCourseStatisticsv2(courseSlug: string) {
     loading,
     courseSessionName,
     circleMeta,
-    courseId,
   };
 }
diff --git a/client/src/pages/dashboard/statistic/AssignmentList.vue b/client/src/pages/dashboard/statistic/AssignmentList.vue
index 2b539e8a..4a824731 100644
--- a/client/src/pages/dashboard/statistic/AssignmentList.vue
+++ b/client/src/pages/dashboard/statistic/AssignmentList.vue
@@ -4,18 +4,17 @@ import type {
   AssignmentStatisticsRecordType,
 } from "@/gql/graphql";
 import StatisticFilterList from "@/components/dashboard/StatisticFilterList.vue";
-import { useCourseStatisticsv2 } from "@/composables";
 import { getDateString } from "@/components/dueDates/dueDatesUtils";
 import dayjs from "dayjs";
 import ItProgress from "@/components/ui/ItProgress.vue";
 
 const props = defineProps<{
   courseSlug: string;
+  courseStatistics: any;
+  courseSessionName: any;
+  circleMeta: any;
 }>();
 
-const { courseStatistics, loading, courseSessionName, circleMeta } =
-  useCourseStatisticsv2(props.courseSlug);
-
 const assignmentStats = (metrics: AssignmentCompletionMetricsType) => {
   if (!metrics.ranking_completed) {
     return {
@@ -38,7 +37,7 @@ const total = (metrics: AssignmentCompletionMetricsType) => {
 </script>
 
 <template>
-  <main v-if="!loading">
+  <main>
     <div class="mb-10 flex items-center justify-between">
       <h3>{{ $t("a.Kompetenznachweis-Elemente") }}</h3>
     </div>
diff --git a/client/src/pages/dashboard/statistic/AttendanceList.vue b/client/src/pages/dashboard/statistic/AttendanceList.vue
index 53ec8c28..fbd7814d 100644
--- a/client/src/pages/dashboard/statistic/AttendanceList.vue
+++ b/client/src/pages/dashboard/statistic/AttendanceList.vue
@@ -2,17 +2,16 @@
 import type { PresenceRecordStatisticsType } from "@/gql/graphql";
 import StatisticFilterList from "@/components/dashboard/StatisticFilterList.vue";
 import ItProgress from "@/components/ui/ItProgress.vue";
-import { useCourseStatisticsv2 } from "@/composables";
 import { getDateString } from "@/components/dueDates/dueDatesUtils";
 import dayjs from "dayjs";
 
 const props = defineProps<{
   courseSlug: string;
+  courseStatistics: any;
+  courseSessionName: any;
+  circleMeta: any;
 }>();
 
-const { courseStatistics, loading, courseSessionName, circleMeta } =
-  useCourseStatisticsv2(props.courseSlug);
-
 const attendanceStats = (present: number, total: number) => {
   return {
     SUCCESS: present,
@@ -23,7 +22,7 @@ const attendanceStats = (present: number, total: number) => {
 </script>
 
 <template>
-  <main v-if="!loading">
+  <main>
     <div class="mb-10 flex items-center justify-between">
       <h3>{{ $t("Anwesenheit") }}</h3>
     </div>
diff --git a/client/src/pages/dashboard/statistic/CompetenceList.vue b/client/src/pages/dashboard/statistic/CompetenceList.vue
index d585464c..68d6e5ab 100644
--- a/client/src/pages/dashboard/statistic/CompetenceList.vue
+++ b/client/src/pages/dashboard/statistic/CompetenceList.vue
@@ -1,18 +1,17 @@
 <script setup lang="ts">
 import type { CompetenceRecordStatisticsType } from "@/gql/graphql";
 import StatisticFilterList from "@/components/dashboard/StatisticFilterList.vue";
-import { useCourseStatisticsv2 } from "@/composables";
 
 const props = defineProps<{
   courseSlug: string;
+  courseStatistics: any;
+  courseSessionName: any;
+  circleMeta: any;
 }>();
-
-const { courseStatistics, loading, courseSessionName, circleMeta } =
-  useCourseStatisticsv2(props.courseSlug);
 </script>
 
 <template>
-  <main v-if="!loading">
+  <main>
     <div class="mb-10 flex items-center justify-between">
       <h3>{{ $t("a.Selbsteinschätzung") }}</h3>
     </div>
diff --git a/client/src/pages/dashboard/statistic/FeedbackList.vue b/client/src/pages/dashboard/statistic/FeedbackList.vue
index 69be5d73..05bca6df 100644
--- a/client/src/pages/dashboard/statistic/FeedbackList.vue
+++ b/client/src/pages/dashboard/statistic/FeedbackList.vue
@@ -1,31 +1,23 @@
 <script setup lang="ts">
-import ItDropdownSelect from "@/components/ui/ItDropdownSelect.vue";
 import type {
   FeedbackStatisticsRecordType,
   PresenceRecordStatisticsType,
 } from "@/gql/graphql";
 import StatisticFilterList from "@/components/dashboard/StatisticFilterList.vue";
-import { useCourseStatisticsv2 } from "@/composables";
 import { getBlendedColorForRating } from "@/utils/ratingToColor";
 
 const props = defineProps<{
   courseSlug: string;
+  courseStatistics: any;
+  courseSessionName: any;
+  circleMeta: any;
 }>();
-
-const { courseStatistics, loading, courseSessionName, circleMeta } =
-  useCourseStatisticsv2(props.courseSlug);
 </script>
 
 <template>
-  <main v-if="!loading">
+  <main>
     <div class="mb-10 flex items-center justify-between">
       <h3>{{ $t("a.Feedback Teilnehmer") }}</h3>
-      <ItDropdownSelect
-        :model-value="dashboardStore.currentDashboardConfig"
-        class="mt-4 w-full lg:mt-0 lg:w-96"
-        :items="dashboardStore.dashboardConfigs"
-        @update:model-value="dashboardStore.switchAndLoadDashboardConfig"
-      ></ItDropdownSelect>
     </div>
     <div v-if="courseStatistics?.feedback_responses.records" class="mt-8 bg-white">
       <StatisticFilterList
diff --git a/client/src/pages/dashboard/statistic/StatisticParentPage.vue b/client/src/pages/dashboard/statistic/StatisticParentPage.vue
index 25ac2985..29f2dd4c 100644
--- a/client/src/pages/dashboard/statistic/StatisticParentPage.vue
+++ b/client/src/pages/dashboard/statistic/StatisticParentPage.vue
@@ -1,20 +1,18 @@
 <script setup lang="ts">
-import { useDashboardStore } from "@/stores/dashboard";
-import { onMounted } from "vue";
 import LoadingSpinner from "@/components/ui/LoadingSpinner.vue";
+import { useCourseStatisticsv2 } from "@/composables";
 
-const dashboardStore = useDashboardStore();
-dashboardStore.loading = true;
+const props = defineProps<{
+  courseSlug: string;
+}>();
 
-onMounted(async () => {
-  console.log("onMount StatisticParentPage", dashboardStore.loading);
-  await dashboardStore.loadDashboardDetails();
-});
+const { courseStatistics, loading, courseSessionName, circleMeta } =
+  useCourseStatisticsv2(props.courseSlug);
 </script>
 
 <template>
   <div class="bg-gray-200">
-    <div v-if="dashboardStore.loading" class="m-8 flex justify-center">
+    <div v-if="loading" class="m-8 flex justify-center">
       <LoadingSpinner />
     </div>
     <div v-else class="container-large flex flex-col space-y-8">
@@ -22,7 +20,11 @@ onMounted(async () => {
         <it-icon-arrow-left />
         <span>{{ $t("general.back") }}</span>
       </router-link>
-      <router-view></router-view>
+      <router-view
+        :course-statistics="courseStatistics"
+        :course-session-name="courseSessionName"
+        :circle-meta="circleMeta"
+      ></router-view>
     </div>
   </div>
 </template>

From 34512f8db0f6bc9f368f38fbceba30565fd34601 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Fri, 19 Apr 2024 19:28:22 +0200
Subject: [PATCH 58/82] Make typechecker happy

---
 .../src/components/dashboard/UkStatistics.vue | 32 +++++++--
 client/src/composables.ts                     | 10 +--
 client/src/pages/dashboard/StatisticPage.vue  | 66 -------------------
 3 files changed, 33 insertions(+), 75 deletions(-)
 delete mode 100644 client/src/pages/dashboard/StatisticPage.vue

diff --git a/client/src/components/dashboard/UkStatistics.vue b/client/src/components/dashboard/UkStatistics.vue
index 15084d74..7d70d930 100644
--- a/client/src/components/dashboard/UkStatistics.vue
+++ b/client/src/components/dashboard/UkStatistics.vue
@@ -17,24 +17,46 @@ const statistics = ref<CourseStatisticsType | null>(null);
 const dashboardStore = useDashboardStore();
 
 const attendanceDayPresences = computed(() => {
-  return statistics.value.attendance_day_presences.summary;
+  return (
+    statistics?.value?.attendance_day_presences?.summary ?? {
+      days_completed: 0,
+      participants_present: 0,
+    }
+  );
 });
 
 const assigmentSummary = computed(() => {
-  return statistics.value.assignments.summary;
+  return (
+    statistics?.value?.assignments.summary ?? {
+      average_passed: 0,
+      completed_count: 0,
+      total_passed: 0,
+      total_failed: 0,
+    }
+  );
 });
 
 const competenceSummary = computed(() => {
-  return statistics.value.competences.summary;
+  return (
+    statistics?.value?.competences.summary ?? {
+      fail_total: 0,
+      success_total: 0,
+    }
+  );
 });
 
 const feebackSummary = computed(() => {
-  return statistics.value.feedback_responses.summary;
+  return (
+    statistics?.value?.feedback_responses.summary ?? {
+      satisfaction_average: 0,
+      satisfaction_max: 0,
+      total_responses: 0,
+    }
+  );
 });
 
 onMounted(async () => {
   statistics.value = await dashboardStore.loadStatisticsDatav2(props.courseId);
-  //await dashboardStore.loadStatisticsData(props.courseId);
 });
 </script>
 
diff --git a/client/src/composables.ts b/client/src/composables.ts
index b0b0bfc1..1428e4e8 100644
--- a/client/src/composables.ts
+++ b/client/src/composables.ts
@@ -616,7 +616,7 @@ export function useCourseCircleProgress(circles: Ref<CircleType[] | undefined>)
 
 export function useCourseStatisticsv2(courseSlug: string) {
   const dashboardStore = useDashboardStore();
-  const courseStatistics = ref<CourseStatisticsType[] | null>(null);
+  const courseStatistics = ref<CourseStatisticsType | null>(null);
   const loading = ref(false);
 
   const fetchData = async () => {
@@ -627,20 +627,22 @@ export function useCourseStatisticsv2(courseSlug: string) {
       courseSlug
     );
     try {
-      courseStatistics.value = await fetchStatisticData(courseId);
+      if (courseId) {
+        courseStatistics.value = await fetchStatisticData(courseId);
+      }
     } finally {
       loading.value = false;
     }
   };
 
   const courseSessionName = (courseSessionId: string) => {
-    return courseStatistics.value.course_session_properties.sessions.find(
+    return courseStatistics?.value?.course_session_properties?.sessions.find(
       (session) => session.id === courseSessionId
     )?.name;
   };
 
   const circleMeta = (circleId: string) => {
-    return courseStatistics.value.course_session_properties.circles.find(
+    return courseStatistics?.value?.course_session_properties.circles.find(
       (circle) => circle.id === circleId
     );
   };
diff --git a/client/src/pages/dashboard/StatisticPage.vue b/client/src/pages/dashboard/StatisticPage.vue
deleted file mode 100644
index 0e1d29af..00000000
--- a/client/src/pages/dashboard/StatisticPage.vue
+++ /dev/null
@@ -1,66 +0,0 @@
-<script setup lang="ts">
-import { useDashboardStore } from "@/stores/dashboard";
-import { computed } from "vue";
-import CourseStatistics from "@/components/dashboard/CourseStatistics.vue";
-import AttendanceSummaryBox from "@/components/dashboard/AttendanceSummaryBox.vue";
-import type { CourseStatisticsType } from "@/gql/graphql";
-import AssignmentSummaryBox from "@/components/dashboard/AssignmentSummaryBox.vue";
-import FeedbackSummaryBox from "@/components/dashboard/FeedbackSummaryBox.vue";
-import CompetenceSummaryBox from "@/components/dashboard/CompetenceSummaryBox.vue";
-
-const dashboardStore = useDashboardStore();
-
-const statistics = computed(() => {
-  return dashboardStore.currentDashBoardData as CourseStatisticsType;
-});
-
-const courseSessionSelectionMetrics = computed(() => {
-  return statistics.value.course_session_selection_metrics;
-});
-
-const attendanceDayPresences = computed(() => {
-  return statistics.value.attendance_day_presences.summary;
-});
-
-const assigmentSummary = computed(() => {
-  return statistics.value.assignments.summary;
-});
-
-const competenceSummary = computed(() => {
-  return statistics.value.competences.summary;
-});
-
-const feebackSummary = computed(() => {
-  return statistics.value.feedback_responses.summary;
-});
-</script>
-
-<template>
-  <div v-if="statistics" class="mb-14 space-y-8">
-    <CourseStatistics
-      :session-count="courseSessionSelectionMetrics.session_count"
-      :participant-count="courseSessionSelectionMetrics.participant_count"
-      :expert-count="courseSessionSelectionMetrics.expert_count"
-    />
-    <div class="grid auto-rows-fr grid-cols-1 gap-8 xl:grid-cols-2">
-      <AttendanceSummaryBox
-        :days-completed="attendanceDayPresences.days_completed"
-        :avg-participants-present="attendanceDayPresences.participants_present"
-      />
-      <AssignmentSummaryBox
-        :assignments-completed="assigmentSummary.completed_count"
-        :avg-passed="assigmentSummary.average_passed"
-      />
-      <FeedbackSummaryBox
-        :feedback-count="feebackSummary.total_responses"
-        :statisfaction-max="feebackSummary.satisfaction_max"
-        :statisfaction-avg="feebackSummary.satisfaction_average"
-      />
-      <CompetenceSummaryBox
-        :fail-count="competenceSummary.fail_total"
-        :success-count="competenceSummary.success_total"
-        details-link="/statistic/competence"
-      />
-    </div>
-  </div>
-</template>

From e0b4a045ce5a3b93cd612104f81e49c46674b89a Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Mon, 22 Apr 2024 08:29:35 +0200
Subject: [PATCH 59/82] Fix some tests, fix linting

---
 .../src/components/dashboard/CoursePanel.vue  |  2 +-
 .../dashboard/statistic/AssignmentList.vue    | 10 +++---
 .../dashboard/statistic/AttendanceList.vue    | 14 +++++---
 .../dashboard/statistic/CompetenceList.vue    | 14 +++++---
 .../dashboard/statistic/FeedbackList.vue      | 10 +++---
 client/src/router/index.ts                    |  8 ++---
 client/src/stores/dashboard.ts                | 33 +++++++++----------
 .../e2e/dashboard/dashboardSupervisor.cy.js   |  6 ++--
 cypress/e2e/login.cy.js                       | 12 ++++---
 9 files changed, 59 insertions(+), 50 deletions(-)

diff --git a/client/src/components/dashboard/CoursePanel.vue b/client/src/components/dashboard/CoursePanel.vue
index 05e3d4a6..2ed02993 100644
--- a/client/src/components/dashboard/CoursePanel.vue
+++ b/client/src/components/dashboard/CoursePanel.vue
@@ -85,7 +85,7 @@ function hasActionButton(): boolean {
     <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">
-          <h3 class="mb-4 text-3xl">{{ courseName }}</h3>
+          <h3 class="mb-4 text-3xl" data-cy="db-course-title">{{ courseName }}</h3>
           <a
             v-if="hasActionButton()"
             :href="actionButtonProps.href"
diff --git a/client/src/pages/dashboard/statistic/AssignmentList.vue b/client/src/pages/dashboard/statistic/AssignmentList.vue
index 4a824731..ccc2dfb1 100644
--- a/client/src/pages/dashboard/statistic/AssignmentList.vue
+++ b/client/src/pages/dashboard/statistic/AssignmentList.vue
@@ -2,17 +2,19 @@
 import type {
   AssignmentCompletionMetricsType,
   AssignmentStatisticsRecordType,
+  CourseStatisticsType,
+  StatisticsCircleDataType,
 } from "@/gql/graphql";
 import StatisticFilterList from "@/components/dashboard/StatisticFilterList.vue";
 import { getDateString } from "@/components/dueDates/dueDatesUtils";
 import dayjs from "dayjs";
 import ItProgress from "@/components/ui/ItProgress.vue";
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 const props = defineProps<{
-  courseSlug: string;
-  courseStatistics: any;
-  courseSessionName: any;
-  circleMeta: any;
+  courseStatistics: CourseStatisticsType;
+  courseSessionName: (sessionId: string) => string;
+  circleMeta: (circleId: string) => StatisticsCircleDataType;
 }>();
 
 const assignmentStats = (metrics: AssignmentCompletionMetricsType) => {
diff --git a/client/src/pages/dashboard/statistic/AttendanceList.vue b/client/src/pages/dashboard/statistic/AttendanceList.vue
index fbd7814d..09231812 100644
--- a/client/src/pages/dashboard/statistic/AttendanceList.vue
+++ b/client/src/pages/dashboard/statistic/AttendanceList.vue
@@ -1,15 +1,19 @@
 <script setup lang="ts">
-import type { PresenceRecordStatisticsType } from "@/gql/graphql";
+import type {
+  CourseStatisticsType,
+  PresenceRecordStatisticsType,
+  StatisticsCircleDataType,
+} from "@/gql/graphql";
 import StatisticFilterList from "@/components/dashboard/StatisticFilterList.vue";
 import ItProgress from "@/components/ui/ItProgress.vue";
 import { getDateString } from "@/components/dueDates/dueDatesUtils";
 import dayjs from "dayjs";
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 const props = defineProps<{
-  courseSlug: string;
-  courseStatistics: any;
-  courseSessionName: any;
-  circleMeta: any;
+  courseStatistics: CourseStatisticsType;
+  courseSessionName: (sessionId: string) => string;
+  circleMeta: (circleId: string) => StatisticsCircleDataType;
 }>();
 
 const attendanceStats = (present: number, total: number) => {
diff --git a/client/src/pages/dashboard/statistic/CompetenceList.vue b/client/src/pages/dashboard/statistic/CompetenceList.vue
index 68d6e5ab..331cc5e1 100644
--- a/client/src/pages/dashboard/statistic/CompetenceList.vue
+++ b/client/src/pages/dashboard/statistic/CompetenceList.vue
@@ -1,12 +1,16 @@
 <script setup lang="ts">
-import type { CompetenceRecordStatisticsType } from "@/gql/graphql";
+import type {
+  CompetenceRecordStatisticsType,
+  CourseStatisticsType,
+  StatisticsCircleDataType,
+} from "@/gql/graphql";
 import StatisticFilterList from "@/components/dashboard/StatisticFilterList.vue";
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 const props = defineProps<{
-  courseSlug: string;
-  courseStatistics: any;
-  courseSessionName: any;
-  circleMeta: any;
+  courseStatistics: CourseStatisticsType;
+  courseSessionName: (sessionId: string) => string;
+  circleMeta: (circleId: string) => StatisticsCircleDataType;
 }>();
 </script>
 
diff --git a/client/src/pages/dashboard/statistic/FeedbackList.vue b/client/src/pages/dashboard/statistic/FeedbackList.vue
index 05bca6df..27917ee0 100644
--- a/client/src/pages/dashboard/statistic/FeedbackList.vue
+++ b/client/src/pages/dashboard/statistic/FeedbackList.vue
@@ -1,16 +1,18 @@
 <script setup lang="ts">
 import type {
+  CourseStatisticsType,
   FeedbackStatisticsRecordType,
   PresenceRecordStatisticsType,
+  StatisticsCircleDataType,
 } from "@/gql/graphql";
 import StatisticFilterList from "@/components/dashboard/StatisticFilterList.vue";
 import { getBlendedColorForRating } from "@/utils/ratingToColor";
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 const props = defineProps<{
-  courseSlug: string;
-  courseStatistics: any;
-  courseSessionName: any;
-  circleMeta: any;
+  courseStatistics: CourseStatisticsType;
+  courseSessionName: (sessionId: string) => string;
+  circleMeta: (circleId: string) => StatisticsCircleDataType;
 }>();
 </script>
 
diff --git a/client/src/router/index.ts b/client/src/router/index.ts
index b4dcf96d..1ffeeccf 100644
--- a/client/src/router/index.ts
+++ b/client/src/router/index.ts
@@ -387,13 +387,11 @@ router.beforeEach(updateLoggedIn);
 router.beforeEach(redirectToLoginIfRequired);
 
 // register after login hooks
-router.beforeEach(async (to, from) => await handleCurrentCourseSession(to));
-router.beforeEach(async (to, from) => await handleCourseSessionAsQueryParam(to));
+router.beforeEach(async (to) => await handleCurrentCourseSession(to));
+router.beforeEach(async (to) => await handleCourseSessionAsQueryParam(to));
 
 // only unset the current course session in the after hook
-router.afterEach(
-  async (to, from) => await handleCurrentCourseSession(to, { unset: true })
-);
+router.afterEach(async (to) => await handleCurrentCourseSession(to, { unset: true }));
 
 router.beforeEach(addToHistory);
 
diff --git a/client/src/stores/dashboard.ts b/client/src/stores/dashboard.ts
index d172c77e..da9d7417 100644
--- a/client/src/stores/dashboard.ts
+++ b/client/src/stores/dashboard.ts
@@ -2,13 +2,11 @@ import type {
   CourseProgressType,
   CourseStatisticsType,
   DashboardConfigType,
-  DashboardType,
 } from "@/gql/graphql";
 import type { DashboardCourseConfigType } from "@/services/dashboard";
 import {
   fetchDashboardConfig,
   fetchDashboardConfigv2,
-  fetchProgressData,
   fetchStatisticData,
 } from "@/services/dashboard";
 import { defineStore } from "pinia";
@@ -27,21 +25,21 @@ export const useDashboardStore = defineStore("dashboard", () => {
     ref(null);
   const loading = ref(false);
 
-  const loadDashboardData = async (type: DashboardType, id: string) => {
-    let data;
-    switch (type) {
-      case "STATISTICS_DASHBOARD":
-        data = await fetchStatisticData(id);
-        break;
-      case "PROGRESS_DASHBOARD":
-        data = await fetchProgressData(id);
-        break;
-      default:
-        return;
-    }
-    dashBoardDataCache[id] = data;
-    currentDashBoardData.value = data;
-  };
+  // const loadDashboardData = async (type: DashboardType, id: string) => {
+  //   let data;
+  //   switch (type) {
+  //     case "STATISTICS_DASHBOARD":
+  //       data = await fetchStatisticData(id);
+  //       break;
+  //     case "PROGRESS_DASHBOARD":
+  //       data = await fetchProgressData(id);
+  //       break;
+  //     default:
+  //       return;
+  //   }
+  //   dashBoardDataCache[id] = data;
+  //   currentDashBoardData.value = data;
+  // };
 
   const switchAndLoadDashboardConfig = async (config: DashboardConfigType) => {
     currentDashboardConfig.value = config;
@@ -85,7 +83,6 @@ export const useDashboardStore = defineStore("dashboard", () => {
   };
 
   const loadStatisticsDatav2 = async (id: string) => {
-    console.log("fetching statistics v2 for course ID: ", id);
     const data = await fetchStatisticData(id);
     dashBoardDataCache[id] = data;
     return data;
diff --git a/cypress/e2e/dashboard/dashboardSupervisor.cy.js b/cypress/e2e/dashboard/dashboardSupervisor.cy.js
index ff7aeb20..0ba7400e 100644
--- a/cypress/e2e/dashboard/dashboardSupervisor.cy.js
+++ b/cypress/e2e/dashboard/dashboardSupervisor.cy.js
@@ -53,7 +53,7 @@ describe("dashboardSupervisor.cy.js", () => {
     });
     it("contains correct details link", () => {
       clickOnDetailsLink("attendance");
-      cy.url().should("contain", "/statistic/attendance");
+      cy.url().should("contain", "/statistic/test-lehrgang/attendance");
 
       // might be improved: roughly check
       // that the correct data is displayed
@@ -70,7 +70,7 @@ describe("dashboardSupervisor.cy.js", () => {
     });
     it("contains correct details link", () => {
       clickOnDetailsLink("feedback");
-      cy.url().should("contain", "/statistic/feedback");
+      cy.url().should("contain", "/statistic/test-lehrgang/feedback");
 
       // might be improved: roughly check
       // that the correct data is displayed
@@ -88,7 +88,7 @@ describe("dashboardSupervisor.cy.js", () => {
     });
     it("contains correct details link", () => {
       clickOnDetailsLink("competence");
-      cy.url().should("contain", "/statistic/competence");
+      cy.url().should("contain", "/statistic/test-lehrgang/competence");
 
       // might be improved: roughly check
       // that the correct data is displayed
diff --git a/cypress/e2e/login.cy.js b/cypress/e2e/login.cy.js
index 0f20f31a..c3321d09 100644
--- a/cypress/e2e/login.cy.js
+++ b/cypress/e2e/login.cy.js
@@ -16,17 +16,19 @@ describe("login.cy.js", () => {
     cy.get("#username").type("test-student1@example.com");
     cy.get("#password").type("test");
 
-    cy.get("[data-cy=\"login-button\"]").click();
+    cy.get('[data-cy="login-button"]').click();
     cy.request("/api/core/me").its("status").should("eq", 200);
 
-    cy.get("[data-cy=\"dashboard-title\"]").should("contain", "Dashboard");
+    cy.get('[data-cy="db-course-title"]')
+      .first()
+      .should("contain", "Test Lehrgang");
   });
 
   it("can login with helper function", () => {
     login("test-student1@example.com", "test");
     cy.visit("/");
     cy.request("/api/core/me").its("status").should("eq", 200);
-    cy.get("[data-cy=\"dashboard-title\"]").should("contain", "Dashboard");
+    cy.get('[data-cy="dashboard-title"]').should("contain", "Dashboard");
   });
 
   it("login will redirect to requested page", () => {
@@ -36,9 +38,9 @@ describe("login.cy.js", () => {
     cy.get("#username").type("test-student1@example.com");
     cy.get("#password").type("test");
 
-    cy.get("[data-cy=\"login-button\"]").click();
+    cy.get('[data-cy="login-button"]').click();
 
-    cy.get("[data-cy=\"learning-path-title\"]").should(
+    cy.get('[data-cy="learning-path-title"]').should(
       "contain",
       "Test Lehrgang"
     );

From db7fbdd03a6d9b67f5bb8fea2ce64ce790b44b6c Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Mon, 22 Apr 2024 11:05:50 +0200
Subject: [PATCH 60/82] Fix title, add basic link to persons

---
 client/src/components/dashboard/CoursePanel.vue       | 1 +
 client/src/components/dashboard/MentorMenteeCount.vue | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/client/src/components/dashboard/CoursePanel.vue b/client/src/components/dashboard/CoursePanel.vue
index 2ed02993..7f41c202 100644
--- a/client/src/components/dashboard/CoursePanel.vue
+++ b/client/src/components/dashboard/CoursePanel.vue
@@ -156,6 +156,7 @@ function hasActionButton(): boolean {
         <MentorMenteeCount
           v-if="hasWidget('MentorPersonWidget')"
           :course-id="courseConfig.course_id"
+          :course-slug="courseConfig?.course_slug"
         />
         <MentorCompetenceSummary
           v-if="hasWidget('MentorCompetenceWidget')"
diff --git a/client/src/components/dashboard/MentorMenteeCount.vue b/client/src/components/dashboard/MentorMenteeCount.vue
index 6562a129..b221c240 100644
--- a/client/src/components/dashboard/MentorMenteeCount.vue
+++ b/client/src/components/dashboard/MentorMenteeCount.vue
@@ -6,6 +6,7 @@ import BaseBox from "@/components/dashboard/BaseBox.vue";
 
 const props = defineProps<{
   courseId: string;
+  courseSlug: string;
 }>();
 
 const menteeCount: Ref<number> = ref(0);
@@ -18,8 +19,11 @@ onMounted(async () => {
 
 <template>
   <div class="w-[325px]">
-    <BaseBox :details-link="'foo'" data-cy="dashboard.mentor.competenceSummary">
-      <template #title>{{ $t("Elemente zu erledigen") }}</template>
+    <BaseBox
+      :details-link="`/dashboard/persons`"
+      data-cy="dashboard.mentor.competenceSummary"
+    >
+      <template #title>{{ $t("Personen") }}</template>
       <template #content>
         <div class="flex flex-row space-x-3 bg-white pb-6">
           <div

From 2318135f501385bda92a7419b6e509437150c5ba Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Mon, 22 Apr 2024 13:30:44 +0200
Subject: [PATCH 61/82] wip: Add routes

---
 .../userProfile/CompetenceProfilePage.vue     | 55 ++++++++++++++-----
 client/src/router/index.ts                    | 20 +++++++
 client/src/types.ts                           |  1 +
 3 files changed, 61 insertions(+), 15 deletions(-)

diff --git a/client/src/pages/userProfile/CompetenceProfilePage.vue b/client/src/pages/userProfile/CompetenceProfilePage.vue
index b193eef4..8ae17a31 100644
--- a/client/src/pages/userProfile/CompetenceProfilePage.vue
+++ b/client/src/pages/userProfile/CompetenceProfilePage.vue
@@ -1,11 +1,14 @@
 <script setup lang="ts">
 import CockpitProfileContent from "@/components/userProfile/UserProfileContent.vue";
-import { ref } from "vue";
+import { computed } from "vue";
 import SelfEvaluationAndFeedbackList from "@/components/selfEvaluationFeedback/SelfEvaluationAndFeedbackList.vue";
 import SelfEvaluationAndFeedbackOverview from "@/components/selfEvaluationFeedback/SelfEvaluationAndFeedbackOverview.vue";
 import { useCurrentCourseSession } from "@/composables";
+import CompetenceCertificateListPage from "@/pages/competence/CompetenceCertificateListPage.vue";
+import { useRoute } from "vue-router";
 
-type SubMenuType = "OVERVIEW" | "DETAILS";
+type SubMenuType = "OVERVIEW" | "EVALUATIONS" | "COMPETENCES";
+const subMenuOptions: SubMenuType[] = ["OVERVIEW", "EVALUATIONS", "COMPETENCES"];
 
 const props = defineProps<{
   userId: string;
@@ -15,49 +18,71 @@ const props = defineProps<{
 interface SubMenuItem {
   type: SubMenuType;
   label: string;
+  url: string;
 }
 
 const MENU_ENTRIES: SubMenuItem[] = [
-  { type: "OVERVIEW", label: "a.Übersicht" },
   {
-    type: "DETAILS",
-    label: useCurrentCourseSession().value.course.configuration.enable_learning_mentor
+    type: "OVERVIEW",
+    label: "a.Übersicht",
+    url: `/course/${props.courseSlug}/profile/${props.userId}/competence`,
+  },
+  {
+    type: "EVALUATIONS",
+    label: useCurrentCourseSession().value.course.configuration.is_vv
       ? "a.Selbst- und Fremdeinschätzungen"
       : "a.Selbsteinschätzungen",
+    url: `/course/${props.courseSlug}/profile/${props.userId}/competence/evaluations`,
   },
 ];
 
-const active = ref<SubMenuItem>(MENU_ENTRIES[0]);
-const selectDetails = () => {
-  active.value = MENU_ENTRIES[1];
-};
+if (useCurrentCourseSession().value.course.configuration.is_uk) {
+  MENU_ENTRIES.push({
+    type: "COMPETENCES",
+    label: "Kompetenznachweise",
+    url: `/course/${props.courseSlug}/profile/${props.userId}/competence/competences`,
+  });
+}
+
+const route = useRoute();
+const active = computed(() => {
+  const index = subMenuOptions.indexOf(route.meta?.subpage);
+  if (index > -1) {
+    return MENU_ENTRIES[index];
+  }
+  return MENU_ENTRIES[0];
+});
 </script>
 
 <template>
   <CockpitProfileContent>
     <template #side>
       <div v-for="(entry, index) in MENU_ENTRIES" :key="index" class="mb-2">
-        <button
+        <router-link
+          v-if="active"
+          :to="entry.url"
           class="flex w-full items-center space-x-2 p-2 pr-4 text-blue-900 hover:bg-gray-200 lg:pr-8"
           :class="{ 'text-bold bg-gray-200': active.type === entry.type }"
-          @click="active = entry"
         >
           <span>{{ $t(entry.label) }}</span>
-        </button>
+        </router-link>
       </div>
     </template>
     <template #main>
-      <div class="container-large">
+      <div v-if="active" class="container-large">
         <SelfEvaluationAndFeedbackOverview
           v-if="active.type === 'OVERVIEW'"
           :profile-user-id="props.userId"
-          @show-all="selectDetails"
         />
         <SelfEvaluationAndFeedbackList
-          v-else-if="active.type === 'DETAILS'"
+          v-else-if="active.type === 'EVALUATIONS'"
           class="w-full"
           :profile-user-id="props.userId"
         />
+        <CompetenceCertificateListPage
+          v-else-if="active.type === 'COMPETENCES'"
+          :course-slug="useCurrentCourseSession().value.course.slug"
+        />
       </div>
     </template>
   </CockpitProfileContent>
diff --git a/client/src/router/index.ts b/client/src/router/index.ts
index 1ffeeccf..e5088406 100644
--- a/client/src/router/index.ts
+++ b/client/src/router/index.ts
@@ -174,6 +174,26 @@ const router = createRouter({
           component: () => import("@/pages/userProfile/CompetenceProfilePage.vue"),
           props: true,
           name: "profileCompetence",
+          children: [
+            {
+              path: "", // Default path (e.g., /competence)
+              name: "competenceMain",
+              meta: { subpage: "OVERVIEW" },
+              component: () => import("@/pages/userProfile/CompetenceProfilePage.vue"),
+            },
+            {
+              path: "evaluations", // Subpath (e.g., /competence/evaluations)
+              name: "competenceEvaluations",
+              meta: { subpage: "EVALUATIONS" },
+              component: () => import("@/pages/userProfile/CompetenceProfilePage.vue"),
+            },
+            {
+              path: "competences", // Another subpath (e.g., /competence/competences)
+              name: "profileCompetences",
+              meta: { subpage: "COMPETENCES" },
+              component: () => import("@/pages/userProfile/CompetenceProfilePage.vue"),
+            },
+          ],
         },
       ],
     },
diff --git a/client/src/types.ts b/client/src/types.ts
index e5cc501d..83a234d5 100644
--- a/client/src/types.ts
+++ b/client/src/types.ts
@@ -194,6 +194,7 @@ export interface CourseConfiguration {
   enable_learning_mentor: boolean;
   enable_competence_certificates: boolean;
   is_uk: boolean;
+  is_vv: boolean;
 }
 
 export interface Course {

From 073c2a8a601d159021745fbd5ea91fb14119832e Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Mon, 22 Apr 2024 15:49:31 +0200
Subject: [PATCH 62/82] wip: Add user certificate query, modify components

---
 client/src/gql/gql.ts                         |  5 ++
 client/src/gql/graphql.ts                     | 65 +++++++++++++++++++
 client/src/gql/schema.graphql                 |  1 +
 client/src/graphql/queries.ts                 | 36 ++++++++++
 .../CompetenceCertificateComponent.vue        |  9 ++-
 .../CompetenceCertificateListPage.vue         | 53 ++++++++++++---
 .../userProfile/CompetenceProfilePage.vue     | 60 +++++++++++++----
 client/src/router/index.ts                    | 17 +++--
 .../vbv_lernwelt/assignment/graphql/types.py  |  4 ++
 .../competence/graphql/queries.py             | 34 ++++++++++
 10 files changed, 255 insertions(+), 29 deletions(-)

diff --git a/client/src/gql/gql.ts b/client/src/gql/gql.ts
index 9fdb14ae..1be7a7ba 100644
--- a/client/src/gql/gql.ts
+++ b/client/src/gql/gql.ts
@@ -19,6 +19,7 @@ const documents = {
     "\n  query attendanceCheckQuery($courseSessionId: ID!) {\n    course_session_attendance_course(id: $courseSessionId) {\n      id\n      attendance_user_list {\n        user_id\n        status\n      }\n    }\n  }\n": types.AttendanceCheckQueryDocument,
     "\n  query assignmentCompletionQuery(\n    $assignmentId: ID!\n    $courseSessionId: ID!\n    $learningContentId: ID\n    $assignmentUserId: UUID\n  ) {\n    assignment(id: $assignmentId) {\n      assignment_type\n      needs_expert_evaluation\n      max_points\n      content_type\n      effort_required\n      evaluation_description\n      evaluation_document_url\n      evaluation_tasks\n      id\n      intro_text\n      performance_objectives\n      slug\n      tasks\n      title\n      translation_key\n      solution_sample {\n        id\n        url\n      }\n      competence_certificate {\n        ...CoursePageFields\n      }\n    }\n    assignment_completion(\n      assignment_id: $assignmentId\n      course_session_id: $courseSessionId\n      assignment_user_id: $assignmentUserId\n      learning_content_page_id: $learningContentId\n    ) {\n      id\n      completion_status\n      submitted_at\n      evaluation_submitted_at\n      evaluation_user {\n        id\n        first_name\n        last_name\n      }\n      assignment_user {\n        avatar_url\n        first_name\n        last_name\n        id\n      }\n      evaluation_points\n      evaluation_max_points\n      evaluation_passed\n      edoniq_extended_time_flag\n      completion_data\n      task_completion_data\n    }\n  }\n": types.AssignmentCompletionQueryDocument,
     "\n  query competenceCertificateQuery($courseSlug: String!, $courseSessionId: ID!) {\n    competence_certificate_list(course_slug: $courseSlug) {\n      ...CoursePageFields\n      competence_certificates {\n        ...CoursePageFields\n        assignments {\n          ...CoursePageFields\n          assignment_type\n          max_points\n          completion(course_session_id: $courseSessionId) {\n            id\n            completion_status\n            submitted_at\n            evaluation_points\n            evaluation_max_points\n            evaluation_passed\n          }\n          learning_content {\n            ...CoursePageFields\n            circle {\n              id\n              title\n              slug\n            }\n          }\n        }\n      }\n    }\n  }\n": types.CompetenceCertificateQueryDocument,
+    "\n  query 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          completion(course_session_id: $courseSessionId) {\n            id\n            completion_status\n            submitted_at\n            evaluation_points\n            evaluation_max_points\n            evaluation_passed\n          }\n          learning_content {\n            ...CoursePageFields\n            circle {\n              id\n              title\n              slug\n            }\n          }\n        }\n      }\n    }\n  }\n": types.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,6 +68,10 @@ export function graphql(source: "\n  query assignmentCompletionQuery(\n    $assi
  * The graphql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
 export function graphql(source: "\n  query competenceCertificateQuery($courseSlug: String!, $courseSessionId: ID!) {\n    competence_certificate_list(course_slug: $courseSlug) {\n      ...CoursePageFields\n      competence_certificates {\n        ...CoursePageFields\n        assignments {\n          ...CoursePageFields\n          assignment_type\n          max_points\n          completion(course_session_id: $courseSessionId) {\n            id\n            completion_status\n            submitted_at\n            evaluation_points\n            evaluation_max_points\n            evaluation_passed\n          }\n          learning_content {\n            ...CoursePageFields\n            circle {\n              id\n              title\n              slug\n            }\n          }\n        }\n      }\n    }\n  }\n"): (typeof documents)["\n  query competenceCertificateQuery($courseSlug: String!, $courseSessionId: ID!) {\n    competence_certificate_list(course_slug: $courseSlug) {\n      ...CoursePageFields\n      competence_certificates {\n        ...CoursePageFields\n        assignments {\n          ...CoursePageFields\n          assignment_type\n          max_points\n          completion(course_session_id: $courseSessionId) {\n            id\n            completion_status\n            submitted_at\n            evaluation_points\n            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          completion(course_session_id: $courseSessionId) {\n            id\n            completion_status\n            submitted_at\n            evaluation_points\n            evaluation_max_points\n            evaluation_passed\n          }\n          learning_content {\n            ...CoursePageFields\n            circle {\n              id\n              title\n              slug\n            }\n          }\n        }\n      }\n    }\n  }\n"): (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          completion(course_session_id: $courseSessionId) {\n            id\n            completion_status\n            submitted_at\n            evaluation_points\n            evaluation_max_points\n            evaluation_passed\n          }\n          learning_content {\n            ...CoursePageFields\n            circle {\n              id\n              title\n              slug\n            }\n          }\n        }\n      }\n    }\n  }\n"];
 /**
  * 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 a4149db6..0dd382f2 100644
--- a/client/src/gql/graphql.ts
+++ b/client/src/gql/graphql.ts
@@ -917,6 +917,7 @@ 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>;
@@ -968,6 +969,15 @@ export type QueryCompetenceCertificateListArgs = {
 };
 
 
+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']>;
+};
+
+
 export type QueryCourseArgs = {
   id?: InputMaybe<Scalars['ID']['input']>;
   slug?: InputMaybe<Scalars['String']['input']>;
@@ -1210,6 +1220,60 @@ export type CompetenceCertificateQueryQuery = { __typename?: 'Query', competence
     & { ' $fragmentRefs'?: { 'CoursePageFieldsCompetenceCertificateListObjectTypeFragment': CoursePageFieldsCompetenceCertificateListObjectTypeFragment } }
   ) | null };
 
+export type CompetenceCertificateForUserQueryQueryVariables = Exact<{
+  courseSlug: Scalars['String']['input'];
+  courseSessionId: Scalars['ID']['input'];
+  userId: Scalars['UUID']['input'];
+}>;
+
+
+export type CompetenceCertificateForUserQueryQuery = { __typename?: 'Query', competence_certificate_list_for_user?: (
+    { __typename?: 'CompetenceCertificateListObjectType', competence_certificates: Array<(
+      { __typename?: 'CompetenceCertificateObjectType', assignments: Array<(
+        { __typename?: 'AssignmentObjectType', assignment_type: AssignmentAssignmentAssignmentTypeChoices, max_points?: number | null, completion?: { __typename?: 'AssignmentCompletionObjectType', id: string, completion_status: AssignmentAssignmentCompletionCompletionStatusChoices, submitted_at?: string | null, evaluation_points?: 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 CourseSessionDetailQueryVariables = Exact<{
   courseSessionId: Scalars['ID']['input'];
 }>;
@@ -1340,6 +1404,7 @@ export const UpsertAssignmentCompletionDocument = {"kind":"Document","definition
 export const AttendanceCheckQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"attendanceCheckQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"course_session_attendance_course"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"attendance_user_list"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"user_id"}},{"kind":"Field","name":{"kind":"Name","value":"status"}}]}}]}}]}}]} as unknown as DocumentNode<AttendanceCheckQueryQuery, AttendanceCheckQueryQueryVariables>;
 export const AssignmentCompletionQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"assignmentCompletionQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"learningContentId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"assignmentUserId"}},"type":{"kind":"NamedType","name":{"kind":"Name","value":"UUID"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"assignment"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"assignment_type"}},{"kind":"Field","name":{"kind":"Name","value":"needs_expert_evaluation"}},{"kind":"Field","name":{"kind":"Name","value":"max_points"}},{"kind":"Field","name":{"kind":"Name","value":"content_type"}},{"kind":"Field","name":{"kind":"Name","value":"effort_required"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_description"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_document_url"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_tasks"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"intro_text"}},{"kind":"Field","name":{"kind":"Name","value":"performance_objectives"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"tasks"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"translation_key"}},{"kind":"Field","name":{"kind":"Name","value":"solution_sample"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"url"}}]}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificate"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}}]}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignment_completion"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"assignment_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentId"}}},{"kind":"Argument","name":{"kind":"Name","value":"course_session_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}}},{"kind":"Argument","name":{"kind":"Name","value":"assignment_user_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"assignmentUserId"}}},{"kind":"Argument","name":{"kind":"Name","value":"learning_content_page_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"learningContentId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"completion_status"}},{"kind":"Field","name":{"kind":"Name","value":"submitted_at"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_submitted_at"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"first_name"}},{"kind":"Field","name":{"kind":"Name","value":"last_name"}}]}},{"kind":"Field","name":{"kind":"Name","value":"assignment_user"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"avatar_url"}},{"kind":"Field","name":{"kind":"Name","value":"first_name"}},{"kind":"Field","name":{"kind":"Name","value":"last_name"}},{"kind":"Field","name":{"kind":"Name","value":"id"}}]}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_max_points"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_passed"}},{"kind":"Field","name":{"kind":"Name","value":"edoniq_extended_time_flag"}},{"kind":"Field","name":{"kind":"Name","value":"completion_data"}},{"kind":"Field","name":{"kind":"Name","value":"task_completion_data"}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"CoursePageFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"CoursePageInterface"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"content_type"}},{"kind":"Field","name":{"kind":"Name","value":"frontend_url"}}]}}]} as unknown as DocumentNode<AssignmentCompletionQueryQuery, AssignmentCompletionQueryQueryVariables>;
 export const CompetenceCertificateQueryDocument = {"kind":"Document","definitions":[{"kind":"OperationDefinition","operation":"query","name":{"kind":"Name","value":"competenceCertificateQuery"},"variableDefinitions":[{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSlug"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"String"}}}},{"kind":"VariableDefinition","variable":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}},"type":{"kind":"NonNullType","type":{"kind":"NamedType","name":{"kind":"Name","value":"ID"}}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"competence_certificate_list"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_slug"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseSlug"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"competence_certificates"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"assignments"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"assignment_type"}},{"kind":"Field","name":{"kind":"Name","value":"max_points"}},{"kind":"Field","name":{"kind":"Name","value":"completion"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_session_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"completion_status"}},{"kind":"Field","name":{"kind":"Name","value":"submitted_at"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_max_points"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_passed"}}]}},{"kind":"Field","name":{"kind":"Name","value":"learning_content"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"circle"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}}]}}]}}]}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"CoursePageFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"CoursePageInterface"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"content_type"}},{"kind":"Field","name":{"kind":"Name","value":"frontend_url"}}]}}]} as unknown as DocumentNode<CompetenceCertificateQueryQuery, CompetenceCertificateQueryQueryVariables>;
+export const 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":"completion"},"arguments":[{"kind":"Argument","name":{"kind":"Name","value":"course_session_id"},"value":{"kind":"Variable","name":{"kind":"Name","value":"courseSessionId"}}}],"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"completion_status"}},{"kind":"Field","name":{"kind":"Name","value":"submitted_at"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_points"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_max_points"}},{"kind":"Field","name":{"kind":"Name","value":"evaluation_passed"}}]}},{"kind":"Field","name":{"kind":"Name","value":"learning_content"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"FragmentSpread","name":{"kind":"Name","value":"CoursePageFields"}},{"kind":"Field","name":{"kind":"Name","value":"circle"},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}}]}}]}}]}}]}}]}}]}},{"kind":"FragmentDefinition","name":{"kind":"Name","value":"CoursePageFields"},"typeCondition":{"kind":"NamedType","name":{"kind":"Name","value":"CoursePageInterface"}},"selectionSet":{"kind":"SelectionSet","selections":[{"kind":"Field","name":{"kind":"Name","value":"title"}},{"kind":"Field","name":{"kind":"Name","value":"id"}},{"kind":"Field","name":{"kind":"Name","value":"slug"}},{"kind":"Field","name":{"kind":"Name","value":"content_type"}},{"kind":"Field","name":{"kind":"Name","value":"frontend_url"}}]}}]} as unknown as DocumentNode<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 5df3500c..ac20748c 100644
--- a/client/src/gql/schema.graphql
+++ b/client/src/gql/schema.graphql
@@ -21,6 +21,7 @@ type Query {
   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
   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
 }
diff --git a/client/src/graphql/queries.ts b/client/src/graphql/queries.ts
index a4da79c9..c0811c4b 100644
--- a/client/src/graphql/queries.ts
+++ b/client/src/graphql/queries.ts
@@ -117,6 +117,42 @@ export const COMPETENCE_NAVI_CERTIFICATE_QUERY = graphql(`
   }
 `);
 
+export const COMPETENCE_NAVI_CERTIFICATE_FOR_USER_QUERY = graphql(`
+  query competenceCertificateForUserQuery(
+    $courseSlug: String!
+    $courseSessionId: ID!
+    $userId: UUID!
+  ) {
+    competence_certificate_list_for_user(course_slug: $courseSlug, user_id: $userId) {
+      ...CoursePageFields
+      competence_certificates {
+        ...CoursePageFields
+        assignments {
+          ...CoursePageFields
+          assignment_type
+          max_points
+          completion(course_session_id: $courseSessionId) {
+            id
+            completion_status
+            submitted_at
+            evaluation_points
+            evaluation_max_points
+            evaluation_passed
+          }
+          learning_content {
+            ...CoursePageFields
+            circle {
+              id
+              title
+              slug
+            }
+          }
+        }
+      }
+    }
+  }
+`);
+
 export const COURSE_SESSION_DETAIL_QUERY = graphql(`
   query courseSessionDetail($courseSessionId: ID!) {
     course_session(id: $courseSessionId) {
diff --git a/client/src/pages/competence/CompetenceCertificateComponent.vue b/client/src/pages/competence/CompetenceCertificateComponent.vue
index 436de3dd..30647b23 100644
--- a/client/src/pages/competence/CompetenceCertificateComponent.vue
+++ b/client/src/pages/competence/CompetenceCertificateComponent.vue
@@ -15,6 +15,7 @@ log.debug("CompetenceCertificateComponent setup");
 const props = defineProps<{
   competenceCertificate: CompetenceCertificate;
   detailView: boolean;
+  frontendUrl?: string;
 }>();
 
 const totalPointsEvaluatedAssignments = computed(() => {
@@ -40,6 +41,12 @@ const progressStatusCount = computed(() => {
     props.competenceCertificate.assignments
   );
 });
+
+const frontendUrl = computed(() => {
+  return props.frontendUrl
+    ? props.frontendUrl
+    : props.competenceCertificate.frontend_url;
+});
 </script>
 
 <template>
@@ -90,7 +97,7 @@ const progressStatusCount = computed(() => {
 
       <div v-if="!props.detailView">
         <router-link
-          :to="competenceCertificate.frontend_url"
+          :to="frontendUrl"
           class="btn-text mt-4 inline-flex items-center py-2 pl-0"
           :data-cy="`certificate-${competenceCertificate.slug}-detail-link`"
         >
diff --git a/client/src/pages/competence/CompetenceCertificateListPage.vue b/client/src/pages/competence/CompetenceCertificateListPage.vue
index c4c4157d..c616082d 100644
--- a/client/src/pages/competence/CompetenceCertificateListPage.vue
+++ b/client/src/pages/competence/CompetenceCertificateListPage.vue
@@ -1,6 +1,9 @@
 <script setup lang="ts">
 import log from "loglevel";
-import { COMPETENCE_NAVI_CERTIFICATE_QUERY } from "@/graphql/queries";
+import {
+  COMPETENCE_NAVI_CERTIFICATE_FOR_USER_QUERY,
+  COMPETENCE_NAVI_CERTIFICATE_QUERY,
+} from "@/graphql/queries";
 import { useQuery } from "@urql/vue";
 import { computed, onMounted } from "vue";
 import type { CompetenceCertificate } from "@/types";
@@ -10,27 +13,45 @@ import {
   assignmentsMaxEvaluationPoints,
   assignmentsUserPoints,
 } from "@/pages/competence/utils";
+import { useRoute } from "vue-router";
 
 const props = defineProps<{
   courseSlug: string;
+  userId?: string;
 }>();
 
 log.debug("CompetenceCertificateListPage setup", props);
 
 const courseSession = useCurrentCourseSession();
+const route = useRoute();
 
-const certificatesQuery = useQuery({
-  query: COMPETENCE_NAVI_CERTIFICATE_QUERY,
-  variables: {
-    courseSlug: props.courseSlug,
-    courseSessionId: courseSession.value.id,
-  },
-});
+const certificatesQuery = (() => {
+  if (props.userId) {
+    return useQuery({
+      query: COMPETENCE_NAVI_CERTIFICATE_FOR_USER_QUERY,
+      variables: {
+        courseSlug: props.courseSlug,
+        courseSessionId: courseSession.value.id,
+        userId: props.userId,
+      },
+    });
+  } else {
+    return useQuery({
+      query: COMPETENCE_NAVI_CERTIFICATE_QUERY,
+      variables: {
+        courseSlug: props.courseSlug,
+        courseSessionId: courseSession.value.id,
+      },
+    });
+  }
+})();
 
 const competenceCertificates = computed(() => {
+  const certificates = props.userId
+    ? certificatesQuery.data?.value?.competence_certificate_list_for_user
+    : certificatesQuery.data?.value?.competence_certificate_list;
   return (
-    (certificatesQuery.data.value?.competence_certificate_list
-      ?.competence_certificates as unknown as CompetenceCertificate[]) ?? []
+    (certificates?.competence_certificates as unknown as CompetenceCertificate[]) ?? []
   );
 });
 
@@ -52,6 +73,17 @@ const numAssignmentsEvaluated = computed(() => {
   }).length;
 });
 
+const certificateFrontendUrl = function (frontendUrl: string) {
+  if (props.userId) {
+    const pathSegments = frontendUrl.split("/");
+    const lastSegment = pathSegments[pathSegments.length - 1];
+
+    // Assuming you want to navigate to the current path + last segment
+    return `${route.path}/${lastSegment}`;
+  }
+  return frontendUrl;
+};
+
 onMounted(async () => {
   // log.debug("AssignmentView mounted", props.assignmentId, props.userId);
 });
@@ -92,6 +124,7 @@ onMounted(async () => {
       <CompetenceCertificateComponent
         :competence-certificate="competenceCertificate"
         :detail-view="false"
+        :frontend-url="certificateFrontendUrl(competenceCertificate.frontend_url)"
       ></CompetenceCertificateComponent>
     </div>
   </div>
diff --git a/client/src/pages/userProfile/CompetenceProfilePage.vue b/client/src/pages/userProfile/CompetenceProfilePage.vue
index 8ae17a31..f493faa6 100644
--- a/client/src/pages/userProfile/CompetenceProfilePage.vue
+++ b/client/src/pages/userProfile/CompetenceProfilePage.vue
@@ -5,27 +5,36 @@ import SelfEvaluationAndFeedbackList from "@/components/selfEvaluationFeedback/S
 import SelfEvaluationAndFeedbackOverview from "@/components/selfEvaluationFeedback/SelfEvaluationAndFeedbackOverview.vue";
 import { useCurrentCourseSession } from "@/composables";
 import CompetenceCertificateListPage from "@/pages/competence/CompetenceCertificateListPage.vue";
+import CompetenceCertificateDetailPage from "@/pages/competence/CompetenceCertificateDetailPage.vue";
 import { useRoute } from "vue-router";
 
-type SubMenuType = "OVERVIEW" | "EVALUATIONS" | "COMPETENCES";
-const subMenuOptions: SubMenuType[] = ["OVERVIEW", "EVALUATIONS", "COMPETENCES"];
+type SubMenuType = "OVERVIEW" | "EVALUATIONS" | "CERTIFICATES" | "CERTIFICATE_DETAIL";
+const subMenuOptions: SubMenuType[] = [
+  "OVERVIEW",
+  "EVALUATIONS",
+  "CERTIFICATES",
+  "CERTIFICATE_DETAIL",
+];
 
 const props = defineProps<{
   userId: string;
   courseSlug: string;
+  certificateSlug?: string;
 }>();
 
 interface SubMenuItem {
   type: SubMenuType;
   label: string;
   url: string;
+  inMenu: boolean;
 }
 
-const MENU_ENTRIES: SubMenuItem[] = [
+const SUBPAGES: SubMenuItem[] = [
   {
     type: "OVERVIEW",
     label: "a.Übersicht",
     url: `/course/${props.courseSlug}/profile/${props.userId}/competence`,
+    inMenu: true,
   },
   {
     type: "EVALUATIONS",
@@ -33,36 +42,52 @@ const MENU_ENTRIES: SubMenuItem[] = [
       ? "a.Selbst- und Fremdeinschätzungen"
       : "a.Selbsteinschätzungen",
     url: `/course/${props.courseSlug}/profile/${props.userId}/competence/evaluations`,
+    inMenu: true,
   },
 ];
 
 if (useCurrentCourseSession().value.course.configuration.is_uk) {
-  MENU_ENTRIES.push({
-    type: "COMPETENCES",
-    label: "Kompetenznachweise",
-    url: `/course/${props.courseSlug}/profile/${props.userId}/competence/competences`,
-  });
+  SUBPAGES.push(
+    {
+      type: "CERTIFICATES",
+      label: "Kompetenznachweise",
+      url: `/course/${props.courseSlug}/profile/${props.userId}/competence/certificates`,
+      inMenu: true,
+    },
+    {
+      type: "CERTIFICATE_DETAIL",
+      label: "",
+      url: "",
+      inMenu: false,
+    }
+  );
 }
 
 const route = useRoute();
 const active = computed(() => {
-  const index = subMenuOptions.indexOf(route.meta?.subpage);
+  const index = subMenuOptions.findIndex((option) =>
+    option.startsWith(route.meta?.subpage)
+  );
   if (index > -1) {
-    return MENU_ENTRIES[index];
+    return SUBPAGES[index];
   }
-  return MENU_ENTRIES[0];
+  return SUBPAGES[0];
 });
 </script>
 
 <template>
   <CockpitProfileContent>
     <template #side>
-      <div v-for="(entry, index) in MENU_ENTRIES" :key="index" class="mb-2">
+      <div
+        v-for="(entry, index) in SUBPAGES.filter((p) => p.inMenu)"
+        :key="index"
+        class="mb-2"
+      >
         <router-link
           v-if="active"
           :to="entry.url"
           class="flex w-full items-center space-x-2 p-2 pr-4 text-blue-900 hover:bg-gray-200 lg:pr-8"
-          :class="{ 'text-bold bg-gray-200': active.type === entry.type }"
+          :class="{ 'text-bold bg-gray-200': entry.type.startsWith(active.type) }"
         >
           <span>{{ $t(entry.label) }}</span>
         </router-link>
@@ -80,8 +105,15 @@ const active = computed(() => {
           :profile-user-id="props.userId"
         />
         <CompetenceCertificateListPage
-          v-else-if="active.type === 'COMPETENCES'"
+          v-else-if="active.type === 'CERTIFICATES'"
           :course-slug="useCurrentCourseSession().value.course.slug"
+          :user-id="userId"
+        />
+        <CompetenceCertificateDetailPage
+          v-else-if="active.type === 'CERTIFICATE_DETAIL'"
+          :course-slug="useCurrentCourseSession().value.course.slug"
+          :certificate-slug="certificateSlug ? certificateSlug : ''"
+          :user-id="userId"
         />
       </div>
     </template>
diff --git a/client/src/router/index.ts b/client/src/router/index.ts
index e5088406..834fcd2d 100644
--- a/client/src/router/index.ts
+++ b/client/src/router/index.ts
@@ -176,22 +176,31 @@ const router = createRouter({
           name: "profileCompetence",
           children: [
             {
-              path: "", // Default path (e.g., /competence)
+              path: "",
               name: "competenceMain",
               meta: { subpage: "OVERVIEW" },
               component: () => import("@/pages/userProfile/CompetenceProfilePage.vue"),
             },
             {
-              path: "evaluations", // Subpath (e.g., /competence/evaluations)
+              path: "evaluations",
               name: "competenceEvaluations",
               meta: { subpage: "EVALUATIONS" },
               component: () => import("@/pages/userProfile/CompetenceProfilePage.vue"),
             },
             {
-              path: "competences", // Another subpath (e.g., /competence/competences)
+              path: "certificates",
               name: "profileCompetences",
-              meta: { subpage: "COMPETENCES" },
+              meta: { subpage: "CERTIFICATES" },
               component: () => import("@/pages/userProfile/CompetenceProfilePage.vue"),
+              children: [
+                {
+                  path: ":certificateSlug",
+                  props: true,
+                  meta: { subpage: "CERTIFICATE_DETAIL" },
+                  component: () =>
+                    import("@/pages/userProfile/CompetenceProfilePage.vue"),
+                },
+              ],
             },
           ],
         },
diff --git a/server/vbv_lernwelt/assignment/graphql/types.py b/server/vbv_lernwelt/assignment/graphql/types.py
index b8a23d3d..2f81d61c 100644
--- a/server/vbv_lernwelt/assignment/graphql/types.py
+++ b/server/vbv_lernwelt/assignment/graphql/types.py
@@ -101,6 +101,10 @@ class AssignmentObjectType(DjangoObjectType):
             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)
+
         return resolve_assignment_completion(
             info=info,
             course_session_id=course_session_id,
diff --git a/server/vbv_lernwelt/competence/graphql/queries.py b/server/vbv_lernwelt/competence/graphql/queries.py
index 815316b8..942842a8 100644
--- a/server/vbv_lernwelt/competence/graphql/queries.py
+++ b/server/vbv_lernwelt/competence/graphql/queries.py
@@ -9,6 +9,8 @@ from vbv_lernwelt.competence.models import (
     CompetenceCertificateList,
 )
 from vbv_lernwelt.course.graphql.types import resolve_course_page
+from vbv_lernwelt.course.models import CourseSessionUser
+from vbv_lernwelt.iam.permissions import can_view_profile
 
 
 class CompetenceCertificateQuery(object):
@@ -24,6 +26,15 @@ class CompetenceCertificateQuery(object):
         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(),
+    )
+
     def resolve_competence_certificate(root, info, id=None, slug=None):
         return resolve_course_page(CompetenceCertificate, root, info, id=id, slug=slug)
 
@@ -39,3 +50,26 @@ class CompetenceCertificateQuery(object):
             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:
+            course_session_user = CourseSessionUser.objects.get(user__id=user_id)
+        except CourseSessionUser.DoesNotExist:
+            return None
+
+        if not can_view_profile(info.context.user, course_session_user):
+            return None
+
+        setattr(info.context, "assignment_user_id", user_id)
+
+        return resolve_course_page(
+            CompetenceCertificateList,
+            root,
+            info,
+            id=id,
+            slug=slug,
+            course_id=course_id,
+            course_slug=course_slug,
+        )

From 0d982f937c297d34f9a0a2bfed5346c23d8f3536 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Mon, 22 Apr 2024 20:08:37 +0200
Subject: [PATCH 63/82] Use sub routes

---
 .../SelfEvaluationAndFeedbackOverview.vue     | 192 +++++++++---------
 .../CompetenceCertificateDetailPage.vue       |  46 +++--
 .../userProfile/CompetenceProfilePage.vue     |  61 ++----
 .../src/pages/userProfile/UserProfilePage.vue |  18 +-
 client/src/router/index.ts                    |  34 ++--
 5 files changed, 178 insertions(+), 173 deletions(-)

diff --git a/client/src/components/selfEvaluationFeedback/SelfEvaluationAndFeedbackOverview.vue b/client/src/components/selfEvaluationFeedback/SelfEvaluationAndFeedbackOverview.vue
index fdf3d296..1944be5e 100644
--- a/client/src/components/selfEvaluationFeedback/SelfEvaluationAndFeedbackOverview.vue
+++ b/client/src/components/selfEvaluationFeedback/SelfEvaluationAndFeedbackOverview.vue
@@ -28,104 +28,106 @@ const isLoaded = computed(() => !selfEvaluationFeedbackSummaries.loading.value);
 </script>
 
 <template>
-  <template v-if="isLoaded">
-    <!-- Self Evaluation -->
-    <div class="bg-white px-8 py-4 lg:mb-8 lg:py-8">
-      <div class="mb-8">
-        <h3 class="mb-4 pb-4 lg:pb-0">
-          {{ $t("a.Selbsteinschätzungen") }}
-        </h3>
-        <ul
-          class="mb-6 flex flex-col lg:flex-row lg:items-center lg:justify-between lg:gap-8"
+  <div>
+    <template v-if="isLoaded">
+      <!-- Self Evaluation -->
+      <div class="bg-white px-8 py-4 lg:mb-8 lg:py-8">
+        <div class="mb-8">
+          <h3 class="mb-4 pb-4 lg:pb-0">
+            {{ $t("a.Selbsteinschätzungen") }}
+          </h3>
+          <ul
+            class="mb-6 flex flex-col lg:flex-row lg:items-center lg:justify-between lg:gap-8"
+          >
+            <li class="mb-4 inline-block flex-1 pb-4 lg:mb-0 lg:w-1/3 lg:pb-0">
+              <h5 class="mb-4 text-gray-700">«{{ $t("selfEvaluation.no") }}»</h5>
+              <div class="flex flex-row items-center">
+                <it-icon-smiley-thinking class="h-16 w-16"></it-icon-smiley-thinking>
+                <p
+                  class="ml-4 inline-block text-7xl font-bold"
+                  data-cy="self-evaluation-fail"
+                >
+                  {{ selfAssessmentCounts?.fail }}
+                </p>
+              </div>
+            </li>
+            <li class="mb-4 inline-block flex-1 pb-4 lg:mb-0 lg:w-1/3 lg:pb-0">
+              <h5 class="mb-4 text-gray-700">«{{ $t("selfEvaluation.yes") }}»</h5>
+              <div class="flex flex-row items-center">
+                <it-icon-smiley-happy class="h-16 w-16"></it-icon-smiley-happy>
+                <p
+                  class="ml-4 inline-block text-7xl font-bold"
+                  data-cy="self-evaluation-success"
+                >
+                  {{ selfAssessmentCounts?.pass }}
+                </p>
+              </div>
+            </li>
+            <li class="flex-1 pb-4 lg:mb-0 lg:w-1/3 lg:pb-0">
+              <h5 class="mb-4 text-gray-700">{{ $t("competences.notAssessed") }}</h5>
+              <div class="flex flex-row items-center">
+                <it-icon-smiley-neutral class="h-16 w-16"></it-icon-smiley-neutral>
+                <p
+                  class="ml-4 inline-block text-7xl font-bold"
+                  data-cy="self-evaluation-unknown"
+                >
+                  {{ selfAssessmentCounts?.unknown }}
+                </p>
+              </div>
+            </li>
+          </ul>
+        </div>
+        <!-- Feedback Evaluation -->
+        <div
+          v-if="courseSession.course.configuration.enable_learning_mentor"
+          class="border-t pt-8"
         >
-          <li class="mb-4 inline-block flex-1 pb-4 lg:mb-0 lg:w-1/3 lg:pb-0">
-            <h5 class="mb-4 text-gray-700">«{{ $t("selfEvaluation.no") }}»</h5>
-            <div class="flex flex-row items-center">
-              <it-icon-smiley-thinking class="h-16 w-16"></it-icon-smiley-thinking>
-              <p
-                class="ml-4 inline-block text-7xl font-bold"
-                data-cy="self-evaluation-fail"
-              >
-                {{ selfAssessmentCounts?.fail }}
-              </p>
-            </div>
-          </li>
-          <li class="mb-4 inline-block flex-1 pb-4 lg:mb-0 lg:w-1/3 lg:pb-0">
-            <h5 class="mb-4 text-gray-700">«{{ $t("selfEvaluation.yes") }}»</h5>
-            <div class="flex flex-row items-center">
-              <it-icon-smiley-happy class="h-16 w-16"></it-icon-smiley-happy>
-              <p
-                class="ml-4 inline-block text-7xl font-bold"
-                data-cy="self-evaluation-success"
-              >
-                {{ selfAssessmentCounts?.pass }}
-              </p>
-            </div>
-          </li>
-          <li class="flex-1 pb-4 lg:mb-0 lg:w-1/3 lg:pb-0">
-            <h5 class="mb-4 text-gray-700">{{ $t("competences.notAssessed") }}</h5>
-            <div class="flex flex-row items-center">
-              <it-icon-smiley-neutral class="h-16 w-16"></it-icon-smiley-neutral>
-              <p
-                class="ml-4 inline-block text-7xl font-bold"
-                data-cy="self-evaluation-unknown"
-              >
-                {{ selfAssessmentCounts?.unknown }}
-              </p>
-            </div>
-          </li>
-        </ul>
-      </div>
-      <!-- Feedback Evaluation -->
-      <div
-        v-if="courseSession.course.configuration.enable_learning_mentor"
-        class="border-t pt-8"
-      >
-        <h3 class="mb-4 pb-4 lg:pb-0">
-          {{ $t("a.Fremdeinschätzungen") }}
-        </h3>
-        <ul
-          class="mb-6 flex flex-col lg:flex-row lg:items-center lg:justify-between lg:gap-8"
+          <h3 class="mb-4 pb-4 lg:pb-0">
+            {{ $t("a.Fremdeinschätzungen") }}
+          </h3>
+          <ul
+            class="mb-6 flex flex-col lg:flex-row lg:items-center lg:justify-between lg:gap-8"
+          >
+            <li class="mb-4 inline-block flex-1 pb-4 lg:mb-0 lg:w-1/3 lg:pb-0">
+              <h5 class="mb-4 text-gray-700">«{{ $t("receivedEvaluation.no") }}»</h5>
+              <div class="flex flex-row items-center">
+                <it-icon-smiley-thinking class="h-16 w-16"></it-icon-smiley-thinking>
+                <p class="ml-4 inline-block text-7xl font-bold">
+                  {{ feedbackEvaluationCounts?.fail }}
+                </p>
+              </div>
+            </li>
+            <li class="mb-4 inline-block flex-1 pb-4 lg:mb-0 lg:w-1/3 lg:pb-0">
+              <h5 class="mb-4 text-gray-700">«{{ $t("receivedEvaluation.yes") }}»</h5>
+              <div class="flex flex-row items-center">
+                <it-icon-smiley-happy class="h-16 w-16"></it-icon-smiley-happy>
+                <p class="ml-4 inline-block text-7xl font-bold">
+                  {{ feedbackEvaluationCounts?.pass }}
+                </p>
+              </div>
+            </li>
+            <li class="flex-1 pb-4 lg:mb-0 lg:w-1/3 lg:pb-0">
+              <h5 class="mb-4 text-gray-700">{{ $t("competences.notAssessed") }}</h5>
+              <div class="flex flex-row items-center">
+                <it-icon-smiley-neutral class="h-16 w-16"></it-icon-smiley-neutral>
+                <p class="ml-4 inline-block text-7xl font-bold">
+                  {{ feedbackEvaluationCounts?.unknown }}
+                </p>
+              </div>
+            </li>
+          </ul>
+        </div>
+        <!-- Show All (always)-->
+        <button
+          class="btn-text inline-flex items-center py-2 pl-0 pt-8"
+          @click="emit('showAll')"
         >
-          <li class="mb-4 inline-block flex-1 pb-4 lg:mb-0 lg:w-1/3 lg:pb-0">
-            <h5 class="mb-4 text-gray-700">«{{ $t("receivedEvaluation.no") }}»</h5>
-            <div class="flex flex-row items-center">
-              <it-icon-smiley-thinking class="h-16 w-16"></it-icon-smiley-thinking>
-              <p class="ml-4 inline-block text-7xl font-bold">
-                {{ feedbackEvaluationCounts?.fail }}
-              </p>
-            </div>
-          </li>
-          <li class="mb-4 inline-block flex-1 pb-4 lg:mb-0 lg:w-1/3 lg:pb-0">
-            <h5 class="mb-4 text-gray-700">«{{ $t("receivedEvaluation.yes") }}»</h5>
-            <div class="flex flex-row items-center">
-              <it-icon-smiley-happy class="h-16 w-16"></it-icon-smiley-happy>
-              <p class="ml-4 inline-block text-7xl font-bold">
-                {{ feedbackEvaluationCounts?.pass }}
-              </p>
-            </div>
-          </li>
-          <li class="flex-1 pb-4 lg:mb-0 lg:w-1/3 lg:pb-0">
-            <h5 class="mb-4 text-gray-700">{{ $t("competences.notAssessed") }}</h5>
-            <div class="flex flex-row items-center">
-              <it-icon-smiley-neutral class="h-16 w-16"></it-icon-smiley-neutral>
-              <p class="ml-4 inline-block text-7xl font-bold">
-                {{ feedbackEvaluationCounts?.unknown }}
-              </p>
-            </div>
-          </li>
-        </ul>
+          <span>{{ $t("general.showAll") }}</span>
+          <it-icon-arrow-right></it-icon-arrow-right>
+        </button>
       </div>
-      <!-- Show All (always)-->
-      <button
-        class="btn-text inline-flex items-center py-2 pl-0 pt-8"
-        @click="emit('showAll')"
-      >
-        <span>{{ $t("general.showAll") }}</span>
-        <it-icon-arrow-right></it-icon-arrow-right>
-      </button>
-    </div>
-  </template>
+    </template>
+  </div>
 </template>
 
 <style scoped></style>
diff --git a/client/src/pages/competence/CompetenceCertificateDetailPage.vue b/client/src/pages/competence/CompetenceCertificateDetailPage.vue
index 43dd169c..46814d2c 100644
--- a/client/src/pages/competence/CompetenceCertificateDetailPage.vue
+++ b/client/src/pages/competence/CompetenceCertificateDetailPage.vue
@@ -1,6 +1,9 @@
 <script setup lang="ts">
 import log from "loglevel";
-import { COMPETENCE_NAVI_CERTIFICATE_QUERY } from "@/graphql/queries";
+import {
+  COMPETENCE_NAVI_CERTIFICATE_FOR_USER_QUERY,
+  COMPETENCE_NAVI_CERTIFICATE_QUERY,
+} from "@/graphql/queries";
 import { useQuery } from "@urql/vue";
 import { computed, onMounted } from "vue";
 import type { CompetenceCertificate } from "@/types";
@@ -10,25 +13,44 @@ import CompetenceCertificateComponent from "@/pages/competence/CompetenceCertifi
 const props = defineProps<{
   courseSlug: string;
   certificateSlug: string;
+  userId?: string;
 }>();
 
 log.debug("CompetenceCertificateDetailPage setup", props);
 
 const courseSession = useCurrentCourseSession();
 
-const certificatesQuery = useQuery({
-  query: COMPETENCE_NAVI_CERTIFICATE_QUERY,
-  variables: {
-    courseSlug: props.courseSlug,
-    courseSessionId: courseSession.value.id,
-  },
-});
+const certificatesQuery = (() => {
+  if (props.userId) {
+    return useQuery({
+      query: COMPETENCE_NAVI_CERTIFICATE_FOR_USER_QUERY,
+      variables: {
+        courseSlug: props.courseSlug,
+        courseSessionId: courseSession.value.id,
+        userId: props.userId,
+      },
+    });
+  } else {
+    return useQuery({
+      query: COMPETENCE_NAVI_CERTIFICATE_QUERY,
+      variables: {
+        courseSlug: props.courseSlug,
+        courseSessionId: courseSession.value.id,
+      },
+    });
+  }
+})();
 
 const certificate = computed(() => {
-  return (
-    (certificatesQuery.data.value?.competence_certificate_list
-      ?.competence_certificates as unknown as CompetenceCertificate[]) ?? []
-  ).find((cc) => cc.slug.endsWith(props.certificateSlug));
+  const certificate = props.userId
+    ? certificatesQuery.data?.value?.competence_certificate_list_for_user
+    : certificatesQuery.data?.value?.competence_certificate_list;
+  if (certificate) {
+    return (
+      (certificate.competence_certificates as unknown as CompetenceCertificate[]) ?? []
+    ).find((cc) => cc.slug.endsWith(props.certificateSlug));
+  }
+  return null;
 });
 
 onMounted(async () => {
diff --git a/client/src/pages/userProfile/CompetenceProfilePage.vue b/client/src/pages/userProfile/CompetenceProfilePage.vue
index f493faa6..4b0a50cd 100644
--- a/client/src/pages/userProfile/CompetenceProfilePage.vue
+++ b/client/src/pages/userProfile/CompetenceProfilePage.vue
@@ -1,21 +1,8 @@
 <script setup lang="ts">
 import CockpitProfileContent from "@/components/userProfile/UserProfileContent.vue";
-import { computed } from "vue";
-import SelfEvaluationAndFeedbackList from "@/components/selfEvaluationFeedback/SelfEvaluationAndFeedbackList.vue";
-import SelfEvaluationAndFeedbackOverview from "@/components/selfEvaluationFeedback/SelfEvaluationAndFeedbackOverview.vue";
 import { useCurrentCourseSession } from "@/composables";
-import CompetenceCertificateListPage from "@/pages/competence/CompetenceCertificateListPage.vue";
-import CompetenceCertificateDetailPage from "@/pages/competence/CompetenceCertificateDetailPage.vue";
 import { useRoute } from "vue-router";
 
-type SubMenuType = "OVERVIEW" | "EVALUATIONS" | "CERTIFICATES" | "CERTIFICATE_DETAIL";
-const subMenuOptions: SubMenuType[] = [
-  "OVERVIEW",
-  "EVALUATIONS",
-  "CERTIFICATES",
-  "CERTIFICATE_DETAIL",
-];
-
 const props = defineProps<{
   userId: string;
   courseSlug: string;
@@ -23,56 +10,47 @@ const props = defineProps<{
 }>();
 
 interface SubMenuItem {
-  type: SubMenuType;
   label: string;
   url: string;
   inMenu: boolean;
+  routeMatch: string[];
 }
 
 const SUBPAGES: SubMenuItem[] = [
   {
-    type: "OVERVIEW",
     label: "a.Übersicht",
     url: `/course/${props.courseSlug}/profile/${props.userId}/competence`,
     inMenu: true,
+    routeMatch: ["competenceMain"],
   },
   {
-    type: "EVALUATIONS",
     label: useCurrentCourseSession().value.course.configuration.is_vv
       ? "a.Selbst- und Fremdeinschätzungen"
       : "a.Selbsteinschätzungen",
     url: `/course/${props.courseSlug}/profile/${props.userId}/competence/evaluations`,
     inMenu: true,
+    routeMatch: ["competenceEvaluations"],
   },
 ];
 
 if (useCurrentCourseSession().value.course.configuration.is_uk) {
   SUBPAGES.push(
     {
-      type: "CERTIFICATES",
       label: "Kompetenznachweise",
       url: `/course/${props.courseSlug}/profile/${props.userId}/competence/certificates`,
       inMenu: true,
+      routeMatch: ["competenceCertificates", "competenceCertificateDetail"],
     },
     {
-      type: "CERTIFICATE_DETAIL",
       label: "",
       url: "",
       inMenu: false,
+      routeMatch: [],
     }
   );
 }
 
 const route = useRoute();
-const active = computed(() => {
-  const index = subMenuOptions.findIndex((option) =>
-    option.startsWith(route.meta?.subpage)
-  );
-  if (index > -1) {
-    return SUBPAGES[index];
-  }
-  return SUBPAGES[0];
-});
 </script>
 
 <template>
@@ -84,37 +62,26 @@ const active = computed(() => {
         class="mb-2"
       >
         <router-link
-          v-if="active"
           :to="entry.url"
           class="flex w-full items-center space-x-2 p-2 pr-4 text-blue-900 hover:bg-gray-200 lg:pr-8"
-          :class="{ 'text-bold bg-gray-200': entry.type.startsWith(active.type) }"
+          :class="{
+            'text-bold bg-gray-200': route.matched.some((record) =>
+              entry.routeMatch.includes(record.name)
+            ),
+          }"
         >
           <span>{{ $t(entry.label) }}</span>
         </router-link>
       </div>
     </template>
     <template #main>
-      <div v-if="active" class="container-large">
-        <SelfEvaluationAndFeedbackOverview
-          v-if="active.type === 'OVERVIEW'"
+      <div class="container-large">
+        <router-view
           :profile-user-id="props.userId"
-        />
-        <SelfEvaluationAndFeedbackList
-          v-else-if="active.type === 'EVALUATIONS'"
-          class="w-full"
-          :profile-user-id="props.userId"
-        />
-        <CompetenceCertificateListPage
-          v-else-if="active.type === 'CERTIFICATES'"
-          :course-slug="useCurrentCourseSession().value.course.slug"
-          :user-id="userId"
-        />
-        <CompetenceCertificateDetailPage
-          v-else-if="active.type === 'CERTIFICATE_DETAIL'"
+          :user-id="props.userId"
           :course-slug="useCurrentCourseSession().value.course.slug"
           :certificate-slug="certificateSlug ? certificateSlug : ''"
-          :user-id="userId"
-        />
+        ></router-view>
       </div>
     </template>
   </CockpitProfileContent>
diff --git a/client/src/pages/userProfile/UserProfilePage.vue b/client/src/pages/userProfile/UserProfilePage.vue
index 639becc1..39464bbd 100644
--- a/client/src/pages/userProfile/UserProfilePage.vue
+++ b/client/src/pages/userProfile/UserProfilePage.vue
@@ -13,8 +13,16 @@ const props = defineProps<{
 const { t } = useTranslation();
 
 const pages = ref([
-  { label: t("general.learningPath"), route: "profileLearningPath" },
-  { label: t("a.KompetenzNavi"), route: "profileCompetence" },
+  {
+    label: t("general.learningPath"),
+    route: "profileLearningPath",
+    routeMatch: "profileLearningPath",
+  },
+  {
+    label: t("a.KompetenzNavi"),
+    route: "competenceMain",
+    routeMatch: "profileCompetence",
+  },
 ]);
 
 const courseSession = useCurrentCourseSession();
@@ -54,7 +62,11 @@ onMounted(() => {
           v-for="page in pages"
           :key="page.route"
           class="relative top-px mr-12 pb-3"
-          :class="[route.name === page.route ? 'border-b-2 border-blue-900 pb-3' : '']"
+          :class="[
+            route.matched.some((record) => record.name === page.routeMatch)
+              ? 'border-b-2 border-blue-900 pb-3'
+              : '',
+          ]"
         >
           <router-link :to="{ name: page.route }">
             {{ page.label }}
diff --git a/client/src/router/index.ts b/client/src/router/index.ts
index 834fcd2d..e67c3654 100644
--- a/client/src/router/index.ts
+++ b/client/src/router/index.ts
@@ -178,29 +178,31 @@ const router = createRouter({
             {
               path: "",
               name: "competenceMain",
-              meta: { subpage: "OVERVIEW" },
-              component: () => import("@/pages/userProfile/CompetenceProfilePage.vue"),
+              component: () =>
+                import(
+                  "@/components/selfEvaluationFeedback/SelfEvaluationAndFeedbackOverview.vue"
+                ),
             },
             {
               path: "evaluations",
               name: "competenceEvaluations",
-              meta: { subpage: "EVALUATIONS" },
-              component: () => import("@/pages/userProfile/CompetenceProfilePage.vue"),
+              component: () =>
+                import(
+                  "@/components/selfEvaluationFeedback/SelfEvaluationAndFeedbackList.vue"
+                ),
+            },
+            {
+              path: "certificates/:certificateSlug",
+              name: "competenceCertificateDetail",
+              props: true,
+              component: () =>
+                import("@/pages/competence/CompetenceCertificateDetailPage.vue"),
             },
             {
               path: "certificates",
-              name: "profileCompetences",
-              meta: { subpage: "CERTIFICATES" },
-              component: () => import("@/pages/userProfile/CompetenceProfilePage.vue"),
-              children: [
-                {
-                  path: ":certificateSlug",
-                  props: true,
-                  meta: { subpage: "CERTIFICATE_DETAIL" },
-                  component: () =>
-                    import("@/pages/userProfile/CompetenceProfilePage.vue"),
-                },
-              ],
+              name: "competenceCertificates",
+              component: () =>
+                import("@/pages/competence/CompetenceCertificateListPage.vue"),
             },
           ],
         },

From 5d7898d415ba8bff61752e8bf28e920ad801e062 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Tue, 23 Apr 2024 11:02:43 +0200
Subject: [PATCH 64/82] wip: Update copy, fix typecheck

---
 .../dashboard/MentorMenteeCount.vue           |  4 +--
 client/src/composables.ts                     |  2 +-
 client/src/gql/graphql.ts                     |  1 +
 client/src/gql/schema.graphql                 |  1 +
 .../CompetenceCertificateDetailPage.vue       | 35 ++++++++++++++-----
 .../CompetenceCertificateListPage.vue         | 28 ++++++++++++---
 .../userProfile/CompetenceProfilePage.vue     | 17 ++++++++-
 client/src/services/competence.ts             | 22 ++++++++++++
 client/src/services/dashboard.ts              |  2 +-
 client/src/types.ts                           |  2 ++
 server/vbv_lernwelt/course/graphql/types.py   |  1 +
 11 files changed, 97 insertions(+), 18 deletions(-)

diff --git a/client/src/components/dashboard/MentorMenteeCount.vue b/client/src/components/dashboard/MentorMenteeCount.vue
index b221c240..4beac8cd 100644
--- a/client/src/components/dashboard/MentorMenteeCount.vue
+++ b/client/src/components/dashboard/MentorMenteeCount.vue
@@ -23,7 +23,7 @@ onMounted(async () => {
       :details-link="`/dashboard/persons`"
       data-cy="dashboard.mentor.competenceSummary"
     >
-      <template #title>{{ $t("Personen") }}</template>
+      <template #title>{{ $t("a.Personen") }}</template>
       <template #content>
         <div class="flex flex-row space-x-3 bg-white pb-6">
           <div
@@ -32,7 +32,7 @@ onMounted(async () => {
             <span>{{ menteeCount }}</span>
           </div>
           <p class="ml-3 mt-0 leading-[74px]">
-            {{ $t("Personen, die du begleitest") }}
+            {{ $t("a.Personen, die du begleitest") }}
           </p>
         </div>
       </template>
diff --git a/client/src/composables.ts b/client/src/composables.ts
index 1428e4e8..99003461 100644
--- a/client/src/composables.ts
+++ b/client/src/composables.ts
@@ -177,7 +177,7 @@ export function useCourseData(courseSlug: string) {
       log.error(result.error);
     }
 
-    course.value = result.data?.course as Course;
+    course.value = result.data?.course as unknown as Course;
     actionCompetences.value = result.data?.course
       ?.action_competences as ActionCompetence[];
     learningPath.value = result.data?.course?.learning_path as LearningPathType;
diff --git a/client/src/gql/graphql.ts b/client/src/gql/graphql.ts
index 0dd382f2..ea49df2e 100644
--- a/client/src/gql/graphql.ts
+++ b/client/src/gql/graphql.ts
@@ -348,6 +348,7 @@ export type CourseConfigurationObjectType = {
   enable_learning_mentor: Scalars['Boolean']['output'];
   id: Scalars['ID']['output'];
   is_uk: Scalars['Boolean']['output'];
+  is_vv: Scalars['Boolean']['output'];
 };
 
 export type CourseObjectType = {
diff --git a/client/src/gql/schema.graphql b/client/src/gql/schema.graphql
index ac20748c..8aa5b9ed 100644
--- a/client/src/gql/schema.graphql
+++ b/client/src/gql/schema.graphql
@@ -231,6 +231,7 @@ type CourseConfigurationObjectType {
   enable_circle_documents: Boolean!
   enable_learning_mentor: Boolean!
   enable_competence_certificates: Boolean!
+  is_vv: Boolean!
   is_uk: Boolean!
 }
 
diff --git a/client/src/pages/competence/CompetenceCertificateDetailPage.vue b/client/src/pages/competence/CompetenceCertificateDetailPage.vue
index 46814d2c..33c098ad 100644
--- a/client/src/pages/competence/CompetenceCertificateDetailPage.vue
+++ b/client/src/pages/competence/CompetenceCertificateDetailPage.vue
@@ -9,6 +9,10 @@ import { computed, onMounted } from "vue";
 import type { CompetenceCertificate } from "@/types";
 import { useCurrentCourseSession } from "@/composables";
 import CompetenceCertificateComponent from "@/pages/competence/CompetenceCertificateComponent.vue";
+import {
+  isCompetenceCertificateForUserQueryQuery,
+  isCompetenceCertificateQueryQuery,
+} from "@/services/competence";
 
 const props = defineProps<{
   courseSlug: string;
@@ -42,15 +46,30 @@ const certificatesQuery = (() => {
 })();
 
 const certificate = computed(() => {
-  const certificate = props.userId
-    ? certificatesQuery.data?.value?.competence_certificate_list_for_user
-    : certificatesQuery.data?.value?.competence_certificate_list;
-  if (certificate) {
-    return (
-      (certificate.competence_certificates as unknown as CompetenceCertificate[]) ?? []
-    ).find((cc) => cc.slug.endsWith(props.certificateSlug));
+  const data = certificatesQuery.data.value;
+  if (!data) {
+    return null;
   }
-  return null;
+
+  let certificate;
+
+  if (props.userId && isCompetenceCertificateForUserQueryQuery(data)) {
+    certificate = data.competence_certificate_list_for_user;
+  } else if (isCompetenceCertificateQueryQuery(data)) {
+    certificate = data.competence_certificate_list;
+  } else {
+    // Handle case where data does not match expected types
+    console.error("Data structure is not recognized!");
+    return null;
+  }
+
+  if (!certificate) {
+    return null;
+  }
+
+  return (
+    (certificate.competence_certificates as unknown as CompetenceCertificate[]) ?? []
+  ).find((cc) => cc.slug.endsWith(props.certificateSlug));
 });
 
 onMounted(async () => {
diff --git a/client/src/pages/competence/CompetenceCertificateListPage.vue b/client/src/pages/competence/CompetenceCertificateListPage.vue
index c616082d..c1727b9c 100644
--- a/client/src/pages/competence/CompetenceCertificateListPage.vue
+++ b/client/src/pages/competence/CompetenceCertificateListPage.vue
@@ -14,6 +14,10 @@ import {
   assignmentsUserPoints,
 } from "@/pages/competence/utils";
 import { useRoute } from "vue-router";
+import {
+  isCompetenceCertificateForUserQueryQuery,
+  isCompetenceCertificateQueryQuery,
+} from "@/services/competence";
 
 const props = defineProps<{
   courseSlug: string;
@@ -47,16 +51,30 @@ const certificatesQuery = (() => {
 })();
 
 const competenceCertificates = computed(() => {
-  const certificates = props.userId
-    ? certificatesQuery.data?.value?.competence_certificate_list_for_user
-    : certificatesQuery.data?.value?.competence_certificate_list;
+  const data = certificatesQuery.data.value;
+  if (!data) {
+    return [];
+  }
+
+  let certificate;
+
+  if (props.userId && isCompetenceCertificateForUserQueryQuery(data)) {
+    certificate = data.competence_certificate_list_for_user;
+  } else if (isCompetenceCertificateQueryQuery(data)) {
+    certificate = data.competence_certificate_list;
+  } else {
+    // Handle case where data does not match expected types
+    console.error("Data structure is not recognized!");
+    return [];
+  }
+
   return (
-    (certificates?.competence_certificates as unknown as CompetenceCertificate[]) ?? []
+    (certificate?.competence_certificates as unknown as CompetenceCertificate[]) ?? []
   );
 });
 
 const assignments = computed(() => {
-  return competenceCertificates.value.flatMap((cc) => cc.assignments);
+  return competenceCertificates?.value?.flatMap((cc) => cc.assignments);
 });
 
 const totalPointsEvaluatedAssignments = computed(() => {
diff --git a/client/src/pages/userProfile/CompetenceProfilePage.vue b/client/src/pages/userProfile/CompetenceProfilePage.vue
index 4b0a50cd..58fdb156 100644
--- a/client/src/pages/userProfile/CompetenceProfilePage.vue
+++ b/client/src/pages/userProfile/CompetenceProfilePage.vue
@@ -50,6 +50,21 @@ if (useCurrentCourseSession().value.course.configuration.is_uk) {
   );
 }
 
+function convertRouteRecordNameToString(
+  routeRecordName: string | symbol | undefined
+): string {
+  if (!routeRecordName) {
+    return "";
+  }
+  if (typeof routeRecordName === "symbol") {
+    // Convert symbol to string explicitly
+    return routeRecordName.toString();
+  } else {
+    // It's already a string, return as is
+    return routeRecordName;
+  }
+}
+
 const route = useRoute();
 </script>
 
@@ -66,7 +81,7 @@ const route = useRoute();
           class="flex w-full items-center space-x-2 p-2 pr-4 text-blue-900 hover:bg-gray-200 lg:pr-8"
           :class="{
             'text-bold bg-gray-200': route.matched.some((record) =>
-              entry.routeMatch.includes(record.name)
+              entry.routeMatch.includes(convertRouteRecordNameToString(record?.name))
             ),
           }"
         >
diff --git a/client/src/services/competence.ts b/client/src/services/competence.ts
index fd8e70a6..f2ec7b91 100644
--- a/client/src/services/competence.ts
+++ b/client/src/services/competence.ts
@@ -1,3 +1,7 @@
+import type {
+  CompetenceCertificateForUserQueryQuery,
+  CompetenceCertificateQueryQuery,
+} from "@/gql/graphql";
 import type { PerformanceCriteria } from "@/types";
 import groupBy from "lodash/groupBy";
 
@@ -17,3 +21,21 @@ 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
+  );
+}
diff --git a/client/src/services/dashboard.ts b/client/src/services/dashboard.ts
index 8367824f..26dfb485 100644
--- a/client/src/services/dashboard.ts
+++ b/client/src/services/dashboard.ts
@@ -121,7 +121,7 @@ export const fetchDashboardConfig = async (): Promise<DashboardConfigType[] | nu
       console.error("Error fetching dashboard config:", res.error);
     }
 
-    return res.data?.dashboard_config || null;
+    return (res.data?.dashboard_config as unknown as DashboardConfigType[]) || null;
   } catch (error) {
     console.error("Error fetching dashboard config:", error);
     return null;
diff --git a/client/src/types.ts b/client/src/types.ts
index 83a234d5..7ef3a364 100644
--- a/client/src/types.ts
+++ b/client/src/types.ts
@@ -209,6 +209,8 @@ export interface CourseCategory {
   id: string;
   name: string;
   general: boolean;
+  is_uk: boolean;
+  is_vv: boolean;
 }
 
 export type MediaLibraryContentBlockValue = {
diff --git a/server/vbv_lernwelt/course/graphql/types.py b/server/vbv_lernwelt/course/graphql/types.py
index b4eee50a..20f96ce0 100644
--- a/server/vbv_lernwelt/course/graphql/types.py
+++ b/server/vbv_lernwelt/course/graphql/types.py
@@ -96,6 +96,7 @@ class CourseConfigurationObjectType(DjangoObjectType):
             "enable_learning_mentor",
             "enable_competence_certificates",
             "is_uk",
+            "is_vv",
         )
 
 

From 552746182f0551893dd8d8898f89066dc76391e2 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Wed, 24 Apr 2024 21:17:33 +0200
Subject: [PATCH 65/82] Refactor frontend

---
 .../src/components/dashboard/CoursePanel.vue  |  4 +-
 client/src/composables.ts                     | 33 +++++++++-
 .../CompetenceCertificateDetailPage.vue       | 62 ++++---------------
 .../CompetenceCertificateListPage.vue         | 61 +++++-------------
 client/src/services/competence.ts             | 22 +++++++
 5 files changed, 83 insertions(+), 99 deletions(-)

diff --git a/client/src/components/dashboard/CoursePanel.vue b/client/src/components/dashboard/CoursePanel.vue
index 7f41c202..4cdf739a 100644
--- a/client/src/components/dashboard/CoursePanel.vue
+++ b/client/src/components/dashboard/CoursePanel.vue
@@ -96,7 +96,9 @@ function hasActionButton(): boolean {
           </a>
         </div>
         <p>
-          <span class="rounded bg-gray-300 px-2 py-1">{{ courseConfig.role_key }}</span>
+          <span class="rounded bg-gray-300 px-2 py-1">
+            {{ $t(courseConfig.role_key) }}
+          </span>
           <router-link
             v-if="courseConfig.has_preview"
             :to="getLearningPathUrl(courseConfig.course_slug)"
diff --git a/client/src/composables.ts b/client/src/composables.ts
index 99003461..bc924117 100644
--- a/client/src/composables.ts
+++ b/client/src/composables.ts
@@ -1,7 +1,12 @@
 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 {
+  COMPETENCE_NAVI_CERTIFICATE_FOR_USER_QUERY,
+  COMPETENCE_NAVI_CERTIFICATE_QUERY,
+  COURSE_QUERY,
+  COURSE_SESSION_DETAIL_QUERY,
+} from "@/graphql/queries";
 import {
   circleFlatChildren,
   circleFlatLearningContents,
@@ -656,3 +661,29 @@ export function useCourseStatisticsv2(courseSlug: string) {
     circleMeta,
   };
 }
+
+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 };
+}
diff --git a/client/src/pages/competence/CompetenceCertificateDetailPage.vue b/client/src/pages/competence/CompetenceCertificateDetailPage.vue
index 33c098ad..9d27ea63 100644
--- a/client/src/pages/competence/CompetenceCertificateDetailPage.vue
+++ b/client/src/pages/competence/CompetenceCertificateDetailPage.vue
@@ -1,18 +1,10 @@
 <script setup lang="ts">
 import log from "loglevel";
-import {
-  COMPETENCE_NAVI_CERTIFICATE_FOR_USER_QUERY,
-  COMPETENCE_NAVI_CERTIFICATE_QUERY,
-} from "@/graphql/queries";
-import { useQuery } from "@urql/vue";
 import { computed, onMounted } from "vue";
 import type { CompetenceCertificate } from "@/types";
-import { useCurrentCourseSession } from "@/composables";
+import { useCertificateQuery } from "@/composables";
 import CompetenceCertificateComponent from "@/pages/competence/CompetenceCertificateComponent.vue";
-import {
-  isCompetenceCertificateForUserQueryQuery,
-  isCompetenceCertificateQueryQuery,
-} from "@/services/competence";
+import { getCertificates } from "@/services/competence";
 
 const props = defineProps<{
   courseSlug: string;
@@ -22,53 +14,23 @@ const props = defineProps<{
 
 log.debug("CompetenceCertificateDetailPage setup", props);
 
-const courseSession = useCurrentCourseSession();
-
-const certificatesQuery = (() => {
-  if (props.userId) {
-    return useQuery({
-      query: COMPETENCE_NAVI_CERTIFICATE_FOR_USER_QUERY,
-      variables: {
-        courseSlug: props.courseSlug,
-        courseSessionId: courseSession.value.id,
-        userId: props.userId,
-      },
-    });
-  } else {
-    return useQuery({
-      query: COMPETENCE_NAVI_CERTIFICATE_QUERY,
-      variables: {
-        courseSlug: props.courseSlug,
-        courseSessionId: courseSession.value.id,
-      },
-    });
-  }
-})();
+const certificatesQuery = useCertificateQuery(
+  props.userId,
+  props.courseSlug
+).certificatesQuery;
 
 const certificate = computed(() => {
-  const data = certificatesQuery.data.value;
-  if (!data) {
-    return null;
-  }
+  const certificates = getCertificates(
+    certificatesQuery.data.value,
+    props.userId ?? null
+  );
 
-  let certificate;
-
-  if (props.userId && isCompetenceCertificateForUserQueryQuery(data)) {
-    certificate = data.competence_certificate_list_for_user;
-  } else if (isCompetenceCertificateQueryQuery(data)) {
-    certificate = data.competence_certificate_list;
-  } else {
-    // Handle case where data does not match expected types
-    console.error("Data structure is not recognized!");
-    return null;
-  }
-
-  if (!certificate) {
+  if (!certificates) {
     return null;
   }
 
   return (
-    (certificate.competence_certificates as unknown as CompetenceCertificate[]) ?? []
+    (certificates.competence_certificates as unknown as CompetenceCertificate[]) ?? []
   ).find((cc) => cc.slug.endsWith(props.certificateSlug));
 });
 
diff --git a/client/src/pages/competence/CompetenceCertificateListPage.vue b/client/src/pages/competence/CompetenceCertificateListPage.vue
index c1727b9c..40e0008b 100644
--- a/client/src/pages/competence/CompetenceCertificateListPage.vue
+++ b/client/src/pages/competence/CompetenceCertificateListPage.vue
@@ -1,23 +1,15 @@
 <script setup lang="ts">
 import log from "loglevel";
-import {
-  COMPETENCE_NAVI_CERTIFICATE_FOR_USER_QUERY,
-  COMPETENCE_NAVI_CERTIFICATE_QUERY,
-} from "@/graphql/queries";
-import { useQuery } from "@urql/vue";
 import { computed, onMounted } from "vue";
 import type { CompetenceCertificate } from "@/types";
-import { useCurrentCourseSession } from "@/composables";
+import { useCertificateQuery } from "@/composables";
 import CompetenceCertificateComponent from "@/pages/competence/CompetenceCertificateComponent.vue";
 import {
   assignmentsMaxEvaluationPoints,
   assignmentsUserPoints,
 } from "@/pages/competence/utils";
 import { useRoute } from "vue-router";
-import {
-  isCompetenceCertificateForUserQueryQuery,
-  isCompetenceCertificateQueryQuery,
-} from "@/services/competence";
+import { getCertificates } from "@/services/competence";
 
 const props = defineProps<{
   courseSlug: string;
@@ -26,50 +18,25 @@ const props = defineProps<{
 
 log.debug("CompetenceCertificateListPage setup", props);
 
-const courseSession = useCurrentCourseSession();
 const route = useRoute();
 
-const certificatesQuery = (() => {
-  if (props.userId) {
-    return useQuery({
-      query: COMPETENCE_NAVI_CERTIFICATE_FOR_USER_QUERY,
-      variables: {
-        courseSlug: props.courseSlug,
-        courseSessionId: courseSession.value.id,
-        userId: props.userId,
-      },
-    });
-  } else {
-    return useQuery({
-      query: COMPETENCE_NAVI_CERTIFICATE_QUERY,
-      variables: {
-        courseSlug: props.courseSlug,
-        courseSessionId: courseSession.value.id,
-      },
-    });
-  }
-})();
+const certificatesQuery = useCertificateQuery(
+  props.userId,
+  props.courseSlug
+).certificatesQuery;
 
 const competenceCertificates = computed(() => {
-  const data = certificatesQuery.data.value;
-  if (!data) {
-    return [];
-  }
+  const certificates = getCertificates(
+    certificatesQuery.data.value,
+    props.userId ?? null
+  );
 
-  let certificate;
-
-  if (props.userId && isCompetenceCertificateForUserQueryQuery(data)) {
-    certificate = data.competence_certificate_list_for_user;
-  } else if (isCompetenceCertificateQueryQuery(data)) {
-    certificate = data.competence_certificate_list;
-  } else {
-    // Handle case where data does not match expected types
-    console.error("Data structure is not recognized!");
-    return [];
+  if (!certificates) {
+    return null;
   }
 
   return (
-    (certificate?.competence_certificates as unknown as CompetenceCertificate[]) ?? []
+    (certificates?.competence_certificates as unknown as CompetenceCertificate[]) ?? []
   );
 });
 
@@ -108,7 +75,7 @@ onMounted(async () => {
 </script>
 
 <template>
-  <div class="container-large">
+  <div v-if="assignments" class="container-large">
     <h2 class="mb-4 lg:py-4">{{ $t("a.Kompetenznachweise") }}</h2>
 
     <div class="mb-4 bg-white p-8" data-cy="certificate-total-points-text">
diff --git a/client/src/services/competence.ts b/client/src/services/competence.ts
index f2ec7b91..53793917 100644
--- a/client/src/services/competence.ts
+++ b/client/src/services/competence.ts
@@ -1,5 +1,6 @@
 import type {
   CompetenceCertificateForUserQueryQuery,
+  CompetenceCertificateListObjectType,
   CompetenceCertificateQueryQuery,
 } from "@/gql/graphql";
 import type { PerformanceCriteria } from "@/types";
@@ -39,3 +40,24 @@ export function isCompetenceCertificateQueryQuery(
     (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 ?? null;
+}

From 7f92272290a642610ea7d81a49d41f69284e0f09 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Wed, 24 Apr 2024 21:17:56 +0200
Subject: [PATCH 66/82] Add basic certificate list tests

---
 .../competence/tests/test_graphql.py          | 307 ++++++++++++++++++
 1 file changed, 307 insertions(+)
 create mode 100644 server/vbv_lernwelt/competence/tests/test_graphql.py

diff --git a/server/vbv_lernwelt/competence/tests/test_graphql.py b/server/vbv_lernwelt/competence/tests/test_graphql.py
new file mode 100644
index 00000000..c1b56fb0
--- /dev/null
+++ b/server/vbv_lernwelt/competence/tests/test_graphql.py
@@ -0,0 +1,307 @@
+from django.utils import timezone
+from graphene_django.utils import GraphQLTestCase
+
+from vbv_lernwelt.assignment.models import Assignment, AssignmentCompletion
+from vbv_lernwelt.core.create_default_users import create_default_users
+from vbv_lernwelt.course.creators.test_course import create_test_course
+from vbv_lernwelt.course.creators.test_utils import (
+    add_course_session_group_supervisor,
+    add_course_session_user,
+    create_course_session_group,
+    create_user,
+)
+from vbv_lernwelt.course.models import CourseSession, CourseSessionUser
+
+
+class TestCertificateList(GraphQLTestCase):
+    GRAPHQL_URL = "/server/graphql/"
+
+    def setUp(self):
+        create_default_users()
+        self.course = create_test_course(include_vv=False, with_sessions=True)
+        self.course_session = CourseSession.objects.get(title="Test Bern 2022 a")
+        assignment = Assignment.objects.get(
+            slug="test-lehrgang-assignment-überprüfen-einer-motorfahrzeugs-versicherungspolice"
+        )
+
+        self.supervisor = create_user("supervisor")
+        group = create_course_session_group(course_session=self.course_session)
+        add_course_session_group_supervisor(group=group, user=self.supervisor)
+
+        self.member_one = create_user("member one")
+        add_course_session_user(
+            course_session=self.course_session,
+            user=self.member_one,
+            role=CourseSessionUser.Role.MEMBER,
+        )
+
+        self.member_two = create_user("member two")
+        add_course_session_user(
+            course_session=self.course_session,
+            user=self.member_two,
+            role=CourseSessionUser.Role.MEMBER,
+        )
+
+        AssignmentCompletion.objects.create(
+            assignment_user=self.member_one,
+            assignment=assignment,
+            learning_content_page=assignment.find_attached_learning_content(),
+            course_session=self.course_session,
+            completion_status="SUBMITTED",
+            submitted_at=timezone.now(),
+            completion_data={},
+            evaluation_max_points=10,
+            evaluation_points=5,
+            evaluation_passed=False,
+        )
+
+        AssignmentCompletion.objects.create(
+            assignment_user=self.member_two,
+            assignment=assignment,
+            learning_content_page=assignment.find_attached_learning_content(),
+            course_session=self.course_session,
+            completion_status="SUBMITTED",
+            submitted_at=timezone.now(),
+            completion_data={},
+            evaluation_max_points=10,
+            evaluation_points=10,
+            evaluation_passed=True,
+        )
+
+    def test_supervisor_userprofile_certificate_summary(self):
+        self.client.force_login(self.supervisor)
+
+        query = f"""query competenceCertificateForUserQuery(
+  $courseSlug: String!,
+  $courseSessionId: ID!,
+  $userId: UUID!
+) {{
+  competence_certificate_list_for_user(
+    course_slug: $courseSlug,
+    user_id: $userId
+  ) {{
+    ...CoursePageFields
+    competence_certificates {{
+      ...CoursePageFields
+      assignments {{
+        ...CoursePageFields
+        assignment_type
+        max_points
+        completion(course_session_id: $courseSessionId) {{
+          id
+          completion_status
+          submitted_at
+          evaluation_points
+          evaluation_max_points
+          evaluation_passed
+          __typename
+        }}
+        learning_content {{
+          ...CoursePageFields
+          circle {{
+            id
+            title
+            slug
+            __typename
+          }}
+          __typename
+        }}
+        __typename
+      }}
+      __typename
+    }}
+    __typename
+  }}
+}}
+
+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),
+        }
+
+        # WHEN
+        response = self.query(query, variables=variables)
+
+        # THEN
+        self.assertResponseNoErrors(response)
+
+        certificates = response.json()["data"]["competence_certificate_list_for_user"][
+            "competence_certificates"
+        ]
+        self.assertEqual(len(certificates), 1)
+
+        assignments = certificates[0]["assignments"]
+        self.assertEqual(len(assignments), 2)
+
+        completion1 = assignments[0]["completion"]
+        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)
+
+    def test_member_cannot_see_other_user_certificate_summary(self):
+        self.client.force_login(self.member_one)
+
+        query = f"""query competenceCertificateForUserQuery(
+          $courseSlug: String!,
+          $courseSessionId: ID!,
+          $userId: UUID!
+        ) {{
+          competence_certificate_list_for_user(
+            course_slug: $courseSlug,
+            user_id: $userId
+          ) {{
+            ...CoursePageFields
+            competence_certificates {{
+              ...CoursePageFields
+              assignments {{
+                ...CoursePageFields
+                assignment_type
+                max_points
+                completion(course_session_id: $courseSessionId) {{
+                  id
+                  completion_status
+                  submitted_at
+                  evaluation_points
+                  evaluation_max_points
+                  evaluation_passed
+                  __typename
+                }}
+                learning_content {{
+                  ...CoursePageFields
+                  circle {{
+                    id
+                    title
+                    slug
+                    __typename
+                  }}
+                  __typename
+                }}
+                __typename
+              }}
+              __typename
+            }}
+            __typename
+          }}
+        }}
+
+        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),
+        }
+
+        # WHEN
+        response = self.query(query, variables=variables)
+
+        # THEN
+        self.assertResponseNoErrors(response)
+        self.assertIsNone(
+            response.json()["data"]["competence_certificate_list_for_user"]
+        )
+
+    def test_member_userprofile_certificate_summary(self):
+        self.client.force_login(self.member_one)
+
+        query = f"""query competenceCertificateForUserQuery(
+  $courseSlug: String!,
+  $courseSessionId: ID!,
+) {{
+  competence_certificate_list(
+    course_slug: $courseSlug,
+  ) {{
+    ...CoursePageFields
+    competence_certificates {{
+      ...CoursePageFields
+      assignments {{
+        ...CoursePageFields
+        assignment_type
+        max_points
+        completion(course_session_id: $courseSessionId) {{
+          id
+          completion_status
+          submitted_at
+          evaluation_points
+          evaluation_max_points
+          evaluation_passed
+          __typename
+        }}
+        learning_content {{
+          ...CoursePageFields
+          circle {{
+            id
+            title
+            slug
+            __typename
+          }}
+          __typename
+        }}
+        __typename
+      }}
+      __typename
+    }}
+    __typename
+  }}
+}}
+
+fragment CoursePageFields on CoursePageInterface {{
+  title
+  id
+  slug
+  content_type
+  frontend_url
+  __typename
+}}
+
+                                    """
+        variables = {
+            "courseSessionId": str(self.course_session.id),
+            "courseSlug": self.course.slug,
+        }
+
+        # WHEN
+        response = self.query(query, variables=variables)
+
+        # THEN
+        self.assertResponseNoErrors(response)
+
+        certificates = response.json()["data"]["competence_certificate_list"][
+            "competence_certificates"
+        ]
+        self.assertEqual(len(certificates), 1)
+
+        assignments = certificates[0]["assignments"]
+        self.assertEqual(len(assignments), 2)
+
+        completion1 = assignments[0]["completion"]
+        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)

From a7900f6bc89f67154f873a52bab10ee3d888894d Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Thu, 25 Apr 2024 07:17:48 +0200
Subject: [PATCH 67/82] =?UTF-8?q?Fix=20typecheck=20=F0=9F=AA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/pages/competence/CompetenceCertificateListPage.vue  | 6 +++---
 client/src/services/competence.ts                           | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/src/pages/competence/CompetenceCertificateListPage.vue b/client/src/pages/competence/CompetenceCertificateListPage.vue
index 40e0008b..31694b1d 100644
--- a/client/src/pages/competence/CompetenceCertificateListPage.vue
+++ b/client/src/pages/competence/CompetenceCertificateListPage.vue
@@ -45,15 +45,15 @@ const assignments = computed(() => {
 });
 
 const totalPointsEvaluatedAssignments = computed(() => {
-  return assignmentsMaxEvaluationPoints(assignments.value);
+  return assignmentsMaxEvaluationPoints(assignments.value ?? []);
 });
 
 const userPointsEvaluatedAssignments = computed(() => {
-  return assignmentsUserPoints(assignments.value);
+  return assignmentsUserPoints(assignments.value ?? []);
 });
 
 const numAssignmentsEvaluated = computed(() => {
-  return assignments.value.filter((a) => {
+  return (assignments.value ?? []).filter((a) => {
     return a.completion?.completion_status === "EVALUATION_SUBMITTED";
   }).length;
 });
diff --git a/client/src/services/competence.ts b/client/src/services/competence.ts
index 53793917..78689005 100644
--- a/client/src/services/competence.ts
+++ b/client/src/services/competence.ts
@@ -59,5 +59,5 @@ export function getCertificates(
     console.error("Data structure is not recognized!");
     return null;
   }
-  return certificates ?? null;
+  return (certificates as unknown as CompetenceCertificateListObjectType) ?? null;
 }

From f4bde62e935998be7d260849ed6dfff1e10e5ac7 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Thu, 25 Apr 2024 09:26:12 +0200
Subject: [PATCH 68/82] Fix link vertical alingment in Basebox

---
 client/src/components/dashboard/BaseBox.vue     | 2 +-
 client/src/components/dashboard/CoursePanel.vue | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/client/src/components/dashboard/BaseBox.vue b/client/src/components/dashboard/BaseBox.vue
index f05a0bc9..d0f0310e 100644
--- a/client/src/components/dashboard/BaseBox.vue
+++ b/client/src/components/dashboard/BaseBox.vue
@@ -5,7 +5,7 @@ defineProps<{
 </script>
 
 <template>
-  <div class="flex flex-col space-y-4 bg-white">
+  <div class="flex h-full flex-col space-y-4 bg-white">
     <h4 class="mb-1 font-bold">
       <slot name="title"></slot>
     </h4>
diff --git a/client/src/components/dashboard/CoursePanel.vue b/client/src/components/dashboard/CoursePanel.vue
index 4cdf739a..8d778486 100644
--- a/client/src/components/dashboard/CoursePanel.vue
+++ b/client/src/components/dashboard/CoursePanel.vue
@@ -150,7 +150,10 @@ function hasActionButton(): boolean {
       >
         <UkStatistics :course-slug="courseSlug" :course-id="courseConfig.course_id" />
       </div>
-      <div v-if="numberOfMentorWidgets > 0" class="flex flex-col flex-wrap md:flex-row">
+      <div
+        v-if="numberOfMentorWidgets > 0"
+        class="flex flex-col flex-wrap items-stretch md:flex-row"
+      >
         <MentorOpenTasksCount
           v-if="hasWidget('MentorTasksWidget')"
           :course-id="courseConfig.course_id"

From 85007a17c957befbb0ec244a469e0f83c5bc0fb2 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Thu, 25 Apr 2024 11:33:33 +0200
Subject: [PATCH 69/82] Fix back button

---
 .../competence/CompetenceCertificateDetailPage.vue   | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/client/src/pages/competence/CompetenceCertificateDetailPage.vue b/client/src/pages/competence/CompetenceCertificateDetailPage.vue
index 9d27ea63..52abe634 100644
--- a/client/src/pages/competence/CompetenceCertificateDetailPage.vue
+++ b/client/src/pages/competence/CompetenceCertificateDetailPage.vue
@@ -5,6 +5,7 @@ import type { CompetenceCertificate } from "@/types";
 import { useCertificateQuery } from "@/composables";
 import CompetenceCertificateComponent from "@/pages/competence/CompetenceCertificateComponent.vue";
 import { getCertificates } from "@/services/competence";
+import { getPreviousRoute } from "@/router/history";
 
 const props = defineProps<{
   courseSlug: string;
@@ -43,11 +44,14 @@ onMounted(async () => {
   <div class="container-large">
     <nav class="py-4">
       <router-link
-        class="btn-text inline-flex items-center pl-0"
-        :to="`/course/${props.courseSlug}/competence/certificates`"
+        :to="
+          getPreviousRoute() || `/course/${props.courseSlug}/competence/certificates`
+        "
+        class="btn-text inline-flex items-center p-0"
+        data-cy="back-button"
       >
-        <it-icon-arrow-left />
-        <span>{{ $t("general.back") }}</span>
+        <it-icon-arrow-left class="-ml-1 mr-1 h-5 w-5"></it-icon-arrow-left>
+        <span class="inline">{{ $t("general.back") }}</span>
       </router-link>
     </nav>
     <div v-if="certificate">

From bb57591387483aba42223cfd636529bccca479e4 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Thu, 25 Apr 2024 11:26:35 +0200
Subject: [PATCH 70/82] Add avatar images to dashboar persons page

---
 .../pages/dashboard/DashboardPersonsPage.vue  |  7 +-
 client/src/services/dashboard.ts              |  2 +
 server/config/settings/local_daniel.py        | 11 +++
 server/vbv_lernwelt/core/models.py            | 26 +++--
 server/vbv_lernwelt/dashboard/views.py        | 95 ++++++++-----------
 5 files changed, 77 insertions(+), 64 deletions(-)
 create mode 100644 server/config/settings/local_daniel.py

diff --git a/client/src/pages/dashboard/DashboardPersonsPage.vue b/client/src/pages/dashboard/DashboardPersonsPage.vue
index cff500dd..c367db56 100644
--- a/client/src/pages/dashboard/DashboardPersonsPage.vue
+++ b/client/src/pages/dashboard/DashboardPersonsPage.vue
@@ -161,9 +161,12 @@ watch(selectedCourse, () => {
             <div class="w-full flex-auto md:w-1/3">
               <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.last_name"
-                  class="h-11 w-11 rounded-full"
-                  :src="'/static/avatars/myvbv-default-avatar.png'"
                 />
                 <div>
                   <div class="text-bold">
diff --git a/client/src/services/dashboard.ts b/client/src/services/dashboard.ts
index 26dfb485..7e2fba9d 100644
--- a/client/src/services/dashboard.ts
+++ b/client/src/services/dashboard.ts
@@ -56,6 +56,8 @@ export type DashboardPersonType = {
   last_name: string;
   email: string;
   course_sessions: DashboardPersonCourseSessionType[];
+  avatar_url: string;
+  avatar_url_small: string;
 };
 
 export type DashboardCourseConfigType = {
diff --git a/server/config/settings/local_daniel.py b/server/config/settings/local_daniel.py
new file mode 100644
index 00000000..55bfc8b2
--- /dev/null
+++ b/server/config/settings/local_daniel.py
@@ -0,0 +1,11 @@
+# pylint: disable=unused-wildcard-import,wildcard-import,wrong-import-position
+import os
+from environs import Env
+
+script_path = os.path.abspath(__file__)
+script_dir = os.path.dirname(script_path)
+
+env = Env()
+env.read_env(f"{script_dir}/../../../env_secrets/local_daniel.env", recurse=False)
+
+from .base import *  # noqa
diff --git a/server/vbv_lernwelt/core/models.py b/server/vbv_lernwelt/core/models.py
index 41b1a487..75e18afb 100644
--- a/server/vbv_lernwelt/core/models.py
+++ b/server/vbv_lernwelt/core/models.py
@@ -1,10 +1,13 @@
 import uuid
 
+import structlog
 from django.contrib.auth.models import AbstractUser
 from django.db import models
 from django.db.models import JSONField
 from django.urls import reverse
 
+logger = structlog.get_logger(__name__)
+
 
 class Organisation(models.Model):
     organisation_id = models.IntegerField(primary_key=True)
@@ -107,15 +110,24 @@ class User(AbstractUser):
         blank=True,
     )
 
+    def create_avatar_url(self, size=400):
+        try:
+            if self.avatar:
+                filter_spec = f"fill-{size}x{size}"
+                self.avatar.get_rendition(filter_spec)
+                url = reverse("user_image", kwargs={"image_id": self.avatar.id})
+                return f"{url}?filter={filter_spec}"
+        except Exception:
+            logger.warn("could not create avatar url", label="security", exc_info=True)
+        return "/static/avatars/myvbv-default-avatar.png"
+
     @property
     def avatar_url(self):
-        if self.avatar:
-            filter_spec = "fill-400x400"
-            self.avatar.get_rendition(filter_spec)
-            url = reverse("user_image", kwargs={"image_id": self.avatar.id})
-            return f"{url}?filter={filter_spec}"
-        else:
-            return "/static/avatars/myvbv-default-avatar.png"
+        return self.create_avatar_url()
+
+    @property
+    def avatar_url_small(self):
+        return self.create_avatar_url(size=96)
 
 
 class SecurityRequestResponseLog(models.Model):
diff --git a/server/vbv_lernwelt/dashboard/views.py b/server/vbv_lernwelt/dashboard/views.py
index bac8875f..1f2e7e6a 100644
--- a/server/vbv_lernwelt/dashboard/views.py
+++ b/server/vbv_lernwelt/dashboard/views.py
@@ -126,6 +126,29 @@ def user_role(roles: Set[str]) -> str:
 
 @api_view(["GET"])
 def get_dashboard_persons(request):
+    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,
+        }
+
+    def create_course_session_dict(course_session_object, user_role, my_role):
+        return {
+            "id": str(course_session_object.id),
+            "session_title": course_session_object.title,
+            "course_id": str(course_session_object.course.id),
+            "course_title": course_session_object.course.title,
+            "course_slug": course_session_object.course.slug,
+            "user_role": user_role,
+            "my_role": my_role,
+            "is_uk": course_session_object.course.configuration.is_uk,
+            "is_vv": course_session_object.course.configuration.is_vv,
+        }
+
     try:
         course_sessions = get_course_sessions_with_roles_for_user(request.user)
 
@@ -137,25 +160,11 @@ def get_dashboard_persons(request):
                 )
                 my_role = user_role(cs.roles)
                 for csu in course_session_users:
-                    result_persons[csu.user.id] = {
-                        "user_id": csu.user.id,
-                        "first_name": csu.user.first_name,
-                        "last_name": csu.user.last_name,
-                        "email": csu.user.email,
-                        "course_sessions": [
-                            {
-                                "id": str(cs.id),
-                                "session_title": cs.title,
-                                "course_id": str(cs.course.id),
-                                "course_title": cs.course.title,
-                                "course_slug": cs.course.slug,
-                                "user_role": csu.role,
-                                "my_role": my_role,
-                                "is_uk": cs.course.configuration.is_uk,
-                                "is_vv": cs.course.configuration.is_vv,
-                            }
-                        ],
-                    }
+                    person_data = create_user_dict(csu.user)
+                    person_data["course_sessions"] = [
+                        create_course_session_dict(cs, csu.role, my_role)
+                    ]
+                    result_persons[csu.user.id] = person_data
 
         # add persons where request.user is mentor
         for cs in course_sessions:
@@ -165,26 +174,14 @@ def get_dashboard_persons(request):
                 ).first()
 
                 for participant in lm.participants.all():
-                    course_session_entry = {
-                        "id": str(cs.id),
-                        "session_title": cs.title,
-                        "course_id": str(cs.course.id),
-                        "course_title": cs.course.title,
-                        "course_slug": cs.course.slug,
-                        "user_role": "LEARNING_MENTEE",
-                        "my_role": "LEARNING_MENTOR",
-                        "is_uk": cs.course.configuration.is_uk,
-                        "is_vv": cs.course.configuration.is_vv,
-                    }
+                    course_session_entry = create_course_session_dict(
+                        cs, "LEARNING_MENTEE", "LEARNING_MENTOR"
+                    )
 
                     if participant.user.id not in result_persons:
-                        result_persons[participant.user.id] = {
-                            "user_id": participant.user.id,
-                            "first_name": participant.user.first_name,
-                            "last_name": participant.user.last_name,
-                            "email": participant.user.email,
-                            "course_sessions": [course_session_entry],
-                        }
+                        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(
@@ -197,26 +194,14 @@ def get_dashboard_persons(request):
         ).prefetch_related("mentor", "course_session")
         for mentor_relation in mentor_relation_qs:
             cs = mentor_relation.course_session
-            course_session_entry = {
-                "id": str(cs.id),
-                "session_title": cs.title,
-                "course_id": str(cs.course.id),
-                "course_title": cs.course.title,
-                "course_slug": cs.course.slug,
-                "user_role": "LEARNING_MENTOR",
-                "my_role": "LEARNING_MENTEE",
-                "is_uk": cs.course.configuration.is_uk,
-                "is_vv": cs.course.configuration.is_vv,
-            }
+            course_session_entry = create_course_session_dict(
+                cs, "LEARNING_MENTOR", "LEARNING_MENTEE"
+            )
 
             if mentor_relation.mentor.id not in result_persons:
-                result_persons[mentor_relation.mentor.id] = {
-                    "user_id": mentor_relation.mentor.id,
-                    "first_name": mentor_relation.mentor.first_name,
-                    "last_name": mentor_relation.mentor.last_name,
-                    "email": mentor_relation.mentor.email,
-                    "course_sessions": [course_session_entry],
-                }
+                person_data = create_user_dict(mentor_relation.mentor)
+                person_data["course_sessions"] = [course_session_entry]
+                result_persons[mentor_relation.mentor.id] = person_data
             else:
                 # user is already in result_persons
                 result_persons[mentor_relation.mentor.id]["course_sessions"].append(

From daa8a16e55f943d0d1cd8b615f7fbebaef920094 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Thu, 25 Apr 2024 13:56:01 +0200
Subject: [PATCH 71/82] Render due dates without url for `LEARNING_MENTOR`

---
 client/src/components/dueDates/DueDateSingle.vue | 16 ++++++++++++++--
 server/vbv_lernwelt/dashboard/views.py           | 12 +++++++-----
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/client/src/components/dueDates/DueDateSingle.vue b/client/src/components/dueDates/DueDateSingle.vue
index 47f659d7..b3261187 100644
--- a/client/src/components/dueDates/DueDateSingle.vue
+++ b/client/src/components/dueDates/DueDateSingle.vue
@@ -30,6 +30,12 @@ const urlText = computed(() => {
   return result.trim();
 });
 
+const showAsUrl = computed(() => {
+  return ["SUPERVISOR", "EXPERT", "MEMBER"].includes(
+    props.dueDate.course_session.my_role
+  );
+});
+
 const url = computed(() => {
   if (["SUPERVISOR", "EXPERT"].includes(props.dueDate.course_session.my_role)) {
     return props.dueDate.url_expert;
@@ -45,18 +51,24 @@ const url = computed(() => {
   >
     <div class="space-y-1">
       <div>
-        <a :href="url">
+        <a v-if="showAsUrl" :href="url">
           <span class="text-bold text-gray-900">
             {{ dayjs(props.dueDate.start).format("dddd D. MMMM YYYY") }}
           </span>
         </a>
+        <span v-else class="text-bold text-gray-900">
+          {{ dayjs(props.dueDate.start).format("dddd D. MMMM YYYY") }}
+        </span>
       </div>
       <div>
-        <a class="underline" :href="url">
+        <a v-if="showAsUrl" class="underline" :href="url">
           <span class="text-bold">
             {{ urlText }}
           </span>
         </a>
+        <span v-else class="text-bold">
+          {{ urlText }}
+        </span>
       </div>
       <div class="text-small text-gray-900">
         <div>
diff --git a/server/vbv_lernwelt/dashboard/views.py b/server/vbv_lernwelt/dashboard/views.py
index 1f2e7e6a..d6e83ae7 100644
--- a/server/vbv_lernwelt/dashboard/views.py
+++ b/server/vbv_lernwelt/dashboard/views.py
@@ -117,11 +117,13 @@ def has_cs_role(roles: Set[str]) -> bool:
 
 
 def user_role(roles: Set[str]) -> str:
-    return (
-        "SUPERVISOR"
-        if "SUPERVISOR" in roles
-        else ("EXPERT" if "EXPERT" in roles else "MEMBER")
-    )
+    if "SUPERVISOR" in roles:
+        return "SUPERVISOR"
+    if "EXPERT" in roles:
+        return "EXPERT"
+    if "MEMBER" in roles:
+        return "MEMBER"
+    return "LEARNING_MENTOR"
 
 
 @api_view(["GET"])

From c294f0e35d2f9f9d0b5099074be78b47f4533a80 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Thu, 25 Apr 2024 14:18:41 +0200
Subject: [PATCH 72/82] VBV-674: Add avatar images to dueDates for lerning
 mentors

---
 .../src/components/dueDates/DueDateSingle.vue |  9 +++++++
 client/src/composables.ts                     | 24 +++++++++++++++----
 .../pages/dashboard/DashboardPersonsPage.vue  |  2 +-
 client/src/services/dashboard.ts              |  1 +
 4 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/client/src/components/dueDates/DueDateSingle.vue b/client/src/components/dueDates/DueDateSingle.vue
index b3261187..ce068271 100644
--- a/client/src/components/dueDates/DueDateSingle.vue
+++ b/client/src/components/dueDates/DueDateSingle.vue
@@ -78,6 +78,15 @@ const url = computed(() => {
           {{ $t("a.Circle") }} «{{ props.dueDate.circle?.title }}»
         </div>
       </div>
+      <div v-if="props.dueDate.persons?.length" class="flex gap-2">
+        <div v-for="person in props.dueDate.persons" :key="person.user_id">
+          <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>
     </div>
   </div>
 </template>
diff --git a/client/src/composables.ts b/client/src/composables.ts
index bc924117..043b7ce1 100644
--- a/client/src/composables.ts
+++ b/client/src/composables.ts
@@ -509,7 +509,7 @@ export function useDashboardPersons() {
   const dashboardDueDates = ref<DashboardDueDate[]>([]);
   const loading = ref(false);
 
-  // due dates from today to the next year
+  // due dates from today to future
   const currentDueDates = ref<DashboardDueDate[]>([]);
 
   const fetchData = async () => {
@@ -536,10 +536,24 @@ export function useDashboardPersons() {
           refDate = dayjs(dueDate.end);
         }
 
-        return (
-          refDate >= dayjs().startOf("day") &&
-          refDate <= dayjs().add(1, "year").endOf("day")
-        );
+        return refDate >= dayjs().startOf("day");
+      });
+
+      // attach `LEARNING_MENTEE` 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) => {
+            if (
+              person.course_sessions
+                .map((cs) => cs.id)
+                .includes(dueDate.course_session.id)
+            ) {
+              return person.course_sessions.some(
+                (cs) => cs.user_role === "LEARNING_MENTEE"
+              );
+            }
+          });
+        }
       });
     } catch (error) {
       console.error("Error fetching data:", error);
diff --git a/client/src/pages/dashboard/DashboardPersonsPage.vue b/client/src/pages/dashboard/DashboardPersonsPage.vue
index c367db56..68c9b363 100644
--- a/client/src/pages/dashboard/DashboardPersonsPage.vue
+++ b/client/src/pages/dashboard/DashboardPersonsPage.vue
@@ -166,7 +166,7 @@ watch(selectedCourse, () => {
                     person.avatar_url_small ||
                     '/static/avatars/myvbv-default-avatar.png'
                   "
-                  :alt="person.last_name"
+                  :alt="`${person.first_name} ${person.last_name}`"
                 />
                 <div>
                   <div class="text-bold">
diff --git a/client/src/services/dashboard.ts b/client/src/services/dashboard.ts
index 7e2fba9d..b0f53853 100644
--- a/client/src/services/dashboard.ts
+++ b/client/src/services/dashboard.ts
@@ -76,6 +76,7 @@ export type DashboardCourseConfigType = {
 export type DashboardDueDate = DueDate & {
   course_session: DashboardPersonCourseSessionType;
   translatedType: string;
+  persons?: DashboardPersonType[];
 };
 
 export const fetchStatisticData = async (

From 1325d9912ce2aa7c2c09ba8dec2463b6fa90f93e Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Thu, 25 Apr 2024 15:01:45 +0200
Subject: [PATCH 73/82] Add region filter to persons page

---
 .../pages/dashboard/DashboardDueDatesPage.vue |  18 ---
 .../pages/dashboard/DashboardPersonsPage.vue  | 107 ++++++++++++++++--
 client/src/services/dashboard.ts              |   2 +
 server/vbv_lernwelt/dashboard/views.py        |  56 ++++-----
 4 files changed, 127 insertions(+), 56 deletions(-)

diff --git a/client/src/pages/dashboard/DashboardDueDatesPage.vue b/client/src/pages/dashboard/DashboardDueDatesPage.vue
index 4be29fc4..93cf3ff1 100644
--- a/client/src/pages/dashboard/DashboardDueDatesPage.vue
+++ b/client/src/pages/dashboard/DashboardDueDatesPage.vue
@@ -172,24 +172,6 @@ const circles = computed(() => {
 });
 const selectedCircle = ref<DropboxItem>(circles.value[0]);
 
-// async function loadCircleValues() {
-//   if (selectedCourse.value && selectedCourse.value.slug) {
-//     const learningPathQuery = useCourseData(selectedCourse.value.slug);
-//     await learningPathQuery.resultPromise;
-//     circles.value = [
-//       initialItemCircle,
-//       ...(learningPathQuery.circles.value ?? []).map((circle) => ({
-//         id: circle.id,
-//         name: circle.title,
-//       })),
-//     ];
-//   } else {
-//     circles.value = [initialItemCircle];
-//   }
-//
-//   selectedCircle.value = circles.value[0];
-// }
-
 const dueDateTypes = computed(() => {
   const types = _(dashboardDueDates.value)
     .map((dueDate) => {
diff --git a/client/src/pages/dashboard/DashboardPersonsPage.vue b/client/src/pages/dashboard/DashboardPersonsPage.vue
index 68c9b363..88167699 100644
--- a/client/src/pages/dashboard/DashboardPersonsPage.vue
+++ b/client/src/pages/dashboard/DashboardPersonsPage.vue
@@ -25,7 +25,7 @@ const courses = computed(() => {
   return [
     {
       id: UNFILTERED,
-      name: t("a.Alle Lehrgänge"),
+      name: `${t("Lehrgang")}: ${t("a.Alle")}`,
     },
     ..._(dashboardPersons.value)
       .flatMap((person) => person.course_sessions)
@@ -37,11 +37,35 @@ const courses = computed(() => {
       .value(),
   ];
 });
-
 const selectedCourse = ref<MenuItem>(courses.value[0]);
 
+const regions = computed(() => {
+  let values = _(dashboardPersons.value)
+    .flatMap((person) => person.course_sessions)
+    .map((cs) => {
+      return Object.assign({}, cs, { name: cs.region, id: cs.region });
+    })
+    .uniqBy("id")
+    .orderBy("name")
+    .value();
+
+  // filter by selected course
+  if (selectedCourse.value.id !== UNFILTERED) {
+    values = values.filter((cs) => cs.course_id === selectedCourse.value.id);
+  }
+
+  return [
+    {
+      id: UNFILTERED,
+      name: `${t("Region")}: ${t("a.Alle")}`,
+    },
+    ...values,
+  ];
+});
+const selectedRegion = ref<MenuItem>(regions.value[0]);
+
 const courseSessions = computed(() => {
-  let sessions = _(dashboardPersons.value)
+  let values = _(dashboardPersons.value)
     .flatMap((person) => person.course_sessions)
     .map((cs) => {
       return Object.assign({}, cs, { name: cs.session_title, id: cs.id });
@@ -52,20 +76,43 @@ const courseSessions = computed(() => {
 
   // filter by selected course
   if (selectedCourse.value.id !== UNFILTERED) {
-    sessions = sessions.filter((cs) => cs.course_id === selectedCourse.value.id);
+    values = values.filter((cs) => cs.course_id === selectedCourse.value.id);
+  }
+  // filter by selected region
+  if (selectedRegion.value.id !== UNFILTERED) {
+    values = values.filter((cs) => cs.region === selectedRegion.value.id);
   }
 
   return [
     {
       id: UNFILTERED,
-      name: t("a.AlleDurchführungen"),
+      name: `${t("Durchführung")}: ${t("a.Alle")}`,
     },
-    ...sessions,
+    ...values,
   ];
 });
-
 const selectedSession = ref<MenuItem>(courseSessions.value[0]);
 
+const generations = computed(() => {
+  const values = _(dashboardPersons.value)
+    .flatMap((person) => person.course_sessions)
+    .map((cs) => {
+      return Object.assign({}, cs, { name: cs.generation, id: cs.generation });
+    })
+    .uniqBy("id")
+    .orderBy("name")
+    .value();
+
+  return [
+    {
+      id: UNFILTERED,
+      name: `${t("Generation")}: ${t("a.Alle")}`,
+    },
+    ...values,
+  ];
+});
+const selectedGeneration = ref<MenuItem>(generations.value[0]);
+
 const filteredPersons = computed(() => {
   return _.orderBy(
     dashboardPersons.value
@@ -82,13 +129,33 @@ const filteredPersons = computed(() => {
           return true;
         }
         return person.course_sessions.some((cs) => cs.id === selectedSession.value.id);
+      })
+      .filter((person) => {
+        if (selectedRegion.value.id === UNFILTERED) {
+          return true;
+        }
+        return person.course_sessions.some(
+          (cs) => cs.region === selectedRegion.value.id
+        );
+      })
+      .filter((person) => {
+        if (selectedGeneration.value.id === UNFILTERED) {
+          return true;
+        }
+        return person.course_sessions.some(
+          (cs) => cs.generation === selectedGeneration.value.id
+        );
       }),
     ["last_name", "first_name"]
   );
 });
 
 const filtersVisible = computed(() => {
-  return courses.value.length > 2 || courseSessions.value.length > 2;
+  return (
+    courses.value.length > 2 ||
+    courseSessions.value.length > 2 ||
+    regions.value.length > 2
+  );
 });
 
 function personRoleDisplayValue(personCourseSession: DashboardPersonCourseSessionType) {
@@ -111,6 +178,10 @@ function personRoleDisplayValue(personCourseSession: DashboardPersonCourseSessio
 }
 
 watch(selectedCourse, () => {
+  selectedRegion.value = regions.value[0];
+});
+
+watch(selectedRegion, () => {
   selectedSession.value = courseSessions.value[0];
 });
 </script>
@@ -139,18 +210,34 @@ watch(selectedCourse, () => {
             <ItDropdownSelect
               v-if="courses.length > 2"
               v-model="selectedCourse"
-              data-cy="session-select"
+              data-cy="select-course"
               :items="courses"
               borderless
             ></ItDropdownSelect>
 
+            <ItDropdownSelect
+              v-if="regions.length > 2"
+              v-model="selectedRegion"
+              data-cy="select-region"
+              :items="regions"
+              borderless
+            ></ItDropdownSelect>
+
             <ItDropdownSelect
               v-if="courseSessions.length > 2"
               v-model="selectedSession"
-              data-cy="session-select"
+              data-cy="select-session"
               :items="courseSessions"
               borderless
             ></ItDropdownSelect>
+
+            <ItDropdownSelect
+              v-if="generations.length > 2"
+              v-model="selectedGeneration"
+              data-cy="select-generation"
+              :items="generations"
+              borderless
+            ></ItDropdownSelect>
           </section>
           <div
             v-for="person in filteredPersons"
diff --git a/client/src/services/dashboard.ts b/client/src/services/dashboard.ts
index b0f53853..bf5edf28 100644
--- a/client/src/services/dashboard.ts
+++ b/client/src/services/dashboard.ts
@@ -44,6 +44,8 @@ export type DashboardPersonCourseSessionType = {
   course_id: string;
   course_title: string;
   course_slug: string;
+  region: string;
+  generation: string;
   user_role: DashboardPersonRoleType;
   my_role: DashboardPersonRoleType;
   is_uk: boolean;
diff --git a/server/vbv_lernwelt/dashboard/views.py b/server/vbv_lernwelt/dashboard/views.py
index d6e83ae7..d1f0ffcf 100644
--- a/server/vbv_lernwelt/dashboard/views.py
+++ b/server/vbv_lernwelt/dashboard/views.py
@@ -126,6 +126,22 @@ def user_role(roles: Set[str]) -> str:
     return "LEARNING_MENTOR"
 
 
+def _create_course_session_dict(course_session_object, my_role, user_role):
+    return {
+        "id": str(course_session_object.id),
+        "session_title": course_session_object.title,
+        "course_id": str(course_session_object.course.id),
+        "course_title": course_session_object.course.title,
+        "course_slug": course_session_object.course.slug,
+        "region": course_session_object.region,
+        "generation": course_session_object.generation,
+        "my_role": my_role,
+        "user_role": user_role,
+        "is_uk": course_session_object.course.configuration.is_uk,
+        "is_vv": course_session_object.course.configuration.is_vv,
+    }
+
+
 @api_view(["GET"])
 def get_dashboard_persons(request):
     def create_user_dict(user_object):
@@ -138,19 +154,6 @@ def get_dashboard_persons(request):
             "avatar_url": user_object.avatar_url,
         }
 
-    def create_course_session_dict(course_session_object, user_role, my_role):
-        return {
-            "id": str(course_session_object.id),
-            "session_title": course_session_object.title,
-            "course_id": str(course_session_object.course.id),
-            "course_title": course_session_object.course.title,
-            "course_slug": course_session_object.course.slug,
-            "user_role": user_role,
-            "my_role": my_role,
-            "is_uk": course_session_object.course.configuration.is_uk,
-            "is_vv": course_session_object.course.configuration.is_vv,
-        }
-
     try:
         course_sessions = get_course_sessions_with_roles_for_user(request.user)
 
@@ -164,7 +167,7 @@ def get_dashboard_persons(request):
                 for csu in course_session_users:
                     person_data = create_user_dict(csu.user)
                     person_data["course_sessions"] = [
-                        create_course_session_dict(cs, csu.role, my_role)
+                        _create_course_session_dict(cs, my_role, csu.role)
                     ]
                     result_persons[csu.user.id] = person_data
 
@@ -176,8 +179,10 @@ def get_dashboard_persons(request):
                 ).first()
 
                 for participant in lm.participants.all():
-                    course_session_entry = create_course_session_dict(
-                        cs, "LEARNING_MENTEE", "LEARNING_MENTOR"
+                    course_session_entry = _create_course_session_dict(
+                        cs,
+                        "LEARNING_MENTOR",
+                        "LEARNING_MENTEE",
                     )
 
                     if participant.user.id not in result_persons:
@@ -196,8 +201,10 @@ def get_dashboard_persons(request):
         ).prefetch_related("mentor", "course_session")
         for mentor_relation in mentor_relation_qs:
             cs = mentor_relation.course_session
-            course_session_entry = create_course_session_dict(
-                cs, "LEARNING_MENTOR", "LEARNING_MENTEE"
+            course_session_entry = _create_course_session_dict(
+                cs,
+                "LEARNING_MENTEE",
+                "LEARNING_MENTOR",
             )
 
             if mentor_relation.mentor.id not in result_persons:
@@ -257,16 +264,9 @@ def get_dashboard_due_dates(request):
                 if course_session.id == due_date.course_session.id
             )
             if cs:
-                data["course_session"] = {
-                    "id": str(cs.id),
-                    "session_title": cs.title,
-                    "course_id": str(cs.course.id),
-                    "course_title": cs.course.title,
-                    "course_slug": cs.course.slug,
-                    "my_role": user_role(cs.roles),
-                    "is_uk": cs.course.configuration.is_uk,
-                    "is_vv": cs.course.configuration.is_vv,
-                }
+                data["course_session"] = _create_course_session_dict(
+                    cs, my_role=user_role(cs.roles), user_role=""
+                )
             result_due_dates.append(data)
 
         return Response(

From 9c1e399f4dcf8da8340a43ddafb393f31d073be7 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Thu, 25 Apr 2024 15:30:10 +0200
Subject: [PATCH 74/82] Add role filter to persons page

---
 client/src/composables.ts                     | 57 +++++++++++++++++-
 .../pages/dashboard/DashboardDueDatesPage.vue |  6 +-
 .../pages/dashboard/DashboardPersonsPage.vue  | 60 ++++++++++++++-----
 client/src/services/dashboard.ts              |  2 +
 server/vbv_lernwelt/learning_mentor/admin.py  | 16 +++++
 5 files changed, 123 insertions(+), 18 deletions(-)

diff --git a/client/src/composables.ts b/client/src/composables.ts
index 043b7ce1..97ecfec8 100644
--- a/client/src/composables.ts
+++ b/client/src/composables.ts
@@ -13,7 +13,11 @@ import {
   circleFlatLearningUnits,
   someFinishedInLearningSequence,
 } from "@/services/circle";
-import type { DashboardDueDate, DashboardPersonType } from "@/services/dashboard";
+import type {
+  DashboardDueDate,
+  DashboardPersonRoleType,
+  DashboardPersonType,
+} from "@/services/dashboard";
 import {
   courseIdForCourseSlug,
   fetchDashboardDueDates,
@@ -504,6 +508,40 @@ export function useMyLearningMentors() {
   };
 }
 
+export function getVvRoleDisplay(role: DashboardPersonRoleType) {
+  switch (role) {
+    case "LEARNING_MENTOR":
+      return t("a.Lernbegleitung");
+    case "LEARNING_MENTEE":
+      return t("a.Teilnehmer");
+    case "EXPERT":
+      return t("a.Experte");
+    case "MEMBER":
+      return t("a.Teilnehmer");
+    case "SUPERVISOR":
+      return t("a.Regionenleiter");
+    default:
+      return role;
+  }
+}
+
+export function getUkRoleDisplay(role: DashboardPersonRoleType) {
+  switch (role) {
+    case "LEARNING_MENTOR":
+      return t("a.Praxisbildner");
+    case "LEARNING_MENTEE":
+      return t("a.Teilnehmer");
+    case "EXPERT":
+      return t("a.Trainer");
+    case "MEMBER":
+      return t("a.Teilnehmer");
+    case "SUPERVISOR":
+      return t("a.Regionenleiter");
+    default:
+      return role;
+  }
+}
+
 export function useDashboardPersons() {
   const dashboardPersons = ref<DashboardPersonType[]>([]);
   const dashboardDueDates = ref<DashboardDueDate[]>([]);
@@ -520,6 +558,23 @@ export function useDashboardPersons() {
         fetchDashboardDueDates(),
       ]);
       dashboardPersons.value = persons;
+
+      // attach role name to persons
+      dashboardPersons.value.forEach((person) => {
+        person.course_sessions.forEach((cs) => {
+          if (cs.is_uk) {
+            cs.my_role_display = getUkRoleDisplay(cs.my_role);
+            cs.user_role_display = getUkRoleDisplay(cs.user_role);
+          } else if (cs.is_vv) {
+            cs.my_role_display = getVvRoleDisplay(cs.my_role);
+            cs.user_role_display = getVvRoleDisplay(cs.user_role);
+          } else {
+            cs.my_role_display = "";
+            cs.user_role_display = "";
+          }
+        });
+      });
+
       dashboardDueDates.value = dueDates.map((dueDate) => {
         const dateType = t(dueDate.date_type_translation_key);
         const assignmentType = t(dueDate.assignment_type_translation_key);
diff --git a/client/src/pages/dashboard/DashboardDueDatesPage.vue b/client/src/pages/dashboard/DashboardDueDatesPage.vue
index 93cf3ff1..4f39c7cc 100644
--- a/client/src/pages/dashboard/DashboardDueDatesPage.vue
+++ b/client/src/pages/dashboard/DashboardDueDatesPage.vue
@@ -31,7 +31,7 @@ const courses = computed(() => {
   return [
     {
       id: UNFILTERED,
-      name: t("a.Alle Lehrgänge"),
+      name: `${t("Lehrgang")}: ${t("a.Alle")}`,
       slug: "",
     },
     ..._(dashboardDueDates.value)
@@ -70,7 +70,7 @@ const courseSessions = computed(() => {
   return [
     {
       id: UNFILTERED,
-      name: t("a.AlleDurchführungen"),
+      name: `${t("Durchführung")}: ${t("a.Alle")}`,
     },
     ...sessions,
   ];
@@ -165,7 +165,7 @@ const circles = computed(() => {
   return [
     {
       id: UNFILTERED,
-      name: t("a.AlleCircle"),
+      name: `${t("Circle")}: ${t("a.Alle")}`,
     },
     ...circleList,
   ];
diff --git a/client/src/pages/dashboard/DashboardPersonsPage.vue b/client/src/pages/dashboard/DashboardPersonsPage.vue
index 88167699..16598df9 100644
--- a/client/src/pages/dashboard/DashboardPersonsPage.vue
+++ b/client/src/pages/dashboard/DashboardPersonsPage.vue
@@ -113,6 +113,27 @@ const generations = computed(() => {
 });
 const selectedGeneration = ref<MenuItem>(generations.value[0]);
 
+const roles = computed(() => {
+  const values = _(dashboardPersons.value)
+    .flatMap((person) => person.course_sessions)
+    .map((cs) => {
+      return Object.assign({}, cs, { name: cs.user_role_display, id: cs.user_role_display });
+    })
+    .uniqBy("id")
+    .orderBy("name")
+    .value();
+
+  return [
+    {
+      id: "",
+      name: `${t("Rolle")}: ${t("a.Alle")}`,
+    },
+    ...values,
+  ];
+});
+const selectedRole = ref<MenuItem>(roles.value[0]);
+
+
 const filteredPersons = computed(() => {
   return _.orderBy(
     dashboardPersons.value
@@ -145,6 +166,14 @@ const filteredPersons = computed(() => {
         return person.course_sessions.some(
           (cs) => cs.generation === selectedGeneration.value.id
         );
+      })
+      .filter((person) => {
+        if (selectedRole.value.id === "") {
+          return true;
+        }
+        return person.course_sessions.some(
+          (cs) => cs.user_role_display === selectedRole.value.id
+        );
       }),
     ["last_name", "first_name"]
   );
@@ -154,24 +183,17 @@ const filtersVisible = computed(() => {
   return (
     courses.value.length > 2 ||
     courseSessions.value.length > 2 ||
-    regions.value.length > 2
+    regions.value.length > 2 ||
+    generations.value.length > 2 ||
+    roles.value.length > 2
   );
 });
 
 function personRoleDisplayValue(personCourseSession: DashboardPersonCourseSessionType) {
-  if (personCourseSession.is_uk) {
-    if (personCourseSession.user_role === "EXPERT") {
-      return t("a.Trainer");
-    }
-    if (personCourseSession.user_role === "LEARNING_MENTOR") {
-      return t("a.Praxisbildner");
-    }
-  }
-
-  if (personCourseSession.is_vv) {
-    if (personCourseSession.user_role === "LEARNING_MENTOR") {
-      return t("a.Lernbegleitung");
-    }
+  if (
+    ["SUPERVISOR", "EXPERT", "LEARNING_MENTOR"].includes(personCourseSession.user_role)
+  ) {
+    return personCourseSession.user_role_display;
   }
 
   return "";
@@ -183,6 +205,8 @@ watch(selectedCourse, () => {
 
 watch(selectedRegion, () => {
   selectedSession.value = courseSessions.value[0];
+  selectedGeneration.value = generations.value[0];
+  selectedRole.value = roles.value[0];
 });
 </script>
 
@@ -238,6 +262,14 @@ watch(selectedRegion, () => {
               :items="generations"
               borderless
             ></ItDropdownSelect>
+
+            <ItDropdownSelect
+              v-if="roles.length > 2"
+              v-model="selectedRole"
+              data-cy="select-role"
+              :items="roles"
+              borderless
+            ></ItDropdownSelect>
           </section>
           <div
             v-for="person in filteredPersons"
diff --git a/client/src/services/dashboard.ts b/client/src/services/dashboard.ts
index bf5edf28..678af9ab 100644
--- a/client/src/services/dashboard.ts
+++ b/client/src/services/dashboard.ts
@@ -47,7 +47,9 @@ export type DashboardPersonCourseSessionType = {
   region: string;
   generation: string;
   user_role: DashboardPersonRoleType;
+  user_role_display: string;
   my_role: DashboardPersonRoleType;
+  my_role_display: string;
   is_uk: boolean;
   is_vv: boolean;
 };
diff --git a/server/vbv_lernwelt/learning_mentor/admin.py b/server/vbv_lernwelt/learning_mentor/admin.py
index 80387032..5501638f 100644
--- a/server/vbv_lernwelt/learning_mentor/admin.py
+++ b/server/vbv_lernwelt/learning_mentor/admin.py
@@ -1,5 +1,6 @@
 from django.contrib import admin
 
+from vbv_lernwelt.course.models import CourseSessionUser
 from vbv_lernwelt.learning_mentor.models import LearningMentor, MentorInvitation
 
 
@@ -14,6 +15,21 @@ class LearningMentorAdmin(admin.ModelAdmin):
 
     search_fields = ["mentor__email"]
 
+    raw_id_fields = [
+        "mentor",
+        "course_session",
+    ]
+
+    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)
+
 
 @admin.register(MentorInvitation)
 class MentorInvitationAdmin(admin.ModelAdmin):

From d15eb70792d7277d18d5336c5d3abdfbebedbb79 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Thu, 25 Apr 2024 16:42:47 +0200
Subject: [PATCH 75/82] VBV-672: Link zu gefilteter Personenliste

---
 .../dashboard/MentorMenteeCount.vue           |  2 +-
 .../pages/dashboard/DashboardPersonsPage.vue  | 23 +++++++++++++++++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/client/src/components/dashboard/MentorMenteeCount.vue b/client/src/components/dashboard/MentorMenteeCount.vue
index 4beac8cd..10dc86f7 100644
--- a/client/src/components/dashboard/MentorMenteeCount.vue
+++ b/client/src/components/dashboard/MentorMenteeCount.vue
@@ -20,7 +20,7 @@ onMounted(async () => {
 <template>
   <div class="w-[325px]">
     <BaseBox
-      :details-link="`/dashboard/persons`"
+      :details-link="`/dashboard/persons?course=${props.courseId}`"
       data-cy="dashboard.mentor.competenceSummary"
     >
       <template #title>{{ $t("a.Personen") }}</template>
diff --git a/client/src/pages/dashboard/DashboardPersonsPage.vue b/client/src/pages/dashboard/DashboardPersonsPage.vue
index 16598df9..113bf29b 100644
--- a/client/src/pages/dashboard/DashboardPersonsPage.vue
+++ b/client/src/pages/dashboard/DashboardPersonsPage.vue
@@ -7,6 +7,7 @@ import { computed, ref, watch } from "vue";
 import { useTranslation } from "i18next-vue";
 import _ from "lodash";
 import type { DashboardPersonCourseSessionType } from "@/services/dashboard";
+import { useRouteQuery } from "@vueuse/router";
 
 log.debug("DashboardPersonsPage created");
 
@@ -38,6 +39,20 @@ const courses = computed(() => {
   ];
 });
 const selectedCourse = ref<MenuItem>(courses.value[0]);
+const selectedCourseRouteQuery = useRouteQuery("course", UNFILTERED, {
+  mode: "replace",
+});
+
+watch(selectedCourse, () => {
+  selectedCourseRouteQuery.value = selectedCourse.value.id;
+});
+watch(courses, () => {
+  if (selectedCourseRouteQuery.value !== UNFILTERED) {
+    selectedCourse.value =
+      courses.value.find((course) => course.id === selectedCourseRouteQuery.value) ||
+      courses.value[0];
+  }
+});
 
 const regions = computed(() => {
   let values = _(dashboardPersons.value)
@@ -45,6 +60,7 @@ const regions = computed(() => {
     .map((cs) => {
       return Object.assign({}, cs, { name: cs.region, id: cs.region });
     })
+    .filter((cs) => !!cs.region)
     .uniqBy("id")
     .orderBy("name")
     .value();
@@ -99,6 +115,7 @@ const generations = computed(() => {
     .map((cs) => {
       return Object.assign({}, cs, { name: cs.generation, id: cs.generation });
     })
+    .filter((cs) => !!cs.generation)
     .uniqBy("id")
     .orderBy("name")
     .value();
@@ -117,7 +134,10 @@ const roles = computed(() => {
   const values = _(dashboardPersons.value)
     .flatMap((person) => person.course_sessions)
     .map((cs) => {
-      return Object.assign({}, cs, { name: cs.user_role_display, id: cs.user_role_display });
+      return Object.assign({}, cs, {
+        name: cs.user_role_display,
+        id: cs.user_role_display,
+      });
     })
     .uniqBy("id")
     .orderBy("name")
@@ -133,7 +153,6 @@ const roles = computed(() => {
 });
 const selectedRole = ref<MenuItem>(roles.value[0]);
 
-
 const filteredPersons = computed(() => {
   return _.orderBy(
     dashboardPersons.value

From 1693adce39a7e4c42501668c86fd40ec1768d07f Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Thu, 25 Apr 2024 18:48:13 +0200
Subject: [PATCH 76/82] Fix cypress test for due dates page

---
 .../pages/dashboard/DashboardAsideWidget.vue  |  3 +-
 .../pages/dashboard/DashboardDueDatesPage.vue | 14 +++--
 .../pages/dashboard/DashboardPersonsPage.vue  |  2 +-
 cypress/e2e/appointments.cy.js                | 41 -------------
 cypress/e2e/dueDates.cy.js                    | 50 ++++++++++++++++
 cypress/e2e/login.cy.js                       |  2 +-
 server/config/settings/local_daniel.py        |  1 +
 .../course/creators/test_course.py            | 58 +++++++++++++++++--
 8 files changed, 117 insertions(+), 54 deletions(-)
 delete mode 100644 cypress/e2e/appointments.cy.js
 create mode 100644 cypress/e2e/dueDates.cy.js

diff --git a/client/src/pages/dashboard/DashboardAsideWidget.vue b/client/src/pages/dashboard/DashboardAsideWidget.vue
index 934fd7eb..39278242 100644
--- a/client/src/pages/dashboard/DashboardAsideWidget.vue
+++ b/client/src/pages/dashboard/DashboardAsideWidget.vue
@@ -29,7 +29,8 @@ const displayDueDates = computed(() => {
           </router-link>
         </div>
       </section>
-      <section class="p-8">
+
+      <section v-if="dashboardDueDates.length > 0" class="p-8">
         <h3>{{ $t("a.Termine") }}</h3>
 
         <div v-for="dueDate in displayDueDates" :key="dueDate.id">
diff --git a/client/src/pages/dashboard/DashboardDueDatesPage.vue b/client/src/pages/dashboard/DashboardDueDatesPage.vue
index 4f39c7cc..5e96cd61 100644
--- a/client/src/pages/dashboard/DashboardDueDatesPage.vue
+++ b/client/src/pages/dashboard/DashboardDueDatesPage.vue
@@ -198,6 +198,7 @@ const selectedType = ref<DropboxItem>(dueDateTypes.value[0]);
 watch(selectedCourse, async () => {
   selectedSession.value = courseSessions.value[0];
   selectedCircle.value = circles.value[0];
+  selectedType.value = dueDateTypes.value[0];
 });
 </script>
 
@@ -225,37 +226,40 @@ watch(selectedCourse, async () => {
           >
             <ItDropdownSelect
               v-model="selectedCourse"
-              data-cy="session-select"
+              data-cy="select-course"
               :items="courses"
               borderless
             ></ItDropdownSelect>
 
             <ItDropdownSelect
               v-model="selectedSession"
-              data-cy="session-select"
+              data-cy="select-session"
               :items="courseSessions"
               borderless
             ></ItDropdownSelect>
 
             <ItDropdownSelect
               v-model="selectedCircle"
-              data-cy="appointments-circle-select"
+              data-cy="select-circle"
               :items="circles"
               borderless
             ></ItDropdownSelect>
 
             <ItDropdownSelect
               v-model="selectedType"
-              data-cy="appointments-type-select"
+              data-cy="select-type"
               :items="dueDateTypes"
               borderless
             ></ItDropdownSelect>
           </section>
 
-          <section>
+          <section data-cy="due-date-list">
             <div v-for="dueDate in filteredDueDates" :key="dueDate.id" class="border-b">
               <DueDateSingle :single-line="true" :due-date="dueDate"></DueDateSingle>
             </div>
+            <div v-if="!filteredDueDates.length" class="mt-4">
+              <p>{{ $t("dueDates.noDueDatesAvailable") }}</p>
+            </div>
           </section>
         </div>
       </div>
diff --git a/client/src/pages/dashboard/DashboardPersonsPage.vue b/client/src/pages/dashboard/DashboardPersonsPage.vue
index 113bf29b..0eb57636 100644
--- a/client/src/pages/dashboard/DashboardPersonsPage.vue
+++ b/client/src/pages/dashboard/DashboardPersonsPage.vue
@@ -269,7 +269,7 @@ watch(selectedRegion, () => {
             <ItDropdownSelect
               v-if="courseSessions.length > 2"
               v-model="selectedSession"
-              data-cy="select-session"
+              data-cy="select-course"
               :items="courseSessions"
               borderless
             ></ItDropdownSelect>
diff --git a/cypress/e2e/appointments.cy.js b/cypress/e2e/appointments.cy.js
deleted file mode 100644
index cc660032..00000000
--- a/cypress/e2e/appointments.cy.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import { login } from "./helpers";
-
-// constants
-const COURSE_SELECT = "[data-cy=appointments-course-select]";
-const SESSION_SELECT = "[data-cy=appointments-session-select]";
-const CIRCLE_SELECT = "[data-cy=appointments-circle-select]";
-const APPOINTMENTS = "[data-cy=appointments-list]";
-
-describe("appointments.cy.js", () => {
-  beforeEach(() => {
-    cy.manageCommand("cypress_reset");
-    login("test-student2@example.com", "test");
-    cy.visit("/course/test-lehrgang/appointments");
-  });
-
-  it("preselects first course (Test Lehrgang)", () => {
-    cy.visit("/course/test-lehrgang/appointments");
-    cy.get(COURSE_SELECT).should("contain", "Test Lehrgang");
-    cy.get(SESSION_SELECT).should("contain", "Bern");
-    cy.get(CIRCLE_SELECT).should("contain", "Alle");
-
-    cy.get(".cy-single-due-date").should("have.length", 5);
-  });
-
-  it("can filter by circle", () => {
-    cy.get(CIRCLE_SELECT).click();
-    cy.get(CIRCLE_SELECT).contains("Fahrzeug").click();
-
-    // THEN
-    cy.get(APPOINTMENTS).should("not.contain", "Keine Termine");
-  });
-
-  it("can switch course session", () => {
-    cy.get(SESSION_SELECT).click();
-    cy.get(SESSION_SELECT).contains("Zürich").click();
-    cy.get(SESSION_SELECT).should("contain", "Zürich");
-
-    // THEN
-    cy.get(APPOINTMENTS).should("contain", "Keine Termine");
-  });
-});
diff --git a/cypress/e2e/dueDates.cy.js b/cypress/e2e/dueDates.cy.js
new file mode 100644
index 00000000..4e9d3287
--- /dev/null
+++ b/cypress/e2e/dueDates.cy.js
@@ -0,0 +1,50 @@
+import { login } from "./helpers";
+
+function selectDropboxItem(dropboxSelector, item) {
+  cy.get(dropboxSelector).click();
+  cy.get(dropboxSelector).contains(item).click();
+}
+
+describe("appointments.cy.js", () => {
+  beforeEach(() => {
+    cy.manageCommand("cypress_reset");
+    login("test-student2@example.com", "test");
+    cy.visit("/dashboard/due-dates");
+  });
+
+  it("can filter due dates by dropbox selects", () => {
+    cy.get('[data-cy="due-date-list"]').children().should("have.length", 7);
+
+    // can filter by session
+    cy.get('[data-cy="select-session"]').click();
+    selectDropboxItem('[data-cy="select-session"]', "Zürich");
+    cy.get('[data-cy="due-date-list"]').children().should("have.length", 1);
+    selectDropboxItem('[data-cy="select-session"]', "Bern");
+    cy.get('[data-cy="due-date-list"]').children().should("have.length", 6);
+    selectDropboxItem('[data-cy="select-session"]', "Alle");
+    cy.get('[data-cy="due-date-list"]').children().should("have.length", 7);
+
+    // can filter by circle
+    selectDropboxItem('[data-cy="select-circle"]', "Fahrzeug");
+    cy.get('[data-cy="due-date-list"]').children().should("have.length", 6);
+    selectDropboxItem('[data-cy="select-circle"]', "Reisen");
+    cy.get('[data-cy="due-date-list"]').children().should("have.length", 1);
+    selectDropboxItem('[data-cy="select-circle"]', "Alle");
+    cy.get('[data-cy="due-date-list"]').children().should("have.length", 7);
+
+    // can filter by types
+    selectDropboxItem('[data-cy="select-type"]', "Präsenzkurs");
+    cy.get('[data-cy="due-date-list"]').children().should("have.length", 3);
+    selectDropboxItem('[data-cy="select-type"]', "Bewertung");
+    cy.get('[data-cy="due-date-list"]').children().should("have.length", 1);
+
+    // combination
+    selectDropboxItem('[data-cy="select-session"]', "Bern");
+    selectDropboxItem('[data-cy="select-type"]', "Präsenzkurs");
+    cy.get('[data-cy="due-date-list"]').children().should("have.length", 2);
+    selectDropboxItem('[data-cy="select-session"]', "Zürich");
+    cy.get('[data-cy="due-date-list"]').children().should("have.length", 1);
+    selectDropboxItem('[data-cy="select-type"]', "Bewertung");
+    cy.get('[data-cy="due-date-list"]').should("contain", "Keine Termine");
+  });
+});
diff --git a/cypress/e2e/login.cy.js b/cypress/e2e/login.cy.js
index c3321d09..57afc60a 100644
--- a/cypress/e2e/login.cy.js
+++ b/cypress/e2e/login.cy.js
@@ -28,7 +28,7 @@ describe("login.cy.js", () => {
     login("test-student1@example.com", "test");
     cy.visit("/");
     cy.request("/api/core/me").its("status").should("eq", 200);
-    cy.get('[data-cy="dashboard-title"]').should("contain", "Dashboard");
+    cy.get('[data-cy="db-course-title"]').should("contain", "Test Lehrgang");
   });
 
   it("login will redirect to requested page", () => {
diff --git a/server/config/settings/local_daniel.py b/server/config/settings/local_daniel.py
index 55bfc8b2..e463c124 100644
--- a/server/config/settings/local_daniel.py
+++ b/server/config/settings/local_daniel.py
@@ -1,5 +1,6 @@
 # pylint: disable=unused-wildcard-import,wildcard-import,wrong-import-position
 import os
+
 from environs import Env
 
 script_path = os.path.abspath(__file__)
diff --git a/server/vbv_lernwelt/course/creators/test_course.py b/server/vbv_lernwelt/course/creators/test_course.py
index 2c30840a..59fb6a2e 100644
--- a/server/vbv_lernwelt/course/creators/test_course.py
+++ b/server/vbv_lernwelt/course/creators/test_course.py
@@ -1,6 +1,6 @@
 from datetime import datetime
 
-from dateutil.relativedelta import MO, relativedelta, TH, TU
+from dateutil.relativedelta import MO, relativedelta, TH, TU, WE
 from django.utils import timezone
 from slugify import slugify
 from wagtail.rich_text import RichText
@@ -164,14 +164,33 @@ def create_test_course(
             location="Handelsschule KV Bern, Zimmer 123, Eigerstrasse 16, 3012 Bern",
             trainer="Roland Grossenbacher, roland.grossenbacher@helvetia.ch",
         )
-        tuesday_in_one_week = (
+        wednesday_in_four_weeks = (
             datetime.now() + relativedelta(weekday=TU) + relativedelta(weeks=1)
         )
         csac.due_date.start = timezone.make_aware(
-            tuesday_in_one_week.replace(hour=8, minute=30, second=0, microsecond=0)
+            wednesday_in_four_weeks.replace(hour=8, minute=30, second=0, microsecond=0)
         )
         csac.due_date.end = timezone.make_aware(
-            tuesday_in_one_week.replace(hour=17, minute=0, second=0, microsecond=0)
+            wednesday_in_four_weeks.replace(hour=17, minute=0, second=0, microsecond=0)
+        )
+        csac.due_date.save()
+
+        csac = CourseSessionAttendanceCourse.objects.create(
+            course_session=cs_bern,
+            learning_content=LearningContentAttendanceCourse.objects.get(
+                slug="test-lehrgang-lp-circle-reisen-lc-präsenzkurs-reisen"
+            ),
+            location="Handelsschule KV Bern, Zimmer 123, Eigerstrasse 16, 3012 Bern",
+            trainer="Roland Grossenbacher, roland.grossenbacher@helvetia.ch",
+        )
+        wednesday_in_four_weeks = (
+            datetime.now() + relativedelta(weekday=TU) + relativedelta(weeks=4)
+        )
+        csac.due_date.start = timezone.make_aware(
+            wednesday_in_four_weeks.replace(hour=8, minute=15, second=0, microsecond=0)
+        )
+        csac.due_date.end = timezone.make_aware(
+            wednesday_in_four_weeks.replace(hour=17, minute=30, second=0, microsecond=0)
         )
         csac.due_date.save()
 
@@ -237,6 +256,24 @@ def create_test_course(
             id=TEST_COURSE_SESSION_ZURICH_ID,
             start_date=now,
         )
+        csac = CourseSessionAttendanceCourse.objects.create(
+            course_session=cs_zurich,
+            learning_content=LearningContentAttendanceCourse.objects.get(
+                slug="test-lehrgang-lp-circle-fahrzeug-lc-präsenzkurs-fahrzeug"
+            ),
+            location="siehe Anzeigetafel, Bildungszentrum Jungholz, Jungholzstrasse 43, 8050 Zürich-Oerlikon",
+            trainer="Catia Logarzo",
+        )
+        wednesday_in_four_weeks = (
+            datetime.now() + relativedelta(weekday=WE) + relativedelta(weeks=1)
+        )
+        csac.due_date.start = timezone.make_aware(
+            wednesday_in_four_weeks.replace(hour=8, minute=30, second=0, microsecond=0)
+        )
+        csac.due_date.end = timezone.make_aware(
+            wednesday_in_four_weeks.replace(hour=17, minute=0, second=0, microsecond=0)
+        )
+        csac.due_date.save()
 
         region1 = CourseSessionGroup.objects.create(
             name="Region 1",
@@ -603,8 +640,19 @@ def create_test_circle_reisen(lp):
         content_url="/course/test-lehrgang/media/handlungsfelder/reisen",
     )
 
-    LearningSequenceFactory(title="Analyse", parent=circle)
+    LearningSequenceFactory(title="Training", parent=circle)
+    LearningUnitFactory(title="Präsenzkurs", parent=circle)
+    LearningContentAttendanceCourseFactory(
+        title="Präsenzkurs Reisen",
+        parent=circle,
+    )
+    LearningUnitFactory(title="Unterlagen", parent=circle)
+    LearningContentPlaceholderFactory(
+        title="Unterlagen für den Unterricht",
+        parent=circle,
+    )
 
+    LearningSequenceFactory(title="Analyse", parent=circle)
     # analyse
     lu = LearningUnitFactory(
         title="Bedarfsanalyse, Ist- und Soll-Situation",

From 4c0d73150e5fc692b25567e77de587e5c9369f8f Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Fri, 26 Apr 2024 11:14:15 +0200
Subject: [PATCH 77/82] Fix tests

---
 cypress/e2e/circle.cy.js                      |  4 +-
 .../e2e/competenceNavi/selfEvaluation.cy.js   |  4 +-
 cypress/e2e/dueDates.cy.js                    |  2 +-
 .../course/creators/test_course.py            | 41 +++++++++++--------
 .../vbv_lernwelt/learnpath/tests/test_api.py  |  2 +-
 5 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/cypress/e2e/circle.cy.js b/cypress/e2e/circle.cy.js
index 3daaf0e6..bf249d5d 100644
--- a/cypress/e2e/circle.cy.js
+++ b/cypress/e2e/circle.cy.js
@@ -101,7 +101,7 @@ describe("circle.cy.js", () => {
       .should("contain", "Feedback");
 
     cy.visit("/course/test-lehrgang/learn/reisen");
-    cy.get("[data-cy=\"lp-learning-sequence\"]").should("have.length", 3);
-    cy.get("[data-cy=\"lp-learning-content\"]").should("have.length", 9);
+    cy.get("[data-cy=\"lp-learning-sequence\"]").should("have.length", 4);
+    cy.get("[data-cy=\"lp-learning-content\"]").should("have.length", 11);
   });
 });
diff --git a/cypress/e2e/competenceNavi/selfEvaluation.cy.js b/cypress/e2e/competenceNavi/selfEvaluation.cy.js
index d926c8bd..2b76664f 100644
--- a/cypress/e2e/competenceNavi/selfEvaluation.cy.js
+++ b/cypress/e2e/competenceNavi/selfEvaluation.cy.js
@@ -29,9 +29,9 @@ describe("selfEvaluation.cy.js", () => {
     cy.get("[data-cy=\"self-evaluation-unknown\"]").should("have.text", "4");
 
 
-    // learning unit id = 687 also known as:
+    // learning unit id = 692 also known as:
     // Bedarfsanalyse, Ist- und Soll-Situation <<Reisen>>
-    const identifier = "self-eval-687"
+    const identifier = "self-eval-692"
 
     // data in KompetenzNavi/Selbsteinschätzungen is correct
     cy.visit("/course/test-lehrgang/competence/self-evaluation-and-feedback");
diff --git a/cypress/e2e/dueDates.cy.js b/cypress/e2e/dueDates.cy.js
index 4e9d3287..71912aff 100644
--- a/cypress/e2e/dueDates.cy.js
+++ b/cypress/e2e/dueDates.cy.js
@@ -5,7 +5,7 @@ function selectDropboxItem(dropboxSelector, item) {
   cy.get(dropboxSelector).contains(item).click();
 }
 
-describe("appointments.cy.js", () => {
+describe("dueDates.cy.js", () => {
   beforeEach(() => {
     cy.manageCommand("cypress_reset");
     login("test-student2@example.com", "test");
diff --git a/server/vbv_lernwelt/course/creators/test_course.py b/server/vbv_lernwelt/course/creators/test_course.py
index 59fb6a2e..8120f7bf 100644
--- a/server/vbv_lernwelt/course/creators/test_course.py
+++ b/server/vbv_lernwelt/course/creators/test_course.py
@@ -175,24 +175,29 @@ def create_test_course(
         )
         csac.due_date.save()
 
-        csac = CourseSessionAttendanceCourse.objects.create(
-            course_session=cs_bern,
-            learning_content=LearningContentAttendanceCourse.objects.get(
-                slug="test-lehrgang-lp-circle-reisen-lc-präsenzkurs-reisen"
-            ),
-            location="Handelsschule KV Bern, Zimmer 123, Eigerstrasse 16, 3012 Bern",
-            trainer="Roland Grossenbacher, roland.grossenbacher@helvetia.ch",
-        )
-        wednesday_in_four_weeks = (
-            datetime.now() + relativedelta(weekday=TU) + relativedelta(weeks=4)
-        )
-        csac.due_date.start = timezone.make_aware(
-            wednesday_in_four_weeks.replace(hour=8, minute=15, second=0, microsecond=0)
-        )
-        csac.due_date.end = timezone.make_aware(
-            wednesday_in_four_weeks.replace(hour=17, minute=30, second=0, microsecond=0)
-        )
-        csac.due_date.save()
+        if include_vv:
+            csac = CourseSessionAttendanceCourse.objects.create(
+                course_session=cs_bern,
+                learning_content=LearningContentAttendanceCourse.objects.get(
+                    slug="test-lehrgang-lp-circle-reisen-lc-präsenzkurs-reisen"
+                ),
+                location="Handelsschule KV Bern, Zimmer 123, Eigerstrasse 16, 3012 Bern",
+                trainer="Roland Grossenbacher, roland.grossenbacher@helvetia.ch",
+            )
+            wednesday_in_four_weeks = (
+                datetime.now() + relativedelta(weekday=TU) + relativedelta(weeks=4)
+            )
+            csac.due_date.start = timezone.make_aware(
+                wednesday_in_four_weeks.replace(
+                    hour=8, minute=15, second=0, microsecond=0
+                )
+            )
+            csac.due_date.end = timezone.make_aware(
+                wednesday_in_four_weeks.replace(
+                    hour=17, minute=30, second=0, microsecond=0
+                )
+            )
+            csac.due_date.save()
 
         csa = CourseSessionAssignment.objects.create(
             course_session=cs_bern,
diff --git a/server/vbv_lernwelt/learnpath/tests/test_api.py b/server/vbv_lernwelt/learnpath/tests/test_api.py
index 96c7dfb2..8f69740d 100644
--- a/server/vbv_lernwelt/learnpath/tests/test_api.py
+++ b/server/vbv_lernwelt/learnpath/tests/test_api.py
@@ -28,7 +28,7 @@ class TestRetrieveLearingPathContents(APITestCase):
         # topics and circles
         self.assertEqual(4, len(data["children"]))
         # circle "analyse" contents
-        self.assertEqual(15, len(data["children"][3]["children"]))
+        self.assertEqual(20, len(data["children"][3]["children"]))
 
     def test_normalUser_withoutCourseSession_cannotAccess(self):
         self.user = User.objects.get(username="student")

From 45be3ae2962186b73dd5161ac4ae4b03f343942c Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Fri, 26 Apr 2024 12:00:19 +0200
Subject: [PATCH 78/82] Fix bug in cypress test

---
 cypress/e2e/dueDates.cy.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cypress/e2e/dueDates.cy.js b/cypress/e2e/dueDates.cy.js
index 71912aff..7da34778 100644
--- a/cypress/e2e/dueDates.cy.js
+++ b/cypress/e2e/dueDates.cy.js
@@ -16,7 +16,6 @@ describe("dueDates.cy.js", () => {
     cy.get('[data-cy="due-date-list"]').children().should("have.length", 7);
 
     // can filter by session
-    cy.get('[data-cy="select-session"]').click();
     selectDropboxItem('[data-cy="select-session"]', "Zürich");
     cy.get('[data-cy="due-date-list"]').children().should("have.length", 1);
     selectDropboxItem('[data-cy="select-session"]', "Bern");

From f4be4e2418a6962525dd711867858f0b7cecf593 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Fri, 26 Apr 2024 17:01:25 +0200
Subject: [PATCH 79/82] =?UTF-8?q?VBV-673:=20Praxisbildner=20=C3=9Cbersicht?=
 =?UTF-8?q?=20KN?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/dashboard/CoursePanel.vue  |   1 +
 .../dashboard/MentorOpenTasksCount.vue        |   6 +-
 client/src/composables.ts                     |   5 +-
 .../pages/dashboard/DashboardPersonsPage.vue  |  37 +++-
 client/src/router/index.ts                    |   5 +
 client/src/services/dashboard.ts              |  18 +-
 client/src/types.ts                           |   2 +
 server/vbv_lernwelt/competence/services.py    |  42 +++++
 .../dashboard/graphql/types/assignment.py     |  25 +--
 server/vbv_lernwelt/dashboard/views.py        | 166 ++++++++++++------
 10 files changed, 223 insertions(+), 84 deletions(-)
 create mode 100644 server/vbv_lernwelt/competence/services.py

diff --git a/client/src/components/dashboard/CoursePanel.vue b/client/src/components/dashboard/CoursePanel.vue
index 8d778486..1eae18b0 100644
--- a/client/src/components/dashboard/CoursePanel.vue
+++ b/client/src/components/dashboard/CoursePanel.vue
@@ -157,6 +157,7 @@ function hasActionButton(): boolean {
         <MentorOpenTasksCount
           v-if="hasWidget('MentorTasksWidget')"
           :course-id="courseConfig.course_id"
+          :course-slug="courseSlug"
         />
         <MentorMenteeCount
           v-if="hasWidget('MentorPersonWidget')"
diff --git a/client/src/components/dashboard/MentorOpenTasksCount.vue b/client/src/components/dashboard/MentorOpenTasksCount.vue
index 2c42e182..db59374c 100644
--- a/client/src/components/dashboard/MentorOpenTasksCount.vue
+++ b/client/src/components/dashboard/MentorOpenTasksCount.vue
@@ -6,6 +6,7 @@ import BaseBox from "@/components/dashboard/BaseBox.vue";
 
 const props = defineProps<{
   courseId: string;
+  courseSlug: string;
 }>();
 
 const openTaskCount: Ref<number> = ref(0);
@@ -18,7 +19,10 @@ onMounted(async () => {
 
 <template>
   <div class="w-[325px]">
-    <BaseBox :details-link="'foo'" data-cy="dashboard.mentor.competenceSummary">
+    <BaseBox
+      :details-link="`/course/${props.courseSlug}/learning-mentor/tasks`"
+      data-cy="dashboard.mentor.competenceSummary"
+    >
       <template #title>{{ $t("Zu erledigen") }}</template>
       <template #content>
         <div class="flex flex-row space-x-3 bg-white pb-6">
diff --git a/client/src/composables.ts b/client/src/composables.ts
index 97ecfec8..4b6f329a 100644
--- a/client/src/composables.ts
+++ b/client/src/composables.ts
@@ -37,6 +37,7 @@ import type {
   CourseCompletionStatus,
   CourseSession,
   CourseSessionDetail,
+  DashboardPersonsPageMode,
   LearningContentWithCompletion,
   LearningMentor,
   LearningPathType,
@@ -542,7 +543,7 @@ export function getUkRoleDisplay(role: DashboardPersonRoleType) {
   }
 }
 
-export function useDashboardPersons() {
+export function useDashboardPersons(mode: DashboardPersonsPageMode = "default") {
   const dashboardPersons = ref<DashboardPersonType[]>([]);
   const dashboardDueDates = ref<DashboardDueDate[]>([]);
   const loading = ref(false);
@@ -554,7 +555,7 @@ export function useDashboardPersons() {
     loading.value = true;
     try {
       const [persons, dueDates] = await Promise.all([
-        fetchDashboardPersons(),
+        fetchDashboardPersons(mode),
         fetchDashboardDueDates(),
       ]);
       dashboardPersons.value = persons;
diff --git a/client/src/pages/dashboard/DashboardPersonsPage.vue b/client/src/pages/dashboard/DashboardPersonsPage.vue
index 0eb57636..bbdd0939 100644
--- a/client/src/pages/dashboard/DashboardPersonsPage.vue
+++ b/client/src/pages/dashboard/DashboardPersonsPage.vue
@@ -8,9 +8,18 @@ import { useTranslation } from "i18next-vue";
 import _ from "lodash";
 import type { DashboardPersonCourseSessionType } from "@/services/dashboard";
 import { useRouteQuery } from "@vueuse/router";
+import type { DashboardPersonsPageMode } from "@/types";
 
 log.debug("DashboardPersonsPage created");
 
+export interface Props {
+  mode?: DashboardPersonsPageMode;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  mode: "default",
+});
+
 const UNFILTERED = Number.MAX_SAFE_INTEGER.toString();
 
 type MenuItem = {
@@ -20,7 +29,7 @@ type MenuItem = {
 
 const { t } = useTranslation();
 
-const { loading, dashboardPersons } = useDashboardPersons();
+const { loading, dashboardPersons } = useDashboardPersons(props.mode);
 
 const courses = computed(() => {
   return [
@@ -323,15 +332,33 @@ watch(selectedRegion, () => {
                 class="w-full border-b pb-2 pt-2 first:pt-0 last:border-b-0 last:pb-0"
               >
                 <div class="flex flex-col md:flex-row md:items-center">
-                  <div class="md:w-1/2">
+                  <div v-if="props.mode === 'default'" class="md:w-1/2">
                     <div class="text-gray-900">{{ cs.course_title }}</div>
                     <div v-if="cs.is_uk">{{ cs.session_title }}</div>
                   </div>
-                  <div class="md:w-1/4">
-                    <!--                    <div>{{ cs.user_role }}</div>-->
-                    <!--                    <div>my role: {{ cs.my_role }}</div>-->
+                  <div v-if="props.mode === 'competenceMetrics'" class="md:w-1/3">
+                    <div
+                      v-if="cs.competence_metrics?.passed_count || 0 > 0"
+                      class="my-2 w-fit rounded-md bg-green-200 px-2.5 py-0.5"
+                    >
+                      {{ $t("a.Bestanden") }}:
+                      {{ cs.competence_metrics?.passed_count }}
+                    </div>
+                  </div>
+
+                  <div v-if="props.mode === 'default'" class="md:w-1/4">
                     {{ personRoleDisplayValue(cs) }}
                   </div>
+                  <div v-else-if="props.mode === 'competenceMetrics'" class="md:w-1/3">
+                    <div
+                      v-if="cs.competence_metrics?.failed_count || 0 > 0"
+                      class="my-2 w-fit rounded-md bg-error-red-200 px-2.5 py-0.5"
+                    >
+                      {{ $t("a.Nicht Bestanden") }}:
+                      {{ cs.competence_metrics?.failed_count }}
+                    </div>
+                  </div>
+
                   <div class="md:w-1/4 md:text-right">
                     <div
                       v-if="
diff --git a/client/src/router/index.ts b/client/src/router/index.ts
index e67c3654..1bbfcb90 100644
--- a/client/src/router/index.ts
+++ b/client/src/router/index.ts
@@ -64,6 +64,11 @@ const router = createRouter({
       path: "/dashboard/persons",
       component: () => import("@/pages/dashboard/DashboardPersonsPage.vue"),
     },
+    {
+      path: "/dashboard/persons-competence",
+      component: () => import("@/pages/dashboard/DashboardPersonsPage.vue"),
+      props: { mode: "competenceMetrics" },
+    },
     {
       path: "/dashboard/due-dates",
       component: () => import("@/pages/dashboard/DashboardDueDatesPage.vue"),
diff --git a/client/src/services/dashboard.ts b/client/src/services/dashboard.ts
index 678af9ab..60beb348 100644
--- a/client/src/services/dashboard.ts
+++ b/client/src/services/dashboard.ts
@@ -13,7 +13,7 @@ import type {
   CourseStatisticsType,
   DashboardConfigType,
 } from "@/gql/graphql";
-import type { DueDate } from "@/types";
+import type { DashboardPersonsPageMode, DueDate } from "@/types";
 
 export type DashboardPersonRoleType =
   | "SUPERVISOR"
@@ -52,6 +52,10 @@ export type DashboardPersonCourseSessionType = {
   my_role_display: string;
   is_uk: boolean;
   is_vv: boolean;
+  competence_metrics?: {
+    passed_count: number;
+    failed_count: number;
+  };
 };
 
 export type DashboardPersonType = {
@@ -62,6 +66,10 @@ export type DashboardPersonType = {
   course_sessions: DashboardPersonCourseSessionType[];
   avatar_url: string;
   avatar_url_small: string;
+  competence_metrics?: {
+    passed_count: number;
+    failed_count: number;
+  };
 };
 
 export type DashboardCourseConfigType = {
@@ -153,8 +161,12 @@ export const fetchMentorCompetenceSummary = async (
   }
 };
 
-export async function fetchDashboardPersons() {
-  return await itGetCached<DashboardPersonType[]>("/api/dashboard/persons/");
+export async function fetchDashboardPersons(mode: DashboardPersonsPageMode) {
+  let url = "/api/dashboard/persons/";
+  if (mode === "competenceMetrics") {
+    url += "?with_competence_metrics=true";
+  }
+  return await itGetCached<DashboardPersonType[]>(url);
 }
 
 export async function fetchDashboardDueDates() {
diff --git a/client/src/types.ts b/client/src/types.ts
index 7ef3a364..cf7a2268 100644
--- a/client/src/types.ts
+++ b/client/src/types.ts
@@ -610,3 +610,5 @@ export type User = {
   course_session_experts: any[];
   language: string;
 };
+
+export type DashboardPersonsPageMode = "default" | "competenceMetrics";
diff --git a/server/vbv_lernwelt/competence/services.py b/server/vbv_lernwelt/competence/services.py
new file mode 100644
index 00000000..0ef4d306
--- /dev/null
+++ b/server/vbv_lernwelt/competence/services.py
@@ -0,0 +1,42 @@
+from vbv_lernwelt.assignment.models import AssignmentType
+from vbv_lernwelt.course_session.models import (
+    CourseSessionAssignment,
+    CourseSessionEdoniqTest,
+)
+
+
+def query_competence_course_session_assignments(course_session_ids, circle_ids=None):
+    if circle_ids is None:
+        circle_ids = []
+
+    result = []
+
+    for csa in CourseSessionAssignment.objects.filter(
+        course_session_id__in=course_session_ids,
+        learning_content__content_assignment__assignment_type__in=[
+            AssignmentType.CASEWORK.value,
+        ],
+        learning_content__content_assignment__competence_certificate__isnull=False,
+    ):
+        if circle_ids and csa.learning_content.get_circle().id not in circle_ids:
+            continue
+        result.append(csa)
+
+    return result
+
+
+def query_competence_course_session_edoniq_tests(course_session_ids, circle_ids=None):
+    if circle_ids is None:
+        circle_ids = []
+
+    result = []
+
+    for cset in CourseSessionEdoniqTest.objects.filter(
+        course_session_id__in=course_session_ids,
+        learning_content__content_assignment__competence_certificate__isnull=False,
+    ):
+        if circle_ids and cset.learning_content.get_circle().id not in circle_ids:
+            continue
+        result.append(cset)
+
+    return result
diff --git a/server/vbv_lernwelt/dashboard/graphql/types/assignment.py b/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
index 499ccf61..98939fd0 100644
--- a/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
+++ b/server/vbv_lernwelt/dashboard/graphql/types/assignment.py
@@ -9,6 +9,10 @@ from vbv_lernwelt.assignment.models import (
     AssignmentCompletionStatus,
     AssignmentType,
 )
+from vbv_lernwelt.competence.services import (
+    query_competence_course_session_assignments,
+    query_competence_course_session_edoniq_tests,
+)
 from vbv_lernwelt.course.models import CourseSession, CourseSessionUser
 from vbv_lernwelt.course_session.models import (
     CourseSessionAssignment,
@@ -169,26 +173,15 @@ def assignments(
     records: List[AssignmentStatisticsRecordType] = []
 
     for course_session in course_sessions:
-        for csa in CourseSessionAssignment.objects.filter(
-            course_session=course_session,
-            learning_content__content_assignment__assignment_type__in=[
-                AssignmentType.CASEWORK.value,
-            ],
-            learning_content__content_assignment__competence_certificate__isnull=False,
+        for csa in query_competence_course_session_assignments(
+            [course_session.id], circle_ids
         ):
-            if circle_ids and csa.learning_content.get_circle().id not in circle_ids:
-                continue
-            record = create_record(
-                course_session_assignment=csa, user_selection_ids=user_selection_ids
-            )
+            record = create_record(csa, user_selection_ids)
             records.append(record)
 
-        for cset in CourseSessionEdoniqTest.objects.filter(
-            course_session=course_session,
-            learning_content__content_assignment__competence_certificate__isnull=False,
+        for cset in query_competence_course_session_edoniq_tests(
+            [course_session.id], circle_ids
         ):
-            if circle_ids and cset.learning_content.get_circle().id not in circle_ids:
-                continue
             record = create_record(
                 course_session_assignment=cset, user_selection_ids=user_selection_ids
             )
diff --git a/server/vbv_lernwelt/dashboard/views.py b/server/vbv_lernwelt/dashboard/views.py
index d1f0ffcf..bb05a202 100644
--- a/server/vbv_lernwelt/dashboard/views.py
+++ b/server/vbv_lernwelt/dashboard/views.py
@@ -11,6 +11,10 @@ from vbv_lernwelt.assignment.models import (
     AssignmentCompletion,
     AssignmentCompletionStatus,
 )
+from vbv_lernwelt.competence.services import (
+    query_competence_course_session_assignments,
+    query_competence_course_session_edoniq_tests,
+)
 from vbv_lernwelt.core.models import User
 from vbv_lernwelt.course.models import (
     CourseConfiguration,
@@ -142,8 +146,7 @@ def _create_course_session_dict(course_session_object, my_role, user_role):
     }
 
 
-@api_view(["GET"])
-def get_dashboard_persons(request):
+def _create_person_list_with_roles(user):
     def create_user_dict(user_object):
         return {
             "user_id": user_object.id,
@@ -154,72 +157,121 @@ def get_dashboard_persons(request):
             "avatar_url": user_object.avatar_url,
         }
 
-    try:
-        course_sessions = get_course_sessions_with_roles_for_user(request.user)
+    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
+    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
+            )
+            my_role = user_role(cs.roles)
+            for csu in course_session_users:
+                person_data = create_user_dict(csu.user)
+                person_data["course_sessions"] = [
+                    _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:
+        if "LEARNING_MENTOR" in cs.roles:
+            lm = LearningMentor.objects.filter(
+                mentor=user, course_session=cs.id
+            ).first()
+
+            for participant in lm.participants.all():
+                course_session_entry = _create_course_session_dict(
+                    cs,
+                    "LEARNING_MENTOR",
+                    "LEARNING_MENTEE",
                 )
-                my_role = user_role(cs.roles)
-                for csu in course_session_users:
-                    person_data = create_user_dict(csu.user)
-                    person_data["course_sessions"] = [
-                        _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:
-            if "LEARNING_MENTOR" in cs.roles:
-                lm = LearningMentor.objects.filter(
-                    mentor=request.user, course_session=cs.id
-                ).first()
-
-                for participant in lm.participants.all():
-                    course_session_entry = _create_course_session_dict(
-                        cs,
-                        "LEARNING_MENTOR",
-                        "LEARNING_MENTEE",
+                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 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
-                        )
+    # add persons where request.user is mentee
+    mentor_relation_qs = LearningMentor.objects.filter(
+        participants__user=user
+    ).prefetch_related("mentor", "course_session")
+    for mentor_relation in mentor_relation_qs:
+        cs = mentor_relation.course_session
+        course_session_entry = _create_course_session_dict(
+            cs,
+            "LEARNING_MENTEE",
+            "LEARNING_MENTOR",
+        )
 
-        # add persons where request.user is mentee
-        mentor_relation_qs = LearningMentor.objects.filter(
-            participants__user=request.user
-        ).prefetch_related("mentor", "course_session")
-        for mentor_relation in mentor_relation_qs:
-            cs = mentor_relation.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)
+            person_data["course_sessions"] = [course_session_entry]
+            result_persons[mentor_relation.mentor.id] = person_data
+        else:
+            # user is already in result_persons
+            result_persons[mentor_relation.mentor.id]["course_sessions"].append(
+                course_session_entry
             )
 
-            if mentor_relation.mentor.id not in result_persons:
-                person_data = create_user_dict(mentor_relation.mentor)
-                person_data["course_sessions"] = [course_session_entry]
-                result_persons[mentor_relation.mentor.id] = person_data
-            else:
-                # user is already in result_persons
-                result_persons[mentor_relation.mentor.id]["course_sessions"].append(
-                    course_session_entry
-                )
+    return result_persons.values()
+
+
+def _persons_list_add_competence_metrics(persons):
+    course_session_ids = {cs["id"] for p in persons for cs in p["course_sessions"]}
+    competence_assignments = query_competence_course_session_assignments(
+        course_session_ids
+    ) + query_competence_course_session_edoniq_tests(course_session_ids)
+    assignment_ids = {
+        a.learning_content.content_assignment.id for a in competence_assignments
+    }
+
+    for p in persons:
+        passed_count = 0
+        failed_count = 0
+        for cs in p["course_sessions"]:
+            evaluation_results = AssignmentCompletion.objects.filter(
+                completion_status=AssignmentCompletionStatus.EVALUATION_SUBMITTED.value,
+                assignment_user_id=p.get("user_id"),
+                course_session=cs.get("id"),
+                assignment_id__in=assignment_ids,
+            )
+            cs_passed_count = len(
+                [ac for ac in evaluation_results if ac.evaluation_passed]
+            )
+            cs_failed_count = len(evaluation_results) - cs_passed_count
+            cs["competence_metrics"] = {
+                "passed_count": cs_passed_count,
+                "failed_count": cs_failed_count,
+            }
+            passed_count += len(
+                [ac for ac in evaluation_results if ac.evaluation_passed]
+            )
+            failed_count += len(evaluation_results) - passed_count
+        p["competence_metrics"] = {
+            "passed_count": passed_count,
+            "failed_count": failed_count,
+        }
+
+    return persons
+
+
+@api_view(["GET"])
+def get_dashboard_persons(request):
+    try:
+        persons = list(_create_person_list_with_roles(request.user))
+
+        if request.GET.get("with_competence_metrics", "") == "true":
+            persons = _persons_list_add_competence_metrics(persons)
 
         return Response(
             status=200,
-            data=list(result_persons.values()),
+            data=list(persons),
         )
     except PermissionDenied as e:
         raise e

From ec1c94b990539e8c1e00ad32918427b05a3a7f0e Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Tue, 30 Apr 2024 11:01:38 +0200
Subject: [PATCH 80/82] Rename composable

---
 client/src/components/dashboard/MentorCompetenceSummary.vue | 5 ++++-
 .../src/components/dueDates/CourseSessionDueDatesList.vue   | 4 ++--
 client/src/composables.ts                                   | 6 ++++--
 client/src/pages/dashboard/DashboardAsideWidget.vue         | 4 ++--
 client/src/pages/dashboard/DashboardDueDatesPage.vue        | 4 ++--
 client/src/pages/dashboard/DashboardPersonsPage.vue         | 4 ++--
 6 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/client/src/components/dashboard/MentorCompetenceSummary.vue b/client/src/components/dashboard/MentorCompetenceSummary.vue
index c750eb7a..d4bd0669 100644
--- a/client/src/components/dashboard/MentorCompetenceSummary.vue
+++ b/client/src/components/dashboard/MentorCompetenceSummary.vue
@@ -19,7 +19,10 @@ onMounted(async () => {
 
 <template>
   <div v-if="summary" class="w-[325px]">
-    <BaseBox :details-link="'foo'" data-cy="dashboard.mentor.competenceSummary">
+    <BaseBox
+      :details-link="`/dashboard/persons-competence?course=${props.courseId}`"
+      data-cy="dashboard.mentor.competenceSummary"
+    >
       <template #title>{{ $t("Kompetenznachweise") }}</template>
       <template #content>
         <div class="flex flex-row space-x-3 bg-white">
diff --git a/client/src/components/dueDates/CourseSessionDueDatesList.vue b/client/src/components/dueDates/CourseSessionDueDatesList.vue
index 3adff9d8..da5f469a 100644
--- a/client/src/components/dueDates/CourseSessionDueDatesList.vue
+++ b/client/src/components/dueDates/CourseSessionDueDatesList.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { useDashboardPersons } from "@/composables";
+import { useDashboardPersonsDueDates } from "@/composables";
 import { computed } from "vue";
 import _ from "lodash";
 import LoadingSpinner from "@/components/ui/LoadingSpinner.vue";
@@ -19,7 +19,7 @@ const props = withDefaults(
   }
 );
 
-const { loading, currentDueDates } = useDashboardPersons();
+const { loading, currentDueDates } = useDashboardPersonsDueDates();
 
 const filteredDueDates = computed(() => {
   let dueDates = currentDueDates.value.filter(
diff --git a/client/src/composables.ts b/client/src/composables.ts
index 4b6f329a..9eb62bf5 100644
--- a/client/src/composables.ts
+++ b/client/src/composables.ts
@@ -543,7 +543,9 @@ export function getUkRoleDisplay(role: DashboardPersonRoleType) {
   }
 }
 
-export function useDashboardPersons(mode: DashboardPersonsPageMode = "default") {
+export function useDashboardPersonsDueDates(
+  mode: DashboardPersonsPageMode = "default"
+) {
   const dashboardPersons = ref<DashboardPersonType[]>([]);
   const dashboardDueDates = ref<DashboardDueDate[]>([]);
   const loading = ref(false);
@@ -633,7 +635,7 @@ export function useMentorTexts() {
     try {
       const is_uk =
         useCourseSessionsStore().currentCourseSession?.course.configuration.is_uk;
-      const mentorTabTitle = is_uk ? "Praxisbildner" : "a.Lernbegleitung";
+      const mentorTabTitle = is_uk ? "a.Praxisbildner" : "a.Lernbegleitung";
       const myLearningMentors = is_uk ? "Meine Praxisbildner" : "Meine Lernbegleiter";
       const inviteLearningMentor = is_uk
         ? "Neuen Praxisbildner einladen"
diff --git a/client/src/pages/dashboard/DashboardAsideWidget.vue b/client/src/pages/dashboard/DashboardAsideWidget.vue
index 39278242..c17a4e1d 100644
--- a/client/src/pages/dashboard/DashboardAsideWidget.vue
+++ b/client/src/pages/dashboard/DashboardAsideWidget.vue
@@ -1,14 +1,14 @@
 <script setup lang="ts">
 import LoadingSpinner from "@/components/ui/LoadingSpinner.vue";
 import log from "loglevel";
-import { useDashboardPersons } from "@/composables";
+import { useDashboardPersonsDueDates } from "@/composables";
 import { computed } from "vue";
 import _ from "lodash";
 import DueDateSingle from "@/components/dueDates/DueDateSingle.vue";
 
 log.debug("DashboardAsideWidget created");
 
-const { loading, dashboardPersons, dashboardDueDates } = useDashboardPersons();
+const { loading, dashboardPersons, dashboardDueDates } = useDashboardPersonsDueDates();
 
 const displayDueDates = computed(() => {
   return _.take(dashboardDueDates.value, 6);
diff --git a/client/src/pages/dashboard/DashboardDueDatesPage.vue b/client/src/pages/dashboard/DashboardDueDatesPage.vue
index 5e96cd61..34c5e05d 100644
--- a/client/src/pages/dashboard/DashboardDueDatesPage.vue
+++ b/client/src/pages/dashboard/DashboardDueDatesPage.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import LoadingSpinner from "@/components/ui/LoadingSpinner.vue";
 import log from "loglevel";
-import { useDashboardPersons } from "@/composables";
+import { useDashboardPersonsDueDates } from "@/composables";
 import ItDropdownSelect from "@/components/ui/ItDropdownSelect.vue";
 import { computed, ref, watch } from "vue";
 import { useTranslation } from "i18next-vue";
@@ -25,7 +25,7 @@ type CourseItem = DropboxItem & {
 
 const { t } = useTranslation();
 
-const { loading, currentDueDates: dashboardDueDates } = useDashboardPersons();
+const { loading, currentDueDates: dashboardDueDates } = useDashboardPersonsDueDates();
 
 const courses = computed(() => {
   return [
diff --git a/client/src/pages/dashboard/DashboardPersonsPage.vue b/client/src/pages/dashboard/DashboardPersonsPage.vue
index bbdd0939..3ba57c57 100644
--- a/client/src/pages/dashboard/DashboardPersonsPage.vue
+++ b/client/src/pages/dashboard/DashboardPersonsPage.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import LoadingSpinner from "@/components/ui/LoadingSpinner.vue";
 import log from "loglevel";
-import { useDashboardPersons } from "@/composables";
+import { useDashboardPersonsDueDates } from "@/composables";
 import ItDropdownSelect from "@/components/ui/ItDropdownSelect.vue";
 import { computed, ref, watch } from "vue";
 import { useTranslation } from "i18next-vue";
@@ -29,7 +29,7 @@ type MenuItem = {
 
 const { t } = useTranslation();
 
-const { loading, dashboardPersons } = useDashboardPersons(props.mode);
+const { loading, dashboardPersons } = useDashboardPersonsDueDates(props.mode);
 
 const courses = computed(() => {
   return [

From 06fcc5d23a84c3c6a395b61fb473722a82dd524f Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Tue, 30 Apr 2024 15:41:24 +0200
Subject: [PATCH 81/82] Update text

---
 client/src/pages/learningMentor/mentor/MentorIndexPage.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/pages/learningMentor/mentor/MentorIndexPage.vue b/client/src/pages/learningMentor/mentor/MentorIndexPage.vue
index d73868f6..82ed09a2 100644
--- a/client/src/pages/learningMentor/mentor/MentorIndexPage.vue
+++ b/client/src/pages/learningMentor/mentor/MentorIndexPage.vue
@@ -53,7 +53,7 @@ onMounted(() => {
             :to="{ name: 'learningMentorOverview' }"
             class="block py-3"
           >
-            {{ $t("a.Übersicht") }}
+            {{ $t("a.Aufgaben") }}
           </router-link>
         </li>
       </ul>

From c45e0e9d7497206ba68b2f88f5c3e3ff2a98a81f Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Wed, 1 May 2024 07:08:30 +0200
Subject: [PATCH 82/82] Reorder components

---
 client/src/components/dashboard/CoursePanel.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/src/components/dashboard/CoursePanel.vue b/client/src/components/dashboard/CoursePanel.vue
index 1eae18b0..d53b58c4 100644
--- a/client/src/components/dashboard/CoursePanel.vue
+++ b/client/src/components/dashboard/CoursePanel.vue
@@ -154,16 +154,16 @@ function hasActionButton(): boolean {
         v-if="numberOfMentorWidgets > 0"
         class="flex flex-col flex-wrap items-stretch md:flex-row"
       >
-        <MentorOpenTasksCount
-          v-if="hasWidget('MentorTasksWidget')"
-          :course-id="courseConfig.course_id"
-          :course-slug="courseSlug"
-        />
         <MentorMenteeCount
           v-if="hasWidget('MentorPersonWidget')"
           :course-id="courseConfig.course_id"
           :course-slug="courseConfig?.course_slug"
         />
+        <MentorOpenTasksCount
+          v-if="hasWidget('MentorTasksWidget')"
+          :course-id="courseConfig.course_id"
+          :course-slug="courseSlug"
+        />
         <MentorCompetenceSummary
           v-if="hasWidget('MentorCompetenceWidget')"
           :course-id="courseConfig.course_id"