From 9d961501ec876fdc625304e73210935cc21ac8ec Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Thu, 21 Apr 2022 15:58:50 +0100
Subject: [PATCH] .

---
 generic/templates/generic/exam_cids_edit.html | 26 +++++++++++++++++++
 generic/views.py                              | 12 ++++-----
 templates/exam_cids_edit.html                 | 12 +++++++++
 3 files changed, 44 insertions(+), 6 deletions(-)
 create mode 100644 generic/templates/generic/exam_cids_edit.html
 create mode 100644 templates/exam_cids_edit.html

diff --git a/generic/templates/generic/exam_cids_edit.html b/generic/templates/generic/exam_cids_edit.html
new file mode 100644
index 00000000..5834f206
--- /dev/null
+++ b/generic/templates/generic/exam_cids_edit.html
@@ -0,0 +1,26 @@
+
+        
+        <h3>Current</h3>
+        <ol>
+        {% for cid in current_cid_users %}
+        
+            <li><a href="{% url 'generic:update_cid' cid.pk %}">{{cid.cid}}</a> [{{cid.passcode}}] {{cid.name}} / 
+                Email: {{cid.email}} 
+            </li>
+            
+        {% endfor %}
+        </ol>
+        <h3>Available</h3>
+        <ol>
+        {% for cid in current_cid_users %}
+        
+            <li><a href="{% url 'generic:update_cid' cid.pk %}">{{cid.cid}}</a> [{{cid.passcode}}] {{cid.name}} / 
+                Email: {{cid.email}} 
+            </li>
+            
+        {% endfor %}
+        </ol>
+            
+
+    
+        <a href="{% url 'generic:manage_cids' %}">Manage CIDs here</a>
\ No newline at end of file
diff --git a/generic/views.py b/generic/views.py
index 02fd259d..d8cedf50 100644
--- a/generic/views.py
+++ b/generic/views.py
@@ -625,21 +625,21 @@ class ExamViews(View, LoginRequiredMixin):
             if not self.check_user_access(request.user, exam_id):
                 raise PermissionDenied
 
-        cid_users = exam.valid_users.all()
+        current_cid_users = exam.valid_users.all()
 
         exam_groups = exam.cid_user_groups.all()
 
-        available_cid_users = CidUser.objects.filter(group__in=exam_groups)
+        available_cid_users = CidUser.objects.filter(group__in=exam_groups).difference(current_cid_users)
 
-        cid_user_count = cid_users.count()
 
         return render(
             request,
-            "exam_cids.html",
+            "exam_cids_edit.html",
             {
                 "exam": exam,
-                "cid_users": available_cid_users,
-                "cid_user_count": cid_user_count,
+                "groups": exam_groups,
+                "current_cid_users": current_cid_users,
+                "available_cid_users": available_cid_users,
                 "app_name": self.app_name,
             },
         )
diff --git a/templates/exam_cids_edit.html b/templates/exam_cids_edit.html
new file mode 100644
index 00000000..1e643cf5
--- /dev/null
+++ b/templates/exam_cids_edit.html
@@ -0,0 +1,12 @@
+{% extends app_name|add:'/exams.html' %}
+
+{% block content %}
+
+    {% load thumbnail %}
+    <div class="{{app_name}}">
+        <h1>Exam: {{ exam.name }}</h1>
+
+{% include "generic/exam_cids.html" %}
+
+    </div>
+{% endblock %}