From 8b3b3328fb6b447d49fa3b359408e0ea38427bc7 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Sat, 25 Sep 2021 18:51:00 +0100
Subject: [PATCH] .

---
 anatomy/templates/anatomy/cid_scores.html | 13 -------------
 rad/views.py                              | 15 ++++++++++-----
 2 files changed, 10 insertions(+), 18 deletions(-)
 delete mode 100644 anatomy/templates/anatomy/cid_scores.html

diff --git a/anatomy/templates/anatomy/cid_scores.html b/anatomy/templates/anatomy/cid_scores.html
deleted file mode 100644
index fcde81bf..00000000
--- a/anatomy/templates/anatomy/cid_scores.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{% extends 'anatomy/base.html' %}
-
-{% block content %}
-<div class="anatomy">
-    <h2>CID: {{ cid }}</h2>
-    The following exams have been found (click to view answers and scores):
-    <ul>
-    {% for exam in exams %}
-    <li><a href="{% url 'anatomy:exam_scores_cid_user' pk=exam.pk sk=cid %}">{{exam.name}}</a></li>
-    {% endfor %}
-    </ul>
-</div>
-{% endblock %}
diff --git a/rad/views.py b/rad/views.py
index fe26ef79..8820f0a9 100644
--- a/rad/views.py
+++ b/rad/views.py
@@ -97,20 +97,25 @@ def cid_scores(request, pk):
     ):
         raise Http404("cid not found")
 
+    kwargs = {"publish_results": True}
+
+    if request.user.groups.filter(name="view_all_results").exists():
+        kwargs = {}
+    
     physics_exam_ids = physics_answers.values_list("exam").distinct()
-    physics_exams = PhysicsExam.objects.filter(id__in=physics_exam_ids, publish_results=True)
+    physics_exams = PhysicsExam.objects.filter(id__in=physics_exam_ids, **kwargs)
 
     anatomy_exam_ids = anatomy_answers.values_list("exam").distinct()
-    anatomy_exams = AnatomyExam.objects.filter(id__in=anatomy_exam_ids, publish_results=True)
+    anatomy_exams = AnatomyExam.objects.filter(id__in=anatomy_exam_ids, **kwargs)
 
     rapids_exam_ids = rapids_answers.values_list("exam").distinct()
-    rapids_exams = RapidsExam.objects.filter(id__in=rapids_exam_ids, publish_results=True)
+    rapids_exams = RapidsExam.objects.filter(id__in=rapids_exam_ids, **kwargs)
 
     longs_exam_ids = longs_answers.values_list("exam").distinct()
-    longs_exams = LongsExam.objects.filter(id__in=longs_exam_ids, publish_results=True)
+    longs_exams = LongsExam.objects.filter(id__in=longs_exam_ids, **kwargs)
 
     sbas_exam_ids = sbas_answers.values_list("exam").distinct()
-    sbas_exams = SbasExam.objects.filter(id__in=sbas_exam_ids, publish_results=True)
+    sbas_exams = SbasExam.objects.filter(id__in=sbas_exam_ids, **kwargs)
 
     return render(
         request,