This commit is contained in:
Ross
2021-12-12 12:40:15 +00:00
parent 90a2ef78d9
commit 1ecd71d799
14 changed files with 320 additions and 289 deletions
+5 -3
View File
@@ -7,13 +7,15 @@
Answers:
<ul>
{% for question, a, score, correct_answer in answers_and_marks %}
<li class="user-answer-li"><a href="{% url 'sbas:exam_take' exam.pk forloop.counter0 cid %}">Question {{forloop.counter}}</a> - {{ question.stem |safe}}</li>
<span>Correct answer: {{correct_answer|safe}} <br />{{a}} <span class="answer-{{score}}">(Score: {{score}})</span></span>
<li class="user-answer-li"><a href="{% url 'sbas:exam_take' exam.pk forloop.counter0 cid %}">Question
{{forloop.counter}}</a> - {{ question.stem |safe}}</li>
<span>Correct answer: {{correct_answer|safe}} <br />{{a}} <span class="answer-{{score}}">(Score:
{{score}})</span></span>
{% endfor %}
</ul>
<br /> Total mark: {{ total_score }} / {{max_score}}
<div>
<a href="{% url 'cid_scores' cid %}">Other exams</a>
<a href="{% url 'cid_scores' cid passcode %}">Other exams</a>
</div>
</div>
{% endblock %}
+3 -3
View File
@@ -14,9 +14,9 @@ urlpatterns = [
# path("question/<int:pk>/update", views.QuestionUpdate.as_view(), name="anatomy_question_update"),
# path("exam/<int:pk>/<int:sk>/mark", views.mark, name="mark"),
# path("exam/<int:pk>/mark", views.mark_overview, name="mark_overview"),
path("exam/<int:pk>/<int:sk>/<str:cid>/take", views.exam_take, name="exam_take"),
path("exam/<int:pk>/<int:sk>/<str:cid>/<str:passcode>/take", views.exam_take, name="exam_take"),
path("exam/<int:pk>/start", views.exam_start, name="exam_start"),
path("exam/<int:pk>/<str:cid>/finish", views.exam_finish, name="exam_finish"),
path("exam/<int:pk>/<str:cid>/<str:passcode>/finish", views.exam_finish, name="exam_finish"),
path("exam/<int:pk>/", views.SbasExamViews.exam_overview, name="exam_overview"),
path(
"exam/<int:pk>/scores",
@@ -24,7 +24,7 @@ urlpatterns = [
name="exam_scores_cid",
),
path(
"exam/<int:pk>/scores/<int:sk>/",
"exam/<int:pk>/scores/<int:sk>/<str:passcode>/",
views.exam_scores_cid_user,
name="exam_scores_cid_user",
),
+19 -7
View File
@@ -179,7 +179,7 @@ def exam_scores_cid(request, pk):
)
def exam_scores_cid_user(request, pk, sk):
def exam_scores_cid_user(request, pk, sk, passcode):
exam = get_object_or_404(Exam, pk=pk)
# TODO:Need some kind of test for cid
@@ -229,6 +229,7 @@ def exam_scores_cid_user(request, pk, sk):
{
"exam": exam,
"cid": cid,
"passcode" : passcode,
"questions": questions,
"answers": answers,
"answers_marks": answers_marks,
@@ -253,9 +254,12 @@ def exam_start(request, pk):
},
)
def exam_finish(request, pk, cid):
def exam_finish(request, pk, cid, passcode):
exam = get_object_or_404(Exam, pk=pk)
if not exam.check_cid_user(cid, passcode):
raise Http404("Error accessing exam")
questions = exam.exam_questions.all()
answers = CidUserAnswer.objects.filter(
@@ -286,17 +290,21 @@ def exam_finish(request, pk, cid):
"question_answer_tuples": question_answer_tuples,
"answer_count": answer_count,
"exam_length": len(questions),
"passcode": passcode,
},
)
def exam_take(request, pk, sk, cid):
def exam_take(request, pk, sk, cid, passcode):
exam = get_object_or_404(Exam, pk=pk)
if not exam.active:
raise Http404("Exam not found")
if not exam.check_cid_user(cid, passcode):
raise Http404("Error accessing exam")
question = exam.exam_questions.all()[sk]
exam_length = len(exam.exam_questions.all())
@@ -318,14 +326,17 @@ def exam_take(request, pk, sk, cid):
answer.exam = exam
# answer.published_date = timezone.now()
answer.save()
kwargs = {"pk": pk, "cid": cid, "passcode": passcode}
if "next" in request.POST:
return redirect("sbas:exam_take", pk=pk, sk=pos + 1, cid=cid)
return redirect("sbas:exam_take", sk=pos + 1, **kwargs)
elif "previous" in request.POST:
return redirect("sbas:exam_take", pk=pk, sk=pos - 1, cid=cid)
return redirect("sbas:exam_take", sk=pos - 1, **kwargs)
elif "finish" in request.POST:
return redirect("sbas:exam_finish", pk=pk, cid=cid)
return redirect("sbas:exam_finish", **kwargs)
elif "goto" in request.POST:
return redirect("sbas:exam_take", pk=pk, sk=int(request.POST.get("goto")), cid=cid)
return redirect("sbas:exam_take", sk=int(request.POST.get("goto")), **kwargs)
else:
form = CidUserAnswerForm(instance=answer)
@@ -354,6 +365,7 @@ def exam_take(request, pk, sk, cid):
"exam_length": exam_length,
"pos": pos,
"saved_answer": saved_answer,
"passcode": passcode,
},
)