From 804551b14bc02d2f18ccd74c04081a620caef250 Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Mon, 23 Sep 2024 18:25:35 +0200
Subject: [PATCH] Anpassungen nach Kommentar Dario

---
 .../assignment/evaluation/EvaluationIntro.vue |  2 +-
 .../evaluation/EvaluationSummary.vue          | 28 ++++++++++---------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/client/src/components/assignment/evaluation/EvaluationIntro.vue b/client/src/components/assignment/evaluation/EvaluationIntro.vue
index aad665dd..0fdedd9e 100644
--- a/client/src/components/assignment/evaluation/EvaluationIntro.vue
+++ b/client/src/components/assignment/evaluation/EvaluationIntro.vue
@@ -104,7 +104,7 @@ async function startEvaluation() {
     </p>
 
     <p v-if="props.dueDate" class="my-4" data-cy="evaluation-duedate">
-      {{ "a.Freigabetermin Bewertung" }}: {{ props.dueDate.format("DD.MM.YYYY") }}
+      {{ $t("a.Freigabetermin Bewertung") }}: {{ props.dueDate.format("DD.MM.YYYY") }}
       {{ props.dueDate.format("HH.mm") }}
     </p>
 
diff --git a/client/src/components/assignment/evaluation/EvaluationSummary.vue b/client/src/components/assignment/evaluation/EvaluationSummary.vue
index eda77e12..f0a23e69 100644
--- a/client/src/components/assignment/evaluation/EvaluationSummary.vue
+++ b/client/src/components/assignment/evaluation/EvaluationSummary.vue
@@ -252,7 +252,7 @@ const showPassed = computed(() => {
       </div>
 
       <p v-if="props.dueDate" class="my-4" data-cy="evaluation-duedate">
-        {{ "a.Freigabetermin Bewertung" }}: {{ props.dueDate.format("DD.MM.YYYY") }}
+        {{ $t("a.Freigabetermin Bewertung") }}: {{ props.dueDate.format("DD.MM.YYYY") }}
         {{ props.dueDate.format("HH.mm") }}
       </p>
 
@@ -265,18 +265,6 @@ const showPassed = computed(() => {
         {{ $t("a.assignment.evaluationFeedbackDescriptionText") }}
       </p>
 
-      <section>
-        <div
-          v-for="historyEntry in props.assignmentCompletion.additional_json_data
-            ?.submission_history ?? []"
-          :key="historyEntry.timestamp"
-        >
-          {{ dayjs(historyEntry.timestamp).format("DD.MM.YYYY HH.mm") }}:
-          {{ $t(historyEntry.translation_key) }}
-          ({{ historyEntry.user_display_name }})
-        </div>
-      </section>
-
       <div
         v-if="props.assignmentCompletion.completion_status !== 'EVALUATION_SUBMITTED'"
         class="mt-8"
@@ -297,6 +285,8 @@ const showPassed = computed(() => {
         ></ItTextarea>
       </div>
       <div v-else-if="evaluationComment" class="mt-4">
+        {{ $t("a.Kommentar") }}:
+        <br />
         {{ evaluationComment }}
       </div>
 
@@ -310,6 +300,18 @@ const showPassed = computed(() => {
           "
         ></ItSuccessAlert>
       </div>
+
+      <section class="mt-4">
+        <div
+          v-for="historyEntry in props.assignmentCompletion.additional_json_data
+            ?.submission_history ?? []"
+          :key="historyEntry.timestamp"
+        >
+          {{ dayjs(historyEntry.timestamp).format("DD.MM.YYYY HH.mm") }}:
+          {{ $t(historyEntry.translation_key) }}
+          ({{ historyEntry.user_display_name }})
+        </div>
+      </section>
     </section>
 
     <section>