This commit is contained in:
Ross
2021-10-16 08:36:06 +01:00
parent e3da6ac9b2
commit 26910f66c3
8 changed files with 63 additions and 29 deletions
+5 -5
View File
@@ -161,8 +161,8 @@ class AnatomyQuestion(models.Model):
exams = ", ".join(e)
return exams
def get_unmarked_answer_string(self, exam_pk=None):
unmarked_answers = self.get_unmarked_answers(exam_pk)
def get_unmarked_user_answer_string(self, exam_pk=None):
unmarked_answers = self.get_unmarked_user_answers(exam_pk)
if not unmarked_answers:
return "No answers to mark"
@@ -172,7 +172,7 @@ class AnatomyQuestion(models.Model):
)
)
def get_unmarked_answers(self, exam_pk=None):
def get_unmarked_user_answers(self, exam_pk=None):
if exam_pk is None:
user_answers = set([i.answer_compare for i in self.cid_user_answers.all()])
else:
@@ -187,8 +187,8 @@ class AnatomyQuestion(models.Model):
return unmarked_answers
def get_unmarked_answer_count(self, exam_pk=None):
return len(self.get_unmarked_answers(exam_pk))
def get_unmarked_user_answer_count(self, exam_pk=None):
return len(self.get_unmarked_user_answers(exam_pk))
def get_marked_answers(self):
return set(
+1 -1
View File
@@ -323,7 +323,7 @@ def mark(request, pk, sk):
# i.answer.lower() for i in question.incorrect_answers.all()
# ]
unmarked_user_answers = question.get_unmarked_answers()
unmarked_user_answers = question.get_unmarked_user_answers()
if request.method == "POST":