ross/penracourses
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add user_user support to atlas collections

Browse Source
This commit is contained in:
Ross
2023-07-03 13:06:08 +01:00
parent 15b6233802
commit c799f106d7
9 changed files with 160 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sbas/views.py
+3 -11
View File
@@ -202,11 +202,7 @@ def exam_take_overview(request, pk, cid=None, passcode=None):
else:
question_answer_tuples.append((q, None))
if cid is not None:
c = CidUser.objects.filter(cid=cid).first()
cid_user_exam = exam.get_or_create_cid_user_exam(cid_user=c)
else:
cid_user_exam = exam.get_or_create_cid_user_exam(user_user=request.user)
cid_user_exam = exam.get_or_create_cid_user_exam(cid=cid, user_user=request.user)
return render(
request,
@@ -223,7 +219,7 @@ def exam_take_overview(request, pk, cid=None, passcode=None):
)
def exam_take(request, pk: int, sk: int, cid: str = None, passcode: str = None):
def exam_take(request, pk: int, sk: int, cid: int = None, passcode: str = None):
exam = get_object_or_404(Exam, pk=pk)
if not exam.active:
@@ -232,11 +228,7 @@ def exam_take(request, pk: int, sk: int, cid: str = None, passcode: str = None):
if not exam.check_cid_user(cid, passcode, request):
raise Http404("Error accessing exam")
if cid is not None:
c = CidUser.objects.filter(cid=cid).first()
cid_user_exam = exam.get_or_create_cid_user_exam(cid_user=c)
else:
cid_user_exam = exam.get_or_create_cid_user_exam(user_user=request.user)
cid_user_exam = exam.get_or_create_cid_user_exam(cid = cid, user_user=request.user)
question = exam.exam_questions.all()[sk]