Refactor exam scores user template for improved layout and clarity
This commit is contained in:
@@ -1,32 +1,40 @@
|
|||||||
{% extends 'base.html' %}
|
{% extends 'base.html' %}
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<div class="physics">
|
<div class="container physics my-3">
|
||||||
{% include 'user_score_header.html' %}
|
{% include 'user_score_header.html' %}
|
||||||
<ul>
|
|
||||||
{% for question, ans in answers_and_marks %}
|
|
||||||
<li class="user-answer-li"><span class="question-stem-text">
|
|
||||||
{% if request.user.is_authenticated %}
|
|
||||||
<a href="{% url 'physics:exam_take_user' pk=exam.id sk=forloop.counter0 %}">
|
|
||||||
Question {{forloop.counter}}
|
|
||||||
</a>
|
|
||||||
{% else %}
|
|
||||||
<a href="{% url 'physics:exam_take' exam.pk forloop.counter0 cid passcode %}">
|
|
||||||
Question {{forloop.counter}}
|
|
||||||
</a>
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
- {{ question.stem|safe }}</span>
|
<div class="card">
|
||||||
<ol type="a">
|
<div class="card-body p-0">
|
||||||
|
<ul class="list-group list-group-flush">
|
||||||
|
{% for question, ans in answers_and_marks %}
|
||||||
|
<li class="list-group-item">
|
||||||
|
<div class="d-flex align-items-start">
|
||||||
|
<div class="me-3">
|
||||||
|
<span class="badge bg-secondary">{{ forloop.counter }}</span>
|
||||||
|
</div>
|
||||||
|
<div class="flex-grow-1">
|
||||||
|
<div class="fw-bold mb-2">
|
||||||
|
{% if request.user.is_authenticated %}
|
||||||
|
<a href="{% url 'physics:exam_take_user' pk=exam.id sk=forloop.counter0 %}">Question {{forloop.counter}}</a>
|
||||||
|
{% else %}
|
||||||
|
<a href="{% url 'physics:exam_take' exam.pk forloop.counter0 cid passcode %}">Question {{forloop.counter}}</a>
|
||||||
|
{% endif %}
|
||||||
|
- {{ question.stem|safe }}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="mb-2">
|
||||||
|
<ol type="a" class="mb-0">
|
||||||
{% for q, a, score, correct_answer in ans %}
|
{% for q, a, score, correct_answer in ans %}
|
||||||
<li class="question-part">
|
<li class="d-flex justify-content-between align-items-start py-1">
|
||||||
<span class="question-text">{{q|safe}}:</span> {% if exam.publish_results %}<span class="correct-answer">Correct answer: {{correct_answer|safe}}</span>{% endif %}
|
<div><span class="me-2"></span><span>{{ q|safe }}</span></div>
|
||||||
<br />
|
<div class="text-end">
|
||||||
<span class="submitted-user-answer">{{a}}</span>
|
{% if exam.publish_results %}
|
||||||
|
<div class="text-primary fw-semibold">Correct answer: {{ correct_answer|safe }}</div>
|
||||||
|
{% endif %}
|
||||||
|
<div class="submitted-user-answer">{{ a }}</div>
|
||||||
{% if exam.publish_results or view_all_results %}
|
{% if exam.publish_results or view_all_results %}
|
||||||
<span class="answer-{{score}}">
|
<div class="answer-{{score}} small">(Score: {{score}})</div>
|
||||||
(Score: {{score}})
|
|
||||||
</span>
|
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if exam.publish_results %}
|
{% if exam.publish_results %}
|
||||||
{% if forloop.counter0 == 0 and question.a_feedback %}
|
{% if forloop.counter0 == 0 and question.a_feedback %}
|
||||||
@@ -41,12 +49,25 @@
|
|||||||
<div class="small text-muted mt-1 text-end">Feedback: {{ question.e_feedback|safe }}</div>
|
<div class="small text-muted mt-1 text-end">Feedback: {{ question.e_feedback|safe }}</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
</div>
|
||||||
</li>
|
</li>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</ol>
|
</ol>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="small text-muted">
|
||||||
|
Category: {{ question.category }}
|
||||||
|
— <a href="{% url 'physics:question_detail' pk=question.pk %}">View</a>
|
||||||
|
<a href="{% url 'admin:physics_question_change' question.id %}" class="ms-2">Edit</a>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</li>
|
</li>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</ul>
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
{% include 'user_scores_footer.html' %}
|
{% include 'user_scores_footer.html' %}
|
||||||
</div>
|
</div>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
Reference in New Issue
Block a user