This commit is contained in:
Ross
2021-10-16 11:02:42 +01:00
parent d1c1d059a5
commit 7fc9cccf03
4 changed files with 97 additions and 94 deletions
+10 -11
View File
@@ -572,16 +572,23 @@ def loadJsonAnswer(answer):
return True, None
@login_required
def mark_all(request, exam_pk, sk):
return mark(request, exam_pk, sk, unmarked_exam_answers_only=False)
@login_required
def mark_review(request, exam_pk, sk):
return mark(request, exam_pk, sk, unmarked_exam_answers_only=False, review=True)
# @user_passes_test(user_is_admin, login_url="/accounts/login")
@login_required
def mark(request, exam_pk, sk, unmarked_exam_answers_only=True):
def mark(request, exam_pk, sk, unmarked_exam_answers_only=True, review=False):
exam = get_object_or_404(Exam, pk=exam_pk)
mark_url = "rapids:mark"
if not unmarked_exam_answers_only:
if review:
mark_url = "rapids:mark_review"
elif not unmarked_exam_answers_only:
mark_url = "rapids:mark_all"
questions = exam.exam_questions.all()
@@ -603,15 +610,6 @@ def mark(request, exam_pk, sk, unmarked_exam_answers_only=True):
for ans in question.answers.all():
answers_dict[ans.answer_compare] = ans
#marked_answers_set = set(answers_dict.keys())
# correct_answers = [i.answer.lower() for i in question.answers.all()]
# half_correct_answers = [
# i.answer.lower() for i in question.half_mark_answers.all()
# ]
# incorrect_answers = [
# i.answer.lower() for i in question.incorrect_answers.all()
# ]
if unmarked_exam_answers_only:
unmarked_user_answers = question.get_unmarked_user_answers(exam_pk=exam_pk)
@@ -692,6 +690,7 @@ def mark(request, exam_pk, sk, unmarked_exam_answers_only=True):
{
"exam": exam,
"form": form,
"review": review,
"question": question,
"question_number": n,
"question_details": question_details,