This commit is contained in:
Ross
2024-11-04 14:09:33 +00:00
parent d8b07449a4
commit eab6fc9d7e
8 changed files with 35 additions and 10 deletions
+7 -2
View File
@@ -184,6 +184,7 @@ def get_user_exams(user, supervisor_view=False):
if supervisor_view:
kwargs["results_supervisor_visible"] = True
del kwargs["archive"]
exams = []
for exam_type in EXAM_ANSWER_MAP:
@@ -527,7 +528,7 @@ class ExamViews(View, LoginRequiredMixin):
if (exam.open_access and exam.active) or user in exam.get_author_objects():
return True
if exam.cid_user_exam.filter(user_user=user):
if user.is_authenticated and exam.active and exam.cid_user_exam.filter(user_user=user):
return True
if marker and user in exam.markers.all():
@@ -1914,10 +1915,12 @@ class ExamViews(View, LoginRequiredMixin):
user_id = None
else:
user_id = request.user.pk
print(0)
if exam.exam_mode and not exam.check_cid_user(
cid, passcode, request.user, user_id
):
raise Http404("No available exam")
print(1)
# exam_json_cache = cache.get("{}_exam_json_{}".format(self.app_name, pk))
@@ -2116,10 +2119,10 @@ class ExamViews(View, LoginRequiredMixin):
# check for supervisor access
raise Http404("Error accessing exam")
view_all_results = True
else:
if user is None:
raise Exception("user must be defined")
view_all_results = True
if user is not None:
request.user = user
@@ -3853,6 +3856,8 @@ def supervisor_trainee(request, pk, trainee_id):
exams = get_user_exams(trainee, supervisor_view=True)
print(exams)
print(trainee)
return render(