.
This commit is contained in:
@@ -6,6 +6,12 @@
|
|||||||
href="{% url 'rapids:rapid_update' question.id %}" title="Edit the Question">Edit</a> <a
|
href="{% url 'rapids:rapid_update' question.id %}" title="Edit the Question">Edit</a> <a
|
||||||
href="{% url 'admin:rapids_rapid_change' question.id %}" title="Edit the Question using the admin interface">Admin
|
href="{% url 'admin:rapids_rapid_change' question.id %}" title="Edit the Question using the admin interface">Admin
|
||||||
Edit</a>
|
Edit</a>
|
||||||
|
{% if unmarked_answers_bool %}
|
||||||
|
<div class="alert alert-warning" role="alert">
|
||||||
|
This questions has unmarked answers. Are you sure you want to review?
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{% endif %}
|
||||||
{% if question.normal %}
|
{% if question.normal %}
|
||||||
<h3>This question is normal</h3>
|
<h3>This question is normal</h3>
|
||||||
Answers will be automatically marked.<br />
|
Answers will be automatically marked.<br />
|
||||||
|
|||||||
@@ -667,6 +667,7 @@ def mark(request, exam_pk, sk, unmarked_exam_answers_only=True, review=False):
|
|||||||
half_mark_answers = []
|
half_mark_answers = []
|
||||||
incorrect_answers = []
|
incorrect_answers = []
|
||||||
review_user_answers = []
|
review_user_answers = []
|
||||||
|
unmarked_answers_bool = False
|
||||||
# this could be improved
|
# this could be improved
|
||||||
if question.normal:
|
if question.normal:
|
||||||
incorrect_answers = question.get_user_answers()
|
incorrect_answers = question.get_user_answers()
|
||||||
@@ -700,6 +701,8 @@ def mark(request, exam_pk, sk, unmarked_exam_answers_only=True, review=False):
|
|||||||
mark = "half-correct"
|
mark = "half-correct"
|
||||||
elif marked_ans.status == Answer.MarkOptions.INCORRECT:
|
elif marked_ans.status == Answer.MarkOptions.INCORRECT:
|
||||||
mark = "incorrect"
|
mark = "incorrect"
|
||||||
|
else:
|
||||||
|
unmarked_answers_bool = True
|
||||||
review_user_answers.append((ans, mark))
|
review_user_answers.append((ans, mark))
|
||||||
|
|
||||||
|
|
||||||
@@ -713,6 +716,7 @@ def mark(request, exam_pk, sk, unmarked_exam_answers_only=True, review=False):
|
|||||||
"question": question,
|
"question": question,
|
||||||
"question_number": n,
|
"question_number": n,
|
||||||
"question_details": question_details,
|
"question_details": question_details,
|
||||||
|
"unmarked_answers_bool": unmarked_answers_bool,
|
||||||
"user_answers": unmarked_user_answers,
|
"user_answers": unmarked_user_answers,
|
||||||
"review_user_answers": review_user_answers,
|
"review_user_answers": review_user_answers,
|
||||||
"correct_answers": correct_answers,
|
"correct_answers": correct_answers,
|
||||||
|
|||||||
Reference in New Issue
Block a user