From 9e30efd59d3664fb639f3b59fad4d31cf155ad2f Mon Sep 17 00:00:00 2001
From: Livio Bieri <livio@livio.li>
Date: Wed, 13 Mar 2024 15:37:15 +0100
Subject: [PATCH] chore: move AssignmentEvaluationPage.vue out of cockpit
 (shared)

---
 .../EvaluationContainer.vue                      |  6 +++---
 .../assignmentEvaluation}/EvaluationIntro.vue    |  0
 .../assignmentEvaluation}/EvaluationSummary.vue  |  0
 .../assignmentEvaluation}/EvaluationTask.vue     |  4 +---
 .../AssignmentEvaluationPage.vue                 | 16 +++++++++++-----
 client/src/pages/dashboard/MentorPage.vue        |  2 +-
 .../assignment/AssignmentView.vue                |  2 +-
 client/src/router/index.ts                       | 14 ++++++--------
 server/vbv_lernwelt/assignment/models.py         |  7 ++-----
 9 files changed, 25 insertions(+), 26 deletions(-)
 rename client/src/{pages/cockpit/assignmentEvaluationPage => components/assignmentEvaluation}/EvaluationContainer.vue (95%)
 rename client/src/{pages/cockpit/assignmentEvaluationPage => components/assignmentEvaluation}/EvaluationIntro.vue (100%)
 rename client/src/{pages/cockpit/assignmentEvaluationPage => components/assignmentEvaluation}/EvaluationSummary.vue (100%)
 rename client/src/{pages/cockpit/assignmentEvaluationPage => components/assignmentEvaluation}/EvaluationTask.vue (97%)
 rename client/src/pages/{cockpit/assignmentEvaluationPage => assignmentEvaluation}/AssignmentEvaluationPage.vue (91%)

