From 8f307684eb0c1de90200b8269ed10912101b3248 Mon Sep 17 00:00:00 2001 From: Ross Date: Thu, 29 Jul 2021 20:01:18 +0100 Subject: [PATCH] . --- anatomy/urls.py | 1 - rad/views.py | 8 ++++++++ templates/cid_scores.html | 6 ++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/anatomy/urls.py b/anatomy/urls.py index a9c2c55e..caa184c7 100644 --- a/anatomy/urls.py +++ b/anatomy/urls.py @@ -36,7 +36,6 @@ urlpatterns = [ path("exam/json/", views.AnatomyExamViews.active_exams, name="active_exams"), path("exam/json/", views.AnatomyExamViews.exam_json, name="exam_json"), path("exam/json//recreate", views.AnatomyExamViews.exam_json_recreate, name="exam_json_recreate"), - #path("cid/", views.cid_scores, name="cid_scores"), #path("cid/", views.cid_selector, name="cid_selector"), path("ajax/exam/flag/", views.flag_question, name="flag_question"), path("body_part/create/", views.create_body_part, name="create_body_part"), diff --git a/rad/views.py b/rad/views.py index 2b858214..93949910 100644 --- a/rad/views.py +++ b/rad/views.py @@ -40,6 +40,9 @@ from rapids.models import Answer as RapidAnswer from longs.models import CidUserAnswer as LongsCidUserAnswer from longs.models import Exam as LongsExam +from sbas.models import CidUserAnswer as SbasCidUserAnswer +from sbas.models import Exam as SbasExam + from anatomy.views import AnatomyExamViews from rapids.views import RapidExamViews from longs.views import LongExamViews @@ -77,6 +80,7 @@ def cid_scores(request, pk): anatomy_answers = AnatomyCidUserAnswer.objects.filter(cid=cid) rapids_answers = RapidsCidUserAnswer.objects.filter(cid=cid) longs_answers = LongsCidUserAnswer.objects.filter(cid=cid) + sbas_answers = SbasCidUserAnswer.objects.filter(cid=cid) if ( not physics_answers @@ -98,6 +102,9 @@ def cid_scores(request, pk): longs_exam_ids = longs_answers.values_list("exam").distinct() longs_exams = LongsExam.objects.filter(id__in=longs_exam_ids) + sbas_exam_ids = sbas_answers.values_list("exam").distinct() + sbas_exams = LongsExam.objects.filter(id__in=sbas_exam_ids) + return render( request, "cid_scores.html", @@ -106,6 +113,7 @@ def cid_scores(request, pk): "anatomy_exams": anatomy_exams, "rapids_exams": rapids_exams, "longs_exams": longs_exams, + "sbas_exams": sbas_exams, "cid": cid, }, ) diff --git a/templates/cid_scores.html b/templates/cid_scores.html index e415924e..5b8dba1b 100644 --- a/templates/cid_scores.html +++ b/templates/cid_scores.html @@ -28,5 +28,11 @@
  • {{exam.name}}
  • {% endfor %} +

    SBAs

    +
      + {% for exam in sbas_exams %} +
    • {{exam.name}}
    • + {% endfor %} +
    {% endblock %}