From 61ae7ba907f82531983d921622c56bd00e748890 Mon Sep 17 00:00:00 2001
From: bsilkyn <brent.silkyn@ugent.be>
Date: Fri, 10 May 2024 18:01:24 +0200
Subject: [PATCH] chore: show scores when student but not part of course
 related to project #400

---
 backend/api/serializers/group_serializer.py | 22 +++++++++++++++------
 frontend/src/views/admin/UsersView.vue      |  2 +-
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/backend/api/serializers/group_serializer.py b/backend/api/serializers/group_serializer.py
index 3496bcbc..08954943 100644
--- a/backend/api/serializers/group_serializer.py
+++ b/backend/api/serializers/group_serializer.py
@@ -1,6 +1,8 @@
 from api.models.group import Group
 from api.models.student import Student
-from api.permissions.role_permissions import is_student
+from api.models.assistant import Assistant
+from api.models.teacher import Teacher
+from api.permissions.role_permissions import is_student, is_assistant, is_teacher
 from api.serializers.project_serializer import ProjectSerializer
 from api.serializers.student_serializer import StudentIDSerializer
 from django.utils.translation import gettext
@@ -30,12 +32,20 @@ class Meta:
     def to_representation(self, instance):
         data = super().to_representation(instance)
 
-        # If you are not a student, you can always see the score
-        if is_student(self.context["request"].user):
-            # Student can not see the score if they are not part of the group, or it is not visible yet
-            if not instance.students.filter(id=self.context["request"].user.student.id).exists() or\
-                    not instance.project.score_visible:
+        user = self.context["request"].user
+        course_id = instance.project.course.id
 
+        # If you are not a student, you can always see the score
+        # Same with being a student, but not being part of the course affiliated with this group
+        if is_student(user) and \
+                not ((is_assistant(user) or is_teacher(user)) and
+                     not user.student.courses.filter(id=instance.project.course.id).exists()):
+            student_in_course = user.student.courses.filter(id=instance.project.course.id).exists()
+            print(student_in_course, flush=True)
+            # Student can not see the score if they are not part of the course associated with group,
+            # or it is not visible yet
+            if not student_in_course or \
+                    not instance.project.score_visible and student_in_course:
                 data.pop("score")
 
         return data
diff --git a/frontend/src/views/admin/UsersView.vue b/frontend/src/views/admin/UsersView.vue
index 42c329ac..c073e34b 100644
--- a/frontend/src/views/admin/UsersView.vue
+++ b/frontend/src/views/admin/UsersView.vue
@@ -104,7 +104,7 @@ const saveItem = async (): Promise<void> => {
                 if (role === 'student') {
                     const data: Record<string, any> = {
                         ...editItem.value,
-                        studentId: editItem.value.id,
+                        student_id: editItem.value.id,
                     };
                     await func(data);
                 } else {