numerous improvements
This commit is contained in:
+15
-1
@@ -136,6 +136,9 @@ class AnatomyQuestion(models.Model):
|
||||
|
||||
return unmarked_answers
|
||||
|
||||
def GetUnmarkedAnswerCount(self):
|
||||
return len(self.GetUnmarkedAnswers())
|
||||
|
||||
def GetMarkedAnswers(self):
|
||||
return set([i.get_compare_string() for i in self.answers.all() if i.status != i.MarkOptions.UNMARKED])
|
||||
correct_answers = set([i.answer.lower() for i in self.answers.all()])
|
||||
@@ -289,4 +292,15 @@ class CidUserAnswer(models.Model):
|
||||
self.answer.strip()
|
||||
|
||||
def get_compare_string(self):
|
||||
return self.answer.lower()
|
||||
return self.answer.lower()
|
||||
|
||||
def get_answer_score(self):
|
||||
q = self.question
|
||||
ans = self.answer
|
||||
if q.answers.filter(answer__iexact=ans, status=Answer.MarkOptions.CORRECT).first() is not None:
|
||||
mark = 2
|
||||
elif q.answers.filter(answer__iexact=ans, status=Answer.MarkOptions.HALF_MARK).first() is not None:
|
||||
mark = 1
|
||||
else:
|
||||
mark = 0
|
||||
return mark
|
||||
Reference in New Issue
Block a user