From 12144e06d1ee892200776c640bf340afd9d5199b Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Mon, 16 Dec 2024 17:57:53 +0000
Subject: [PATCH] improve exam collections

---
 generic/forms.py                                     | 5 +++++
 generic/templates/generic/examcollection_detail.html | 4 +++-
 templates/exam_list.html                             | 8 +++++++-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/generic/forms.py b/generic/forms.py
index 7106109a..35399f47 100755
--- a/generic/forms.py
+++ b/generic/forms.py
@@ -771,6 +771,11 @@ class ExamCollectionForm(ModelForm):
                 widget=FilteredSelectMultiple(verbose_name=name, is_stacked=False),
             )
 
+        self.fields["author"] = ModelMultipleChoiceField(
+            queryset=User.objects.all(),
+            widget=FilteredSelectMultiple(verbose_name="Authors", is_stacked=False), required=False,
+        )
+
     def save(self, commit=True):
         # Get the unsaved Long instance
         instance = ModelForm.save(self, False)
diff --git a/generic/templates/generic/examcollection_detail.html b/generic/templates/generic/examcollection_detail.html
index 0de7938e..da86a567 100755
--- a/generic/templates/generic/examcollection_detail.html
+++ b/generic/templates/generic/examcollection_detail.html
@@ -10,7 +10,9 @@
         <a href="{% url 'generic:examcollection_delete' object.pk %}">Delete</a>
     </p>
 
-    This collection contains the following exams
+    <div>Authors: {{ object.get_authors }}</div>
+
+    <p>This collection contains the following exams<p>
 
 
 
diff --git a/templates/exam_list.html b/templates/exam_list.html
index c8052aba..e9775973 100644
--- a/templates/exam_list.html
+++ b/templates/exam_list.html
@@ -51,7 +51,13 @@
             {% for exam in exams %}
                 {% if not exam.active %}
                     <li class="exam-item">
-                        <a href="{% url app_name|add:':exam_overview' pk=exam.pk %}" class="flex-col-2 exam-name">{{exam}}</a>
+                        <span class="flex-col-2">
+                        <a href="{% url app_name|add:':exam_overview' pk=exam.pk %}" class="exam-name">{{exam}}</a>
+                            {% if exam.examcollection %}
+                                <a href='{% url "generic:examcollection_detail" exam.examcollection_id %}' title="Collection"><i class="bi bi-collection"></i></a>
+                            {% endif %}
+                        </span>
+                                
                         {% if marking %}<a href="{% url app_name|add:':mark_overview' pk=exam.pk %}" class="flex-col-half" title="Click to mark exam">Mark</a>{% endif %}
                         <span class="flex-col">
                             <a href="{% url app_name|add:':exam_cids' exam_id=exam.pk %}" title="Click to manage candidates">Candidates</a>