From c977fcf51092682df21e3f487a423f09dfa58be5 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Thu, 2 May 2024 10:19:47 +0200
Subject: [PATCH 1/6] Fix c2a for expert

---
 client/src/components/dashboard/CoursePanel.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/components/dashboard/CoursePanel.vue b/client/src/components/dashboard/CoursePanel.vue
index d53b58c4..5a6e8091 100644
--- a/client/src/components/dashboard/CoursePanel.vue
+++ b/client/src/components/dashboard/CoursePanel.vue
@@ -48,7 +48,7 @@ const actionButtonProps = computed<{ href: string; text: string; cyKey: string }
         text: "Weiter lernen",
         cyKey: "progress-dashboard-continue-course-link",
       };
-    } else if (props.courseConfig?.role_key === "Expert") {
+    } else if (props.courseConfig?.role_key === "Trainer") {
       return {
         href: getCockpitUrl(props.courseConfig?.course_slug),
         text: "Cockpit anschauen",

From 94f61c2ef6d881f42650dfaf7e3596ca3a827c37 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Thu, 2 May 2024 10:20:16 +0200
Subject: [PATCH 2/6] Fix texts

---
 .../components/header/MainNavigationBar.vue   |  7 +++-
 client/src/components/header/MobileMenu.vue   | 11 ++++-
 .../components/learningMentor/MyMentors.vue   | 20 ++++++++-
 .../NoMentorInformationPanel.vue              | 16 ++++++-
 client/src/composables.ts                     | 42 -------------------
 5 files changed, 46 insertions(+), 50 deletions(-)

diff --git a/client/src/components/header/MainNavigationBar.vue b/client/src/components/header/MainNavigationBar.vue
index 64e9a6fe..33d264cb 100644
--- a/client/src/components/header/MainNavigationBar.vue
+++ b/client/src/components/header/MainNavigationBar.vue
@@ -22,7 +22,6 @@ import {
   getLearningPathUrl,
   getMediaCenterUrl,
 } from "@/utils/utils";
-import { useMentorTexts } from "@/composables";
 
 log.debug("MainNavigationBar created");
 
@@ -123,7 +122,11 @@ const hasLearningMentor = computed(() => {
   return courseSession.actions.includes("learning-mentor");
 });
 
-const mentorTabTitle = useMentorTexts().mentorTabTitle;
+const mentorTabTitle = computed(() =>
+  courseSessionsStore.currentCourseSession?.course.configuration.is_uk
+    ? "a.Praxisbildner"
+    : "a.Lernbegleitung"
+);
 </script>
 
 <template>
diff --git a/client/src/components/header/MobileMenu.vue b/client/src/components/header/MobileMenu.vue
index a4e6754a..d1f0e80a 100644
--- a/client/src/components/header/MobileMenu.vue
+++ b/client/src/components/header/MobileMenu.vue
@@ -10,7 +10,8 @@ import {
   getLearningPathUrl,
   getMediaCenterUrl,
 } from "@/utils/utils";
-import { useMentorTexts } from "@/composables";
+import { computed } from "vue";
+import { useCourseSessionsStore } from "@/stores/courseSessions";
 
 const router = useRouter();
 
@@ -31,6 +32,8 @@ defineProps<{
 
 const emit = defineEmits(["closemodal", "logout"]);
 
+const courseSessionsStore = useCourseSessionsStore();
+
 const clickLink = (to: string | undefined) => {
   if (to) {
     router.push(to);
@@ -38,7 +41,11 @@ const clickLink = (to: string | undefined) => {
   }
 };
 
-const mentorTabTitle = useMentorTexts().mentorTabTitle;
+const mentorTabTitle = computed(() =>
+  courseSessionsStore.currentCourseSession?.course.configuration.is_uk
+    ? "a.Praxisbildner"
+    : "a.Lernbegleitung"
+);
 </script>
 
 <template>
diff --git a/client/src/components/learningMentor/MyMentors.vue b/client/src/components/learningMentor/MyMentors.vue
index d7052ac8..3a9f58b8 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, useMentorTexts } from "@/composables";
+import { useCurrentCourseSession } from "@/composables";
 import ItModal from "@/components/ui/ItModal.vue";
 import { computed, ref } from "vue";
 import { useCSRFFetch } from "@/fetchHelpers";
@@ -69,7 +69,23 @@ const inviteMentor = async () => {
   inviteeEmail.value = "";
 };
 
-const { myLearningMentors, inviteLearningMentor, noLearningMentors } = useMentorTexts();
+const myLearningMentors = computed(() =>
+  courseSession.value.course.configuration.is_uk
+    ? "Meine Praxisbildner"
+    : "Meine Lernbegleiter"
+);
+
+const inviteLearningMentor = computed(() =>
+  courseSession.value.course.configuration.is_uk
+    ? "Neuen Praxisbildner einladen"
+    : "a.Neue Lernbegleitung einladen"
+);
+
+const noLearningMentors = computed(() =>
+  courseSession.value.course.configuration.is_uk
+    ? "a.Aktuell hast du noch keine Person als Praxisbildner eingeladen."
+    : "a.Aktuell hast du noch keine Person als Lernbegleitung eingeladen."
+);
 </script>
 
 <template>
diff --git a/client/src/components/learningMentor/NoMentorInformationPanel.vue b/client/src/components/learningMentor/NoMentorInformationPanel.vue
index a3077c04..e97c5b41 100644
--- a/client/src/components/learningMentor/NoMentorInformationPanel.vue
+++ b/client/src/components/learningMentor/NoMentorInformationPanel.vue
@@ -1,8 +1,20 @@
 <script setup lang="ts">
-import { useCurrentCourseSession, useMentorTexts } from "@/composables";
+import { useCurrentCourseSession } from "@/composables";
+import { computed } from "vue";
 
 const currentCourseSession = useCurrentCourseSession();
-const { actionNoLearningMentors, inviteLearningMentorShort } = useMentorTexts();
+
+const actionNoLearningMentors = computed(() =>
+  currentCourseSession.value.course.configuration.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."
+);
+
+const inviteLearningMentorShort = computed(() =>
+  currentCourseSession.value.course.configuration.is_uk
+    ? "Neuen Praxisbildner einladen"
+    : "a.Neue Lernbegleitung einladen"
+);
 </script>
 
 <template>
diff --git a/client/src/composables.ts b/client/src/composables.ts
index 9eb62bf5..28fcf0b7 100644
--- a/client/src/composables.ts
+++ b/client/src/composables.ts
@@ -630,48 +630,6 @@ export function useDashboardPersonsDueDates(
   };
 }
 
-export function useMentorTexts() {
-  const texts = computed(() => {
-    try {
-      const is_uk =
-        useCourseSessionsStore().currentCourseSession?.course.configuration.is_uk;
-      const mentorTabTitle = is_uk ? "a.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 };
-}
-
 export function useCourseCircleProgress(circles: Ref<CircleType[] | undefined>) {
   const inProgressCirclesCount = computed(() => {
     if (circles.value?.length) {

From c2a3e5c80e4de715c0346b76f20f9599eda46103 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Thu, 2 May 2024 10:23:09 +0200
Subject: [PATCH 3/6] Hide feedback request in uk

---
 client/src/components/learningPath/SelfEvaluation.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/src/components/learningPath/SelfEvaluation.vue b/client/src/components/learningPath/SelfEvaluation.vue
index ecb578ca..486150b9 100644
--- a/client/src/components/learningPath/SelfEvaluation.vue
+++ b/client/src/components/learningPath/SelfEvaluation.vue
@@ -46,7 +46,9 @@ const previousRoute = getPreviousRoute();
 
 const learningUnitHasFeedbackPage = computed(
   () =>
-    courseSession.value.course.configuration.enable_learning_mentor && !isReadOnly.value
+    courseSession.value.course.configuration.enable_learning_mentor &&
+    !courseSession.value.course.configuration.is_uk &&
+    !isReadOnly.value
 );
 
 const currentQuestion = computed(() => questions.value[questionIndex.value]);

From 8c41d4ab032553d591d890e2f831d0ca71818f37 Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Thu, 2 May 2024 10:58:58 +0200
Subject: [PATCH 4/6] Display Mentees page for experts/supervisors

---
 .../components/learningMentor/MyMentees.vue   | 21 ++++++++++++-------
 .../mentor/MentorParticipantsPage.vue         |  7 +++++--
 client/src/services/dashboard.ts              |  2 +-
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/client/src/components/learningMentor/MyMentees.vue b/client/src/components/learningMentor/MyMentees.vue
index bcc7b0cd..861cac08 100644
--- a/client/src/components/learningMentor/MyMentees.vue
+++ b/client/src/components/learningMentor/MyMentees.vue
@@ -2,9 +2,10 @@
 import { useLearningMentees } from "@/services/learningMentees";
 import { useCurrentCourseSession } from "@/composables";
 import { useCSRFFetch } from "@/fetchHelpers";
+import { computed } from "vue";
 
 const courseSession = useCurrentCourseSession();
-const { summary, fetchData } = useLearningMentees(courseSession.value.id);
+const { isLoading, summary, fetchData } = useLearningMentees(courseSession.value.id);
 
 const removeMyMentee = async (menteeId: string) => {
   await useCSRFFetch(
@@ -12,6 +13,12 @@ const removeMyMentee = async (menteeId: string) => {
   ).delete();
   fetchData();
 };
+
+const noMenteesText = computed(() =>
+  courseSession.value.course.configuration.is_uk
+    ? "a.Aktuell begleitest du niemanden als Praxisbildner."
+    : "a.Aktuell begleitest du niemanden als Lernbegleitung."
+);
 </script>
 
 <template>
@@ -66,12 +73,12 @@ const removeMyMentee = async (menteeId: string) => {
         </div>
       </div>
     </template>
-    <div v-else>
-      <h2 class="heading-2 py-6">{{ $t("a.Personen, die du begleitest") }}</h2>
-      <div class="flex items-center bg-white px-4 py-2">
-        <it-icon-info class="it-icon mr-2 h-6 w-6" />
-        {{ $t("a.Aktuell begleitest du niemanden als Lernbegleitung.") }}
-      </div>
+  </div>
+  <div v-if="!isLoading && !summary">
+    <h2 class="heading-2 py-6">{{ $t("a.Personen, die du begleitest") }}</h2>
+    <div class="flex items-center bg-white px-4 py-2">
+      <it-icon-info class="it-icon mr-2 h-6 w-6" />
+      {{ $t(noMenteesText) }}
     </div>
   </div>
 </template>
diff --git a/client/src/pages/learningMentor/mentor/MentorParticipantsPage.vue b/client/src/pages/learningMentor/mentor/MentorParticipantsPage.vue
index 8eea6870..1e5e7507 100644
--- a/client/src/pages/learningMentor/mentor/MentorParticipantsPage.vue
+++ b/client/src/pages/learningMentor/mentor/MentorParticipantsPage.vue
@@ -10,8 +10,11 @@ const isMyMentorsVisible = computed(() =>
   courseSession.value.actions.includes("learning-mentor::edit-mentors")
 );
 
-const isMyMenteesVisible = computed(() =>
-  courseSession.value.actions.includes("learning-mentor::guide-members")
+const isMyMenteesVisible = computed(
+  () =>
+    courseSession.value.actions.includes("learning-mentor::guide-members") ||
+    courseSession.value.actions.includes("is_expert") ||
+    courseSession.value.actions.includes("is_supervisor")
 );
 </script>
 
diff --git a/client/src/services/dashboard.ts b/client/src/services/dashboard.ts
index 60beb348..2abd9374 100644
--- a/client/src/services/dashboard.ts
+++ b/client/src/services/dashboard.ts
@@ -24,7 +24,7 @@ export type DashboardPersonRoleType =
 
 export type DashboardRoleKeyType =
   | "Supervisor"
-  | "Expert"
+  | "Trainer"
   | "Member"
   | "MentorUK"
   | "MentorVV";

From 92d96f47107fd447fc308c5c011243ff2867b1ca Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Thu, 2 May 2024 11:15:16 +0200
Subject: [PATCH 5/6] Add label texts in order

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

diff --git a/client/src/components/dashboard/CoursePanel.vue b/client/src/components/dashboard/CoursePanel.vue
index 5a6e8091..dca6810d 100644
--- a/client/src/components/dashboard/CoursePanel.vue
+++ b/client/src/components/dashboard/CoursePanel.vue
@@ -42,25 +42,21 @@ function hasWidget(widget: WidgetType) {
 
 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 === "Trainer") {
+    if (props.courseConfig?.role_key === "Supervisor") {
       return {
         href: getCockpitUrl(props.courseConfig?.course_slug),
         text: "Cockpit anschauen",
         cyKey: "cockpit-dashboard-link",
       };
-    } else if (props.courseConfig?.role_key === "Supervisor") {
+    }
+    if (props.courseConfig?.role_key === "Trainer") {
       return {
         href: getCockpitUrl(props.courseConfig?.course_slug),
         text: "Cockpit anschauen",
         cyKey: "cockpit-dashboard-link",
       };
-    } else if (props.courseConfig?.role_key === "MentorVV") {
+    }
+    if (props.courseConfig?.role_key === "MentorVV") {
       return {
         href: getLearningMentorUrl(props.courseConfig?.course_slug),
         text: "a.Übersicht anschauen",

From f11d51b3337677a8be4bd42225f28ac15454ad5b Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Thu, 2 May 2024 12:02:03 +0200
Subject: [PATCH 6/6] Show "noMenteesText" for Lernbegleiter

---
 .../components/learningMentor/MyMentees.vue   | 105 +++++++++---------
 1 file changed, 52 insertions(+), 53 deletions(-)

diff --git a/client/src/components/learningMentor/MyMentees.vue b/client/src/components/learningMentor/MyMentees.vue
index 861cac08..5f22d2cc 100644
--- a/client/src/components/learningMentor/MyMentees.vue
+++ b/client/src/components/learningMentor/MyMentees.vue
@@ -3,6 +3,7 @@ import { useLearningMentees } from "@/services/learningMentees";
 import { useCurrentCourseSession } from "@/composables";
 import { useCSRFFetch } from "@/fetchHelpers";
 import { computed } from "vue";
+import LoadingSpinner from "@/components/ui/LoadingSpinner.vue";
 
 const courseSession = useCurrentCourseSession();
 const { isLoading, summary, fetchData } = useLearningMentees(courseSession.value.id);
@@ -22,63 +23,61 @@ const noMenteesText = computed(() =>
 </script>
 
 <template>
-  <div v-if="summary">
-    <template v-if="summary.participants.length > 0">
-      <h2 class="heading-2 py-6">{{ $t("a.Personen, die du begleitest") }}</h2>
-      <div class="bg-white px-4 py-2">
-        <div
-          v-for="participant in summary.participants"
-          :key="participant.id"
-          data-cy="lm-my-mentee-list-item"
-          class="flex flex-col items-start justify-between gap-4 border-b py-2 last:border-b-0 md:flex-row md:items-center md:gap-16"
-        >
-          <div class="flex items-center space-x-2">
-            <img
-              :alt="participant.last_name"
-              class="h-11 w-11 rounded-full"
-              :src="
-                participant.avatar_url || '/static/avatars/myvbv-default-avatar.png'
-              "
-            />
-            <div>
-              <div class="text-bold">
-                {{ participant.first_name }}
-                {{ participant.last_name }}
-              </div>
-              {{ participant.email }}
+  <div v-if="isLoading" class="m-8 flex justify-center">
+    <LoadingSpinner />
+  </div>
+  <div v-else>
+    <h2 class="heading-2 py-6">{{ $t("a.Personen, die du begleitest") }}</h2>
+    <div v-if="(summary?.participants?.length ?? 0) > 0" class="bg-white px-4 py-2">
+      <div
+        v-for="participant in summary?.participants ?? []"
+        :key="participant.id"
+        data-cy="lm-my-mentee-list-item"
+        class="flex flex-col items-start justify-between gap-4 border-b py-2 last:border-b-0 md:flex-row md:items-center md:gap-16"
+      >
+        <div class="flex items-center space-x-2">
+          <img
+            :alt="participant.last_name"
+            class="h-11 w-11 rounded-full"
+            :src="participant.avatar_url || '/static/avatars/myvbv-default-avatar.png'"
+          />
+          <div>
+            <div class="text-bold">
+              {{ participant.first_name }}
+              {{ participant.last_name }}
             </div>
-          </div>
-          <div class="space-x-5">
-            <router-link
-              data-cy="lm-my-mentee-profile"
-              :to="{
-                name: 'profileLearningPath',
-                params: {
-                  userId: participant.id,
-                  courseSlug: courseSession.course.slug,
-                },
-              }"
-              class="underline"
-            >
-              {{ $t("cockpit.profileLink") }}
-            </router-link>
-            <button
-              class="underline"
-              data-cy="lm-my-mentee-remove"
-              @click="removeMyMentee(participant.id)"
-            >
-              {{ $t("a.Entfernen") }}
-            </button>
+            {{ participant.email }}
           </div>
         </div>
+        <div class="space-x-5">
+          <router-link
+            data-cy="lm-my-mentee-profile"
+            :to="{
+              name: 'profileLearningPath',
+              params: {
+                userId: participant.id,
+                courseSlug: courseSession.course.slug,
+              },
+            }"
+            class="underline"
+          >
+            {{ $t("cockpit.profileLink") }}
+          </router-link>
+          <button
+            class="underline"
+            data-cy="lm-my-mentee-remove"
+            @click="removeMyMentee(participant.id)"
+          >
+            {{ $t("a.Entfernen") }}
+          </button>
+        </div>
+      </div>
+    </div>
+    <div v-else>
+      <div class="flex items-center bg-white px-4 py-2">
+        <it-icon-info class="it-icon mr-2 h-6 w-6" />
+        {{ $t(noMenteesText) }}
       </div>
-    </template>
-  </div>
-  <div v-if="!isLoading && !summary">
-    <h2 class="heading-2 py-6">{{ $t("a.Personen, die du begleitest") }}</h2>
-    <div class="flex items-center bg-white px-4 py-2">
-      <it-icon-info class="it-icon mr-2 h-6 w-6" />
-      {{ $t(noMenteesText) }}
     </div>
   </div>
 </template>