From 08b2e9e49ad2fd02d5389db015b5903d4a40535d Mon Sep 17 00:00:00 2001
From: Daniel Egger <daniel.egger@gmail.com>
Date: Fri, 5 May 2023 18:33:40 +0200
Subject: [PATCH] Show grade on overview page

---
 .../assignmentsPage/AssignmentDetails.vue     | 27 ++++++++++++++++++-
 client/src/services/assignmentService.ts      |  7 ++++-
 client/src/stores/assignmentStore.ts          |  1 +
 client/src/types.ts                           |  1 +
 4 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue b/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue
index 409ca8fb..8ee5870e 100644
--- a/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue
+++ b/client/src/pages/cockpit/assignmentsPage/AssignmentDetails.vue
@@ -23,6 +23,7 @@ const state = reactive({
     userStatus: AssignmentCompletionStatus;
     progressStatus: StatusCountKey;
     userId: number;
+    grade: number | null;
   }[],
   progressStatusCount: {} as StatusCount,
 });
@@ -62,7 +63,31 @@ function submissionStatusForUser(userId: number) {
           :avatar-url="csu.avatar_url"
         >
           <template #center>
-            {{ submissionStatusForUser(csu.user_id)?.userStatus || "-" }}
+            <section class="flex w-full justify-between px-8">
+              <div
+                v-if="
+                  ['evaluation_submitted'].includes(
+                    submissionStatusForUser(csu.user_id)?.userStatus ?? ''
+                  )
+                "
+              >
+                Bewertung freigegeben
+              </div>
+              <div
+                v-else-if="
+                  ['evaluation_in_progress', 'submitted'].includes(
+                    submissionStatusForUser(csu.user_id)?.userStatus ?? ''
+                  )
+                "
+              >
+                Ergebnisse abgegeben
+              </div>
+              <div v-else></div>
+
+              <div v-if="submissionStatusForUser(csu.user_id)?.grade">
+                Note: {{ submissionStatusForUser(csu.user_id)?.grade }}
+              </div>
+            </section>
           </template>
           <template #link>
             <div
diff --git a/client/src/services/assignmentService.ts b/client/src/services/assignmentService.ts
index a6676860..c9687df3 100644
--- a/client/src/services/assignmentService.ts
+++ b/client/src/services/assignmentService.ts
@@ -74,7 +74,12 @@ export function calcUserAssignmentCompletionStatus(
       progressStatus = "success";
     }
 
-    return { userId: u.user_id, userStatus, progressStatus };
+    return {
+      userId: u.user_id,
+      userStatus,
+      progressStatus,
+      grade: userAssignmentStatus?.evaluation_grade ?? null,
+    };
   });
 }
 
diff --git a/client/src/stores/assignmentStore.ts b/client/src/stores/assignmentStore.ts
index e3f2fffe..5eecf7f7 100644
--- a/client/src/stores/assignmentStore.ts
+++ b/client/src/stores/assignmentStore.ts
@@ -40,6 +40,7 @@ export const useAssignmentStore = defineStore({
       userId: string | undefined = undefined
     ) {
       log.debug("load assignment completion", assignmentId, courseSessionId, userId);
+      this.assignmentCompletion = undefined;
       try {
         let url = `/api/assignment/${assignmentId}/${courseSessionId}/`;
         if (userId) {
diff --git a/client/src/types.ts b/client/src/types.ts
index d3d2bda6..70d2f931 100644
--- a/client/src/types.ts
+++ b/client/src/types.ts
@@ -566,4 +566,5 @@ export interface UserAssignmentCompletionStatus {
   id: number;
   assignment_user_id: number;
   completion_status: AssignmentCompletionStatus;
+  evaluation_grade: number | null;
 }