This commit is contained in:
Ross
2021-01-28 09:35:54 +00:00
parent e5d74d59d5
commit 5e77160bbf
4 changed files with 38 additions and 7 deletions
+6 -3
View File
@@ -537,9 +537,8 @@ def exam_toggle_active(request, pk):
return JsonResponse(data, status=400) return JsonResponse(data, status=400)
def active_exams(request): def active_exams(request, json=True):
exams = Exam.objects.all() exams = Exam.objects.all()
print(exams)
active_exams = {"exams": []} active_exams = {"exams": []}
@@ -549,8 +548,12 @@ def active_exams(request):
{ {
"name": exam.get_exam_name(), "name": exam.get_exam_name(),
"url": request.build_absolute_uri(exam.get_json_url()), "url": request.build_absolute_uri(exam.get_json_url()),
"type": "anatomy",
} }
) )
if json == False:
return active_exams["exams"]
return JsonResponse(active_exams) return JsonResponse(active_exams)
@@ -586,7 +589,7 @@ def exam_json(request, pk):
} }
exam_json = { exam_json = {
"eid": exam.id, "eid": "anatomy/{}".format(exam.id),
"cached": False, "cached": False,
"exam_type": "anatomy", "exam_type": "anatomy",
"exam_name": exam.name, "exam_name": exam.name,
+3
View File
@@ -33,6 +33,9 @@ urlpatterns = [
path("", TemplateView.as_view(template_name="index.html"), name="home"), path("", TemplateView.as_view(template_name="index.html"), name="home"),
path("cid/<int:pk>", views.cid_scores, name="cid_scores"), 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"),
# Global url that registers RTS compatible exams
path("exam/json/", views.active_exams, name="active_exams"),
path("exam/submit", views.exam_submit, name="global_exam_answers_submit"),
] ]
+23 -1
View File
@@ -27,6 +27,9 @@ from physics.models import Exam as PhysicsExam
from anatomy.models import CidUserAnswer as AnatomyCidUserAnswer from anatomy.models import CidUserAnswer as AnatomyCidUserAnswer
from anatomy.models import Exam as AnatomyExam from anatomy.models import Exam as AnatomyExam
from anatomy.views import active_exams as active_anatomy_exams
from rapids.views import active_exams as active_rapid_exams
@login_required @login_required
@@ -73,4 +76,23 @@ def cid_scores(request, pk):
"anatomy_exams": anatomy_exams, "anatomy_exams": anatomy_exams,
"cid": cid, "cid": cid,
}, },
) )
def active_exams(request):
anatomy_exams = active_anatomy_exams(request, False)
rapid_exams = active_rapid_exams(request, False)
exams = []
exams.extend(anatomy_exams)
exams.extend(rapid_exams)
active_exams = {"exams": exams}
return JsonResponse(active_exams)
@csrf_exempt
def exam_submit(request):
# postExamAnswers
pass
+6 -3
View File
@@ -777,9 +777,8 @@ def exam_toggle_active(request, pk):
return JsonResponse(data, status=400) return JsonResponse(data, status=400)
def active_exams(request): def active_exams(request, json=True):
exams = Exam.objects.all() exams = Exam.objects.all()
print(exams)
active_exams = {"exams": []} active_exams = {"exams": []}
@@ -789,8 +788,12 @@ def active_exams(request):
{ {
"name": exam.get_exam_name(), "name": exam.get_exam_name(),
"url": request.build_absolute_uri(exam.get_json_url()), "url": request.build_absolute_uri(exam.get_json_url()),
"type": "rapid",
} }
) )
if json == False:
return active_exams["exams"]
return JsonResponse(active_exams) return JsonResponse(active_exams)
@@ -842,7 +845,7 @@ def exam_json(request, pk):
exam_json = { exam_json = {
"eid": exam.id, "eid": "rapid/{}".format(exam.id),
"cached": False, "cached": False,
"exam_type": "rapid", "exam_type": "rapid",
"exam_name": exam.name, "exam_name": exam.name,