start removing tagulous

atlas/admin.py

@@ -15,7 +15,7 @@ from .models import (
     Presentation,
 )
 
-import tagulous.admin
+#import tagulous.admin
 
 from django.forms import ModelForm
 

atlas/forms.py

@@ -29,7 +29,7 @@ from atlas.models import (
 
 from anatomy.models import Modality
 
-from generic.models import Examination, Sign
+from generic.models import Examination#, Sign
 
 # from generic.models import Examination, Site, Condition, Sign
 

atlas/migrations/0049_alter_condition_parent_alter_condition_synonym_and_more.py

@@ -0,0 +1,33 @@
+# Generated by Django 4.1.4 on 2023-04-03 09:04
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('atlas', '0048_auto_20230116_1119'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='condition',
+            name='parent',
+            field=models.ManyToManyField(blank=True, to='atlas.condition'),
+        ),
+        migrations.AlterField(
+            model_name='condition',
+            name='synonym',
+            field=models.ManyToManyField(blank=True, to='atlas.condition'),
+        ),
+        migrations.AlterField(
+            model_name='finding',
+            name='synonym',
+            field=models.ManyToManyField(blank=True, to='atlas.finding'),
+        ),
+        migrations.AlterField(
+            model_name='structure',
+            name='synonym',
+            field=models.ManyToManyField(blank=True, to='atlas.structure'),
+        ),
+    ]

atlas/models.py

@@ -7,8 +7,8 @@ from django.db.models.fields.related import ForeignKey
 from django.db import models
 from django.shortcuts import get_object_or_404
 from django.utils import timezone
-import tagulous
+#import tagulous
-import tagulous.models
+#import tagulous.models
 
 
 import pydicom

generic/admin.py

