diff --git a/anatomy/forms.py b/anatomy/forms.py index 6a44b3cc..e08f3e2b 100644 --- a/anatomy/forms.py +++ b/anatomy/forms.py @@ -33,6 +33,9 @@ from dal import autocomplete from tinymce.widgets import TinyMCE +from crispy_forms.helper import FormHelper +from crispy_forms.layout import Submit + class AnatomyAnswerForm(ModelForm): class Meta: model = UserAnswer @@ -76,6 +79,14 @@ class AnatomyQuestionForm(ModelForm): ModelForm.__init__(self, *args, **kwargs) super(AnatomyQuestionForm, self).__init__(*args, **kwargs) + + self.helper = FormHelper() + self.helper.form_id = 'id-anatomy-question-form' + #self.helper.form_class = 'blueForms' + #self.helper.form_method = 'post' + #self.helper.form_action = '' + + #self.helper.add_input(Submit('submit', 'Submit')) # self.fields['question'].widget.attrs = {'class': 'question-form', 'rows': 10, 'cols': 100} # self.fields['feedback'].widget.attrs = {'class': 'feedback-form', 'rows': 10, 'cols': 100} self.fields["question_type"] = ModelChoiceField( @@ -145,15 +156,15 @@ class AnatomyQuestionForm(ModelForm): fields = [ "question_type", "image", - "answer_help", - "answer_suggest_incorrect", - "region", + "description", "modality", + "region", "structure", "feedback", "examination", "body_part", - "description", + "answer_help", + "answer_suggest_incorrect", "open_access", ] diff --git a/anatomy/models.py b/anatomy/models.py index b194cff7..e8df503c 100644 --- a/anatomy/models.py +++ b/anatomy/models.py @@ -72,12 +72,12 @@ class QuestionType(models.Model): @reversion.register class AnatomyQuestion(QuestionBase): question_type = models.ForeignKey( - QuestionType, on_delete=models.SET_NULL, null=True, default=1 + QuestionType, on_delete=models.SET_NULL, null=True, default=1, help_text="Type of question, this is the question text that will be displayed to the user." ) image = models.ImageField( upload_to=image_directory_path, - help_text="The image to use for the question. Ideally use use unmarked images and annotate (arrow) them on the test system. If you wish to reuse an image that is already uploaded 'clone' the question that contains it.", + help_text="The image to use for the question. Ideally use unmarked images and annotate (arrow) them on the test system. If you wish to reuse an image that is already uploaded 'clone' the question that contains it.", ) image_annotations = models.TextField( @@ -90,9 +90,9 @@ class AnatomyQuestion(QuestionBase): help_text="Short description of the image e.g. 'Sagittal CT Chest, Abdomen & Pelvis', will be displayed as the title.", ) - answer_help = models.TextField(default="", blank=True, null=True, help_text="Helpful information for marking") + answer_help = models.TextField(default="", blank=True, null=True, help_text="Helpful information for marking, this will not be displayed to the user taking the exam.") - answer_suggest_incorrect = ArrayField(models.CharField(max_length=255, null=True), default=list, blank=True) + answer_suggest_incorrect = ArrayField(models.CharField(max_length=255, null=True), default=list, blank=True, help_text="An array that defines text that if found in the answer is likely incorrect. This is used to aid marking") examination = models.ForeignKey( Examination, on_delete=models.SET_NULL, null=True, blank=True diff --git a/anatomy/templates/anatomy/anatomyquestion_form.html b/anatomy/templates/anatomy/anatomyquestion_form.html index 0cea5e31..46436df7 100644 --- a/anatomy/templates/anatomy/anatomyquestion_form.html +++ b/anatomy/templates/anatomy/anatomyquestion_form.html @@ -1,6 +1,12 @@ {% extends "anatomy/base.html" %} {% load static %} +{% load crispy_forms_tags %} + +{% block title %} + Anatomy +{% endblock %} + {% block js %} @@ -220,6 +226,12 @@ {% endif %}

