From 73dab28cf8c66f08a20f35ad4829425e1e973be8 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Sun, 19 Dec 2021 15:39:34 +0000
Subject: [PATCH] .

---
 anatomy/models.py | 26 +++++++++++++-------------
 generic/views.py  | 12 ++++++------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/anatomy/models.py b/anatomy/models.py
index bbe28255..df63765b 100644
--- a/anatomy/models.py
+++ b/anatomy/models.py
@@ -217,19 +217,19 @@ class AnatomyQuestion(models.Model):
         return unmarked_answers
 
     def get_unmarked_user_answer_count(self, exam_pk=None):
-        if exam_pk is None:
-            return self.cid_user_answers.filter(
-                score=Answer.MarkOptions.UNMARKED
-            ).count()
-        else:
-            if hasattr(self, "prefetched_unmarked_cid_answers"):
-                return len(self.prefetched_unmarked_cid_answers)
-            
-            else:
-                return self.cid_user_answers.filter(
-                    score=Answer.MarkOptions.UNMARKED, exam__id=exam_pk
-                ).count()
-        # return len(self.get_unmarked_user_answers(exam_pk))
+        # if exam_pk is None:
+        #    return self.cid_user_answers.filter(
+        #        score=Answer.MarkOptions.UNMARKED
+        #    ).count()
+        # else:
+        #    if hasattr(self, "prefetched_unmarked_cid_answers"):
+        #        return len(self.prefetched_unmarked_cid_answers)
+        #
+        #    else:
+        #        return self.cid_user_answers.filter(
+        #            score=Answer.MarkOptions.UNMARKED, exam__id=exam_pk
+        #        ).count()
+        return len(self.get_unmarked_user_answers(exam_pk))
 
     def get_marked_answers(self):
         return set(
diff --git a/generic/views.py b/generic/views.py
index 09cc6141..eff58c0a 100644
--- a/generic/views.py
+++ b/generic/views.py
@@ -642,12 +642,12 @@ class ExamViews(View, LoginRequiredMixin):
                        to_attr="prefetched_primary_answer"
                        #queryset=self.Answer.objects.filter(),
                     ),
-                    Prefetch(
-                       "cid_user_answers",
-                       queryset=self.CidUserAnswer.objects.filter(score=self.Answer.MarkOptions.UNMARKED, exam__id=pk),
-                       to_attr="prefetched_unmarked_cid_answers"
-                       #queryset=self.Answer.objects.filter(),
-                    ),
+                    #Prefetch(
+                    #   "cid_user_answers",
+                    #   queryset=self.CidUserAnswer.objects.filter(score=self.Answer.MarkOptions.UNMARKED, exam__id=pk),
+                    #   to_attr="prefetched_unmarked_cid_answers"
+                    #   #queryset=self.Answer.objects.filter(),
+                    #),
                 )
             )
         else: