From 2b6d1077b4236616f1b6dd2c1c63f5e5b74a1ccc Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Thu, 21 Apr 2022 17:34:59 +0100
Subject: [PATCH] .

---
 atlas/templates/atlas/collection_headers.html |  2 +-
 atlas/urls.py                                 |  3 ++-
 atlas/views.py                                |  8 ++++++--
 generic/templates/generic/exam_cids_edit.html |  3 ---
 generic/views.py                              | 18 +++++++++++++-----
 5 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/atlas/templates/atlas/collection_headers.html b/atlas/templates/atlas/collection_headers.html
index b903314e..26349bba 100644
--- a/atlas/templates/atlas/collection_headers.html
+++ b/atlas/templates/atlas/collection_headers.html
@@ -3,7 +3,7 @@
     Collection: {{collection.name}}-> <a href="{% url 'atlas:collection_detail' pk=collection.pk %}">Overview</a> /
     <a href="{% url 'atlas:collection_mark_overview' collection.pk %}">Mark</a> /
     <a href="{% url 'atlas:collection_scores_cid' collection.pk %}">Scores</a> /
-    <a href="{% url 'atlas:collection_candidates' collection.pk %}">Candidates</a>
+    <a href="{% url 'atlas:exam_cids' collection.pk %}">Candidates</a>
     <div class="floating-header">
         <a href="{% url 'atlas:collection_update' collection.id %}" title="Edit the Collection">Edit</a>
         \ <a href="{% url 'atlas:collection_delete' collection.id %}" title="Delete the Collection">Delete</a>
diff --git a/atlas/urls.py b/atlas/urls.py
index 4a5b6045..93c43deb 100755
--- a/atlas/urls.py
+++ b/atlas/urls.py
@@ -19,7 +19,8 @@ urlpatterns = [
     path("collection/<int:pk>/update", views.CaseCollectionUpdate.as_view(), name="collection_update"),
     path("collection/<int:pk>", views.collection_detail, name="collection_detail"),
     path("collection/<int:pk>/take", views.collection_take, name="collection_take"),
-    path("collection/<int:pk>/candidates", views.collection_candidates, name="collection_candidates"),
+    path("collection/<int:exam_id>/cids", views.GenericExamViews.exam_cids, name="exam_cids"),
+    path("collection/<int:exam_id>/cids/edit", views.GenericExamViews.exam_cids_edit, name="exam_cids_edit"),
     path("collection/<int:pk>/mark", views.collection_mark_overview, name="collection_mark_overview"),
     path("collection/<int:pk>/mark/<int:case_number>", views.collection_mark_question, name="collection_mark_question"),
     path("collection/<int:pk>/scores", views.collection_scores_cid, name="collection_scores_cid"),
diff --git a/atlas/views.py b/atlas/views.py
index e05529e6..c7592801 100755
--- a/atlas/views.py
+++ b/atlas/views.py
@@ -1165,7 +1165,7 @@ def collection_mark_question(request, pk, case_number):
 
 
 @user_is_collection_author_or_atlas_editor
-def collection_candidates(request, pk):
+def exam_cids(request, pk):
     collection = get_object_or_404(CaseCollection, pk=pk)
 
     if (
@@ -1177,7 +1177,7 @@ def collection_candidates(request, pk):
         cid_user_count = cid_users.count()
         return render(
             request,
-            "atlas/collection_candidates.html",
+            "atlas/exam_cids.html",
             {
                 "collection": collection,
                 "cid_users": cid_users,
@@ -1510,3 +1510,7 @@ def collection_scores_cid(request, pk):
             "plot": fig_html,
         },
     )
+
+GenericExamViews = ExamViews(
+    CaseCollection, Case, None, CidReportAnswer, "casecollection", "case", None
+)
\ No newline at end of file
diff --git a/generic/templates/generic/exam_cids_edit.html b/generic/templates/generic/exam_cids_edit.html
index e1bcea62..93c1547d 100644
--- a/generic/templates/generic/exam_cids_edit.html
+++ b/generic/templates/generic/exam_cids_edit.html
@@ -24,10 +24,7 @@
         <script>
             $(document).ready(() => {
                 $(".toggle-btn").click((el) => {
-                    console.log(el);
-                    console.log(el.target.dataset.pk);
                     parent = $(el.target).parent()
-                    console.log(!parent.hasClass("current"));
                     $.ajax({
                         url: "{% url exam.app_name|add:':exam_json_edit' exam.pk %}",
                         data: {
diff --git a/generic/views.py b/generic/views.py
index f05ce2fa..e2b582a0 100644
--- a/generic/views.py
+++ b/generic/views.py
@@ -328,6 +328,11 @@ class ExamViews(View, LoginRequiredMixin):
             and not user.groups.filter(name="sba_checker").exists()
         ):
             return False
+        if (
+            self.app_name == "casecollection"
+            and not user.groups.filter(name="casecollection_checker").exists()
+        ):
+            return False
         return True
 
     def check_user_edit_access(self, user, exam_id=None):
@@ -370,6 +375,11 @@ class ExamViews(View, LoginRequiredMixin):
             and not user.groups.filter(name="sba_checker").exists()
         ):
             return False
+        if (
+            self.app_name == "casecollection"
+            and not user.groups.filter(name="casecollection_checker").exists()
+        ):
+            return False
         return True
 
     @method_decorator(login_required)
@@ -593,8 +603,8 @@ class ExamViews(View, LoginRequiredMixin):
     def exam_cids(self, request, exam_id):
         exam = get_object_or_404(self.Exam, pk=exam_id)
 
-        if not request.user.groups.filter(name="cid_user_manager").exists():
-            raise PermissionDenied
+        #if not request.user.groups.filter(name="cid_user_manager").exists():
+        #    raise PermissionDenied
 
         if request.user not in exam.author.all():
             if not self.check_user_access(request.user, exam_id):
@@ -678,13 +688,11 @@ class ExamViews(View, LoginRequiredMixin):
                 
                 add = request.POST.get("add") == "true"
 
-                print(user_id)
-                print(request.POST)
-
                 cid_user = CidUser.objects.get(pk=user_id)
 
                 app_exam_map = {}
                 app_exam_map["rapids"] = cid_user.rapid_exams
+                app_exam_map["casecollection"] = cid_user.casecollection_exams
 
                 if add:
                     app_exam_map[self.app_name].add(pk)