From a9a2874c16f241181462666c046a8ae86eda6a2b Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Mon, 2 Aug 2021 12:29:07 +0100
Subject: [PATCH] .

---
 anatomy/views.py | 6 +++---
 rapids/views.py  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/anatomy/views.py b/anatomy/views.py
index 0e21b304..31353f9d 100644
--- a/anatomy/views.py
+++ b/anatomy/views.py
@@ -453,7 +453,7 @@ def exam_scores_cid(request, pk):
     questions = exam.exam_questions.all()
 
     cids = (
-        CidUserAnswer.objects.filter(question__in=questions)
+        CidUserAnswer.objects.filter(question__in=questions, exam__id=pk)
         .order_by("cid")
         .values_list("cid", flat=True)
         .distinct()
@@ -473,7 +473,7 @@ def exam_scores_cid(request, pk):
         user_names[cid] = cid
         for q in questions:
             # Get user answer
-            s = q.cid_user_answers.filter(cid=cid).first()
+            s = q.cid_user_answers.filter(cid=cid, exam__id=pk).first()
             if not s:
                 # skip if no answer
                 user_answers_marks[cid].append(0)
@@ -564,7 +564,7 @@ def exam_scores_cid_user(request, pk, sk):
 
     for q in questions:
         # Get user answer
-        user_answer = q.cid_user_answers.filter(cid=cid).first()
+        user_answer = q.cid_user_answers.filter(cid=cid, exam__id=pk).first()
         if not user_answer:
             # skip if no answer
             answers_marks.append(0)
diff --git a/rapids/views.py b/rapids/views.py
index 7587a5b8..b0a470ed 100755
--- a/rapids/views.py
+++ b/rapids/views.py
@@ -787,7 +787,7 @@ def exam_scores_cid(request, pk):
     questions = exam.exam_questions.all()
 
     cids = (
-        CidUserAnswer.objects.filter(question__in=questions)
+        CidUserAnswer.objects.filter(question__in=questions, exam__id=pk)
         .order_by("cid")
         .values_list("cid", flat=True)
         .distinct()
@@ -807,7 +807,7 @@ def exam_scores_cid(request, pk):
         user_names[cid] = cid
         for q in questions:
             # Get user answer
-            s = q.cid_user_answers.filter(cid=cid).first()
+            s = q.cid_user_answers.filter(cid=cid, exam__id=pk).first()
 
             if not s:
                 # skip if no answer
@@ -901,7 +901,7 @@ def exam_scores_cid_user(request, pk, sk):
 
     for q in questions:
         # Get user answer
-        user_answer = q.cid_user_answers.filter(cid=cid).first()
+        user_answer = q.cid_user_answers.filter(cid=cid, exam__id=pk).first()
 
         if not user_answer or user_answer is None:
             # skip if no answer