diff --git a/generic/views.py b/generic/views.py index 0da6e501..e84a3dc3 100644 --- a/generic/views.py +++ b/generic/views.py @@ -616,6 +616,8 @@ class ExamViews(View, LoginRequiredMixin): if cid is not None: cid_user = CidUser.objects.filter(cid=cid).first() if not cid_user or cid_user.passcode != passcode: + if json == False: + return active_exams["exams"] return JsonResponse({"status": "invalid"}, status=401) for exam in exams: diff --git a/rad/views.py b/rad/views.py index 848a1a1b..43eed50c 100644 --- a/rad/views.py +++ b/rad/views.py @@ -87,7 +87,6 @@ def cid_scores(request, pk, passcode): raise Http404("CID / Passcode combination not found") print(cid_user.passcode) - # questions = exam.exam_questions.all() physics_answers = PhysicsCidUserAnswer.objects.filter(cid=cid) anatomy_answers = AnatomyCidUserAnswer.objects.filter(cid=cid) @@ -140,7 +139,14 @@ def cid_scores(request, pk, passcode): def active_exams(request, cid=None, passcode=None): - anatomy_exams = AnatomyExamViews.active_exams(request, False, cid=None, passcode=None) + if cid is not None: + cid_user = CidUser.objects.filter(cid=cid).first() + if not cid_user or cid_user.passcode != passcode: + return JsonResponse({"status": "invalid"}, status=401) + + anatomy_exams = AnatomyExamViews.active_exams( + request, False, cid=None, passcode=None + ) rapid_exams = RapidExamViews.active_exams(request, False, cid=None, passcode=None) long_exams = LongExamViews.active_exams(request, False, cid=None, passcode=None)