@@ -5,8 +5,8 @@ from django.contrib import admin
 from .models import (
     CidUserGroup,
     Examination,
-    Sign,
+    #Sign,
-    Condition,
+    #Condition,
     Plane,
     Contrast,
     QuestionNote,
@@ -22,9 +22,9 @@ from .models import (
 # from .models import Examination, Sign, Site, Condition
 
 admin.site.register(Examination)
-admin.site.register(Sign)
+#admin.site.register(Sign)
 admin.site.register(Site)
-admin.site.register(Condition)
+#admin.site.register(Condition)
 admin.site.register(Plane)
 admin.site.register(Contrast)
 admin.site.register(QuestionNote)

generic/migrations/0050_delete_condition_delete_sign.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.1.4 on 2023-04-03 09:04
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('longs', '0065_remove_long_condition_remove_long_sign'),
+        ('generic', '0049_auto_20230116_1119'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='Condition',
+        ),
+        migrations.DeleteModel(
+            name='Sign',
+        ),
+    ]

generic/models.py

@@ -10,8 +10,8 @@ from django.urls import reverse
 from django.views.generic.edit import CreateView
 from reversion.views import RevisionMixin
 
-import tagulous
+#import tagulous
-import tagulous.models
+#import tagulous.models
 
 from sortedm2m.fields import SortedManyToManyField
 from django.conf import settings
@@ -67,12 +67,12 @@ class Site(models.Model):
         return self.short_code
 
 
-class Condition(tagulous.models.TagModel):
+#class Condition(tagulous.models.TagModel):
-    pass
+#    pass
-
+#
-
+#
-class Sign(tagulous.models.TagModel):
+#class Sign(tagulous.models.TagModel):
-    pass
+#    pass
 
 class QuestionBase(models.Model):
 

longs/admin.py

@@ -1,7 +1,7 @@
 from django.contrib import admin
 from .models import AnswerMarks, Long, LongSeries, LongSeriesImage, LongCreationDefault, Exam, CidUserAnswer
 
-import tagulous.admin
+#import tagulous.admin
 
 from django.forms import ModelForm
 
@@ -11,7 +11,7 @@ from django.forms.widgets import RadioSelect
 from tinymce.widgets import TinyMCE
 
 # from generic.models import Examination, Sign, Site, Condition
-from generic.models import Examination, Sign, Condition
+#from generic.models import Examination, Sign, Condition
 
 # Register your models here.
 # admin.site.register(Examination)
@@ -44,7 +44,7 @@ class LongAdminForm(ModelForm):
         fields = [
             "description",
             "history",
-            "sign",
+            #"sign",
             "feedback",
             "mark_scheme",
             "model_observations",

longs/forms.py

@@ -22,7 +22,7 @@ from longs.models import (
 
 from anatomy.models import Modality
 
-from generic.models import Examination, Condition, Sign
+from generic.models import Examination#, Condition, Sign
 
 # from generic.models import Examination, Site, Condition, Sign
 
@@ -201,8 +201,8 @@ class LongForm(ModelForm):
             "description",
             "history",
             "feedback",
-            "condition",
+            #"condition",
-            "sign",
+            #"sign",
             "model_observations",
             "model_interpretation",
             "model_principle_diagnosis",

longs/migrations/0065_remove_long_condition_remove_long_sign.py

@@ -0,0 +1,21 @@
+# Generated by Django 4.1.4 on 2023-04-03 09:04
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('longs', '0064_remove_exam_stats_graph'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='long',
+            name='condition',
+        ),
+        migrations.RemoveField(
+            model_name='long',
+            name='sign',
+        ),
+    ]

longs/models.py

@@ -6,8 +6,8 @@ from django.db.models.fields.related import ForeignKey
 from django.db import models
 from django.shortcuts import get_object_or_404
 from django.utils import timezone
-import tagulous
+#import tagulous
-import tagulous.models
+#import tagulous.models
 
 
 from django.core.files.storage import FileSystemStorage
@@ -34,8 +34,8 @@ from generic.models import (
     CidUserGroup,
     ExamUserStatus,
     Examination,
-    Condition,
+    #Condition,
-    Sign,
+    #Sign,
     ExamBase,
     Plane,
     Contrast,
@@ -90,15 +90,16 @@ class Long(models.Model):
 
     feedback = models.TextField(null=True, blank=True)
 
-    condition = tagulous.models.TagField(
+    # TODO: merge with atlas condition / signs / finding
-        to=Condition,
+    #condition = tagulous.models.TagField(
-        blank=True,
+    #    to=Condition,
-        help_text='Associated condition. Will allow searching / filtering and tips / hints to be displayed. Conditions with spaces must be enclosed in quotes "..."',
+    #    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(
+    #sign = tagulous.models.TagField(
-        to=Sign, blank=True, help_text="Radiological signs in the question"
+    #    to=Sign, blank=True, help_text="Radiological signs in the question"
-    )
+    #)
 
     # Model answers
     model_observations = models.TextField(null=True, blank=True)

rad/settings.py

@@ -67,7 +67,7 @@ INSTALLED_APPS = [
     "django.contrib.messages",
     "django.contrib.staticfiles",
     "debug_toolbar",
-    "tagulous",
+    #"tagulous",
     "dbbackup",
     "rest_framework",
     "tinymce",
@@ -150,12 +150,12 @@ AUTH_PASSWORD_VALIDATORS = [
     },
 ]
 
-SERIALIZATION_MODULES = {
+#SERIALIZATION_MODULES = {
-    "xml": "tagulous.serializers.xml_serializer",
+#    "xml": "tagulous.serializers.xml_serializer",
-    "json": "tagulous.serializers.json",
+#    "json": "tagulous.serializers.json",
-    "python": "tagulous.serializers.python",
+#    "python": "tagulous.serializers.python",
-    "yaml": "tagulous.serializers.pyyaml",
+#    "yaml": "tagulous.serializers.pyyaml",
-}
+#}
 
 # Internationalization
 # https://docs.djangoproject.com/en/1.11/topics/i18n/
@@ -194,14 +194,14 @@ MEDIA_ROOT = "media/"
 LOGIN_REDIRECT_URL = "/"
 LOGOUT_REDIRECT_URL = "/"
 
-TAGULOUS_AUTOCOMPLETE_JS = (
+#TAGULOUS_AUTOCOMPLETE_JS = (
-    "tagulous/lib/jquery.js",
+#    "tagulous/lib/jquery.js",
-    "tagulous/lib/select2-3/select2.min.js",
+#    "tagulous/lib/select2-3/select2.min.js",
-    "tagulous/tagulous.js",
+#    "tagulous/tagulous.js",
-    "tagulous/adaptor/select2-3.js",
+#    "tagulous/adaptor/select2-3.js",
-)
+#)
-
+#
-TAGULOUS_AUTOCOMPLETE_CSS = {"all": ["tagulous/lib/select2-3/select2.css"]}
+#TAGULOUS_AUTOCOMPLETE_CSS = {"all": ["tagulous/lib/select2-3/select2.css"]}
 
 INTERNAL_IPS = ["localhost", "127.0.0.1"]
 

rapids/admin.py

@@ -1,7 +1,7 @@
 from django.contrib import admin
 from .models import Rapid, RapidImage, Examination, Site, Abnormality, Region, RapidCreationDefault, Answer, Exam, CidUserAnswer
 
-import tagulous.admin
+#import tagulous.admin
 
 from django.forms import ModelForm
 

rapids/models.py

@@ -6,8 +6,8 @@ from django.db import models
 from django.http.response import JsonResponse
 from django.shortcuts import get_object_or_404
 from django.utils import timezone
-import tagulous
+#import tagulous
-import tagulous.models
+#import tagulous.models
 
 
 from django.core.files.storage import FileSystemStorage
@@ -32,8 +32,8 @@ from generic.models import (
     CidUserGroup,
     ExamUserStatus,
     Site,
-    Condition,
+    #Condition,
-    Sign,
+    #Sign,
     ExamBase,
     QuestionNote,
     UserUserGroup,

requirements.txt

@@ -3,7 +3,7 @@ Django==4.1.4
 django_debug_toolbar
 django_jquery
 django_reversion
-django_tagulous
+#django_tagulous
 Pillow
 django-cors-headers
 plotly

sbas/admin.py

@@ -3,7 +3,7 @@ from django.contrib import admin
 # Register your models here.
 from .models import Question, Exam, CidUserAnswer, Category
 
-import tagulous.admin
+#import tagulous.admin
 
 from django.forms import ModelForm
 

templates/base.html

@@ -15,7 +15,7 @@
     <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
 
     <link href="{% static 'css/widgets.css' %}" type="text/css" media="all" rel="stylesheet">
-    <link rel="stylesheet" href="{% static 'tagulous/lib/select2-3/select2.css' %}">
+    {% comment %} <link rel="stylesheet" href="{% static 'tagulous/lib/select2-3/select2.css' %}"> {% endcomment %}
     <link rel="stylesheet" href="{% static 'css/dicomViewer.css' %}">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/toastr.js/2.1.4/toastr.min.css" integrity="sha512-6S2HWzVFxruDlZxI3sXOZZ4/eJ8AcxkQH1+JjSe/ONCEqR9L4Ysq5JdT5ipqtzU7WHalNwzwBv+iE51gNHJNqQ==" crossorigin="anonymous" referrerpolicy="no-referrer" />
 
@@ -43,7 +43,7 @@
     <script src="{% static 'autocomplete_light/i18n/en.js' %}"></script>
     <script type="text/javascript" async src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.7/MathJax.js?config=TeX-AMS-MML_HTMLorMML"> </script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/dexie/3.0.3/dexie.min.js" integrity="sha512-aEtNzq8X5E0ambgeM68H174SOXaANJ6wDqJ0TuVIx4R2J4fRdUA0nLzx0faA1mmViqb+r0VX7cOXkskxyJENUA==" crossorigin="anonymous"></script>
-    <!-- <script src="{% static 'tagulous/lib/jquery.js' %}"></script> -->
+    {% comment %} <!-- <script src="{% static 'tagulous/lib/jquery.js' %}"></script> --> {% endcomment %}
     <script src="https://cdnjs.cloudflare.com/ajax/libs/html5sortable/0.10.0/html5sortable.min.js" integrity="sha512-tBlVMq89XaEC9iU5LyRjP2Vxs8SmVhEHGbv2Co6SbGa14Wsxy2qZN0jadrN+Xn5AifORaUbvZcG21/ExcNfWDA==" crossorigin="anonymous"></script>
     <script src="{% static 'tesseract.min.js' %}"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/toastr.js/2.1.4/toastr.min.js" integrity="sha512-lbwH47l/tPXJYG9AcFNoJaTMhGvYWhVM9YI43CT+uteTRRaiLCui8snIgyAN8XWgNjNhCqlAUdzZptso6OCoFQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>