{{object|yesno:"Update,Create"}} Question

+
+ Help +

This form can be used to create an Anatomy question.

+ +

Question type can be selected from a predefined list. If you require a more please contact ross.kruger@nhs.net.

+
{% csrf_token %} - - {{ form.as_table }} -
+ {{ form|crispy }}
Drop image here
diff --git a/anatomy/views.py b/anatomy/views.py index 4450e5be..cbbf0d00 100644 --- a/anatomy/views.py +++ b/anatomy/views.py @@ -494,6 +494,7 @@ class AnatomyQuestionCreateBase(RevisionMixin, LoginRequiredMixin, CreateView): def get_context_data(self, **kwargs): context = super(AnatomyQuestionCreateBase, self).get_context_data(**kwargs) + context["question"] = context["object"] if self.request.POST: context["answer_formset"] = AnswerFormSet( self.request.POST, self.request.FILES @@ -526,6 +527,9 @@ class AnatomyQuestionCreateBase(RevisionMixin, LoginRequiredMixin, CreateView): else: return super().form_invalid(form) + def get_success_url(self) -> str: + return redirect("anatomy:question_detail", pk=self.object.pk) + class AnatomyQuestionCreate(AnatomyQuestionCreateBase): @@ -540,7 +544,6 @@ class AnatomyQuestionCreate(AnatomyQuestionCreateBase): return initial - # # There has to be a better way... # try: # s = (i.pk for i in self.request.user.AnatomyQuestion_default.site.all()) diff --git a/generic/tables.py b/generic/tables.py index 0e9cd972..17a1c7ae 100644 --- a/generic/tables.py +++ b/generic/tables.py @@ -78,9 +78,6 @@ class FirstImageColumn(tables.Column): class CidUserTable(tables.Table): - # edit = tables.LinkColumn( - # "anatomy:anatomy_question_update", text="Edit", args=[A("pk")], orderable=False - # ) cid = tables.LinkColumn( "cid_scores", args=[A("cid"), A("passcode")], orderable=True ) @@ -129,9 +126,6 @@ class CidUserTable(tables.Table): class CidUserExamTable(tables.Table): - # edit = tables.LinkColumn( - # "anatomy:anatomy_question_update", text="Edit", args=[A("pk")], orderable=False - # ) cid = tables.LinkColumn( "cid_scores", args=[A("cid"), A("passcode")], orderable=True ) @@ -189,9 +183,6 @@ class CidUserExamTable(tables.Table): class UserUserTable(tables.Table): - # edit = tables.LinkColumn( - # "anatomy:anatomy_question_update", text="Edit", args=[A("pk")], orderable=False - # ) user = tables.Column( linkify={"viewname": "account_profile", "args": [A("username")]}, diff --git a/rad/static/css/anatomy.css b/rad/static/css/anatomy.css index 092af7f8..9e9373f7 100644 --- a/rad/static/css/anatomy.css +++ b/rad/static/css/anatomy.css @@ -1287,4 +1287,20 @@ tr:has(> td > a) { /* For crispy... */ .select2-selection { padding-bottom: 30px; +} + +.help-text, .help-text summary { + cursor: help !important; +} + +details.help-text > summary { + list-style: none; +} + +/* .selector, .selector-available, .selector-chosen { + display: inline-block; +} */ + +#div_id_exams { + display: inline-block; } \ No newline at end of file diff --git a/sbas/urls.py b/sbas/urls.py index 8c5e8d56..76eb3d76 100644 --- a/sbas/urls.py +++ b/sbas/urls.py @@ -24,9 +24,6 @@ urlpatterns = [ views.QuestionDelete.as_view(), name="question_delete", ), - # path("question//update", views.QuestionUpdate.as_view(), name="anatomy_question_update"), - # path("exam///mark", views.mark, name="mark"), - # path("exam//mark", views.mark_overview, name="mark_overview"), path( "exam/////take", views.exam_take,