.

rapids/models.py

@@ -18,7 +18,7 @@ from sortedm2m.fields import SortedManyToManyField
 import string
 
 
-from generic.models import Examination, Site, Condition, Sign
+from generic.models import Site, Condition, Sign
 
 image_storage = FileSystemStorage(
     # Physical file location ROOT
@@ -68,12 +68,6 @@ class Examination(models.Model):
     class Meta:
         ordering = ('examination', )
 
-class Condition(tagulous.models.TagModel):
-    pass
-
-class Sign(tagulous.models.TagModel):
-    pass
-
 class Answer(models.Model):
     question = models.ForeignKey(
         "Rapid", related_name="answers", on_delete=models.CASCADE
@@ -144,17 +138,14 @@ class Rapid(models.Model):
         choices=LATERALITY_CHOICES,
         default=NONE,
         help_text="Applies to the answer, not the examination")
-    condition = models.CharField(max_length=255, blank=True)
-    #condition = tagulous.models.TagField(
-    #    to=Condition,
-    #    blank=True,
-    #    help_text=
-    #    "Associated condition. Will allow searching / filtering and tips / hints to be displayed. Conditions with spaces must be enclosed in quotes \"...\""
-    #)
-
-    sign = models.CharField(max_length=255, blank=True)
-    #sign = tagulous.models.TagField(
-    #    to=Sign, blank=True, help_text='Radiological signs in the question')
+    condition = tagulous.models.TagField(
+        to=Condition,
+        blank=True,
+        help_text=
+        "Associated condition. Will allow searching / filtering and tips / hints to be displayed. Conditions with spaces must be enclosed in quotes \"...\""
+    )
+    sign = tagulous.models.TagField(
+        to=Sign, blank=True, help_text='Radiological signs in the question')
 
     DEFAULT_SITE_ID = 1
     #site = models.ManyToManyField(