From b8cb09b5c56b874fb085a291b8948fae78048ec9 Mon Sep 17 00:00:00 2001 From: Ross Date: Fri, 5 Feb 2021 10:47:27 +0000 Subject: [PATCH] . --- generic/admin.py | 5 +-- generic/migrations/0002_delete_site.py | 17 +++++++++ generic/migrations/0003_site.py | 21 +++++++++++ generic/migrations/0004_auto_20210205_1031.py | 17 +++++++++ generic/migrations/0005_auto_20210205_1035.py | 17 +++++++++ generic/migrations/0006_delete_site.py | 16 +++++++++ generic/migrations/0007_site.py | 21 +++++++++++ longs/admin.py | 3 +- longs/filters.py | 3 +- longs/forms.py | 7 ++-- longs/migrations/0008_auto_20210205_1013.py | 21 +++++++++++ longs/models.py | 25 ++++++------- rapids/admin.py | 5 +-- rapids/filters.py | 4 ++- rapids/forms.py | 4 +-- rapids/migrations/0009_auto_20210205_1046.py | 24 +++++++++++++ rapids/migrations/0013_auto_20210205_1042.py | 21 +++++++++++ rapids/models.py | 36 +++++++++---------- rapids/tables.py | 4 ++- 19 files changed, 227 insertions(+), 44 deletions(-) create mode 100644 generic/migrations/0002_delete_site.py create mode 100644 generic/migrations/0003_site.py create mode 100644 generic/migrations/0004_auto_20210205_1031.py create mode 100644 generic/migrations/0005_auto_20210205_1035.py create mode 100644 generic/migrations/0006_delete_site.py create mode 100644 generic/migrations/0007_site.py create mode 100644 longs/migrations/0008_auto_20210205_1013.py create mode 100644 rapids/migrations/0009_auto_20210205_1046.py create mode 100644 rapids/migrations/0013_auto_20210205_1042.py diff --git a/generic/admin.py b/generic/admin.py index e8c45772..ada4da31 100644 --- a/generic/admin.py +++ b/generic/admin.py @@ -2,9 +2,10 @@ from longs.models import Exam from django.contrib import admin # Register your models here. -from .models import Examination, Sign, Site, Condition +from .models import Examination, Sign, Condition +#from .models import Examination, Sign, Site, Condition admin.site.register(Examination) admin.site.register(Sign) -admin.site.register(Site) +#admin.site.register(Site) admin.site.register(Condition) \ No newline at end of file diff --git a/generic/migrations/0002_delete_site.py b/generic/migrations/0002_delete_site.py new file mode 100644 index 00000000..60cdf484 --- /dev/null +++ b/generic/migrations/0002_delete_site.py @@ -0,0 +1,17 @@ +# Generated by Django 3.1.3 on 2021-02-05 10:13 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('longs', '0008_auto_20210205_1013'), + ('generic', '0001_initial'), + ] + + operations = [ + migrations.DeleteModel( + name='Site', + ), + ] diff --git a/generic/migrations/0003_site.py b/generic/migrations/0003_site.py new file mode 100644 index 00000000..7ab771ca --- /dev/null +++ b/generic/migrations/0003_site.py @@ -0,0 +1,21 @@ +# Generated by Django 3.1.3 on 2021-02-05 10:22 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('generic', '0002_delete_site'), + ] + + operations = [ + migrations.CreateModel( + name='Site', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('site', models.CharField(max_length=200)), + ('initials', models.CharField(max_length=200)), + ], + ), + ] diff --git a/generic/migrations/0004_auto_20210205_1031.py b/generic/migrations/0004_auto_20210205_1031.py new file mode 100644 index 00000000..8962ef28 --- /dev/null +++ b/generic/migrations/0004_auto_20210205_1031.py @@ -0,0 +1,17 @@ +# Generated by Django 3.1.3 on 2021-02-05 10:31 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('generic', '0003_site'), + ] + + operations = [ + migrations.AlterModelTable( + name='site', + table='rapids_site', + ), + ] diff --git a/generic/migrations/0005_auto_20210205_1035.py b/generic/migrations/0005_auto_20210205_1035.py new file mode 100644 index 00000000..6c415009 --- /dev/null +++ b/generic/migrations/0005_auto_20210205_1035.py @@ -0,0 +1,17 @@ +# Generated by Django 3.1.3 on 2021-02-05 10:35 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('generic', '0004_auto_20210205_1031'), + ] + + operations = [ + migrations.AlterModelTable( + name='site', + table=None, + ), + ] diff --git a/generic/migrations/0006_delete_site.py b/generic/migrations/0006_delete_site.py new file mode 100644 index 00000000..d9a9e2b0 --- /dev/null +++ b/generic/migrations/0006_delete_site.py @@ -0,0 +1,16 @@ +# Generated by Django 3.1.3 on 2021-02-05 10:37 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('generic', '0005_auto_20210205_1035'), + ] + + operations = [ + migrations.DeleteModel( + name='Site', + ), + ] diff --git a/generic/migrations/0007_site.py b/generic/migrations/0007_site.py new file mode 100644 index 00000000..d09cd4dd --- /dev/null +++ b/generic/migrations/0007_site.py @@ -0,0 +1,21 @@ +# Generated by Django 3.1.3 on 2021-02-05 10:39 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('generic', '0006_delete_site'), + ] + + operations = [ + migrations.CreateModel( + name='Site', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('site', models.CharField(max_length=200)), + ('initials', models.CharField(max_length=200)), + ], + ), + ] diff --git a/longs/admin.py b/longs/admin.py index c4c0dc45..2f9b697b 100755 --- a/longs/admin.py +++ b/longs/admin.py @@ -9,7 +9,8 @@ from reversion.admin import VersionAdmin from django.forms.widgets import RadioSelect -from generic.models import Examination, Sign, Site, Condition +#from generic.models import Examination, Sign, Site, Condition +from generic.models import Examination, Sign, Condition # Register your models here. #admin.site.register(Examination) diff --git a/longs/filters.py b/longs/filters.py index 836e1b51..c6b65f39 100755 --- a/longs/filters.py +++ b/longs/filters.py @@ -6,4 +6,5 @@ from .models import Long class LongFilter(django_filters.FilterSet): class Meta: model = Long - fields = ("site", "created_date", "author") + fields = (#"site", + "created_date", "author") diff --git a/longs/forms.py b/longs/forms.py index 41675bb4..6073951d 100755 --- a/longs/forms.py +++ b/longs/forms.py @@ -9,7 +9,7 @@ from django.forms import ( from django.forms import inlineformset_factory from longs.models import ( - Examination, + #Examination, Note, Long, LongSeries, @@ -19,6 +19,9 @@ from longs.models import ( Exam, ) +from generic.models import Examination, Condition, Sign +#from generic.models import Examination, Site, Condition, Sign + from django.contrib.admin.widgets import FilteredSelectMultiple from django.forms.widgets import RadioSelect, TextInput, Textarea @@ -88,7 +91,7 @@ class LongForm(ModelForm): # fields = '__all__' fields = [ #"examination", - "site", + #"site", "feedback", ] # fields = ['question', 'feedback', 'subspecialty', 'references'] diff --git a/longs/migrations/0008_auto_20210205_1013.py b/longs/migrations/0008_auto_20210205_1013.py new file mode 100644 index 00000000..e872352a --- /dev/null +++ b/longs/migrations/0008_auto_20210205_1013.py @@ -0,0 +1,21 @@ +# Generated by Django 3.1.3 on 2021-02-05 10:13 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('longs', '0007_longseries_examination'), + ] + + operations = [ + migrations.RemoveField( + model_name='long', + name='site', + ), + migrations.RemoveField( + model_name='longcreationdefault', + name='site', + ), + ] diff --git a/longs/models.py b/longs/models.py index 12b1f325..88a2ce8d 100644 --- a/longs/models.py +++ b/longs/models.py @@ -21,7 +21,8 @@ import string from anatomy.models import Modality -from generic.models import Examination, Site, Condition, Sign +from generic.models import Examination, Condition, Sign +#from generic.models import Examination, Site, Condition, Sign image_storage = FileSystemStorage( # Physical file location ROOT @@ -62,12 +63,12 @@ class Long(models.Model): DEFAULT_SITE_ID = 1 - site = models.ManyToManyField( - Site, - blank=True, - default=DEFAULT_SITE_ID, - help_text= - "If we know the source of the image") + #site = models.ManyToManyField( + # Site, + # blank=True, + # default=DEFAULT_SITE_ID, + # 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) @@ -181,11 +182,11 @@ class LongCreationDefault(models.Model): related_name="long_default", on_delete=models.CASCADE) - site = models.ManyToManyField( - Site, - blank=True, - default=1, - help_text="Default site to use when creating a new long") + #site = models.ManyToManyField( + # Site, + # blank=True, + # default=1, + # help_text="Default site to use when creating a new long") def get_absolute_url(self): return reverse('longs:long_create') diff --git a/rapids/admin.py b/rapids/admin.py index 6d259e65..75d4d0b1 100755 --- a/rapids/admin.py +++ b/rapids/admin.py @@ -10,7 +10,7 @@ from django.forms.widgets import RadioSelect # Register your models here. admin.site.register(Examination) -admin.site.register(Site) +#admin.site.register(Site) admin.site.register(Exam) admin.site.register(Abnormality) admin.site.register(Region) @@ -41,7 +41,8 @@ class RapidAdminForm(ModelForm): fields = [ "normal", "abnormality", "region", "laterality", "examination", - "site", "sign", "condition", "feedback", "author" + #"site", + "sign", "condition", "feedback", "author" ] widgets = { diff --git a/rapids/filters.py b/rapids/filters.py index 3f10b4f6..e0d14f26 100755 --- a/rapids/filters.py +++ b/rapids/filters.py @@ -7,4 +7,6 @@ class RapidFilter(django_filters.FilterSet): class Meta: model = Rapid fields = ("normal", "abnormality", "region", "examination", - "laterality", "site", "created_date", "author") + "laterality", + #"site", + "created_date", "author") diff --git a/rapids/forms.py b/rapids/forms.py index c98304c5..617e5816 100755 --- a/rapids/forms.py +++ b/rapids/forms.py @@ -65,7 +65,7 @@ class AbnormalityForm(ModelForm): class RapidCreationDefaultForm(ModelForm): class Meta: model = RapidCreationDefault - fields = ["site"] + #fields = ["site"] exclude = ["author"] @@ -116,7 +116,7 @@ class RapidForm(ModelForm): "region", "laterality", "examination", - "site", + #"site", "feedback", ] # fields = ['question', 'feedback', 'subspecialty', 'references'] diff --git a/rapids/migrations/0009_auto_20210205_1046.py b/rapids/migrations/0009_auto_20210205_1046.py new file mode 100644 index 00000000..de2aa61c --- /dev/null +++ b/rapids/migrations/0009_auto_20210205_1046.py @@ -0,0 +1,24 @@ +# Generated by Django 3.1.3 on 2021-02-05 10:46 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('rapids', '0008_auto_20210130_1515'), + ] + + operations = [ + migrations.RemoveField( + model_name='rapid', + name='site', + ), + migrations.RemoveField( + model_name='rapidcreationdefault', + name='site', + ), + migrations.DeleteModel( + name='Site', + ), + ] diff --git a/rapids/migrations/0013_auto_20210205_1042.py b/rapids/migrations/0013_auto_20210205_1042.py new file mode 100644 index 00000000..48d2f653 --- /dev/null +++ b/rapids/migrations/0013_auto_20210205_1042.py @@ -0,0 +1,21 @@ +# 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', + #), + ] diff --git a/rapids/models.py b/rapids/models.py index c9d462ef..8c97f123 100644 --- a/rapids/models.py +++ b/rapids/models.py @@ -17,6 +17,9 @@ from sortedm2m.fields import SortedManyToManyField import string + +from generic.models import Examination, Site, Condition, Sign + image_storage = FileSystemStorage( # Physical file location ROOT location=u"{0}/rapids/".format(settings.MEDIA_ROOT), @@ -65,15 +68,6 @@ class Examination(models.Model): class Meta: ordering = ('examination', ) - -class Site(models.Model): - site = models.CharField(max_length=200) - initials = models.CharField(max_length=200) - - def __str__(self): - return self.site - - class Condition(tagulous.models.TagModel): pass @@ -163,12 +157,13 @@ class Rapid(models.Model): # to=Sign, blank=True, help_text='Radiological signs in the question') DEFAULT_SITE_ID = 1 - site = models.ManyToManyField( - Site, - blank=True, - default=DEFAULT_SITE_ID, - help_text= - "If we know the source of the image") + #site = models.ManyToManyField( + # Site, + # related_name="site_rapid", + # blank=True, + # default=DEFAULT_SITE_ID, + # 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) @@ -342,11 +337,12 @@ class RapidCreationDefault(models.Model): related_name="rapid_default", on_delete=models.CASCADE) - site = models.ManyToManyField( - Site, - blank=True, - default=1, - help_text="Default site to use when creating a new rapid") + #site = models.ManyToManyField( + # Site, + # related_name="site_rapid_creation_default", + # blank=True, + # default=1, + # help_text="Default site to use when creating a new rapid") def get_absolute_url(self): return reverse('rapids:rapid_create') diff --git a/rapids/tables.py b/rapids/tables.py index edcebe21..622496b2 100755 --- a/rapids/tables.py +++ b/rapids/tables.py @@ -44,5 +44,7 @@ class RapidTable(tables.Table): model = Rapid template_name = "django_tables2/bootstrap4.html" fields = ("normal", "abnormality", "region", "examination", - "laterality", "site", "created_date", "author") + "laterality", + #"site", + "created_date", "author") sequence = ("view", "images") \ No newline at end of file