many improvement

This commit is contained in:
Ross
2020-10-19 17:05:59 +01:00
parent 55c596006e
commit 9d3957226d
15 changed files with 85 additions and 46 deletions
+7 -6
View File
@@ -3,6 +3,7 @@ from django.utils import timezone
from django.core.files.storage import FileSystemStorage
from django.conf import settings
from django.utils.html import format_html
from django.urls import reverse
@@ -106,21 +107,21 @@ class AnatomyQuestion(models.Model):
if not unmarked_answers:
return "No answers to mark"
return "{} answer unmarked: {}".format(len(unmarked_answers),
", ".join(unmarked_answers))
return format_html("<span class='warn'>{} answer unmarked:</span> {}".format(len(unmarked_answers),
", ".join(unmarked_answers)))
def GetUnmarkedAnswers(self):
user_answers = set([i.answer for i in self.user_answers.all()])
user_answers = set([i.answer.lower() for i in self.cid_user_answers.all()])
unmarked_answers = user_answers - self.GetMarkedAnswers()
return unmarked_answers
def GetMarkedAnswers(self):
correct_answers = set([i.answer for i in self.answers.all()])
correct_answers = set([i.answer.lower() for i in self.answers.all()])
half_mark_answers = set(
[i.answer for i in self.half_mark_answers.all()])
[i.answer.lower() for i in self.half_mark_answers.all()])
incorrect_answers = set(
[i.answer for i in self.incorrect_answers.all()])
[i.answer.lower() for i in self.incorrect_answers.all()])
marked_answers = correct_answers | half_mark_answers | incorrect_answers
return marked_answers