From 8d0ffbba06cdfa273070a0c0e0f08a523788a6e1 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Wed, 10 Jan 2024 21:06:49 +0000
Subject: [PATCH] fix some useranswer compare issuses

---
 anatomy/models.py                             | 17 +++++--------
 .../anatomy/ciduseranswer_detail.html         | 11 ---------
 .../templates/anatomy/useranswer_detail.html  | 12 ++++++++++
 .../templates/longs/ciduseranswer_detail.html | 24 -------------------
 longs/templates/longs/useranswer_detail.html  | 24 +++++++++++++++++++
 .../physics/ciduseranswer_detail.html         | 17 -------------
 .../templates/physics/useranswer_detail.html  | 17 +++++++++++++
 rapids/models.py                              | 12 +++-------
 .../rapids/ciduseranswer_detail.html          | 13 ----------
 .../templates/rapids/useranswer_detail.html   | 13 ++++++++++
 sbas/templates/sbas/ciduseranswer_detail.html | 11 ---------
 sbas/templates/sbas/useranswer_detail.html    | 11 +++++++++
 12 files changed, 86 insertions(+), 96 deletions(-)
 delete mode 100644 anatomy/templates/anatomy/ciduseranswer_detail.html
 create mode 100644 anatomy/templates/anatomy/useranswer_detail.html
 delete mode 100644 longs/templates/longs/ciduseranswer_detail.html
 create mode 100644 longs/templates/longs/useranswer_detail.html
 delete mode 100644 physics/templates/physics/ciduseranswer_detail.html
 create mode 100644 physics/templates/physics/useranswer_detail.html
 delete mode 100644 rapids/templates/rapids/ciduseranswer_detail.html
 create mode 100644 rapids/templates/rapids/useranswer_detail.html
 delete mode 100644 sbas/templates/sbas/ciduseranswer_detail.html
 create mode 100644 sbas/templates/sbas/useranswer_detail.html

diff --git a/anatomy/models.py b/anatomy/models.py
index 82c0e8a5..86940824 100644
--- a/anatomy/models.py
+++ b/anatomy/models.py
@@ -35,6 +35,10 @@ def image_directory_path(instance, filename):
     # file will be uploaded to MEDIA_ROOT/anatomy/picture/<filename>
     return u"picture/anatomy/{0}".format(filename)
 
+def get_answer_compare(s: str) -> str:
+    s = s.strip().translate(str.maketrans("", "", string.punctuation)).lower()
+    s = " ".join(s.split())
+    return s
 
 class BodyPart(models.Model):
     bodypart = models.CharField(max_length=200)
@@ -333,11 +337,7 @@ class Answer(models.Model):
     def clean(self):
         if self.answer:
             self.answer = self.answer.strip()
-
-            s = " ".join(self.answer.lower().split())
-            s = s.translate(str.maketrans("", "", string.punctuation))
-
-            self.answer_compare = s
+            self.answer_compare = get_answer_compare(self.answer)
 
     # def get_compare_string(self):
     #     s = self.answer.lower().strip()
@@ -506,12 +506,7 @@ class UserAnswer(UserAnswerBase):
 
     def clean(self):
         if self.answer:
-            self.answer = self.answer.strip()
-
-            s = self.answer.lower()
-            s = s.translate(str.maketrans("", "", string.punctuation)).strip()
-
-            self.answer_compare = s
+            self.answer_compare = get_answer_compare(self.answer)
 
     # def get_compare_string(self):
     #     # strip here should be unneccasry (providing clean is now working)
diff --git a/anatomy/templates/anatomy/ciduseranswer_detail.html b/anatomy/templates/anatomy/ciduseranswer_detail.html
deleted file mode 100644
index 26c7d5aa..00000000
--- a/anatomy/templates/anatomy/ciduseranswer_detail.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends 'anatomy/base.html' %}
-
-{% block content %}
-    CID: {{ciduseranswer.cid}}<br />
-    Exam: {{ciduseranswer.exam}}<br />
-    {{ciduseranswer.question}}<br />
-    Answer: {{ciduseranswer.answer}}<br />
-    Score: {{ciduseranswer.get_answer_score}}<br />
-    <a href="{% url 'anatomy:user_answer_delete' ciduseranswer.id %}">Delete answer</a>
-    <a href="{% url 'admin:anatomy_useranswer_change' ciduseranswer.id %}">Admin Edit</a>
-{% endblock content %}
diff --git a/anatomy/templates/anatomy/useranswer_detail.html b/anatomy/templates/anatomy/useranswer_detail.html
new file mode 100644
index 00000000..8e837b44
--- /dev/null
+++ b/anatomy/templates/anatomy/useranswer_detail.html
@@ -0,0 +1,12 @@
+{% extends 'anatomy/base.html' %}
+
+{% block content %}
+    CID: {{useranswer.cid}}<br />
+    Exam: {{useranswer.exam}}<br />
+    {{useranswer.question}}<br />
+    Answer: {{useranswer.answer}}<br />
+    Compare Answer: {{useranswer.answer_compare}}<br />
+    Score: {{useranswer.get_answer_score}}<br />
+    <a href="{% url 'anatomy:user_answer_delete' useranswer.id %}">Delete answer</a>
+    <a href="{% url 'admin:anatomy_useranswer_change' useranswer.id %}">Admin Edit</a>
+{% endblock content %}
diff --git a/longs/templates/longs/ciduseranswer_detail.html b/longs/templates/longs/ciduseranswer_detail.html
deleted file mode 100644
index b396c72a..00000000
--- a/longs/templates/longs/ciduseranswer_detail.html
+++ /dev/null
@@ -1,24 +0,0 @@
-{% extends 'longs/base.html' %}
-
-{% block content %}
-    CID: {{ciduseranswer.cid}}<br />
-    Exam: {{ciduseranswer.exam}}<br />
-
-    <h3>Question</h3>
-    {{ciduseranswer.question}}
-
-    <h3>Answers</h3>
-    <h4>Observation</h4>
-    <pre>{{ciduseranswer.answer_observations}}</pre><br />
-    <h4>Interpretation</h4>
-    <pre>{{ciduseranswer.answer_interpretation}}</pre><br />
-    <h4>Principle Diagnosis</h4>
-    <pre>{{ciduseranswer.answer_principle_diagnosis}}</pre><br />
-    <h4>Differential Diagnosis</h4>
-    <pre>{{ciduseranswer.answer_differential_diagnosis}}</pre><br />
-    <h4>Managment</h4>
-    <pre>{{ciduseranswer.answer_management}}</pre><br />
-
-
-
-{% endblock content %}
diff --git a/longs/templates/longs/useranswer_detail.html b/longs/templates/longs/useranswer_detail.html
new file mode 100644
index 00000000..86d6bdcc
--- /dev/null
+++ b/longs/templates/longs/useranswer_detail.html
@@ -0,0 +1,24 @@
+{% extends 'longs/base.html' %}
+
+{% block content %}
+    CID: {{useranswer.cid}}<br />
+    Exam: {{useranswer.exam}}<br />
+
+    <h3>Question</h3>
+    {{useranswer.question}}
+
+    <h3>Answers</h3>
+    <h4>Observation</h4>
+    <pre>{{useranswer.answer_observations}}</pre><br />
+    <h4>Interpretation</h4>
+    <pre>{{useranswer.answer_interpretation}}</pre><br />
+    <h4>Principle Diagnosis</h4>
+    <pre>{{useranswer.answer_principle_diagnosis}}</pre><br />
+    <h4>Differential Diagnosis</h4>
+    <pre>{{useranswer.answer_differential_diagnosis}}</pre><br />
+    <h4>Managment</h4>
+    <pre>{{useranswer.answer_management}}</pre><br />
+
+
+
+{% endblock content %}
diff --git a/physics/templates/physics/ciduseranswer_detail.html b/physics/templates/physics/ciduseranswer_detail.html
deleted file mode 100644
index 173f034a..00000000
--- a/physics/templates/physics/ciduseranswer_detail.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% extends 'physics/base.html' %}
-
-{% block content %}
-CID: {{ciduseranswer.cid}}<br />
-Exam: {{ciduseranswer.exam}}<br />
-{{ciduseranswer.question}}<br />
-Answers: <br />
-<ol>
-    <li>{{ciduseranswer.a}}</li>
-    <li>{{ciduseranswer.b}}</li>
-    <li>{{ciduseranswer.c}}</li>
-    <li>{{ciduseranswer.d}}</li>
-    <li>{{ciduseranswer.e}}</li>
-</ol>
-Score: {{ciduseranswer.get_answer_score}}<br />
-<a href="{% url 'physics:user_answer_delete' ciduseranswer.id %}">Delete answer</a>
-{% endblock content %}
\ No newline at end of file
diff --git a/physics/templates/physics/useranswer_detail.html b/physics/templates/physics/useranswer_detail.html
new file mode 100644
index 00000000..462ee795
--- /dev/null
+++ b/physics/templates/physics/useranswer_detail.html
@@ -0,0 +1,17 @@
+{% extends 'physics/base.html' %}
+
+{% block content %}
+CID: {{useranswer.cid}}<br />
+Exam: {{useranswer.exam}}<br />
+{{useranswer.question}}<br />
+Answers: <br />
+<ol>
+    <li>{{useranswer.a}}</li>
+    <li>{{useranswer.b}}</li>
+    <li>{{useranswer.c}}</li>
+    <li>{{useranswer.d}}</li>
+    <li>{{useranswer.e}}</li>
+</ol>
+Score: {{useranswer.get_answer_score}}<br />
+<a href="{% url 'physics:user_answer_delete' useranswer.id %}">Delete answer</a>
+{% endblock content %}
\ No newline at end of file
diff --git a/rapids/models.py b/rapids/models.py
index d4afa7bc..2addd7d7 100644
--- a/rapids/models.py
+++ b/rapids/models.py
@@ -76,8 +76,8 @@ def image_directory_path(instance, filename):
 
 
 def get_answer_compare(s):
-    s = s.strip().lower()
-    s = s.translate(str.maketrans("", "", string.punctuation.replace("#", "")))
+    s = s.strip().translate(str.maketrans("", "", string.punctuation.replace("#", ""))).lower()
+    s = " ".join(s.split())
     return s
 
 
@@ -804,13 +804,7 @@ class UserAnswer(UserAnswerBase):
         self.score = Answer.MarkOptions.UNMARKED
         if self.answer:
             self.answer = self.answer.strip()
-
-            s = self.answer.lower()
-            s = s.translate(
-                str.maketrans("", "", string.punctuation.replace("#", ""))
-            ).strip()
-
-            self.answer_compare = s
+            self.answer_compare = get_answer_compare(self.answer)
         else:
             self.answer = ""
             self.answer_compare = ""
diff --git a/rapids/templates/rapids/ciduseranswer_detail.html b/rapids/templates/rapids/ciduseranswer_detail.html
deleted file mode 100644
index 6f69872a..00000000
--- a/rapids/templates/rapids/ciduseranswer_detail.html
+++ /dev/null
@@ -1,13 +0,0 @@
-
-{% extends 'rapids/base.html' %}
-
-{% block content %}
-CID: {{ciduseranswer.cid}}<br/>
-User: {{ciduseranswer.user}}<br/>
-Exam: {{ciduseranswer.exam}}<br/>
-{{ciduseranswer.question}}<br/>
-Normal: {{ciduseranswer.normal}}<br/>
-Answer: {{ciduseranswer.answer}}<br/>
-Score: {{ciduseranswer.get_answer_score}}<br/>
-<a href="{% url 'rapids:user_answer_delete' ciduseranswer.id %}">Delete answer</a>
-{% endblock content %}
\ No newline at end of file
diff --git a/rapids/templates/rapids/useranswer_detail.html b/rapids/templates/rapids/useranswer_detail.html
new file mode 100644
index 00000000..1e5caa7c
--- /dev/null
+++ b/rapids/templates/rapids/useranswer_detail.html
@@ -0,0 +1,13 @@
+
+{% extends 'rapids/base.html' %}
+
+{% block content %}
+CID: {{useranswer.cid}}<br/>
+User: {{useranswer.user}}<br/>
+Exam: {{useranswer.exam}}<br/>
+{{useranswer.question}}<br/>
+Normal: {{useranswer.normal}}<br/>
+Answer: {{useranswer.answer}}<br/>
+Score: {{useranswer.get_answer_score}}<br/>
+<a href="{% url 'rapids:user_answer_delete' useranswer.id %}">Delete answer</a>
+{% endblock content %}
\ No newline at end of file
diff --git a/sbas/templates/sbas/ciduseranswer_detail.html b/sbas/templates/sbas/ciduseranswer_detail.html
deleted file mode 100644
index e6922ba0..00000000
--- a/sbas/templates/sbas/ciduseranswer_detail.html
+++ /dev/null
@@ -1,11 +0,0 @@
-
-{% extends 'rapids/base.html' %}
-
-{% block content %}
-CID: {{ciduseranswer.cid}}<br/>
-Exam: {{ciduseranswer.exam}}<br/>
-{{ciduseranswer.question}}<br/>
-Answer: {{ciduseranswer.answer}}<br/>
-Score: {{ciduseranswer.get_score}}<br/>
-<a href="{% url 'sbas:user_answer_delete' ciduseranswer.id %}">Delete answer</a>
-{% endblock content %}
\ No newline at end of file
diff --git a/sbas/templates/sbas/useranswer_detail.html b/sbas/templates/sbas/useranswer_detail.html
new file mode 100644
index 00000000..0489ff63
--- /dev/null
+++ b/sbas/templates/sbas/useranswer_detail.html
@@ -0,0 +1,11 @@
+
+{% extends 'rapids/base.html' %}
+
+{% block content %}
+CID: {{useranswer.cid}}<br/>
+Exam: {{useranswer.exam}}<br/>
+{{useranswer.question}}<br/>
+Answer: {{useranswer.answer}}<br/>
+Score: {{useranswer.get_score}}<br/>
+<a href="{% url 'sbas:user_answer_delete' useranswer.id %}">Delete answer</a>
+{% endblock content %}
\ No newline at end of file