.

atlas/templates/atlas/collection_case_view.html

@@ -78,8 +78,8 @@
             {% endif %}
 
             {% if collection.publish_results %}
-            <p>Score: {{answer.score}}</p>
+            Answer score: {{answer.score}}<br />
-            <p>Feedback: {{answer.feedback|safe}}</p>
+            Answer feedback: {{answer.feedback|safe}}
             {% endif %}
             <br />
             <button type="submit" name="finish" class="save btn btn-default">Overview</button>

atlas/views.py

@@ -1289,21 +1289,22 @@ def collection_case_view(request, pk, case_number, take=False, cid=None, passcod
         answer = case_detail.cidreportanswer_set.filter(cid=cid).first()
 
         if request.method == "POST":
-            if answer:
+            if not collection.publish_results:
-                form = CidReportAnswerForm(request.POST, instance=answer)
+                if answer:
-            else:
+                    form = CidReportAnswerForm(request.POST, instance=answer)
-                form = CidReportAnswerForm(request.POST)
+                else:
-            if form.is_valid():
+                    form = CidReportAnswerForm(request.POST)
-                answer = form.save(commit=False)
+                if form.is_valid():
-                answer.cid = cid
+                    answer = form.save(commit=False)
-                answer.question = case_detail
+                    answer.cid = cid
-                # answer.published_date = timezone.now()
+                    answer.question = case_detail
-                answer.save()
+                    # answer.published_date = timezone.now()
+                    answer.save()
 
-                cid_user_exam.end_time = timezone.now()
+                    cid_user_exam.end_time = timezone.now()
-                cid_user_exam.save()
+                    cid_user_exam.save()
 
-            kwargs = {"pk": pk, "cid": cid, "passcode": passcode}
+                kwargs = {"pk": pk, "cid": cid, "passcode": passcode}
 
             if "next" in request.POST:
                 return redirect(