feat: move self-evaluation feedback out of cockpit

This commit is contained in:
Livio Bieri 2024-03-11 16:50:45 +01:00
parent 77b4f9cfe3
commit e88a9dae4d
13 changed files with 55 additions and 61 deletions

View File

@ -10,7 +10,7 @@ import type {
import log from "loglevel"; import log from "loglevel";
import { computed } from "vue"; import { computed } from "vue";
import { useTranslation } from "i18next-vue"; import { useTranslation } from "i18next-vue";
import FeedbackSubmissionProgress from "@/components/cockpit/mentor/FeedbackSubmissionProgress.vue"; import FeedbackSubmissionProgress from "@/components/learningMentor/FeedbackSubmissionProgress.vue";
import { learningContentTypeData } from "@/utils/typeMaps"; import { learningContentTypeData } from "@/utils/typeMaps";
import { import {
useCourseDataWithCompletion, useCourseDataWithCompletion,

View File

@ -1,5 +1,5 @@
<script setup lang="ts"> <script setup lang="ts">
import AssignmentItem from "@/components/cockpit/mentor/AssignmentItem.vue"; import AssignmentItem from "@/components/learningMentor/AssignmentItem.vue";
import type { RouteLocationRaw } from "vue-router"; import type { RouteLocationRaw } from "vue-router";
defineProps<{ defineProps<{

View File

@ -1,5 +1,5 @@
<script setup lang="ts"> <script setup lang="ts">
import AssignmentItem from "@/components/cockpit/mentor/AssignmentItem.vue"; import AssignmentItem from "@/components/learningMentor/AssignmentItem.vue";
import type { RouteLocationRaw } from "vue-router"; import type { RouteLocationRaw } from "vue-router";
defineProps<{ defineProps<{

View File

@ -2,7 +2,7 @@
<template> <template>
<router-link <router-link
:to="{ name: 'mentorCockpitOverview' }" :to="{ name: 'learningMentorOverview' }"
class="btn-text mb-4 inline-flex items-center pl-0" class="btn-text mb-4 inline-flex items-center pl-0"
> >
<it-icon-arrow-left class="it-icon"></it-icon-arrow-left> <it-icon-arrow-left class="it-icon"></it-icon-arrow-left>

View File

@ -12,20 +12,21 @@ const route = useRoute();
class="border-t-2 border-t-transparent" class="border-t-2 border-t-transparent"
:class="{ :class="{
'border-b-2 border-b-blue-900': 'border-b-2 border-b-blue-900':
route.name === 'mentorCockpitOverview' || route.name === 'mentorCockpit', route.name === 'learningMentorOverview' ||
route.name === 'learningMentor',
}" }"
> >
<router-link :to="{ name: 'mentorCockpitOverview' }" class="block py-3"> <router-link :to="{ name: 'learningMentorOverview' }" class="block py-3">
{{ $t("a.Übersicht") }} {{ $t("a.Übersicht") }}
</router-link> </router-link>
</li> </li>
<li <li
class="border-t-2 border-t-transparent lg:ml-12" class="border-t-2 border-t-transparent lg:ml-12"
:class="{ :class="{
'border-b-2 border-b-blue-900': route.name === 'mentorCockpitParticipants', 'border-b-2 border-b-blue-900': route.name === 'learningMentorParticipants',
}" }"
> >
<router-link :to="{ name: 'mentorCockpitParticipants' }" class="block py-3"> <router-link :to="{ name: 'learningMentorParticipants' }" class="block py-3">
{{ $t("a.Teilnehmer") }} {{ $t("a.Teilnehmer") }}
</router-link> </router-link>
</li> </li>

View File

@ -4,9 +4,9 @@ import { useMentorCockpit } from "@/services/mentorCockpit";
import { useCurrentCourseSession } from "@/composables"; import { useCurrentCourseSession } from "@/composables";
import ItDropdownSelect from "@/components/ui/ItDropdownSelect.vue"; import ItDropdownSelect from "@/components/ui/ItDropdownSelect.vue";
import { computed, type Ref, ref } from "vue"; import { computed, type Ref, ref } from "vue";
import PraxisAssignmentItem from "@/components/cockpit/mentor/PraxisAssignmentItem.vue"; import PraxisAssignmentItem from "@/components/learningMentor/PraxisAssignmentItem.vue";
import { useTranslation } from "i18next-vue"; import { useTranslation } from "i18next-vue";
import SelfAssignmentFeedbackAssignmentItem from "@/components/cockpit/mentor/SelfAssignmentFeedbackAssignmentItem.vue"; import SelfAssignmentFeedbackAssignmentItem from "@/components/learningMentor/SelfAssignmentFeedbackAssignmentItem.vue";
const { t } = useTranslation(); const { t } = useTranslation();
const courseSession = useCurrentCourseSession(); const courseSession = useCurrentCourseSession();
@ -76,7 +76,7 @@ const filteredAssignments: Ref<Assignment[]> = computed(() => {
:circle-title="mentorCockpitStore.getCircleTitleById(item.circle_id)" :circle-title="mentorCockpitStore.getCircleTitleById(item.circle_id)"
:pending-tasks="item.pending_evaluations" :pending-tasks="item.pending_evaluations"
:task-link="{ :task-link="{
name: 'mentorCockpitPraxisAssignments', name: 'learningMentorPraxisAssignments',
params: { praxisAssignmentId: item.id }, params: { praxisAssignmentId: item.id },
}" }"
:task-title="item.title" :task-title="item.title"
@ -86,7 +86,7 @@ const filteredAssignments: Ref<Assignment[]> = computed(() => {
:circle-title="mentorCockpitStore.getCircleTitleById(item.circle_id)" :circle-title="mentorCockpitStore.getCircleTitleById(item.circle_id)"
:pending-tasks="item.pending_evaluations" :pending-tasks="item.pending_evaluations"
:task-link="{ :task-link="{
name: 'mentorCockpitSelfEvaluationFeedbackAssignments', name: 'learningMentorSelfEvaluationFeedbackAssignments',
params: { learningUnitId: item.id }, params: { learningUnitId: item.id },
}" }"
:task-title="item.title" :task-title="item.title"

View File

@ -93,7 +93,7 @@ const handleContinue = () => {
const clickExit = () => { const clickExit = () => {
console.log("clickExit"); console.log("clickExit");
router.push({ router.push({
name: "mentorCockpitSelfEvaluationFeedbackAssignments", name: "learningMentorSelfEvaluationFeedbackAssignments",
params: { params: {
learningUnitId: props.learningUnitId, learningUnitId: props.learningUnitId,
}, },

View File

@ -177,68 +177,61 @@ const router = createRouter({
], ],
}, },
{ {
path: "/course/:courseSlug/cockpit", path: "/course/:courseSlug/learning-mentor",
name: "cockpit", component: () => import("@/pages/learningMentor/mentor/MentorIndexPage.vue"),
props: true,
name: "learningMentor",
children: [ children: [
{ {
path: "expert", path: "",
component: () => import("@/pages/cockpit/cockpitPage/CockpitExpertPage.vue"), component: () =>
props: true, import("@/pages/learningMentor/mentor/MentorOverviewPage.vue"),
name: "expertCockpit", name: "learningMentorOverview",
}, },
{ {
path: "mentor", path: "participants",
component: () => import("@/pages/cockpit/cockpitPage/CockpitMentorPage.vue"), component: () =>
name: "mentorCockpit", import("@/pages/learningMentor/mentor/MentorParticipantsPage.vue"),
name: "learningMentorParticipants",
},
{
path: "self-evaluation-feedback/:learningUnitId",
component: () =>
import("@/pages/learningMentor/mentor/SelfEvaluationFeedbackPage.vue"),
name: "mentorSelfEvaluationFeedback",
props: true,
},
{
path: "details",
component: () =>
import("@/pages/learningMentor/mentor/MentorDetailParentPage.vue"),
children: [ children: [
{ {
path: "", path: "praxis-assignments/:praxisAssignmentId",
component: () => component: () =>
import("@/pages/cockpit/cockpitPage/mentor/MentorOverviewPage.vue"), import("@/pages/learningMentor/mentor/MentorPraxisAssignmentPage.vue"),
name: "mentorCockpitOverview", name: "learningMentorPraxisAssignments",
},
{
path: "participants",
component: () =>
import("@/pages/cockpit/cockpitPage/mentor/MentorParticipantsPage.vue"),
name: "mentorCockpitParticipants",
},
{
path: "self-evaluation-feedback/:learningUnitId",
component: () =>
import(
"@/pages/cockpit/cockpitPage/mentor/SelfEvaluationFeedbackPage.vue"
),
name: "mentorSelfEvaluationFeedback",
props: true, props: true,
}, },
{ {
path: "details", path: "self-evaluation-feedback-assignments/:learningUnitId",
component: () => component: () =>
import("@/pages/cockpit/cockpitPage/mentor/MentorDetailParentPage.vue"), import(
children: [ "@/pages/learningMentor/mentor/MentorSelfEvaluationFeedbackAssignmentPage.vue"
{ ),
path: "praxis-assignments/:praxisAssignmentId", name: "learningMentorSelfEvaluationFeedbackAssignments",
component: () => props: true,
import(
"@/pages/cockpit/cockpitPage/mentor/MentorPraxisAssignmentPage.vue"
),
name: "mentorCockpitPraxisAssignments",
props: true,
},
{
path: "self-evaluation-feedback-assignments/:learningUnitId",
component: () =>
import(
"@/pages/cockpit/cockpitPage/mentor/MentorSelfEvaluationFeedbackAssignmentPage.vue"
),
name: "mentorCockpitSelfEvaluationFeedbackAssignments",
props: true,
},
],
}, },
], ],
}, },
],
},
{
path: "/course/:courseSlug/cockpit",
component: () => import("@/pages/cockpit/cockpitPage/CockpitExpertPage.vue"),
props: true,
name: "cockpit",
children: [
{ {
path: "profile/:userId/:circleSlug", path: "profile/:userId/:circleSlug",
component: () => import("@/pages/cockpit/CockpitUserCirclePage.vue"), component: () => import("@/pages/cockpit/CockpitUserCirclePage.vue"),