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