From e3ea5e9a6f0e6b27df5e0aca2423e740642e32d7 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Sun, 19 Dec 2021 23:11:11 +0000
Subject: [PATCH] .

---
 generic/views.py         | 36 +++++++++++++++++++++---------------
 templates/exam_list.html |  9 +++++++--
 2 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/generic/views.py b/generic/views.py
index 9daa5bae..c1a7b146 100644
--- a/generic/views.py
+++ b/generic/views.py
@@ -415,7 +415,9 @@ class ExamViews(View, LoginRequiredMixin):
             raise PermissionDenied
 
         return render(
-            request, "exam_list.html".format(self.app_name), {"exams": exams, "app_name": self.app_name}
+            request,
+            "exam_list.html".format(self.app_name),
+            {"exams": exams, "app_name": self.app_name, "view_all": all},
         )
 
     @method_decorator(login_required)
@@ -450,10 +452,12 @@ class ExamViews(View, LoginRequiredMixin):
                 .all()
                 .prefetch_related(
                     Prefetch(
-                       "answers",
-                       queryset=self.Answer.objects.filter(proposed=False, status=self.Answer.MarkOptions.CORRECT),
-                       to_attr="prefetched_primary_answer"
-                       #queryset=self.Answer.objects.filter(),
+                        "answers",
+                        queryset=self.Answer.objects.filter(
+                            proposed=False, status=self.Answer.MarkOptions.CORRECT
+                        ),
+                        to_attr="prefetched_primary_answer"
+                        # queryset=self.Answer.objects.filter(),
                     ),
                 )
             )
@@ -635,19 +639,21 @@ class ExamViews(View, LoginRequiredMixin):
                 )
                 .all()
                 .prefetch_related(
-                    #"cid_user_answers",
+                    # "cid_user_answers",
                     Prefetch(
-                       "answers",
-                       queryset=self.Answer.objects.filter(proposed=False, status=self.Answer.MarkOptions.CORRECT),
-                       to_attr="prefetched_primary_answer"
-                       #queryset=self.Answer.objects.filter(),
+                        "answers",
+                        queryset=self.Answer.objects.filter(
+                            proposed=False, status=self.Answer.MarkOptions.CORRECT
+                        ),
+                        to_attr="prefetched_primary_answer"
+                        # queryset=self.Answer.objects.filter(),
                     ),
-                    #Prefetch(
+                    # Prefetch(
                     #   "cid_user_answers",
                     #   queryset=self.CidUserAnswer.objects.filter(score=self.Answer.MarkOptions.UNMARKED, exam__id=pk),
                     #   to_attr="prefetched_unmarked_cid_answers"
                     #   #queryset=self.Answer.objects.filter(),
-                    #),
+                    # ),
                 )
             )
         else:
@@ -936,7 +942,7 @@ class ExamViews(View, LoginRequiredMixin):
         user_answers_marks = defaultdict(list)
         user_answers = defaultdict(list)
         user_names = {}
-        #cid_passcodes = {}
+        # cid_passcodes = {}
 
         by_question = defaultdict(dict)
         unmarked = set()
@@ -954,7 +960,7 @@ class ExamViews(View, LoginRequiredMixin):
         for cid_user_answer in cid_user_answers:
             # Convoluted (probably...)
             cid = cid_user_answer.cid
-            #cid_passcodes[cid] = cid_user_answer.passcode
+            # cid_passcodes[cid] = cid_user_answer.passcode
             cids.add(cid)
             s = cid_user_answer
             user_names[cid] = cid
@@ -1055,7 +1061,7 @@ class ExamViews(View, LoginRequiredMixin):
             f"{self.app_name}/exam_scores_new.html",
             {
                 "cids": sorted(cids),
-                #"cid_passcodes": cid_passcodes,
+                # "cid_passcodes": cid_passcodes,
                 "exam": exam,
                 "unmarked": unmarked,
                 "questions": questions,
diff --git a/templates/exam_list.html b/templates/exam_list.html
index 658ce3e3..cbcc9d9e 100644
--- a/templates/exam_list.html
+++ b/templates/exam_list.html
@@ -8,7 +8,7 @@
             {% for exam in exams %}
                 {% if exam.active %}
                     <li>
-                        <a href="{% url app_name|add:'exam_overview' pk=exam.pk %}" class="flex-col">{{exam.name}}</a> <a href="{% url app_name|add:'mark_overview' pk=exam.pk %}" class="flex-col">Mark</a><a href="{% url app_name|add:'exam_scores_cid' pk=exam.pk %}" class="flex-col">Scores</a> <span class="flex-col icon-container"><span class="published-icon {% if exam.publish_results %}published{% endif %}">Results Published</span></span>
+                        <a href="{% url app_name|add:':exam_overview' pk=exam.pk %}" class="flex-col">{{exam.name}}</a> <a href="{% url app_name|add:':mark_overview' pk=exam.pk %}" class="flex-col">Mark</a><a href="{% url app_name|add:':exam_scores_cid' pk=exam.pk %}" class="flex-col">Scores</a> <span class="flex-col icon-container"><span class="published-icon {% if exam.publish_results %}published{% endif %}">Results Published</span></span>
                     </li>
                 {% endif %}
             {% endfor %}
@@ -19,12 +19,17 @@
             {% for exam in exams %}
                 {% if not exam.active %}
                     <li>
-                        <a href="{% url app_name|add:'exam_overview' pk=exam.pk %}" class="flex-col">{{exam.name}}</a> <a href="{% url app_name|add:'mark_overview' pk=exam.pk %}" class="flex-col">Mark</a><a href="{% url app_name|add:'exam_scores_cid' pk=exam.pk %}" class="flex-col">Scores</a> <span class="flex-col icon-container"><span class="published-icon {% if exam.publish_results %}published{% endif %}">Results Published</span></span>
+                        <a href="{% url app_name|add:':exam_overview' pk=exam.pk %}" class="flex-col">{{exam.name}}</a> <a href="{% url app_name|add:':mark_overview' pk=exam.pk %}" class="flex-col">Mark</a><a href="{% url app_name|add:':exam_scores_cid' pk=exam.pk %}" class="flex-col">Scores</a> <span class="flex-col icon-container"><span class="published-icon {% if exam.publish_results %}published{% endif %}">Results Published</span></span>
                     </li>
                 {% endif %}
             {% endfor %}
         </ul>
 
 
+        {% if view_all %}
+            <a href="{% url app_name|add:':exam_list' %}">Hide archived</a>
+        {% else %}
+            <a href="{% url app_name|add:':exam_list_all' %}">View all</a>
+        {% endif %}
     </div>
 {% endblock %}