rename rapid functions

anatomy/models.py

@@ -130,7 +130,7 @@ class AnatomyQuestion(models.Model):
     def __str__(self):
         # Get first answer
         return "{} [{}, {}]".format(
-            self.GetPrimaryAnswer(), self.modality, self.structure
+            self.get_primary_answer(), self.modality, self.structure
         )
         # Get associated exams
         e = self.exams.all().values_list("name", flat=True)
@@ -146,19 +146,19 @@ class AnatomyQuestion(models.Model):
     def get_absolute_url(self):
         return reverse("anatomy:question_detail", kwargs={"pk": self.pk})
 
-    def GetPrimaryAnswer(self):
+    def get_primary_answer(self):
         if len(self.answers.filter(proposed=False)) > 0:
             return self.answers.filter(proposed=False).first().answer
         else:
             return "None yet..."
 
-    def GetExams(self):
+    def get_exams(self):
         e = self.exams.all().values_list("name", flat=True)
         exams = ", ".join(e)
         return exams
 
-    def GetUnmarkedAnswersString(self):
-        unmarked_answers = self.GetUnmarkedAnswers()
+    def get_unmarked_answer_string(self):
+        unmarked_answers = self.get_unmarked_answers()
 
         if not unmarked_answers:
             return "No answers to mark"
@@ -168,18 +168,18 @@ class AnatomyQuestion(models.Model):
             )
         )
 
-    def GetUnmarkedAnswers(self):
+    def get_unmarked_answers(self):
         user_answers = set(
             [i.answer_compare for i in self.cid_user_answers.all()]
         )
-        unmarked_answers = user_answers - self.GetMarkedAnswers()
+        unmarked_answers = user_answers - self.get_marked_answers()
 
         return unmarked_answers
 
-    def GetUnmarkedAnswerCount(self):
-        return len(self.GetUnmarkedAnswers())
+    def get_unmarked_answer_count(self):
+        return len(self.get_unmarked_answers())
 
-    def GetMarkedAnswers(self):
+    def get_marked_answers(self):
         return set(
             [
                 i.answer_compare
@@ -350,7 +350,7 @@ class CidUserAnswer(models.Model):
         except (Exam.DoesNotExist, KeyError) as e:
             exam = "None"
         return "{}/{}/{}: {}".format(
-            exam, self.cid, self.question.GetPrimaryAnswer(), self.answer
+            exam, self.cid, self.question.get_primary_answer(), self.answer
         )
 
     def save(self, *args, **kwargs):

anatomy/templates/anatomy/exam_overview.html

@@ -31,7 +31,7 @@
             </a>
             {{ question.description }}
             <br />
-            {{ question.question_type }}: {{ question.GetPrimaryAnswer }}
+            {{ question.question_type }}: {{ question.get_primary_answer }}
             <br />
             Modality: {{ question.modality }}, <a href="{% url 'anatomy:question_detail' pk=question.pk %}">View</a>, <a href="{% url 'anatomy:mark' pk=exam.pk sk=forloop.counter0 %}">Mark</a>
         </li>

anatomy/templates/anatomy/mark_overview.html

@@ -12,8 +12,8 @@
 
     <ul id="question-mark-list">
         {% for question in questions.all %}
-        <li data-markcount={{question.GetUnmarkedAnswerCount}}><a href="{% url 'anatomy:mark' pk=exam.pk sk=forloop.counter0 %}">Question {{forloop.counter }}:
-                {{ question }}</a><br /> {{ question.GetUnmarkedAnswersString }}</li>
+        <li data-markcount={{question.get_unmarked_answer_count}}><a href="{% url 'anatomy:mark' pk=exam.pk sk=forloop.counter0 %}">Question {{forloop.counter }}:
+                {{ question }}</a><br /> {{ question.get_unmarked_answer_string }}</li>
         {% endfor %}
     </ul>
 </div>

anatomy/templates/anatomy/question_detail.html

@@ -29,7 +29,7 @@
     <div class="date">
         Created: {{ question.created_date }}
     </div>
-    <h1>{{ question.GetPrimaryAnswer }}</h1>
+    <h1>{{ question.get_primary_answer }}</h1>
     <h2>{{question.question_type}}</h2>
     Answers (score): {% for answer in question.answers.all %}
     {{ answer }} ({{answer.status}}),

anatomy/views.py

@@ -333,7 +333,7 @@ def mark(request, pk, sk):
     #    i.answer.lower() for i in question.incorrect_answers.all()
     # ]
 
-    unmarked_user_answers = question.GetUnmarkedAnswers()
+    unmarked_user_answers = question.get_unmarked_answers()
 
     if request.method == "POST":
 
@@ -576,7 +576,7 @@ def exam_scores_cid_user(request, pk, sk):
 
             answer_score = user_answer.get_answer_score()
 
-        correct_answer = q.GetPrimaryAnswer()
+        correct_answer = q.get_primary_answer()
 
         if not exam.publish_results:
             correct_answer = "*****"