diff --git a/anatomy/migrations/0030_auto_20210214_2028.py b/anatomy/migrations/0030_auto_20210214_2028.py new file mode 100644 index 00000000..bb2894ad --- /dev/null +++ b/anatomy/migrations/0030_auto_20210214_2028.py @@ -0,0 +1,20 @@ +# Generated by Django 3.1.3 on 2021-02-14 20:28 + +import anatomy.models +import django.core.files.storage +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('anatomy', '0029_auto_20210209_2239'), + ] + + 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/longs/filters.py b/longs/filters.py index 20451bcb..78bb07f0 100755 --- a/longs/filters.py +++ b/longs/filters.py @@ -7,7 +7,7 @@ class LongFilter(django_filters.FilterSet): class Meta: model = Long fields = (#"site", - "created_date", "author") + "created_date", "exams", "author") class LongSeriesFilter(django_filters.FilterSet): class Meta: diff --git a/longs/migrations/0015_auto_20210214_2028.py b/longs/migrations/0015_auto_20210214_2028.py new file mode 100644 index 00000000..396b5ba1 --- /dev/null +++ b/longs/migrations/0015_auto_20210214_2028.py @@ -0,0 +1,25 @@ +# Generated by Django 3.1.3 on 2021-02-14 20:28 + +import django.core.files.storage +from django.db import migrations, models +import longs.models + + +class Migration(migrations.Migration): + + dependencies = [ + ('longs', '0014_auto_20210211_1827'), + ] + + operations = [ + migrations.AddField( + model_name='ciduseranswer', + name='score', + field=models.CharField(choices=[('', 'Unmarked'), ('4', '4'), ('4.5', '4.5'), ('5', '5'), ('5.5', '5.5'), ('6', '6'), ('6.5', '6.5'), ('7', '7'), ('7.5', '7.5'), ('8', '8')], default='', max_length=3), + ), + migrations.AlterField( + model_name='longseriesimage', + name='image', + field=models.FileField(storage=django.core.files.storage.FileSystemStorage(base_url='/media/longs/', location='/home/ross/scripts/sites/rad/media/longs/'), upload_to=longs.models.image_directory_path), + ), + ] diff --git a/longs/models.py b/longs/models.py index 40fd7934..fb405e63 100644 --- a/longs/models.py +++ b/longs/models.py @@ -387,6 +387,22 @@ class CidUserAnswer(models.Model): Exam, related_name="cid_user_answers", on_delete=models.CASCADE, null=True ) + class ScoreOptions(models.TextChoices): + UNMARKED = "", _("Unmarked") + FOUR = "4", _("4") + FOUR_HALF = "4.5", _("4.5") + FIVE = "5", _("5") + FIVE_HALF = "5.5", _("5.5") + SIX = "6", _("6") + SIX_HALF = "6.5", _("6.5") + SEVEN = "7", _("7") + SEVEN_HALF = "7.5", _("7.5") + EIGHT = "8", _("8") + + score = models.CharField( + max_length=3, choices=ScoreOptions.choices, default=ScoreOptions.UNMARKED + ) + created = models.DateTimeField(auto_now_add=True) updated = models.DateTimeField(auto_now=True) diff --git a/rapids/migrations/0016_auto_20210214_2028.py b/rapids/migrations/0016_auto_20210214_2028.py new file mode 100644 index 00000000..f5fbbc00 --- /dev/null +++ b/rapids/migrations/0016_auto_20210214_2028.py @@ -0,0 +1,20 @@ +# Generated by Django 3.1.3 on 2021-02-14 20:28 + +import django.core.files.storage +from django.db import migrations, models +import rapids.models + + +class Migration(migrations.Migration): + + dependencies = [ + ('rapids', '0015_auto_20210211_2035'), + ] + + operations = [ + migrations.AlterField( + model_name='rapidimage', + name='image', + field=models.FileField(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), + ), + ]