.
This commit is contained in:
+7
-4
@@ -707,9 +707,6 @@ def mark_answer(request, exam_id, question_number, cid):
|
|||||||
form = MarkLongQuestionSingleForm(initial={'score': answer.score})
|
form = MarkLongQuestionSingleForm(initial={'score': answer.score})
|
||||||
|
|
||||||
else:
|
else:
|
||||||
mark_object = AnswerMarks.objects.get_or_create(user_answer=answer, marker=request.user)
|
|
||||||
print(mark_object)
|
|
||||||
print(dir(mark_object))
|
|
||||||
if request.method == "POST":
|
if request.method == "POST":
|
||||||
form = MarkLongQuestionDoubleForm(request.POST)
|
form = MarkLongQuestionDoubleForm(request.POST)
|
||||||
|
|
||||||
@@ -720,6 +717,7 @@ def mark_answer(request, exam_id, question_number, cid):
|
|||||||
# return redirect("longs:mark_answer", pk=exam_id, sk=question_number, cid=next_unmarked_id)
|
# return redirect("longs:mark_answer", pk=exam_id, sk=question_number, cid=next_unmarked_id)
|
||||||
|
|
||||||
|
|
||||||
|
mark_object = AnswerMarks.objects.get_or_create(user_answer=answer, marker=request.user)
|
||||||
# Extract score from form and save it to the object
|
# Extract score from form and save it to the object
|
||||||
mark_object.score = form.cleaned_data["score"]
|
mark_object.score = form.cleaned_data["score"]
|
||||||
mark_object.mark_reason = form.cleaned_data["mark_reason"]
|
mark_object.mark_reason = form.cleaned_data["mark_reason"]
|
||||||
@@ -735,7 +733,12 @@ def mark_answer(request, exam_id, question_number, cid):
|
|||||||
# return redirect("longs:mark_question_overview", pk=exam_id, sk=n - 1)
|
# return redirect("longs:mark_question_overview", pk=exam_id, sk=n - 1)
|
||||||
|
|
||||||
else:
|
else:
|
||||||
form = MarkLongQuestionDoubleForm(initial={'score': mark_object.score,'mark_reason': mark_object.mark_reason,'candidate_feedback': mark_object.candidate_feedback, })
|
try:
|
||||||
|
mark_object = AnswerMarks.objects.get(user_answer=answer, marker=request.user)
|
||||||
|
form = MarkLongQuestionDoubleForm(initial={'score': mark_object.score,'mark_reason': mark_object.mark_reason,'candidate_feedback': mark_object.candidate_feedback, })
|
||||||
|
except AnswerMarks.DoesNotExist:
|
||||||
|
form = MarkLongQuestionDoubleForm()
|
||||||
|
|
||||||
|
|
||||||
return render(
|
return render(
|
||||||
request,
|
request,
|
||||||
|
|||||||
Reference in New Issue
Block a user