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 11:49:13 +01:00
parent b0c377aac2
commit 61f285ad83
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rapids/views.py
+9 -7
View File
@@ -683,7 +683,7 @@ def mark(request, exam_pk, sk, unmarked_exam_answers_only=True, review=False):
unmarked_user_answers = question.get_unmarked_user_answers() unmarked_user_answers = question.get_unmarked_user_answers()
if review or not unmarked_exam_answers_only: if not unmarked_exam_answers_only:
correct_answers = question.answers.filter(status=Answer.MarkOptions.CORRECT) correct_answers = question.answers.filter(status=Answer.MarkOptions.CORRECT)
half_mark_answers = question.answers.filter(status=Answer.MarkOptions.HALF_MARK) half_mark_answers = question.answers.filter(status=Answer.MarkOptions.HALF_MARK)
incorrect_answers = question.answers.filter(status=Answer.MarkOptions.INCORRECT) incorrect_answers = question.answers.filter(status=Answer.MarkOptions.INCORRECT)
@@ -691,13 +691,15 @@ def mark(request, exam_pk, sk, unmarked_exam_answers_only=True, review=False):
if review: if review:
for ans in unmarked_user_answers: for ans in unmarked_user_answers:
print(ans, half_mark_answers) print(ans, half_mark_answers)
marked_ans = question.answers.filter(answer_compare__iexact=ans).first()
mark = "unmarked" mark = "unmarked"
if ans in correct_answers: if marked_ans is not None:
mark = "correct" if marked_ans.status == Answer.MarkOptions.CORRECT:
elif ans in half_mark_answers: mark = 2
mark = "half-mark" elif marked_ans.status == Answer.MarkOptions.HALF_MARK:
elif ans in incorrect_answers: mark = 1
mark = "incorrect" elif marked_ans.status == Answer.MarkOptions.INCORRECT:
mark = 0
review_user_answers.append((ans, mark)) review_user_answers.append((ans, mark))