.

atlas/templates/atlas/collection_case_view_take.html

@@ -3,13 +3,13 @@
 {% block content %}
     <h2>Case {{case_number|add:1}}
 
-        {% if collection.show_title_pre %}
+        {% if show_title %}
             : {{case.title}}
         {% endif %}
 
     </h2>
 
-    {% if collection.show_description_pre and case.description%}
+    {% if show_description and case.description %}
         <div>
             Description: {{case.description}}
         </div>
@@ -38,7 +38,7 @@
         </div>
 
     </div>
-    {% if collection.show_discussion_pre and case.discussion%}
+    {% if show_discussion and case.discussion%}
         <details>
             <summary>
                 Discussion:
@@ -48,7 +48,7 @@
             </div>
         </details>
     {% endif %}
-    {% if collection.show_report_pre and case.report%}
+    {% if show_report and case.report%}
         <details>
             <summary>
                 Report:

atlas/views.py

@@ -873,6 +873,7 @@ def series_order_dicom(request, pk):
 
     return redirect("atlas:series_detail", pk=pk)
 
+
 @login_required
 @user_is_author_or_atlas_series_checker
 def series_anonymise_dicom(request, pk):
@@ -1138,13 +1139,15 @@ def collection_mark_question(request, pk, case_number):
     if request.method == "POST":
         for answer in answers:
             if answer:
-                form = CidReportAnswerMarkForm(request.POST, instance=answer, prefix=answer.id)
+                form = CidReportAnswerMarkForm(
+                    request.POST, instance=answer, prefix=answer.id
+                )
             else:
                 form = CidReportAnswerMarkForm(request.POST, prefix=answer.id)
             if form.is_valid():
                 answer = form.save(commit=False)
-                #answer.cid = cid
+                # answer.cid = cid
-                #answer.question = case_detail
+                # answer.question = case_detail
                 # answer.published_date = timezone.now()
                 answer.save()
 
@@ -1152,21 +1155,15 @@ def collection_mark_question(request, pk, case_number):
 
         if "save" in request.POST:
             return redirect(
-                "atlas:collection_mark_question",
+                "atlas:collection_mark_question", case_number=case_number, **kwargs
-                case_number=case_number,
-                **kwargs
             )
         if "next" in request.POST:
             return redirect(
-                "atlas:collection_mark_question",
+                "atlas:collection_mark_question", case_number=case_number + 1, **kwargs
-                case_number=case_number + 1,
-                **kwargs
             )
         elif "previous" in request.POST:
             return redirect(
-                "atlas:collection_mark_question",
+                "atlas:collection_mark_question", case_number=case_number - 1, **kwargs
-                case_number=case_number - 1,
-                **kwargs
             )
         elif "goto" in request.POST:
             return redirect(
@@ -1193,7 +1190,7 @@ def collection_mark_question(request, pk, case_number):
             "case_number": case_number,
             "answer_forms": answer_forms,
             "previous": previous,
-            "next": next
+            "next": next,
         },
     )
 
@@ -1315,15 +1312,11 @@ def collection_case_view_take(request, pk, case_number, cid, passcode):
 
         if "next" in request.POST:
             return redirect(
-                "atlas:collection_case_view_take",
+                "atlas:collection_case_view_take", case_number=case_number + 1, **kwargs
-                case_number=case_number + 1,
-                **kwargs
             )
         elif "previous" in request.POST:
             return redirect(
-                "atlas:collection_case_view_take",
+                "atlas:collection_case_view_take", case_number=case_number - 1, **kwargs
-                case_number=case_number - 1,
-                **kwargs
             )
         elif "finish" in request.POST:
             return redirect("atlas:collection_take_overview", **kwargs)
@@ -1341,6 +1334,19 @@ def collection_case_view_take(request, pk, case_number, cid, passcode):
     previous = case_number > 0
     next = case_number < (len(cases) - 1)
 
+    if collection.publish_results:
+        show_title = collection.show_title_post
+        show_history = collection.show_history_post
+        show_description = collection.show_description_post
+        show_discussion = collection.show_discussion_post
+        show_report = collection.show_report_post
+    else:
+        show_title = collection.show_title_pre
+        show_history = collection.show_history_pre
+        show_description = collection.show_description_pre
+        show_discussion = collection.show_discussion_pre
+        show_report = collection.show_report_pre
+
     return render(
         request,
         "atlas/collection_case_view.html",
@@ -1355,9 +1361,15 @@ def collection_case_view_take(request, pk, case_number, cid, passcode):
             "cid": cid,
             "passcode": passcode,
             "answer": answer,
+            "show_title": show_title,
+            "show_history": show_history,
+            "show_description": show_description,
+            "show_discussion": show_discussion,
+            "show_report": show_report,
         },
     )
 
+
 @user_is_collection_author_or_atlas_editor
 def collection_case_view(request, pk, case_number):
     collection = get_object_or_404(CaseCollection, pk=pk)
@@ -1369,7 +1381,6 @@ def collection_case_view(request, pk, case_number):
         if not collection.active:
             raise Http404("Exam not found")
 
-
     cases = collection.cases.all().order_by("casedetail__sort_order").prefetch_related()
     case = cases[case_number]