diff --git a/anatomy/forms.py b/anatomy/forms.py index 2736a0c7..e0ae595f 100644 --- a/anatomy/forms.py +++ b/anatomy/forms.py @@ -7,6 +7,8 @@ from django.forms import ( CharField, ) from django.forms import inlineformset_factory +from django.contrib.postgres.forms import SimpleArrayField, SplitArrayField , SplitArrayWidget + from generic.forms import ExamAuthorFormMixin, ExamFormMixin @@ -102,6 +104,8 @@ class AnatomyQuestionForm(ModelForm): queryset=BodyPart.objects.all(), ) + self.fields["answer_suggest_incorrect"] = CharField(max_length=255, required=False) + if self.user.groups.filter(name="anatomy_checker").exists(): exam_queryset = Exam.objects.all() else: @@ -142,6 +146,7 @@ class AnatomyQuestionForm(ModelForm): "question_type", "image", "answer_help", + "answer_suggest_incorrect", "region", "modality", "structure", diff --git a/anatomy/migrations/0009_anatomyquestion_answer_suggest_incorrect.py b/anatomy/migrations/0009_anatomyquestion_answer_suggest_incorrect.py new file mode 100644 index 00000000..d050dd60 --- /dev/null +++ b/anatomy/migrations/0009_anatomyquestion_answer_suggest_incorrect.py @@ -0,0 +1,19 @@ +# Generated by Django 4.1.4 on 2024-01-11 21:41 + +import django.contrib.postgres.fields +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('anatomy', '0008_alter_anatomyquestion_answer_help'), + ] + + operations = [ + migrations.AddField( + model_name='anatomyquestion', + name='answer_suggest_incorrect', + field=django.contrib.postgres.fields.ArrayField(base_field=models.CharField(max_length=255), default=list, size=None), + ), + ] diff --git a/anatomy/models.py b/anatomy/models.py index cde5a98d..748687a5 100644 --- a/anatomy/models.py +++ b/anatomy/models.py @@ -3,6 +3,7 @@ import json from django.contrib.contenttypes.fields import GenericRelation from django.db import models from django.utils import timezone +from django.contrib.postgres.fields import ArrayField from django.core.files.storage import FileSystemStorage from django.conf import settings @@ -93,6 +94,8 @@ class AnatomyQuestion(QuestionBase): answer_help = models.TextField(default="", blank=True, null=True, help_text="Helpful information for marking") + answer_suggest_incorrect = ArrayField(models.CharField(max_length=255), default=list) + examination = models.ForeignKey( Examination, on_delete=models.SET_NULL, null=True, blank=True ) diff --git a/anatomy/templates/anatomy/mark.html b/anatomy/templates/anatomy/mark.html index 950717c6..6f0d0e7b 100644 --- a/anatomy/templates/anatomy/mark.html +++ b/anatomy/templates/anatomy/mark.html @@ -23,7 +23,12 @@ Unmarked: Marked: @@ -112,6 +117,9 @@ {% block css %}