.
This commit is contained in:
+3
-3
@@ -550,7 +550,7 @@ class CidUserAnswer(models.Model):
|
|||||||
return 0
|
return 0
|
||||||
# If both are normal full marks
|
# If both are normal full marks
|
||||||
elif q.normal and self.normal:
|
elif q.normal and self.normal:
|
||||||
return 2
|
return 1
|
||||||
|
|
||||||
# Then compare answer strings (as per anatomy questions)
|
# Then compare answer strings (as per anatomy questions)
|
||||||
ans = self.answer_compare
|
ans = self.answer_compare
|
||||||
@@ -560,14 +560,14 @@ class CidUserAnswer(models.Model):
|
|||||||
).first()
|
).first()
|
||||||
is not None
|
is not None
|
||||||
):
|
):
|
||||||
mark = 2
|
mark = 1
|
||||||
elif (
|
elif (
|
||||||
q.answers.filter(
|
q.answers.filter(
|
||||||
answer_compare__iexact=ans, status=Answer.MarkOptions.HALF_MARK
|
answer_compare__iexact=ans, status=Answer.MarkOptions.HALF_MARK
|
||||||
).first()
|
).first()
|
||||||
is not None
|
is not None
|
||||||
):
|
):
|
||||||
mark = 1
|
mark = 0.5
|
||||||
elif q.answers.filter(
|
elif q.answers.filter(
|
||||||
answer_compare__iexact=ans, status=Answer.MarkOptions.INCORRECT
|
answer_compare__iexact=ans, status=Answer.MarkOptions.INCORRECT
|
||||||
).first():
|
).first():
|
||||||
|
|||||||
+1
-1
@@ -861,7 +861,7 @@ def exam_scores_cid(request, pk):
|
|||||||
)
|
)
|
||||||
fig_html = fig.to_html()
|
fig_html = fig.to_html()
|
||||||
|
|
||||||
max_score = len(questions) * 2
|
max_score = len(questions)
|
||||||
|
|
||||||
return render(
|
return render(
|
||||||
request,
|
request,
|
||||||
|
|||||||
Reference in New Issue
Block a user