From cf564d20837fbbe98c1d00965c220ec1ad450ecd Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Mon, 9 Aug 2021 11:45:19 +0000
Subject: [PATCH] .

---
 rad/views.py              | 10 +++++-----
 templates/cid_scores.html | 13 ++++++++++++-
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/rad/views.py b/rad/views.py
index c44de599..44f6032b 100644
--- a/rad/views.py
+++ b/rad/views.py
@@ -91,19 +91,19 @@ def cid_scores(request, pk):
         raise Http404("cid not found")
 
     physics_exam_ids = physics_answers.values_list("exam").distinct()
-    physics_exams = PhysicsExam.objects.filter(id__in=physics_exam_ids)
+    physics_exams = PhysicsExam.objects.filter(id__in=physics_exam_ids, publish_results=True)
 
     anatomy_exam_ids = anatomy_answers.values_list("exam").distinct()
-    anatomy_exams = AnatomyExam.objects.filter(id__in=anatomy_exam_ids)
+    anatomy_exams = AnatomyExam.objects.filter(id__in=anatomy_exam_ids, publish_results=True)
 
     rapids_exam_ids = rapids_answers.values_list("exam").distinct()
-    rapids_exams = RapidsExam.objects.filter(id__in=rapids_exam_ids)
+    rapids_exams = RapidsExam.objects.filter(id__in=rapids_exam_ids, publish_results=True)
 
     longs_exam_ids = longs_answers.values_list("exam").distinct()
-    longs_exams = LongsExam.objects.filter(id__in=longs_exam_ids)
+    longs_exams = LongsExam.objects.filter(id__in=longs_exam_ids, publish_results=True)
 
     sbas_exam_ids = sbas_answers.values_list("exam").distinct()
-    sbas_exams = LongsExam.objects.filter(id__in=sbas_exam_ids)
+    sbas_exams = SbasExam.objects.filter(id__in=sbas_exam_ids, publish_results=True)
 
     return render(
         request,
diff --git a/templates/cid_scores.html b/templates/cid_scores.html
index 5b8dba1b..3b9af238 100644
--- a/templates/cid_scores.html
+++ b/templates/cid_scores.html
@@ -4,35 +4,46 @@
 <div class="">
     <h2>CID: {{ cid }}</h2>
     The following exams have been found (click to view answers and scores):
+    {% if physics_exams %}
     <h3>Physics</h3>
     <ul>
     {% for exam in physics_exams %}
     <li><a href="{% url 'physics:exam_scores_cid_user' pk=exam.pk sk=cid %}">{{exam.name}}</a></li>
     {% endfor %}
     </ul>
+    {% endif %}
+    {% if anatomy_exams %}
     <h3>Anatomy</h3>
     <ul>
     {% for exam in anatomy_exams %}
     <li><a href="{% url 'anatomy:exam_scores_cid_user' pk=exam.pk sk=cid %}">{{exam.name}}</a></li>
     {% endfor %}
     </ul>
+    {% endif %}
+    {% if rapids_exams %}
     <h3>Rapids</h3>
     <ul>
     {% for exam in rapids_exams %}
     <li><a href="{% url 'rapids:exam_scores_cid_user' pk=exam.pk sk=cid %}">{{exam.name}}</a></li>
     {% endfor %}
     </ul>
+    {% endif %}
+    {% if longs_exams %}
     <h3>Longs</h3>
     <ul>
     {% for exam in longs_exams %}
     <li><a href="{% url 'longs:exam_scores_cid_user' pk=exam.pk sk=cid %}">{{exam.name}}</a></li>
     {% endfor %}
     </ul>
+    {% endif %}
+    {% if sbas_exams %}
     <h3>SBAs</h3>
     <ul>
     {% for exam in sbas_exams %}
     <li><a href="{% url 'sbas:exam_scores_cid_user' pk=exam.pk sk=cid %}">{{exam.name}}</a></li>
     {% endfor %}
-    </ul>
+    </
+    {% endif %}
+l>
 </div>
 {% endblock %}