From 720debc2a570b5b53acaa2103f170e66966d292d Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Mon, 16 Dec 2024 12:14:26 +0000
Subject: [PATCH] .

---
 .../generic/examcollection_detail.html        | 96 +++++++++++--------
 generic/views.py                              |  8 +-
 2 files changed, 58 insertions(+), 46 deletions(-)

diff --git a/generic/templates/generic/examcollection_detail.html b/generic/templates/generic/examcollection_detail.html
index 7d59fb3c..0de7938e 100755
--- a/generic/templates/generic/examcollection_detail.html
+++ b/generic/templates/generic/examcollection_detail.html
@@ -2,56 +2,68 @@
 
 {% block content %}
 
-<h1>{{ object.name }} [{{object.date}}] </h1>
+    <h1>{{ object.name }} [{{object.date}}] </h1>
 
-<p>
-    <a href="{% url 'generic:examcollection_edit' object.pk %}">Edit</a>
-    <a href="{% url 'generic:examcollection_clone' object.pk %}">Clone</a>
-    <a href="{% url 'generic:examcollection_delete' object.pk %}">Delete</a>
-</p>
+    <p>
+        <a href="{% url 'generic:examcollection_edit' object.pk %}">Edit</a>
+        <a href="{% url 'generic:examcollection_clone' object.pk %}">Clone</a>
+        <a href="{% url 'generic:examcollection_delete' object.pk %}">Delete</a>
+    </p>
 
-This collection contains the following exams
+    This collection contains the following exams
 
 
-<h2>Anatomy Exams:</h2>
-<ul>
-{% for exam in object.anatomy_exams.all %}
-    <li><a href="{% url 'anatomy:exam_overview' exam.pk %}">{{ exam }}</a> - <a href="{% url 'anatomy:exam_update' exam.pk %}">(Edit)</a></li>
-{% endfor %}
-</ul>
-<a href="{% url 'anatomy:exam_list_collection' object.pk %}">View exam list</a>
 
-<h2>Longs Exams:</h2>
-<ul>
-{% for exam in object.longs_exams.all %}
-    <li><a href="{% url 'longs:exam_overview' exam.pk %}">{{ exam }}</a> - <a href="{% url 'longs:exam_update' exam.pk %}">(Edit)</a></li>
-{% endfor %}
-</ul>
-<a href="{% url 'longs:exam_list_collection' object.pk %}">View exam list</a>
 
-<h2>Rapids Exams:</h2>
-<ul>
-{% for exam in object.rapids_exams.all %}
-    <li><a href="{% url 'rapids:exam_overview' exam.pk %}">{{ exam }}</a> - <a href="{% url 'rapids:exam_update' exam.pk %}">(Edit)</a></li>
-{% endfor %}
-</ul>
-<a href="{% url 'rapids:exam_list_collection' object.pk %}">View exam list</a>
+    {% if object.anatomy_exams.all %}
+        <h2>Anatomy Exams:</h2>
+        <ul>
+            {% for exam in object.anatomy_exams.all %}
+                <li><a href="{% url 'anatomy:exam_overview' exam.pk %}">{{ exam }}</a> - <a href="{% url 'anatomy:exam_update' exam.pk %}">(Edit)</a></li>
+            {% endfor %}
+        </ul>
+        <a href="{% url 'anatomy:exam_list_collection' object.pk %}">View exam list</a>
+    {% endif %}
 
-<h2>Physics Exams:</h2>
-<ul>
-{% for exam in object.physics_exams.all %}
-    <li><a href="{% url 'physics:exam_overview' exam.pk %}">{{ exam }}</a> - <a href="{% url 'physics:exam_update' exam.pk %}">(Edit)</a></li>
-{% endfor %}
-</ul>
-<a href="{% url 'physics:exam_list_collection' object.pk %}">View exam list</a>
+    {% if object.longs_exams.all %}
+        <h2>Longs Exams:</h2>
+        <ul>
+            {% for exam in object.longs_exams.all %}
+                <li><a href="{% url 'longs:exam_overview' exam.pk %}">{{ exam }}</a> - <a href="{% url 'longs:exam_update' exam.pk %}">(Edit)</a></li>
+            {% endfor %}
+        </ul>
+        <a href="{% url 'longs:exam_list_collection' object.pk %}">View exam list</a>
+    {% endif %}
 
-<h2>SBAs Exams:</h2>
-<ul>
-{% for exam in object.sbas_exams.all %}
-    <li><a href="{% url 'sbas:exam_overview' exam.pk %}">{{ exam }}</a> - <a href="{% url 'sbas:exam_update' exam.pk %}">(Edit)</a></li>
-{% endfor %}
-</ul>
-<a href="{% url 'sbas:exam_list_collection' object.pk %}">View exam list</a>
+    {% if object.rapids_exams.all %}
+        <h2>Rapids Exams:</h2>
+        <ul>
+            {% for exam in object.rapids_exams.all %}
+                <li><a href="{% url 'rapids:exam_overview' exam.pk %}">{{ exam }}</a> - <a href="{% url 'rapids:exam_update' exam.pk %}">(Edit)</a></li>
+            {% endfor %}
+        </ul>
+        <a href="{% url 'rapids:exam_list_collection' object.pk %}">View exam list</a>
+    {% endif %}
+
+    {% if object.physics_exams.all %}
+        <h2>Physics Exams:</h2>
+        <ul>
+            {% for exam in object.physics_exams.all %}
+                <li><a href="{% url 'physics:exam_overview' exam.pk %}">{{ exam }}</a> - <a href="{% url 'physics:exam_update' exam.pk %}">(Edit)</a></li>
+            {% endfor %}
+        </ul>
+        <a href="{% url 'physics:exam_list_collection' object.pk %}">View exam list</a>
+    {% endif %}
+
+    {% if object.sbas_exams.all %}
+        <h2>SBAs Exams:</h2>
+        <ul>
+            {% for exam in object.sbas_exams.all %}
+                <li><a href="{% url 'sbas:exam_overview' exam.pk %}">{{ exam }}</a> - <a href="{% url 'sbas:exam_update' exam.pk %}">(Edit)</a></li>
+            {% endfor %}
+        </ul>
+        <a href="{% url 'sbas:exam_list_collection' object.pk %}">View exam list</a>
+    {% endif %}
 
 
 
diff --git a/generic/views.py b/generic/views.py
index 96ebdff7..71318134 100644
--- a/generic/views.py
+++ b/generic/views.py
@@ -2265,9 +2265,9 @@ class ExamViews(View, LoginRequiredMixin):
             case _:
                 max_score = len(questions)
 
-        cid_user_exam = exam.cid_user_exam.filter(user_user=user).first()
-        print(user)
-        print(f"{cid_user_exam=}")
+        #cid_user_exam = exam.cid_user_exam.filter(user_user=user).first()
+        #print(user)
+        #print(f"{cid_user_exam=}")
 
         template_context = {
             "exam": exam,
@@ -2281,7 +2281,7 @@ class ExamViews(View, LoginRequiredMixin):
             "answers_and_marks": answers_and_marks,
             "view_all_results": view_all_results,
             "supervisor": supervisor,
-            "cid_user_exam": cid_user_exam,
+            #"cid_user_exam": cid_user_exam,
         }
 
         if self.normalise_score is not None: