.

2022-03-30 20:37:21 +01:00
parent cc96136e8c
commit aa6b41ab1c
2 changed files with 47 additions and 16 deletions
@@ -237,19 +237,35 @@ class Rapid(models.Model):
    def get_primary_answer(self):
        if self.normal:
            return "Normal"
-        elif (
-            self.answers.filter(
-                proposed=False, status=Answer.MarkOptions.CORRECT
-            ).count()
-            > 0
-        ):
-            return (
-                self.answers.filter(proposed=False, status=Answer.MarkOptions.CORRECT)
-                .first()
-                .answer
-            )
        else:
-            return "None yet..."
+            if hasattr(self, "prefetched_primary_answer") and self.prefetched_primary_answer:
+                ans = self.prefetched_primary_answer[0]
+            else:
+                ans = self.answers.filter(
+                    proposed=False, status=Answer.MarkOptions.CORRECT
+                ).first()
+
+            if ans is None:
+                return "None yet..."
+            else:
+                return ans.answer
+
+    #def get_primary_answer(self):
+    #    if self.normal:
+    #        return "Normal"
+    #    elif (
+    #        self.answers.filter(
+    #            proposed=False, status=Answer.MarkOptions.CORRECT
+    #        ).count()
+    #        > 0
+    #    ):
+    #        return (
+    #            self.answers.filter(proposed=False, status=Answer.MarkOptions.CORRECT)
+    #            .first()
+    #            .answer
+    #        )
+    #    else:
+    #        return "None yet..."

    def get_exams(self):
        e = self.exams.all().values_list("name", flat=True)