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

.

Browse Source
This commit is contained in:
Ross
2021-10-16 09:43:51 +01:00
parent 08666856dd
commit e9dc37fa7e
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rapids/views.py
+14 -9
View File
@@ -577,8 +577,8 @@ def mark_all(request, pk, sk):
# @user_passes_test(user_is_admin, login_url="/accounts/login") # @user_passes_test(user_is_admin, login_url="/accounts/login")
@login_required @login_required
def mark(request, pk, sk, exam_answers_only=True): def mark(request, exam_pk, sk, exam_answers_only=True):
exam = get_object_or_404(Exam, pk=pk) exam = get_object_or_404(Exam, pk=exam_pk)
questions = exam.exam_questions.all() questions = exam.exam_questions.all()
@@ -610,7 +610,7 @@ def mark(request, pk, sk, exam_answers_only=True):
# ] # ]
if exam_answers_only: if exam_answers_only:
unmarked_user_answers = question.get_unmarked_user_answers(exam_pk=pk) unmarked_user_answers = question.get_unmarked_user_answers(exam_pk=exam_pk)
else: else:
unmarked_user_answers = question.get_unmarked_user_answers() unmarked_user_answers = question.get_unmarked_user_answers()
@@ -623,7 +623,7 @@ def mark(request, pk, sk, exam_answers_only=True):
if form.is_valid(): if form.is_valid():
# If skip button is pressed skip the question without marking # If skip button is pressed skip the question without marking
if "skip" in request.POST: if "skip" in request.POST:
return redirect("rapids:mark", pk=pk, sk=n + 1) return redirect("rapids:mark", pk=exam_pk, sk=n + 1)
cd = form.cleaned_data cd = form.cleaned_data
# correct = cd.get("correct") # correct = cd.get("correct")
@@ -695,18 +695,23 @@ def mark(request, pk, sk, exam_answers_only=True):
# answer.published_date = timezone.now() # answer.published_date = timezone.now()
# answer.save() # answer.save()
if "next" in request.POST: if "next" in request.POST:
return redirect("rapids:mark", pk=pk, sk=n + 1) return redirect("rapids:mark", pk=exam_pk, sk=n + 1)
elif "previous" in request.POST: elif "previous" in request.POST:
return redirect("rapids:mark", pk=pk, sk=n - 1) return redirect("rapids:mark", pk=exam_pk, sk=n - 1)
# Reset user answers (relies on the functional javascript) # Reset user answers (relies on the functional javascript)
unmarked_user_answers = set() unmarked_user_answers = set()
else: else:
form = MarkRapidQuestionForm() form = MarkRapidQuestionForm()
correct_answers = question.answers.filter(status=Answer.MarkOptions.CORRECT) if exam_answers_only:
half_mark_answers = question.answers.filter(status=Answer.MarkOptions.HALF_MARK) correct_answers = question.answers.filter(status=Answer.MarkOptions.CORRECT, exam__id=exam_pk)
incorrect_answers = question.answers.filter(status=Answer.MarkOptions.INCORRECT) half_mark_answers = question.answers.filter(status=Answer.MarkOptions.HALF_MARK, exam__id=exam_pk)
incorrect_answers = question.answers.filter(status=Answer.MarkOptions.INCORRECT, exam__id=exam_pk)
else:
correct_answers = question.answers.filter(status=Answer.MarkOptions.CORRECT)
half_mark_answers = question.answers.filter(status=Answer.MarkOptions.HALF_MARK)
incorrect_answers = question.answers.filter(status=Answer.MarkOptions.INCORRECT)
# this could be improved # this could be improved
if question.normal: if question.normal: