From df441d57a2bd7fa7ca4611fd66bbb76c36aa4927 Mon Sep 17 00:00:00 2001
From: Livio Bieri <livio@livio.li>
Date: Mon, 25 Mar 2024 16:55:56 +0100
Subject: [PATCH 1/2] fix: sample solution praxis assignment w/o mentor

---
 .../components/assignment/SampleSolution.vue  | 36 +++++++++++++++++++
 .../assignment/PraxisAssignmentSubmit.vue     |  2 ++
 .../assignment/AssignmentSubmissionView.vue   | 31 ++--------------
 3 files changed, 40 insertions(+), 29 deletions(-)
 create mode 100644 client/src/components/assignment/SampleSolution.vue

diff --git a/client/src/components/assignment/SampleSolution.vue b/client/src/components/assignment/SampleSolution.vue
new file mode 100644
index 00000000..1b9d478b
--- /dev/null
+++ b/client/src/components/assignment/SampleSolution.vue
@@ -0,0 +1,36 @@
+<script setup lang="ts">
+import ItButton from "@/components/ui/ItButton.vue";
+import type { Assignment } from "@/types";
+
+const props = defineProps<{
+  assignment: Assignment;
+}>();
+
+const openSolutionSample = () => {
+  const url = props.assignment.solution_sample?.url;
+  if (url) {
+    window.open(url, "_blank");
+  }
+};
+</script>
+
+<template>
+  <div v-if="assignment.solution_sample" data-cy="show-sample-solution">
+    <p>
+      {{ $t("assignment.submissionShowSampleSolutionText") }}
+    </p>
+
+    <ItButton
+      class="mt-6"
+      variant="primary"
+      size="normal"
+      :disabled="false"
+      data-cy="show-sample-solution-button"
+      @click="openSolutionSample"
+    >
+      <p>{{ $t("assignment.submissionShowSampleSolution") }}</p>
+    </ItButton>
+  </div>
+</template>
+
+<style scoped></style>
diff --git a/client/src/components/learningPath/assignment/PraxisAssignmentSubmit.vue b/client/src/components/learningPath/assignment/PraxisAssignmentSubmit.vue
index fe8bbd27..45b3cd0b 100644
--- a/client/src/components/learningPath/assignment/PraxisAssignmentSubmit.vue
+++ b/client/src/components/learningPath/assignment/PraxisAssignmentSubmit.vue
@@ -14,6 +14,7 @@ import type { Assignment } from "@/types";
 import DateEmbedding from "@/components/dueDates/DateEmbedding.vue";
 import { useLearningMentors } from "@/composables";
 import NoMentorInformationPanel from "@/components/mentor/NoMentorInformationPanel.vue";
+import SampleSolution from "@/components/assignment/SampleSolution.vue";
 
 const props = defineProps<{
   submissionDeadlineStart?: string | null;
@@ -98,4 +99,5 @@ const onSubmit = async () => {
   >
     <p>{{ $t("a.Ergebnisse teilen") }}</p>
   </ItButton>
+  <SampleSolution class="pt-8" :assignment="assignment" />
 </template>
diff --git a/client/src/pages/learningPath/learningContentPage/assignment/AssignmentSubmissionView.vue b/client/src/pages/learningPath/learningContentPage/assignment/AssignmentSubmissionView.vue
index 17a61f09..ebdd32de 100644
--- a/client/src/pages/learningPath/learningContentPage/assignment/AssignmentSubmissionView.vue
+++ b/client/src/pages/learningPath/learningContentPage/assignment/AssignmentSubmissionView.vue
@@ -1,5 +1,4 @@
 <script setup lang="ts">
-import ItButton from "@/components/ui/ItButton.vue";
 import ItSuccessAlert from "@/components/ui/ItSuccessAlert.vue";
 import {
   useCourseData,
@@ -14,6 +13,7 @@ import type { AssignmentAssignmentAssignmentTypeChoices } from "@/gql/graphql";
 import CaseWorkSubmit from "@/components/learningPath/assignment/CaseWorkSubmit.vue";
 import SimpleSubmit from "@/components/learningPath/assignment/SimpleSubmit.vue";
 import PraxisAssignmentSubmit from "@/components/learningPath/assignment/PraxisAssignmentSubmit.vue";
+import SampleSolution from "@/components/assignment/SampleSolution.vue";
 
 const props = defineProps<{
   assignment: Assignment;
@@ -78,14 +78,6 @@ const isPraxisAssignment = computed(() => checkAssignmentType(["PRAXIS_ASSIGNMEN
 const onEditTask = (task: AssignmentTask) => {
   emit("editTask", task);
 };
-
-const openSolutionSample = () => {
-  const url = props.assignment.solution_sample?.url ?? "";
-
-  if (props.assignment.solution_sample) {
-    window.open(url, "_blank");
-  }
-};
 </script>
 <template>
   <div class="w-full border border-gray-400 p-8" data-cy="confirm-container">
@@ -134,26 +126,7 @@ const openSolutionSample = () => {
           $t("assignment.submissionNotificationDisclaimer", { name: circleExpertName })
         }}
       </p>
-      <div
-        v-if="assignment.solution_sample"
-        class="pt-2"
-        data-cy="show-sample-solution"
-      >
-        <p>
-          {{ $t("assignment.submissionShowSampleSolutionText") }}
-        </p>
-
-        <ItButton
-          class="mt-6"
-          variant="primary"
-          size="normal"
-          :disabled="false"
-          data-cy="show-sample-solution-button"
-          @click="openSolutionSample"
-        >
-          <p>{{ $t("assignment.submissionShowSampleSolution") }}</p>
-        </ItButton>
-      </div>
+      <SampleSolution class="pt-2" :assignment="assignment" />
     </div>
   </div>
   <AssignmentSubmissionResponses

From 8109446602cc92759a10c96fe27c8d588ceaa7c3 Mon Sep 17 00:00:00 2001
From: Livio Bieri <livio@livio.li>
Date: Tue, 26 Mar 2024 10:38:05 +0100
Subject: [PATCH 2/2] fix: hide sample solution if learning mentors are present

---
 .../learningPath/assignment/PraxisAssignmentSubmit.vue      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/client/src/components/learningPath/assignment/PraxisAssignmentSubmit.vue b/client/src/components/learningPath/assignment/PraxisAssignmentSubmit.vue
index 45b3cd0b..ac739f65 100644
--- a/client/src/components/learningPath/assignment/PraxisAssignmentSubmit.vue
+++ b/client/src/components/learningPath/assignment/PraxisAssignmentSubmit.vue
@@ -99,5 +99,9 @@ const onSubmit = async () => {
   >
     <p>{{ $t("a.Ergebnisse teilen") }}</p>
   </ItButton>
-  <SampleSolution class="pt-8" :assignment="assignment" />
+  <SampleSolution
+    v-if="learningMentors?.length == 0"
+    class="pt-8"
+    :assignment="assignment"
+  />
 </template>