From 61c5ee7019fc465fde27bfdfcb87bac7d828b04d Mon Sep 17 00:00:00 2001 From: Ross Date: Mon, 1 Feb 2021 12:46:17 +0000 Subject: [PATCH] . --- rad/views.py | 9 +++++++++ templates/cid_scores.html | 6 ++++++ 2 files changed, 15 insertions(+) diff --git a/rad/views.py b/rad/views.py index 8a817f90..f8afe07e 100644 --- a/rad/views.py +++ b/rad/views.py @@ -27,6 +27,9 @@ from physics.models import Exam as PhysicsExam from anatomy.models import CidUserAnswer as AnatomyCidUserAnswer from anatomy.models import Exam as AnatomyExam +from rapids.models import CidUserAnswer as RapidsCidUserAnswer +from rapids.models import Exam as RapidsExam + from anatomy.views import active_exams as active_anatomy_exams, postExamAnswers as postAnatomyExamAnswers from rapids.views import active_exams as active_rapid_exams, postExamAnswers as postRapidExamAnswers @@ -56,6 +59,8 @@ def cid_scores(request, pk): cid=cid) anatomy_answers = AnatomyCidUserAnswer.objects.filter( cid=cid) + rapids_answers = RapidsCidUserAnswer.objects.filter( + cid=cid) if not physics_answers and not anatomy_answers: @@ -67,6 +72,9 @@ def cid_scores(request, pk): anatomy_exam_ids = anatomy_answers.values_list("exam").distinct() anatomy_exams = AnatomyExam.objects.filter(id__in=anatomy_exam_ids) + rapids_exam_ids = rapids_answers.values_list("exam").distinct() + rapids_exams = RapidsExam.objects.filter(id__in=rapids_exam_ids) + return render( request, @@ -74,6 +82,7 @@ def cid_scores(request, pk): { "physics_exams": physics_exams, "anatomy_exams": anatomy_exams, + "rapids_exams": rapids_exams, "cid": cid, }, ) diff --git a/templates/cid_scores.html b/templates/cid_scores.html index bd4955d3..7a61a2de 100644 --- a/templates/cid_scores.html +++ b/templates/cid_scores.html @@ -16,5 +16,11 @@
  • {{exam.name}}
  • {% endfor %} +

    Rapids

    + {% endblock %}