This commit is contained in:
Ross
2022-08-04 10:01:46 +01:00
parent a2759908c4
commit 2930ff5ec1
2 changed files with 4 additions and 21 deletions
+1 -1
View File
@@ -90,7 +90,7 @@ urlpatterns = [
), ),
path( path(
"exam/json/unbased/<int:cid>/<str:passcode>", "exam/json/unbased/<int:cid>/<str:passcode>",
views.active_exams, views.active_exams_unbased,
name="active_exams_cid_unbased", name="active_exams_cid_unbased",
), ),
path("exam/json/unbased", views.active_exams_unbased, name="active_exams_unbased"), path("exam/json/unbased", views.active_exams_unbased, name="active_exams_unbased"),
+3 -20
View File
@@ -239,7 +239,7 @@ def cid_scores(request, pk, passcode):
) )
def active_exams(request, cid=None, passcode=None): def active_exams(request, cid=None, passcode=None, based=True):
active_exams = {} active_exams = {}
if cid is not None: if cid is not None:
@@ -272,25 +272,8 @@ def active_exams(request, cid=None, passcode=None):
return JsonResponse(active_exams) return JsonResponse(active_exams)
def active_exams_unbased(request): def active_exams_unbased(request, cid=None, passcode=None):
anatomy_exams = AnatomyExamViews.active_exams(request, False, False) return active_exams(request, cid, passcode, based=False)
rapid_exams = RapidsExamsViews.active_exams(request, False, False)
long_exams = LongsExamViews.active_exams(request, False, False)
exams = []
exams.extend(anatomy_exams)
exams.extend(rapid_exams)
exams.extend(long_exams)
active_exams = {"exams": exams}
if request.user:
active_exams["user"] = request.user.username
active_exams["user_id"] = request.user.pk
else:
active_exams["user"] = False
return JsonResponse(active_exams)
@csrf_exempt @csrf_exempt