This commit is contained in:
Ross
2021-02-01 12:46:17 +00:00
parent 5854601eb8
commit 61c5ee7019
2 changed files with 15 additions and 0 deletions
+9
View File
@@ -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,
},
)
+6
View File
@@ -16,5 +16,11 @@
<li><a href="{% url 'anatomy:exam_scores_cid_user' pk=exam.pk sk=cid %}">{{exam.name}}</a></li>
{% endfor %}
</ul>
<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>
</div>
{% endblock %}