From c167650ab4b795d9931c3b6081e4b5f3bf1a8b46 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Sat, 2 Apr 2022 22:52:36 +0100
Subject: [PATCH] .

---
 atlas/templates/atlas/collection_detail.html | 60 ++++----------------
 atlas/templates/atlas/collection_take.html   | 53 +++++++++++++++++
 atlas/urls.py                                |  1 +
 atlas/views.py                               |  7 +++
 4 files changed, 73 insertions(+), 48 deletions(-)
 create mode 100644 atlas/templates/atlas/collection_take.html

diff --git a/atlas/templates/atlas/collection_detail.html b/atlas/templates/atlas/collection_detail.html
index caa7b552..a13bbd3c 100644
--- a/atlas/templates/atlas/collection_detail.html
+++ b/atlas/templates/atlas/collection_detail.html
@@ -7,61 +7,25 @@
     <a href="{% url 'atlas:collection_delete' pk=collection.pk %}" title="Delete the Collection">Delete</a>
 </div>
 {% endif %}
+
+    <a href="{% url 'atlas:collection_update' collection.id %}" title="Edit the Collection">Edit</a>
+    \ <a href="{% url 'atlas:collection:exam_delete' collection.id %}" title="Delete the Collection">Delete</a>
+    \ <a href="{% url 'atlas:collection:exam_clone' collection.id %}" title="Clone the Collection">Clone</a>
+{% endif %}
+{% if request.user.is_superuser %}
+    \ <a href="{% url 'admin:atlas_collection_change' collection.id %}" title="Edit the Collection using the admin interface">Admin Edit</a>
+{% endif %}
+
 <h2>{{collection.name}}
+
+{% include 'exam_notes.html' %}
 <ul>
 {% for case in collection.cases.all %}
-<li>{% if collection.collection_type == "REV" %}<a href="{% url 'atlas:collection_case_view' pk=collection.pk case_number=forloop.counter0 %}">Case {{forloop.counter}}</a>{% else %}Case {{forloop.counter}}{% endif %}
-    {% if collection.show_title %}
+<li><a href="{% url 'atlas:collection_case_view' pk=collection.pk case_number=forloop.counter0 %}">Case {{forloop.counter}}</a>
     : {{case.title}}
-    {% endif %}
 </li>
     
 {% endfor %}
 </ul>
-{% if collection.collection_type == "REP" %}
-    <h2>Start: {{exam.name}}</h2>
-
-    Enter your CID and passcode in the below boxes.<br />
-    <p><input id="cid-box" type="text" value="Candidate ID"></p>
-    <p><input id="passcode-box" type="text" value="Passcode"></p>
-
-    <button>Start</button>
-
-    <script type="text/javascript">
-        $(document).ready(function () {
-            window.location.search.substr(1).split("&").forEach((item) =>
-                {
-                    s = item.split("=");
-                    if (s[0] == "cid") {
-                        $("#cid-box").val(s[1]);
-
-                    }
-                    if (s[0] == "passcode") {
-                        $("#passcode-box").val(s[1]);
-                    }
-                });
-
-
-            $("#cid-box, #passcode-box").keypress(function(e) {
-                // Enter pressed?
-                console.log(e)
-                if(e.which == 10 || e.which == 13) {
-                    $("button").click();
-                }
-            });
-
-            $("button").click(() => {
-                let cid = $("#cid-box").val();
-                let passcode = $("#passcode-box").val();
-
-                if (Number.isInteger(parseInt(cid))) {
-                    window.location.replace("{% url 'atlas:collection_case_view_take' pk=collection.pk case_number=0 cid='0000000' passcode='ZZZZZZ' %}".replace("0000000", cid).replace("ZZZZZZ", passcode));
-                } else {
-                    alert("Please enter a valid Candidate ID (CID).")
-                }
-            });
-        });
-    </script>
-{% endif %}
 
 {% endblock %}
\ No newline at end of file
diff --git a/atlas/templates/atlas/collection_take.html b/atlas/templates/atlas/collection_take.html
new file mode 100644
index 00000000..922f6c0d
--- /dev/null
+++ b/atlas/templates/atlas/collection_take.html
@@ -0,0 +1,53 @@
+{% extends 'atlas/base.html' %}
+
+{% block content %}
+<h2>{{collection.name}}
+<ul>
+</ul>
+{% if collection.collection_type == "REP" %}
+    <h2>Start: {{exam.name}}</h2>
+
+    Enter your CID and passcode in the below boxes.<br />
+    <p><input id="cid-box" type="text" value="Candidate ID"></p>
+    <p><input id="passcode-box" type="text" value="Passcode"></p>
+
+    <button>Start</button>
+
+    <script type="text/javascript">
+        $(document).ready(function () {
+            window.location.search.substr(1).split("&").forEach((item) =>
+                {
+                    s = item.split("=");
+                    if (s[0] == "cid") {
+                        $("#cid-box").val(s[1]);
+
+                    }
+                    if (s[0] == "passcode") {
+                        $("#passcode-box").val(s[1]);
+                    }
+                });
+
+
+            $("#cid-box, #passcode-box").keypress(function(e) {
+                // Enter pressed?
+                console.log(e)
+                if(e.which == 10 || e.which == 13) {
+                    $("button").click();
+                }
+            });
+
+            $("button").click(() => {
+                let cid = $("#cid-box").val();
+                let passcode = $("#passcode-box").val();
+
+                if (Number.isInteger(parseInt(cid))) {
+                    window.location.replace("{% url 'atlas:collection_case_view_take' pk=collection.pk case_number=0 cid='0000000' passcode='ZZZZZZ' %}".replace("0000000", cid).replace("ZZZZZZ", passcode));
+                } else {
+                    alert("Please enter a valid Candidate ID (CID).")
+                }
+            });
+        });
+    </script>
+{% endif %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/atlas/urls.py b/atlas/urls.py
index da7ea781..25136b76 100755
--- a/atlas/urls.py
+++ b/atlas/urls.py
@@ -18,6 +18,7 @@ urlpatterns = [
     path("collection/<int:pk>/delete", views.CaseCollectionDelete.as_view(), name="collection_delete"),
     path("collection/<int:pk>/update", views.CaseCollectionUpdate.as_view(), name="collection_update"),
     path("collection/<int:pk>", views.collection_detail, name="collection_detail"),
+    path("collection/<int:pk>/take", views.collection_take, name="collection_take"),
     path("collection/<int:pk>/take/<int:cid>/<str:passcode>", views.collection_take_overview, name="collection_take_overview"),
     path("collection/<int:pk>/<int:case_number>", views.collection_case_view, name="collection_case_view"),
     path("collection/<int:pk>/<int:case_number>/take/<int:cid>/<str:passcode>", views.collection_case_view_take, name="collection_case_view_take"),
diff --git a/atlas/views.py b/atlas/views.py
index 3c85985b..352d3512 100755
--- a/atlas/views.py
+++ b/atlas/views.py
@@ -1064,6 +1064,13 @@ def collection_detail(request, pk):
         request, "atlas/collection_detail.html", {"collection": collection}
     )
 
+def collection_take(request, pk):
+    collection = get_object_or_404(CaseCollection, pk=pk)
+
+    return render(
+        request, "atlas/collection_take.html", {"collection": collection}
+    )
+
 def collection_take_overview(request, pk, cid, passcode):
     collection = get_object_or_404(CaseCollection, pk=pk)