diff --git a/anatomy/migrations/0022_auto_20210121_1806.py b/anatomy/migrations/0022_auto_20210121_1806.py new file mode 100644 index 00000000..5471d954 --- /dev/null +++ b/anatomy/migrations/0022_auto_20210121_1806.py @@ -0,0 +1,20 @@ +# Generated by Django 3.1.3 on 2021-01-21 18:06 + +import anatomy.models +import django.core.files.storage +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('anatomy', '0021_auto_20210120_2206'), + ] + + operations = [ + migrations.AlterField( + model_name='anatomyquestion', + name='image', + field=models.ImageField(storage=django.core.files.storage.FileSystemStorage(base_url='/media/anatomy/', location='/home/ross/scripts/sites/rad/media//anatomy/'), upload_to=anatomy.models.image_directory_path), + ), + ] diff --git a/rapids/admin.py b/rapids/admin.py index 33abf350..6d259e65 100755 --- a/rapids/admin.py +++ b/rapids/admin.py @@ -55,7 +55,7 @@ class RapidAdmin(VersionAdmin): filter_horizontal = ( "abnormality", "region", - "examination", + #"examination", ) save_on_top = True save_as = True diff --git a/rapids/migrations/0005_auto_20210121_1806.py b/rapids/migrations/0005_auto_20210121_1806.py new file mode 100644 index 00000000..b21cc89b --- /dev/null +++ b/rapids/migrations/0005_auto_20210121_1806.py @@ -0,0 +1,30 @@ +# Generated by Django 3.1.3 on 2021-01-21 18:06 + +import django.core.files.storage +from django.db import migrations, models +import django.db.models.deletion +import rapids.models + + +class Migration(migrations.Migration): + + dependencies = [ + ('rapids', '0004_auto_20210120_2214'), + ] + + operations = [ + migrations.RemoveField( + model_name='rapid', + name='examination', + ), + migrations.AddField( + model_name='rapid', + name='examination', + field=models.ForeignKey(help_text='Name of the (primary) examination', null=True, on_delete=django.db.models.deletion.SET_NULL, to='rapids.examination'), + ), + migrations.AlterField( + model_name='rapidimage', + name='image', + field=models.ImageField(storage=django.core.files.storage.FileSystemStorage(base_url='/media/rapids/', location='/home/ross/scripts/sites/rad/media//rapids/'), upload_to=rapids.models.image_directory_path), + ), + ] diff --git a/rapids/models.py b/rapids/models.py index f73c1eed..8a162130 100644 --- a/rapids/models.py +++ b/rapids/models.py @@ -142,8 +142,8 @@ class Rapid(models.Model): Region, blank=True, help_text="Region of the abnormality (laterality independent)") - examination = models.ManyToManyField( - Examination, help_text="Name of the (primary) examination") + examination = models.ForeignKey( + Examination, help_text="Name of the (primary) examination", on_delete=models.SET_NULL, null=True) laterality = models.CharField( max_length=20, choices=LATERALITY_CHOICES,