From ddde2870d16566d6e088bfd59118fe25471c7193 Mon Sep 17 00:00:00 2001 From: Ross Date: Mon, 4 Apr 2022 22:50:48 +0100 Subject: [PATCH] . --- rapids/forms.py | 3 +-- .../migrations/0045_rapidimage_description.py | 18 ++++++++++++++++++ rapids/models.py | 2 ++ .../rapids/question_display_block.html | 1 + 4 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 rapids/migrations/0045_rapidimage_description.py diff --git a/rapids/forms.py b/rapids/forms.py index b7898883..c6a0727d 100755 --- a/rapids/forms.py +++ b/rapids/forms.py @@ -188,12 +188,11 @@ class RapidForm(ModelForm): ImageFormSet = inlineformset_factory( Rapid, RapidImage, - fields=["image", "feedback_image"], + fields=["image", "feedback_image", "description"], exclude=[], can_delete=True, extra=1, max_num=10, - field_classes="testing", ) AnswerFormSet = inlineformset_factory( diff --git a/rapids/migrations/0045_rapidimage_description.py b/rapids/migrations/0045_rapidimage_description.py new file mode 100644 index 00000000..478be033 --- /dev/null +++ b/rapids/migrations/0045_rapidimage_description.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.10 on 2022-04-04 21:50 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('rapids', '0044_rapid_history'), + ] + + operations = [ + migrations.AddField( + model_name='rapidimage', + name='description', + field=models.CharField(blank=True, max_length=255, null=True), + ), + ] diff --git a/rapids/models.py b/rapids/models.py index 8933dd07..d145c18d 100644 --- a/rapids/models.py +++ b/rapids/models.py @@ -484,6 +484,8 @@ class RapidImage(models.Model): feedback_image = models.BooleanField(default=False) + description = models.CharField(max_length=255, null=True, blank=True) + image_md5_hash = models.CharField(max_length=32, null=True, blank=True) is_dicom = models.BooleanField(default=False) diff --git a/rapids/templates/rapids/question_display_block.html b/rapids/templates/rapids/question_display_block.html index db3552f3..73186964 100755 --- a/rapids/templates/rapids/question_display_block.html +++ b/rapids/templates/rapids/question_display_block.html @@ -40,6 +40,7 @@

Open Access: {{ question.open_access }}

Feedback: {{ question.feedback }}

+

History: {{ question.history }}

Author(s): {% for author in question.author.all %} {{author}}, {% endfor %}

Checked by: {% for verified in question.verified.all %}