generalise a QuestionBase

rapids/models.py

@@ -29,6 +29,7 @@ from generic.models import (
     CidUser,
     CidUserGroup,
     ExamUserStatus,
+    QuestionBase,
     Site,
     #Condition,
     #Sign,
@@ -148,7 +149,7 @@ class Answer(models.Model):
             self.answer_compare = get_answer_compare(self.answer)
 
 
-class Rapid(models.Model):
+class Rapid(QuestionBase):
     """
     Django model that defines a rapid question.
 
@@ -160,7 +161,6 @@ class Rapid(models.Model):
 
     question = models.TextField(null=True, blank=True)
     history = models.TextField(null=True, blank=True)
-    feedback = models.TextField(null=True, blank=True)
 
     normal = models.BooleanField(default=False, help_text="Tick if true")
 
@@ -213,8 +213,7 @@ class Rapid(models.Model):
     #    help_text=
     #    "If we know the source of the image")
     verified = models.BooleanField(default=False)
-    created_date = models.DateTimeField(default=timezone.now)
-    published_date = models.DateTimeField(blank=True, null=True)
+
     author = models.ManyToManyField(
         settings.AUTH_USER_MODEL,
         blank=True,
@@ -226,12 +225,6 @@ class Rapid(models.Model):
         default=False, help_text="Question has been scrapped and will not be shown"
     )
 
-    open_access = models.BooleanField(
-        help_text="If a question should be freely available to browse", default=True
-    )
-
-    notes = GenericRelation(QuestionNote)
-
     def get_absolute_url(self):
         return reverse("rapids:question_detail", kwargs={"pk": self.pk})
 
@@ -852,6 +845,9 @@ class UserAnswer(UserAnswerBase):
     #     s = s.translate(str.maketrans('', '', string.punctuation))
     #     return s
 
+    def get_answer(self):
+        return self.get_answer_string()
+
     def get_answer_string(self):
         if self.normal:
             return "Normal"