This commit is contained in:
Ross
2021-12-19 15:39:34 +00:00
parent d1bd0a1235
commit 73dab28cf8
2 changed files with 19 additions and 19 deletions
+13 -13
View File
@@ -217,19 +217,19 @@ class AnatomyQuestion(models.Model):
return unmarked_answers return unmarked_answers
def get_unmarked_user_answer_count(self, exam_pk=None): def get_unmarked_user_answer_count(self, exam_pk=None):
if exam_pk is None: # if exam_pk is None:
return self.cid_user_answers.filter( # return self.cid_user_answers.filter(
score=Answer.MarkOptions.UNMARKED # score=Answer.MarkOptions.UNMARKED
).count() # ).count()
else: # else:
if hasattr(self, "prefetched_unmarked_cid_answers"): # if hasattr(self, "prefetched_unmarked_cid_answers"):
return len(self.prefetched_unmarked_cid_answers) # return len(self.prefetched_unmarked_cid_answers)
#
else: # else:
return self.cid_user_answers.filter( # return self.cid_user_answers.filter(
score=Answer.MarkOptions.UNMARKED, exam__id=exam_pk # score=Answer.MarkOptions.UNMARKED, exam__id=exam_pk
).count() # ).count()
# return len(self.get_unmarked_user_answers(exam_pk)) return len(self.get_unmarked_user_answers(exam_pk))
def get_marked_answers(self): def get_marked_answers(self):
return set( return set(
+6 -6
View File
@@ -642,12 +642,12 @@ class ExamViews(View, LoginRequiredMixin):
to_attr="prefetched_primary_answer" to_attr="prefetched_primary_answer"
#queryset=self.Answer.objects.filter(), #queryset=self.Answer.objects.filter(),
), ),
Prefetch( #Prefetch(
"cid_user_answers", # "cid_user_answers",
queryset=self.CidUserAnswer.objects.filter(score=self.Answer.MarkOptions.UNMARKED, exam__id=pk), # queryset=self.CidUserAnswer.objects.filter(score=self.Answer.MarkOptions.UNMARKED, exam__id=pk),
to_attr="prefetched_unmarked_cid_answers" # to_attr="prefetched_unmarked_cid_answers"
#queryset=self.Answer.objects.filter(), # #queryset=self.Answer.objects.filter(),
), #),
) )
) )
else: else: