From 978136fba046af95d6548d68c7b4e42063715fec Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Wed, 24 Jan 2024 15:17:59 +0100
Subject: [PATCH] Don't create date if none is present

---
 .../assignmentEvaluationPage/EvaluationContainer.vue   |  4 +++-
 .../assignmentEvaluationPage/EvaluationIntro.vue       | 10 ++++++++--
 cypress/e2e/assignment/assignmentTrainer.cy.js         |  5 ++++-
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationContainer.vue b/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationContainer.vue
index 04af049c..b04fdaef 100644
--- a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationContainer.vue
+++ b/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationContainer.vue
@@ -65,7 +65,9 @@ const assignmentDetail = computed(() => {
 });
 
 const dueDate = computed(() =>
-  dayjs(assignmentDetail.value?.evaluation_deadline?.start)
+  assignmentDetail.value?.evaluation_deadline?.start
+    ? dayjs(assignmentDetail.value?.evaluation_deadline?.start)
+    : undefined
 );
 
 const inEvaluationTask = computed(
diff --git a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationIntro.vue b/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationIntro.vue
index 931fb4ba..445e2245 100644
--- a/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationIntro.vue
+++ b/client/src/pages/cockpit/assignmentEvaluationPage/EvaluationIntro.vue
@@ -11,7 +11,7 @@ const props = defineProps<{
   assignmentUser: CourseSessionUser;
   assignment: Assignment;
   assignmentCompletion: AssignmentCompletion;
-  dueDate?: Dayjs;
+  dueDate?: Dayjs | undefined;
 }>();
 
 const emit = defineEmits(["startEvaluation"]);
@@ -101,7 +101,13 @@ async function startEvaluation() {
     </p>
 
     <p class="my-4" data-cy="instruction">
-      {{ $t(text.evaluationInstruction) }}
+      {{
+        $t(text.evaluationInstruction, {
+          name: `${
+            props.assignmentUser.first_name + " " + props.assignmentUser.last_name
+          }`,
+        })
+      }}
     </p>
 
     <p v-if="props.assignment.assignment_type === 'CASEWORK'" class="my-4">
diff --git a/cypress/e2e/assignment/assignmentTrainer.cy.js b/cypress/e2e/assignment/assignmentTrainer.cy.js
index 5902ff3d..905d05c4 100644
--- a/cypress/e2e/assignment/assignmentTrainer.cy.js
+++ b/cypress/e2e/assignment/assignmentTrainer.cy.js
@@ -218,7 +218,10 @@ describe("assignmentTrainer.cy.js", () => {
 
       cy.get('[data-cy="title"]').should("contain", "Feedback");
       cy.get('[data-cy="evaluation-duedate]"').should("not.exist");
-      cy.get('[data-cy="instruction"]').should("contain", "Intro für Feedback");
+      cy.get('[data-cy="instruction"]').should(
+        "contain",
+        "Bitte unterstütze Test Student1 und gib Feedback zum Auftrag."
+      );
       cy.get('[data-cy="start-evaluation"]').click();
       cy.get('[data-cy="evaluation-task"]').should("contain", "Feedback 1 / 5");