.
This commit is contained in:
@@ -468,6 +468,9 @@ class CidUserAnswer(models.Model):
|
|||||||
# s = s.translate(str.maketrans('', '', string.punctuation))
|
# s = s.translate(str.maketrans('', '', string.punctuation))
|
||||||
# return s
|
# return s
|
||||||
|
|
||||||
|
def get_answer_string(self):
|
||||||
|
return self.answer
|
||||||
|
|
||||||
def get_answer_score(self, cached=True):
|
def get_answer_score(self, cached=True):
|
||||||
if cached and self.score:
|
if cached and self.score:
|
||||||
if self.score == Answer.MarkOptions.CORRECT:
|
if self.score == Answer.MarkOptions.CORRECT:
|
||||||
|
|||||||
+1
-7
@@ -895,13 +895,7 @@ class ExamViews(View, LoginRequiredMixin):
|
|||||||
# by_question[q].append(("", 0))
|
# by_question[q].append(("", 0))
|
||||||
# continue
|
# continue
|
||||||
|
|
||||||
if self.app_name == "rapids":
|
ans = s.get_answer_string()
|
||||||
if s.normal:
|
|
||||||
ans = "Normal"
|
|
||||||
else:
|
|
||||||
ans = s.answer
|
|
||||||
else:
|
|
||||||
ans = s.answer
|
|
||||||
|
|
||||||
answer_score = s.get_answer_score()
|
answer_score = s.get_answer_score()
|
||||||
if answer_score == "unmarked":
|
if answer_score == "unmarked":
|
||||||
|
|||||||
@@ -189,6 +189,9 @@ class CidUserAnswer(models.Model):
|
|||||||
def get_answers(self):
|
def get_answers(self):
|
||||||
return (self.a, self.b, self.c, self.d, self.e)
|
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):
|
def get_answer_score(self):
|
||||||
q = self.question
|
q = self.question
|
||||||
|
|
||||||
|
|||||||
@@ -689,6 +689,12 @@ class CidUserAnswer(models.Model):
|
|||||||
# s = s.translate(str.maketrans('', '', string.punctuation))
|
# s = s.translate(str.maketrans('', '', string.punctuation))
|
||||||
# return s
|
# return s
|
||||||
|
|
||||||
|
def get_answer_string(self):
|
||||||
|
if self.normal:
|
||||||
|
return "Normal"
|
||||||
|
else:
|
||||||
|
return self.answer
|
||||||
|
|
||||||
def get_absolute_url(self):
|
def get_absolute_url(self):
|
||||||
return reverse("rapids:user_answer_view", kwargs={"pk": self.pk})
|
return reverse("rapids:user_answer_view", kwargs={"pk": self.pk})
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user