numerous uploading fixes

atlas/forms.py

@@ -16,6 +16,8 @@ from django.forms import (
 )
 from django.forms import inlineformset_factory
 from django.shortcuts import get_object_or_404
+from django_jsonforms.forms import JSONSchemaField
+
 
 from atlas.models import (
     Case,
@@ -516,8 +518,13 @@ SeriesImageFormSet = inlineformset_factory(
 )
 
 class BaseReportAnswerForm(ModelForm):
+    json_answer = JSONSchemaField(
+        schema = "schema/report.json",
+        #options = 'schema/options.json'
+        options = {}
+    )
     class Meta:
-        fields = ["answer"]
+        fields = ["answer", "json_answer"]
 
         widgets = {
             # "normal": RadioSelect(
@@ -532,9 +539,13 @@ class BaseReportAnswerForm(ModelForm):
         #    "answer": "Write your answer in here."
         # }
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, case_detail,  **kwargs):
         super(BaseReportAnswerForm, self).__init__(*args, **kwargs)
         self.fields["answer"].required = False
+        #self.fields["json_answer"].schema = case_detail.question_schema
+        if case_detail.question_schema is not None:
+            self.fields["json_answer"] = JSONSchemaField(schema=case_detail.question_schema, options={})
+
 
 class CidReportAnswerForm(BaseReportAnswerForm):
     class Meta(BaseReportAnswerForm.Meta):
@@ -698,4 +709,18 @@ class CaseAuthorForm(ExamAuthorFormMixin):
         model = Case
 class SeriesAuthorForm(ExamAuthorFormMixin):
     class Meta(ExamAuthorFormMixin.Meta):
-        model = Series
+        model = Series
+
+
+class AnswerJSONForm(Form):
+
+    json = JSONSchemaField(
+        schema = 'schema/schema.json',
+        #options = 'schema/options.json'
+        options = {}
+    )
+
+class CaseDetailForm(ModelForm):
+    class Meta:
+        model = CaseDetail
+        fields = ["sort_order", "question_schema"]#, "user"]

atlas/migrations/0049_casedetail_questions_cidreportanswer_json_answer_and_more.py

@@ -0,0 +1,28 @@
+# Generated by Django 5.0.2 on 2024-04-29 10:32
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('atlas', '0048_cidreportanswer_completed_userreportanswer_completed_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='casedetail',
+            name='questions',
+            field=models.JSONField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='cidreportanswer',
+            name='json_answer',
+            field=models.JSONField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='userreportanswer',
+            name='json_answer',
+            field=models.JSONField(blank=True, null=True),
+        ),
+    ]

atlas/migrations/0050_rename_questions_casedetail_question_schema.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.0.2 on 2024-04-29 11:06
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('atlas', '0049_casedetail_questions_cidreportanswer_json_answer_and_more'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='casedetail',
+            old_name='questions',
+            new_name='question_schema',
+        ),
+    ]

atlas/models.py

@@ -957,6 +957,8 @@ class CaseDetail(models.Model):
     case = models.ForeignKey(Case, on_delete=models.CASCADE)
     collection = models.ForeignKey(CaseCollection, on_delete=models.CASCADE)
 
+    question_schema = models.JSONField(null=True, blank=True)
+
     sort_order = models.IntegerField(default=1000)
 
     class Meta:
@@ -968,6 +970,8 @@ class BaseReportAnswer(models.Model):
 
     answer = models.TextField(blank=True)
 
+    json_answer = models.JSONField(null=True, blank=True)
+
     feedback = models.TextField(blank=True)
 
     created = models.DateTimeField(auto_now_add=True)

atlas/static/schema/report.json

@@ -0,0 +1,14 @@
+{
+  "title": "Report",
+  "description": "Report text",
+  "type": "object",
+  "required": [
+    "report"
+  ],
+  "properties": {
+    "report": {
+      "type": "string",
+      "title": "Report"
+    }
+  }
+}

atlas/templates/atlas/collection_case_detail.html

@@ -0,0 +1,12 @@
+{% extends 'atlas/exams.html' %}
+
+{% block content %}
+    <h2>{{case_detail.collection.name}} / {{case_detail.case.pk}}</h2>
+
+    <form method="POST">
+        {% csrf_token %}
+        {{ form.as_p }}
+        <button type="submit">Submit</button>
+    </form>
+
+{% endblock %}

atlas/templates/atlas/collection_case_view_take.html

@@ -53,7 +53,7 @@
 
     {% if collection.show_ohif_viewer_link %}
         <div>
-            <a href="/ohif/viewer/dicomjson?url=https://www.penracourses.org.uk{% url 'atlas:case_dicom_json' case.pk %}">View case in OHIF</a>
+            <a target="_blank" href="/ohif/viewer/dicomjson?url=https://www.penracourses.org.uk{% url 'atlas:case_dicom_json' case.pk %}">View case in OHIF</a>
         </div>
     {% endif %}
 
