From e3dbdb2615bbe23a78de57c6acef65535f12a811 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Mon, 10 Jan 2022 14:24:04 +0000
Subject: [PATCH] .

---
 generic/templates/generic/base.html | 16 +++++++++-------
 generic/urls.py                     |  1 +
 generic/views.py                    | 21 +++++++++++++++++++--
 3 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/generic/templates/generic/base.html b/generic/templates/generic/base.html
index bdbb5448..2de4720e 100755
--- a/generic/templates/generic/base.html
+++ b/generic/templates/generic/base.html
@@ -1,7 +1,7 @@
 {% extends 'base.html' %}
 
 {% block title %}
-Candidates
+    Candidates
 {% endblock %}
 
 {% block css %}
@@ -15,9 +15,11 @@ Candidates
 {% block content %}
 {% endblock %}
 {% block navigation %}
-Candidates:
-{% if request.user.is_authenticated %}
-<a href="{% url 'generic:manage_cids' %}">Cids</a> /
-<a href="{% url 'generic:group_view' %}">Groups</a> /
-{% endif %}
-{% endblock %}
\ No newline at end of file
+    Candidates:
+    {% if request.user.is_authenticated %}
+        <a href="{% url 'generic:manage_cids' %}">Cids</a> /
+        <a href="{% url 'generic:manage_cid_exams' %}">Cids (exams)</a> /
+        <a href="{% url 'generic:group_view' %}">Groups</a> /
+
+    {% endif %}
+{% endblock %}
diff --git a/generic/urls.py b/generic/urls.py
index 23098670..d785aacb 100755
--- a/generic/urls.py
+++ b/generic/urls.py
@@ -28,6 +28,7 @@ urlpatterns = [
     ),
     path("cids/manage/<int:pk>/update", views.CidUserUpdate.as_view(), name="update_cid"),
     path("cids/manage/", views.CidUserView.as_view(), name="manage_cids"),
+    path("cids/manage/exams", views.CidUserExamView.as_view(), name="manage_cid_exams"),
     path("cids/group/", views.group_view, name="group_view"),
     path("cids/group/<int:pk>/email", views.group_email, name="group_email"),
     path("cids/group/<int:pk>/email_results", views.group_email_results, name="group_email_results"),
diff --git a/generic/views.py b/generic/views.py
index fc1de060..51541cf9 100644
--- a/generic/views.py
+++ b/generic/views.py
@@ -1297,8 +1297,7 @@ class ExaminationAutocomplete(autocomplete.Select2QuerySetView):
 
         return qs
 
-
-class CidUserView(CidManagerRequiredMixin, SingleTableMixin, FilterView):
+class CidUserExamView(CidManagerRequiredMixin, SingleTableMixin, FilterView):
     model = CidUser
     table_class = CidUserTable
     template_name = "generic/cid_view.html"
@@ -1329,6 +1328,24 @@ class CidUserView(CidManagerRequiredMixin, SingleTableMixin, FilterView):
         context["cid_user_groups"] = cid_user_groups
         return context
 
+class CidUserView(CidManagerRequiredMixin, SingleTableMixin, FilterView):
+    model = CidUser
+    table_class = CidUserTable
+    template_name = "generic/cid_view.html"
+
+    filterset_class = CidUserFilter
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        # user = self.request.user
+
+        cid_user_groups = [
+            (i.name, i.pk) for i in CidUserGroup.objects.filter(archive=False)
+        ]
+
+        context["cid_user_groups"] = cid_user_groups
+        return context
+
 
 @login_required
 @user_is_cid_user_manager