From e5ff3ed4dc1c1fe5a80bc2177c934a269795d246 Mon Sep 17 00:00:00 2001 From: Ross Date: Mon, 3 Apr 2023 10:06:05 +0100 Subject: [PATCH] start removing tagulous --- atlas/admin.py | 2 +- atlas/forms.py | 2 +- ...parent_alter_condition_synonym_and_more.py | 33 +++++++++++++++++++ atlas/models.py | 4 +-- generic/admin.py | 8 ++--- .../0050_delete_condition_delete_sign.py | 20 +++++++++++ generic/models.py | 16 ++++----- longs/admin.py | 6 ++-- longs/forms.py | 6 ++-- ..._remove_long_condition_remove_long_sign.py | 21 ++++++++++++ longs/models.py | 25 +++++++------- rad/settings.py | 30 ++++++++--------- rapids/admin.py | 2 +- rapids/models.py | 8 ++--- requirements.txt | 2 +- sbas/admin.py | 2 +- templates/base.html | 4 +-- 17 files changed, 133 insertions(+), 58 deletions(-) create mode 100644 atlas/migrations/0049_alter_condition_parent_alter_condition_synonym_and_more.py create mode 100644 generic/migrations/0050_delete_condition_delete_sign.py create mode 100644 longs/migrations/0065_remove_long_condition_remove_long_sign.py diff --git a/atlas/admin.py b/atlas/admin.py index 143297e0..4f4c7844 100755 --- a/atlas/admin.py +++ b/atlas/admin.py @@ -15,7 +15,7 @@ from .models import ( Presentation, ) -import tagulous.admin +#import tagulous.admin from django.forms import ModelForm diff --git a/atlas/forms.py b/atlas/forms.py index 0b80d8c1..fc8eb7fa 100755 --- a/atlas/forms.py +++ b/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 diff --git a/atlas/migrations/0049_alter_condition_parent_alter_condition_synonym_and_more.py b/atlas/migrations/0049_alter_condition_parent_alter_condition_synonym_and_more.py new file mode 100644 index 00000000..6b8320f4 --- /dev/null +++ b/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'), + ), + ] diff --git a/atlas/models.py b/atlas/models.py index c4796f70..123cec26 100644 --- a/atlas/models.py +++ b/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.models +#import tagulous +#import tagulous.models import pydicom diff --git a/generic/admin.py b/generic/admin.py index c673ed6b..adbbbf1a 100644 --- a/generic/admin.py +++ b/generic/admin.py @@ -5,8 +5,8 @@ from django.contrib import admin from .models import ( CidUserGroup, Examination, - Sign, - Condition, + #Sign, + #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) diff --git a/generic/migrations/0050_delete_condition_delete_sign.py b/generic/migrations/0050_delete_condition_delete_sign.py new file mode 100644 index 00000000..023168ff --- /dev/null +++ b/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', + ), + ] diff --git a/generic/models.py b/generic/models.py index 92b4c7fd..687bfa68 100644 --- a/generic/models.py +++ b/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.models +#import tagulous +#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): - pass - - -class Sign(tagulous.models.TagModel): - pass +#class Condition(tagulous.models.TagModel): +# pass +# +# +#class Sign(tagulous.models.TagModel): +# pass class QuestionBase(models.Model): diff --git a/longs/admin.py b/longs/admin.py index 53bbce93..21983062 100755 --- a/longs/admin.py +++ b/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", diff --git a/longs/forms.py b/longs/forms.py index dd9c5ef3..1dd1e6f2 100755 --- a/longs/forms.py +++ b/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", - "sign", + #"condition", + #"sign", "model_observations", "model_interpretation", "model_principle_diagnosis", diff --git a/longs/migrations/0065_remove_long_condition_remove_long_sign.py b/longs/migrations/0065_remove_long_condition_remove_long_sign.py new file mode 100644 index 00000000..5145e2da --- /dev/null +++ b/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', + ), + ] diff --git a/longs/models.py b/longs/models.py index f3a58026..3e5e7694 100644 --- a/longs/models.py +++ b/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.models +#import tagulous +#import tagulous.models from django.core.files.storage import FileSystemStorage @@ -34,8 +34,8 @@ from generic.models import ( CidUserGroup, ExamUserStatus, Examination, - Condition, - Sign, + #Condition, + #Sign, ExamBase, Plane, Contrast, @@ -90,15 +90,16 @@ class Long(models.Model): feedback = models.TextField(null=True, 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 "..."', - ) + # TODO: merge with atlas condition / signs / finding + #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" - ) + #sign = tagulous.models.TagField( + # to=Sign, blank=True, help_text="Radiological signs in the question" + #) # Model answers model_observations = models.TextField(null=True, blank=True) diff --git a/rad/settings.py b/rad/settings.py index be87adcd..eaaf3696 100644 --- a/rad/settings.py +++ b/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 = { - "xml": "tagulous.serializers.xml_serializer", - "json": "tagulous.serializers.json", - "python": "tagulous.serializers.python", - "yaml": "tagulous.serializers.pyyaml", -} +#SERIALIZATION_MODULES = { +# "xml": "tagulous.serializers.xml_serializer", +# "json": "tagulous.serializers.json", +# "python": "tagulous.serializers.python", +# "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/lib/jquery.js", - "tagulous/lib/select2-3/select2.min.js", - "tagulous/tagulous.js", - "tagulous/adaptor/select2-3.js", -) - -TAGULOUS_AUTOCOMPLETE_CSS = {"all": ["tagulous/lib/select2-3/select2.css"]} +#TAGULOUS_AUTOCOMPLETE_JS = ( +# "tagulous/lib/jquery.js", +# "tagulous/lib/select2-3/select2.min.js", +# "tagulous/tagulous.js", +# "tagulous/adaptor/select2-3.js", +#) +# +#TAGULOUS_AUTOCOMPLETE_CSS = {"all": ["tagulous/lib/select2-3/select2.css"]} INTERNAL_IPS = ["localhost", "127.0.0.1"] diff --git a/rapids/admin.py b/rapids/admin.py index 31b0f66e..689304d6 100755 --- a/rapids/admin.py +++ b/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 diff --git a/rapids/models.py b/rapids/models.py index ae5e7982..78fc6e83 100644 --- a/rapids/models.py +++ b/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.models +#import tagulous +#import tagulous.models from django.core.files.storage import FileSystemStorage @@ -32,8 +32,8 @@ from generic.models import ( CidUserGroup, ExamUserStatus, Site, - Condition, - Sign, + #Condition, + #Sign, ExamBase, QuestionNote, UserUserGroup, diff --git a/requirements.txt b/requirements.txt index fb279a74..c0c74d55 100644 --- a/requirements.txt +++ b/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 diff --git a/sbas/admin.py b/sbas/admin.py index 0bed3534..9e737aa1 100644 --- a/sbas/admin.py +++ b/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 diff --git a/templates/base.html b/templates/base.html index 63287a96..ffeae08f 100644 --- a/templates/base.html +++ b/templates/base.html @@ -15,7 +15,7 @@ - + {% comment %} {% endcomment %} @@ -43,7 +43,7 @@ - + {% comment %} {% endcomment %}