.

anatomy/models.py

@@ -147,8 +147,8 @@ class AnatomyQuestion(models.Model):
         return reverse("anatomy:question_detail", kwargs={"pk": self.pk})
 
     def GetPrimaryAnswer(self):
-        if len(self.answers.all()) > 0:
+        if len(self.answers.filter(proposed=False)) > 0:
-            return self.answers.all().first().answer
+            return self.answers.filter(proposed=False).first().answer
         else:
             return "None yet..."
 
@@ -183,7 +183,7 @@ class AnatomyQuestion(models.Model):
         return set(
             [
                 i.answer_compare
-                for i in self.answers.all()
+                for i in self.answers.filter(proposed=False)
                 if i.status != i.MarkOptions.UNMARKED
             ]
         )
@@ -222,6 +222,8 @@ class Answer(models.Model):
         max_length=1, choices=MarkOptions.choices, default=MarkOptions.UNMARKED
     )
 
+    proposed = models.BooleanField(default=False)
+
     def __str__(self):
         return self.answer
 

rapids/models.py

@@ -89,6 +89,8 @@ class Answer(models.Model):
         max_length=1, choices=MarkOptions.choices, default=MarkOptions.UNMARKED
     )
 
+    proposed = models.BooleanField(default=False)
+
     def __str__(self):
         return self.answer
 
@@ -212,10 +214,10 @@ class Rapid(models.Model):
         return "{} / {} {}".format(exams, lat, n)
 
     def GetPrimaryAnswer(self):
-        if len(self.answers.all()) > 0:
+        if self.normal:
-            return self.answers.all().first().answer
-        elif self.normal:
             return "Normal"
+        elif len(self.answers.filter(proposed=False)) > 0:
+            return self.answers.filter(proposed=False).first().answer
         else:
             return "None yet..."
 
@@ -254,7 +256,7 @@ class Rapid(models.Model):
         return set(
             [
                 i.answer_compare
-                for i in self.answers.all()
+                for i in self.answers.filter(proposed=False)
                 if i.status != i.MarkOptions.UNMARKED
             ]
         )
@@ -275,7 +277,7 @@ class Rapid(models.Model):
         return set(
             [
                 str(i)
-                for i in self.answers.all()
+                for i in self.answers.filter(proposed=False)
                 if i.status == i.MarkOptions.CORRECT
             ]
         )