This commit is contained in:
Ross
2021-07-29 20:01:18 +01:00
parent de65851f25
commit 8f307684eb
3 changed files with 14 additions and 1 deletions
-1
View File
@@ -36,7 +36,6 @@ urlpatterns = [
path("exam/json/", views.AnatomyExamViews.active_exams, name="active_exams"), path("exam/json/", views.AnatomyExamViews.active_exams, name="active_exams"),
path("exam/json/<int:pk>", views.AnatomyExamViews.exam_json, name="exam_json"), path("exam/json/<int:pk>", views.AnatomyExamViews.exam_json, name="exam_json"),
path("exam/json/<int:pk>/recreate", views.AnatomyExamViews.exam_json_recreate, name="exam_json_recreate"), path("exam/json/<int:pk>/recreate", views.AnatomyExamViews.exam_json_recreate, name="exam_json_recreate"),
#path("cid/<int:pk>", views.cid_scores, name="cid_scores"),
#path("cid/", views.cid_selector, name="cid_selector"), #path("cid/", views.cid_selector, name="cid_selector"),
path("ajax/exam/flag/", views.flag_question, name="flag_question"), path("ajax/exam/flag/", views.flag_question, name="flag_question"),
path("body_part/create/", views.create_body_part, name="create_body_part"), path("body_part/create/", views.create_body_part, name="create_body_part"),
+8
View File
@@ -40,6 +40,9 @@ from rapids.models import Answer as RapidAnswer
from longs.models import CidUserAnswer as LongsCidUserAnswer from longs.models import CidUserAnswer as LongsCidUserAnswer
from longs.models import Exam as LongsExam 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 anatomy.views import AnatomyExamViews
from rapids.views import RapidExamViews from rapids.views import RapidExamViews
from longs.views import LongExamViews from longs.views import LongExamViews
@@ -77,6 +80,7 @@ def cid_scores(request, pk):
anatomy_answers = AnatomyCidUserAnswer.objects.filter(cid=cid) anatomy_answers = AnatomyCidUserAnswer.objects.filter(cid=cid)
rapids_answers = RapidsCidUserAnswer.objects.filter(cid=cid) rapids_answers = RapidsCidUserAnswer.objects.filter(cid=cid)
longs_answers = LongsCidUserAnswer.objects.filter(cid=cid) longs_answers = LongsCidUserAnswer.objects.filter(cid=cid)
sbas_answers = SbasCidUserAnswer.objects.filter(cid=cid)
if ( if (
not physics_answers not physics_answers
@@ -98,6 +102,9 @@ def cid_scores(request, pk):
longs_exam_ids = longs_answers.values_list("exam").distinct() 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)
sbas_exam_ids = sbas_answers.values_list("exam").distinct()
sbas_exams = LongsExam.objects.filter(id__in=sbas_exam_ids)
return render( return render(
request, request,
"cid_scores.html", "cid_scores.html",
@@ -106,6 +113,7 @@ def cid_scores(request, pk):
"anatomy_exams": anatomy_exams, "anatomy_exams": anatomy_exams,
"rapids_exams": rapids_exams, "rapids_exams": rapids_exams,
"longs_exams": longs_exams, "longs_exams": longs_exams,
"sbas_exams": sbas_exams,
"cid": cid, "cid": cid,
}, },
) )
+6
View File
@@ -28,5 +28,11 @@
<li><a href="{% url 'longs:exam_scores_cid_user' pk=exam.pk sk=cid %}">{{exam.name}}</a></li> <li><a href="{% url 'longs:exam_scores_cid_user' pk=exam.pk sk=cid %}">{{exam.name}}</a></li>
{% endfor %} {% endfor %}
</ul> </ul>
<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>
</div> </div>
{% endblock %} {% endblock %}