.
This commit is contained in:
+4
-4
@@ -650,7 +650,7 @@ def mark_answer(request, pk, sk, tk):
|
|||||||
raise Http404("Exam question does not exist")
|
raise Http404("Exam question does not exist")
|
||||||
|
|
||||||
try:
|
try:
|
||||||
answer = question.cid_user_answers.get(cid=tk)
|
answer = question.cid_user_answers.get(cid=tk, exam__id=pk)
|
||||||
except ObjectDoesNotExist:
|
except ObjectDoesNotExist:
|
||||||
raise Http404("User answer does not exist")
|
raise Http404("User answer does not exist")
|
||||||
|
|
||||||
@@ -722,7 +722,7 @@ def mark(request, pk, sk):
|
|||||||
raise Http404("Exam question does not exist")
|
raise Http404("Exam question does not exist")
|
||||||
|
|
||||||
|
|
||||||
user_answers = question.cid_user_answers.all()
|
user_answers = question.cid_user_answers.filter(exam__id=pk)
|
||||||
|
|
||||||
return render(
|
return render(
|
||||||
request,
|
request,
|
||||||
@@ -764,7 +764,7 @@ def exam_scores_cid(request, pk):
|
|||||||
user_names[cid] = cid
|
user_names[cid] = cid
|
||||||
for q in questions:
|
for q in questions:
|
||||||
# Get user answer
|
# Get user answer
|
||||||
s = q.cid_user_answers.filter(cid=cid).first()
|
s = q.cid_user_answers.filter(cid=cid, exam__id=pk).first()
|
||||||
|
|
||||||
if not s:
|
if not s:
|
||||||
# skip if no answer, (score 4)
|
# skip if no answer, (score 4)
|
||||||
@@ -857,7 +857,7 @@ def exam_scores_cid_user(request, pk, sk):
|
|||||||
|
|
||||||
for q in questions:
|
for q in questions:
|
||||||
# Get user answer
|
# Get user answer
|
||||||
user_answer = q.cid_user_answers.filter(cid=cid).first()
|
user_answer = q.cid_user_answers.filter(cid=cid, exam__id=pk).first()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user