diff --git a/client/src/components/dashboard/MentorCompetenceSummary.vue b/client/src/components/dashboard/MentorCompetenceSummary.vue
new file mode 100644
index 00000000..d4bd0669
--- /dev/null
+++ b/client/src/components/dashboard/MentorCompetenceSummary.vue
@@ -0,0 +1,47 @@
+
+
+
+
+
+ {{ $t("Kompetenznachweise") }}
+
+
+
+ {{ summary.summary.total_passed }}
+
+
{{ $t("Bestanden") }}
+
+
+
+ {{ summary.summary.total_failed }}
+
+
{{ $t("Nicht bestanden") }}
+
+
+
+
+
diff --git a/client/src/components/dashboard/MentorMenteeCount.vue b/client/src/components/dashboard/MentorMenteeCount.vue
new file mode 100644
index 00000000..10dc86f7
--- /dev/null
+++ b/client/src/components/dashboard/MentorMenteeCount.vue
@@ -0,0 +1,41 @@
+
+
+
+
+
+ {{ $t("a.Personen") }}
+
+
+
+ {{ menteeCount }}
+
+
+ {{ $t("a.Personen, die du begleitest") }}
+
+
+
+
+
+
diff --git a/client/src/components/dashboard/MentorOpenTasksCount.vue b/client/src/components/dashboard/MentorOpenTasksCount.vue
new file mode 100644
index 00000000..db59374c
--- /dev/null
+++ b/client/src/components/dashboard/MentorOpenTasksCount.vue
@@ -0,0 +1,39 @@
+
+
+
+
+
+ {{ $t("Zu erledigen") }}
+
+
+
+ {{ openTaskCount }}
+
+
{{ $t("Elemente zu erledigen") }}
+
+
+
+
+
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 @@
-
-
-
- {{ $t("a.AlleTermine") }}
-
-
diff --git a/client/src/pages/dashboard/StatisticPage.vue b/client/src/components/dashboard/UkStatistics.vue
similarity index 50%
rename from client/src/pages/dashboard/StatisticPage.vue
rename to client/src/components/dashboard/UkStatistics.vue
index 0e1d29af..7d70d930 100644
--- a/client/src/pages/dashboard/StatisticPage.vue
+++ b/client/src/components/dashboard/UkStatistics.vue
@@ -1,65 +1,97 @@
-
-
-
+
diff --git a/client/src/components/dueDates/CourseSessionDueDatesList.vue b/client/src/components/dueDates/CourseSessionDueDatesList.vue
new file mode 100644
index 00000000..da5f469a
--- /dev/null
+++ b/client/src/components/dueDates/CourseSessionDueDatesList.vue
@@ -0,0 +1,61 @@
+
+
+
+
+
+
+
+
{{ $t("Nächste Termine") }}
+
+
+
+
+ {{ $t("dueDates.noDueDatesAvailable") }}
+
+
+
+
+ {{ $t("a.Alle Termine anzeigen") }}
+
+
diff --git a/client/src/components/dueDates/DueDateSingle.vue b/client/src/components/dueDates/DueDateSingle.vue
index c7a14785..ce068271 100644
--- a/client/src/components/dueDates/DueDateSingle.vue
+++ b/client/src/components/dueDates/DueDateSingle.vue
@@ -1,41 +1,46 @@
@@ -46,34 +51,42 @@ const courseSessionTitle = computed(() => {
>
+
-
- {{ courseSessionTitle }}:
+
+ {{ props.dueDate.course_session.session_title }}:
{{ $t("a.Circle") }} «{{ props.dueDate.circle?.title }}»
+
+
+
![]()
+
+
diff --git a/client/src/components/dueDates/DueDatesList.vue b/client/src/components/dueDates/DueDatesList.vue
deleted file mode 100644
index f5ce0702..00000000
--- a/client/src/components/dueDates/DueDatesList.vue
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
-
-
-
{{ $t("dueDates.noDueDatesAvailable") }}
-
-
-
-
-
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 @@
-
-
-
-
-
-
-
diff --git a/client/src/components/header/MainNavigationBar.vue b/client/src/components/header/MainNavigationBar.vue
index 59e83de2..64e9a6fe 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");
@@ -59,9 +60,9 @@ const selectedCourseSessionTitle = computed(() => {
const appointmentsUrl = computed(() => {
const currentCourseSession = courseSessionsStore.currentCourseSession;
if (currentCourseSession) {
- return `/course/${currentCourseSession.course.slug}/appointments`;
+ return `/dashboard/due-dates?session=${currentCourseSession.id}`;
} else {
- return `/appointments`;
+ return `/dashboard/due-dates`;
}
});
@@ -121,6 +122,8 @@ const hasLearningMentor = computed(() => {
const courseSession = courseSessionsStore.currentCourseSession;
return courseSession.actions.includes("learning-mentor");
});
+
+const mentorTabTitle = useMentorTexts().mentorTabTitle;
@@ -265,7 +268,7 @@ const hasLearningMentor = computed(() => {
class="nav-item"
:class="{ 'nav-item--active': inLearningMentor() }"
>
- {{ t("a.Lernbegleitung") }}
+ {{ t(mentorTabTitle) }}
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;
@@ -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) }}
diff --git a/client/src/components/learningMentor/MyMentors.vue b/client/src/components/learningMentor/MyMentors.vue
index 3e47bbf2..d7052ac8 100644
--- a/client/src/components/learningMentor/MyMentors.vue
+++ b/client/src/components/learningMentor/MyMentors.vue
@@ -1,5 +1,5 @@
-
{{ $t("a.Meine Lernbegleitung") }}
+
{{ $t(myLearningMentors) }}
@@ -143,16 +146,14 @@ const inviteMentor = async () => {
- {{
- $t("a.Aktuell hast du noch keine Person als Lernbegleitung eingeladen.")
- }}
+ {{ $t(noLearningMentors) }}