.

rapids/migrations/0010_auto_20210205_1051.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.1.3 on 2021-02-05 10:51
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('rapids', '0009_auto_20210205_1046'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='Condition',
+        ),
+        migrations.DeleteModel(
+            name='Sign',
+        ),
+    ]

rapids/migrations/0011_auto_20210205_1056.py

@@ -0,0 +1,33 @@
+# Generated by Django 3.1.3 on 2021-02-05 10:56
+
+from django.db import migrations
+import tagulous.models.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('generic', '0007_site'),
+        ('rapids', '0010_auto_20210205_1051'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='rapid',
+            name='condition',
+        ),
+        migrations.AddField(
+            model_name='rapid',
+            name='condition',
+            field=tagulous.models.fields.TagField(_set_tag_meta=True, blank=True, help_text='Associated condition. Will allow searching / filtering and tips / hints to be displayed. Conditions with spaces must be enclosed in quotes "..."', to='generic.Condition'),
+        ),
+        migrations.RemoveField(
+            model_name='rapid',
+            name='sign',
+        ),
+        migrations.AddField(
+            model_name='rapid',
+            name='sign',
+            field=tagulous.models.fields.TagField(_set_tag_meta=True, blank=True, help_text='Radiological signs in the question', to='generic.Sign'),
+        ),
+    ]

rapids/migrations/0013_auto_20210205_1042.py

@@ -1,21 +0,0 @@
-# Generated by Django 3.1.3 on 2021-02-05 10:42
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('rapids', '0012_auto_20210205_1040'),
-    ]
-
-    operations = [
-        #migrations.RemoveField(
-        #    model_name='rapid',
-        #    name='site',
-        #),
-        #migrations.RemoveField(
-        #    model_name='rapidcreationdefault',
-        #    name='site',
-        #),
-    ]

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(