This commit is contained in:
Ross
2021-12-19 10:14:43 +00:00
parent 889db68a08
commit 07dbdfe0e4
4 changed files with 13 additions and 7 deletions
+3
View File
@@ -468,6 +468,9 @@ class CidUserAnswer(models.Model):
# s = s.translate(str.maketrans('', '', string.punctuation))
# return s
def get_answer_string(self):
return self.answer
def get_answer_score(self, cached=True):
if cached and self.score:
if self.score == Answer.MarkOptions.CORRECT:
+1 -7
View File
@@ -895,13 +895,7 @@ class ExamViews(View, LoginRequiredMixin):
# by_question[q].append(("", 0))
# continue
if self.app_name == "rapids":
if s.normal:
ans = "Normal"
else:
ans = s.answer
else:
ans = s.answer
ans = s.get_answer_string()
answer_score = s.get_answer_score()
if answer_score == "unmarked":
+3
View File
@@ -189,6 +189,9 @@ class CidUserAnswer(models.Model):
def get_answers(self):
return (self.a, self.b, self.c, self.d, self.e)
def get_answer_string(self):
return [str(i) for i in (self.a, self.b, self.c, self.d, self.e)]
def get_answer_score(self):
q = self.question
+6
View File
@@ -689,6 +689,12 @@ class CidUserAnswer(models.Model):
# s = s.translate(str.maketrans('', '', string.punctuation))
# return s
def get_answer_string(self):
if self.normal:
return "Normal"
else:
return self.answer
def get_absolute_url(self):
return reverse("rapids:user_answer_view", kwargs={"pk": self.pk})