From d3a98982eb41e7b7c41bd7de9cee72a23f70cfcc Mon Sep 17 00:00:00 2001 From: Ross Date: Sun, 12 Dec 2021 14:07:21 +0000 Subject: [PATCH] . --- generic/views.py | 1 + rad/views.py | 11 +++++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/generic/views.py b/generic/views.py index 9748da8c..bf56eb9b 100644 --- a/generic/views.py +++ b/generic/views.py @@ -624,6 +624,7 @@ class ExamViews(View, LoginRequiredMixin): if exam.active or self.check_user_access(request.user, exam.pk): print(exam.name, cid, passcode) if not exam.check_cid_user(cid, passcode): + print(exam.name, "fail") continue if exam.json_creation_time: diff --git a/rad/views.py b/rad/views.py index 43eed50c..2f5fafd4 100644 --- a/rad/views.py +++ b/rad/views.py @@ -139,23 +139,26 @@ def cid_scores(request, pk, passcode): def active_exams(request, cid=None, passcode=None): + active_exams = {} + if cid is not None: + active_exams["cid"] = cid 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 + request, False, cid=cid, passcode=passcode ) - rapid_exams = RapidExamViews.active_exams(request, False, cid=None, passcode=None) - long_exams = LongExamViews.active_exams(request, False, cid=None, passcode=None) + rapid_exams = RapidExamViews.active_exams(request, False, cid=cid, passcode=passcode) + long_exams = LongExamViews.active_exams(request, False, cid=cid, passcode=passcode) exams = [] exams.extend(anatomy_exams) exams.extend(rapid_exams) exams.extend(long_exams) - active_exams = {"exams": exams} + active_exams["exams"] = exams if request.user: active_exams["user"] = request.user.username