.
This commit is contained in:
+13
-13
@@ -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(
|
||||
|
||||
+6
-6
@@ -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:
|
||||
|
||||
Reference in New Issue
Block a user