@@ -128,6 +128,7 @@
     {% endif %}
     <form method="POST" class="post-form">{% csrf_token %}
         {% if collection.collection_type == "REP" %}
+            {{form.json.errors}}
             <div class="form-contents">
                 <fieldset {% if completed %}disabled="disabled"{% endif %}>
                     {{form}}
@@ -200,6 +201,7 @@
 
 {% endblock %}
 {% block js %}
+    {{ form.media }}
     <script type="text/javascript">
         window.images = {
             {% for series in series_list %}

atlas/templates/atlas/collection_detail.html

@@ -15,7 +15,7 @@
     <ol id="full-question-list" class="sortable">
         {% for casedetail in casesdetails %}
             <li data-question_pk={{casedetail.case.pk}}><a title="sort_order: {{casedetail.sort_order}}" href="{% url 'atlas:collection_case_view' pk=collection.pk case_number=forloop.counter0 %}">Case {{forloop.counter}}</a>
-                : {{casedetail.case.title}}
+                : {{casedetail.case.title}} (<a href='{% url "atlas:collection_case_details" casedetail.collection.pk casedetail.case.pk %}'>edit</a>)
             </li>
 
         {% endfor %}

atlas/urls.py

@@ -100,6 +100,7 @@ urlpatterns = [
         views.GenericExamViews.exam_user_status_user,
         name="exam_user_status_user",
     ),
+    #path("collection/<int:pk>/<int:sk>/test", views.test_form, name="test_form"),
     path(
         "exam/<int:exam_id>/cids/edit",
         views.GenericExamViews.exam_cids_edit,
@@ -110,6 +111,11 @@ urlpatterns = [
         views.GenericExamViews.exam_users_edit,
         name="exam_users_edit",
     ),
+    path(
+        "collection/<int:exam_id>/case/<int:case_id>/details",
+        views.collection_case_details,
+        name="collection_case_details",
+    ),
     path(
         "collection/<int:exam_id>/cids/<int:cid>/delete_answers",
         views.delete_collection_cid_answers,

atlas/views.py

@@ -39,6 +39,7 @@ from .forms import (
     CaseCollectionAuthorForm,
     CaseCollectionCaseFormSet,
     CaseCollectionForm,
+    CaseDetailForm,
     CaseForm,
     CaseResourceFormSet,
     CidReportAnswerForm,
@@ -1561,6 +1562,23 @@ def collection_take_start(request, pk):
                 request, "atlas/collection_review_start.html", template_variables
             )
 
+@user_is_collection_author_or_atlas_editor
+def collection_case_details(request, exam_id, case_id):
+    case_detail = CaseDetail.objects.get(case=case_id, collection=exam_id)
+
+    if request.method == 'POST':
+        form = CaseDetailForm(request.POST, instance=case_detail)
+        if form.is_valid():
+            form.save()
+            # Add any additional logic or redirection here
+    else:
+        form = CaseDetailForm(instance=case_detail)
+    
+
+    return render(
+        request, "atlas/collection_case_detail.html", {"case_detail": case_detail,
+                                                       "form": form}
+    )
 
 @user_is_collection_author_or_atlas_editor
 def collection_mark_overview(request, pk):
@@ -1830,9 +1848,9 @@ def collection_case_view_take(
         if collection.collection_type == "REP":
             if not collection.publish_results:
                 if answer:
-                    form = ReportAnswerForm(request.POST, instance=answer)
+                    form = ReportAnswerForm(request.POST, instance=answer, case_detail=case_detail)
                 else:
-                    form = ReportAnswerForm(request.POST)
+                    form = ReportAnswerForm(request.POST, case_detail=case_detail)
 
                 if not cid_user_exam.completed and not (
                     answer is not None and answer.completed
@@ -1876,7 +1894,7 @@ def collection_case_view_take(
             )
     else:
         if collection.collection_type == "REP":
-            form = ReportAnswerForm(instance=answer)
+            form = ReportAnswerForm(instance=answer, case_detail=case_detail)
 
     series_list = case.series.all().prefetch_related("images", "examination", "plane")
 

rad/settings.py

@@ -79,6 +79,7 @@ INSTALLED_APPS = [
     "crispy_bootstrap4",
     "autocomplete",
     'markdownify.apps.MarkdownifyConfig',
+    'django_jsonforms',
 
 ]
 

rad/static/css/forms.css

@@ -86,4 +86,9 @@ form input:required {
 
 .select2-selection__rendered {
   user-select: none;
+}
+
+.json-editor-btn-edit, .json-editor-btn-collapse {
+  padding: 1px;
+  font-size: small;
 }

requirements.txt

@@ -46,4 +46,5 @@ django-clone
 django-sortedm2m # remove once migrations squashed
 loguru
 pylibjpeg 
-pylibjpeg-libjpeg
+pylibjpeg-libjpeg
+django-jsonforms