From 64d81d1e50c7a60c8f0936f72e93c22961aedd7f Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Mon, 4 Apr 2022 13:31:07 +0100
Subject: [PATCH] .

---
 .../atlas/collection_mark_overview.html       |  9 ++++--
 .../atlas/collection_mark_question.html       | 16 +++++++++++
 atlas/views.py                                | 28 +++++++++++++++++--
 3 files changed, 48 insertions(+), 5 deletions(-)
 create mode 100644 atlas/templates/atlas/collection_mark_question.html

diff --git a/atlas/templates/atlas/collection_mark_overview.html b/atlas/templates/atlas/collection_mark_overview.html
index b7bd5ea4..6cb7a955 100644
--- a/atlas/templates/atlas/collection_mark_overview.html
+++ b/atlas/templates/atlas/collection_mark_overview.html
@@ -14,8 +14,13 @@
 <ul>
 {% for case_detail, answers in case_map.items %}
 <li>
-    {{case_detail.case.title}}<br/>
-    {% for answer in answers %}{{answer.answer}}: {{answer.score}}<br />{% endfor %}
+    Case: {{case_detail.case.title}}<br/>
+    Answers 
+    <ul>
+    {% for answer in answers %}
+    <li><a href="{% url 'atlas:collection_mark_question' collection.pk forloop.counter0 %}">{{answer.answer}}: {{answer.score}}</a></li>
+    {% endfor %}
+    </ul>
 </li>
     
 {% endfor %}
diff --git a/atlas/templates/atlas/collection_mark_question.html b/atlas/templates/atlas/collection_mark_question.html
new file mode 100644
index 00000000..6d005ce4
--- /dev/null
+++ b/atlas/templates/atlas/collection_mark_question.html
@@ -0,0 +1,16 @@
+{% extends 'atlas/base.html' %}
+
+{% block content %}
+{% include 'atlas/collection_headers.html' %}
+<h3>Marking case: {{case_detail.case.title}}</h3>
+
+<ul>
+{% for answer in answers %}
+<li>
+    {{answer.answer}}: {{answer.score}}
+</li>
+    
+{% endfor %}
+</ul>
+
+{% endblock %}
\ No newline at end of file
diff --git a/atlas/views.py b/atlas/views.py
index eb82cc34..63c5a121 100755
--- a/atlas/views.py
+++ b/atlas/views.py
@@ -1072,6 +1072,7 @@ def collection_take(request, pk):
 
     return render(request, "atlas/collection_take.html", {"collection": collection})
 
+
 @user_is_collection_author_or_atlas_editor
 def collection_mark_overview(request, pk):
     collection = get_object_or_404(CaseCollection, pk=pk)
@@ -1081,7 +1082,9 @@ def collection_mark_overview(request, pk):
 
     cases = collection.cases.all().order_by("casedetail__sort_order").prefetch_related()
 
-    case_details = CaseDetail.objects.filter(case__in=cases, collection=collection).prefetch_related("case")
+    case_details = CaseDetail.objects.filter(
+        case__in=cases, collection=collection
+    ).prefetch_related("case")
 
     answers = CidReportAnswer.objects.filter(question__in=case_details)
 
@@ -1092,7 +1095,17 @@ def collection_mark_overview(request, pk):
     for answer in answers:
         case_map[answer.question].append(answer)
 
-    return render(request, "atlas/collection_mark_overview.html", {"collection": collection, "answers": answers, "case_details": case_details, "case_map": case_map})
+    return render(
+        request,
+        "atlas/collection_mark_overview.html",
+        {
+            "collection": collection,
+            "answers": answers,
+            "case_details": case_details,
+            "case_map": case_map,
+        },
+    )
+
 
 @user_is_collection_author_or_atlas_editor
 def collection_mark_question(request, pk, case_number):
@@ -1108,7 +1121,16 @@ def collection_mark_question(request, pk, case_number):
 
     answers = CidReportAnswer.objects.filter(question=case_detail)
 
-    return render(request, "atlas/collection_mark_question.html", {"collection": collection})
+    return render(
+        request,
+        "atlas/collection_mark_question.html",
+        {
+            "collection": collection,
+            "answers": answers,
+            "case_detail": case_detail,
+            "case_number": case_number,
+        },
+    )
 
 
 @user_is_collection_author_or_atlas_editor