diff --git a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationContainer.vue b/client/src/components/assignmentEvaluation/EvaluationContainer.vue
similarity index 95%
rename from client/src/pages/cockpit/assignmentEvaluationPage/EvaluationContainer.vue
rename to client/src/components/assignmentEvaluation/EvaluationContainer.vue
index b04fdaef..48c0b2e6 100644
--- a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationContainer.vue
+++ b/client/src/components/assignmentEvaluation/EvaluationContainer.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import EvaluationIntro from "@/pages/cockpit/assignmentEvaluationPage/EvaluationIntro.vue";
-import EvaluationSummary from "@/pages/cockpit/assignmentEvaluationPage/EvaluationSummary.vue";
-import EvaluationTask from "@/pages/cockpit/assignmentEvaluationPage/EvaluationTask.vue";
+import EvaluationIntro from "@/components/assignmentEvaluation/EvaluationIntro.vue";
+import EvaluationSummary from "@/components/assignmentEvaluation/EvaluationSummary.vue";
+import EvaluationTask from "@/components/assignmentEvaluation/EvaluationTask.vue";
 import type {
   Assignment,
   AssignmentCompletion,
diff --git a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationIntro.vue b/client/src/components/assignmentEvaluation/EvaluationIntro.vue
similarity index 100%
rename from client/src/pages/cockpit/assignmentEvaluationPage/EvaluationIntro.vue
rename to client/src/components/assignmentEvaluation/EvaluationIntro.vue
diff --git a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationSummary.vue b/client/src/components/assignmentEvaluation/EvaluationSummary.vue
similarity index 100%
rename from client/src/pages/cockpit/assignmentEvaluationPage/EvaluationSummary.vue
rename to client/src/components/assignmentEvaluation/EvaluationSummary.vue
diff --git a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationTask.vue b/client/src/components/assignmentEvaluation/EvaluationTask.vue
similarity index 97%
rename from client/src/pages/cockpit/assignmentEvaluationPage/EvaluationTask.vue
rename to client/src/components/assignmentEvaluation/EvaluationTask.vue
index e6750d3b..300c3506 100644
--- a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationTask.vue
+++ b/client/src/components/assignmentEvaluation/EvaluationTask.vue
@@ -30,12 +30,10 @@ const courseSession = useCurrentCourseSession();
 const task = computed(() => props.assignment.evaluation_tasks[props.taskIndex]);
 
 const expertData = computed(() => {
-  const data = (props.assignmentCompletion?.completion_data?.[task.value.id]
-    ?.expert_data ?? {
+  return (props.assignmentCompletion?.completion_data?.[task.value.id]?.expert_data ?? {
     points: 0,
     text: "",
   }) as ExpertData;
-  return data;
 });
 
 const text = computed(() => {
diff --git a/client/src/pages/cockpit/assignmentEvaluationPage/AssignmentEvaluationPage.vue b/client/src/pages/assignmentEvaluation/AssignmentEvaluationPage.vue
similarity index 91%
rename from client/src/pages/cockpit/assignmentEvaluationPage/AssignmentEvaluationPage.vue
rename to client/src/pages/assignmentEvaluation/AssignmentEvaluationPage.vue
index 08268d60..1b626833 100644
--- a/client/src/pages/cockpit/assignmentEvaluationPage/AssignmentEvaluationPage.vue
+++ b/client/src/pages/assignmentEvaluation/AssignmentEvaluationPage.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { useCurrentCourseSession } from "@/composables";
 import { ASSIGNMENT_COMPLETION_QUERY } from "@/graphql/queries";
-import EvaluationContainer from "@/pages/cockpit/assignmentEvaluationPage/EvaluationContainer.vue";
+import EvaluationContainer from "@/components/assignmentEvaluation/EvaluationContainer.vue";
 import AssignmentSubmissionResponses from "@/pages/learningPath/learningContentPage/assignment/AssignmentSubmissionResponses.vue";
 import type { Assignment, AssignmentCompletion, CourseSessionUser } from "@/types";
 import { useQuery } from "@urql/vue";
@@ -9,7 +9,7 @@ import log from "loglevel";
 import { computed, onMounted } from "vue";
 import { useRouter } from "vue-router";
 import { getPreviousRoute } from "@/router/history";
-import { getAssignmentTypeTitle } from "../../../utils/utils";
+import { getAssignmentTypeTitle } from "../../utils/utils";
 
 const props = defineProps<{
   courseSlug: string;
@@ -42,9 +42,15 @@ function close() {
   if (previousRoute) {
     router.push(previousRoute);
   } else {
-    router.push({
-      path: `/course/${props.courseSlug}/cockpit`,
-    });
+    if (assignment.value?.assignment_type === "PRAXIS_ASSIGNMENT") {
+      router.push({
+        path: `/course/${props.courseSlug}/learning-mentor`,
+      });
+    } else {
+      router.push({
+        path: `/course/${props.courseSlug}/cockpit`,
+      });
+    }
   }
 }
 
diff --git a/client/src/pages/dashboard/MentorPage.vue b/client/src/pages/dashboard/MentorPage.vue
index d6b972fd..9c590ae3 100644
--- a/client/src/pages/dashboard/MentorPage.vue
+++ b/client/src/pages/dashboard/MentorPage.vue
@@ -15,7 +15,7 @@ const dashboardStore = useDashboardStore();
             class="btn-blue"
             :to="getLearningMentorUrl(dashboardStore.currentDashboardConfig.slug)"
           >
-            {{ $t("a.Zur Lernbegleitung") }}
+            {{ $t("a.Übersicht anschauen") }}
           </router-link>
         </div>
       </div>
diff --git a/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue b/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue
index d24ca582..c5a934b3 100644
--- a/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue
+++ b/client/src/pages/learningPath/learningContentPage/assignment/AssignmentView.vue
@@ -19,7 +19,7 @@ import * as log from "loglevel";
 import { computed, onMounted, ref, watchEffect } from "vue";
 import { useTranslation } from "i18next-vue";
 import { learningContentTypeData } from "@/utils/typeMaps";
-import EvaluationSummary from "@/pages/cockpit/assignmentEvaluationPage/EvaluationSummary.vue";
+import EvaluationSummary from "@/components/assignmentEvaluation/EvaluationSummary.vue";
 import { bustItGetCache } from "@/fetchHelpers";
 
 const { t } = useTranslation();
diff --git a/client/src/router/index.ts b/client/src/router/index.ts
index 5a28811e..c8097829 100644
--- a/client/src/router/index.ts
+++ b/client/src/router/index.ts
@@ -226,6 +226,12 @@ const router = createRouter({
         },
       ],
     },
+    {
+      path: "/course/:courseSlug/assignment-evaluation/:assignmentId/:userId",
+      component: () =>
+        import("@/pages/assignmentEvaluation/AssignmentEvaluationPage.vue"),
+      props: true,
+    },
     {
       path: "/course/:courseSlug/cockpit",
       component: () => import("@/pages/cockpit/cockpitPage/CockpitExpertPage.vue"),
@@ -248,14 +254,6 @@ const router = createRouter({
             import("@/pages/cockpit/assignmentsPage/AssignmentsPage.vue"),
           props: true,
         },
-        {
-          path: "assignment/:assignmentId/:userId",
-          component: () =>
-            import(
-              "@/pages/cockpit/assignmentEvaluationPage/AssignmentEvaluationPage.vue"
-            ),
-          props: true,
-        },
         {
           path: "attendance",
           component: () =>
diff --git a/server/vbv_lernwelt/assignment/models.py b/server/vbv_lernwelt/assignment/models.py
index df31c473..6fad423e 100644
--- a/server/vbv_lernwelt/assignment/models.py
+++ b/server/vbv_lernwelt/assignment/models.py
@@ -377,11 +377,8 @@ class AssignmentCompletion(models.Model):
         ]
 
     def get_assignment_evaluation_frontend_url(self):
-        """
-        Used by the expert to evaluate the assignment
-        Example: /course/überbetriebliche-kurse/cockpit/assignment/371/18
-        """
-        return f"{self.course_session.course.get_cockpit_url()}/assignment/{self.assignment.id}/{self.assignment_user.id}"
+        """Used by the expert to evaluate the assignment"""
+        return f"{self.course_session.course.get_course_url()}/assignment-evaluation/{self.assignment.id}/{self.assignment_user.id}"
 
     @property
     def task_completion_data(self):