From 07dbdfe0e4774205371f6203a716dfa3769e8b74 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Sun, 19 Dec 2021 10:14:43 +0000
Subject: [PATCH] .

---
 anatomy/models.py | 3 +++
 generic/views.py  | 8 +-------
 physics/models.py | 3 +++
 rapids/models.py  | 6 ++++++
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/anatomy/models.py b/anatomy/models.py
index 82681137..3d629556 100644
--- a/anatomy/models.py
+++ b/anatomy/models.py
@@ -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:
diff --git a/generic/views.py b/generic/views.py
index b0365842..63cf609d 100644
--- a/generic/views.py
+++ b/generic/views.py
@@ -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":
diff --git a/physics/models.py b/physics/models.py
index 0ffe2aa9..b1d7ea60 100644
--- a/physics/models.py
+++ b/physics/models.py
@@ -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
 
diff --git a/rapids/models.py b/rapids/models.py
index 848a7859..0933ad00 100644
--- a/rapids/models.py
+++ b/rapids/models.py
@@ -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})