This commit is contained in:
Ross
2021-09-11 18:33:27 +01:00
parent 0f7ee7b6f1
commit f1160d237d
7 changed files with 12 additions and 12 deletions
+2 -2
View File
@@ -8,7 +8,7 @@
<div class="alert alert-warning" role="alert">
The following questions need marking
{% for exam_index in unmarked %}
<a href="{% url 'longs:mark' exam.pk exam_index %}">{{ exam_index|add:1 }}</a>
<a href="{% url 'longs:mark_question_overview' exam.pk exam_index %}">{{ exam_index|add:1 }}</a>
{% endfor %}
</div>
@@ -53,7 +53,7 @@
</thead>
{% for question in questions %}
<tr>
<td><a href="{% url 'longs:mark' pk=exam.pk sk=forloop.counter0 %}">Question {{forloop.counter}}</a></td>
<td><a href="{% url 'longs:mark_question_overview' pk=exam.pk sk=forloop.counter0 %}">Question {{forloop.counter}}</a></td>
{% for ans, score in by_question|get_item:question %}
<td class="user-answer-score-{{score}}" title="answer score: {{score}}">{{score}}</td>
{% endfor %}
+1 -1
View File
@@ -4,7 +4,7 @@
{% for exam in exams %}
<div class="longs">
<h1><a href="{% url 'longs:exam_overview' pk=exam.pk %}">Exam: {{ exam.name }} </a></h1>
{% if request.user.is_staff %}<a href="{% url 'longs:mark' pk=exam.pk sk=0 %}">Mark answers</a>{% endif %}
{% if request.user.is_staff %}<a href="{% url 'longs:mark_question_overview' pk=exam.pk sk=0 %}">Mark answers</a>{% endif %}
{% if request.user.is_staff %}<a href="{% url 'longs:exam_scores_cid' pk=exam.pk %}">Scores</a>{% endif %}
</div>
{% endfor %}
+2 -2
View File
@@ -32,12 +32,12 @@
</ul>
<div>
{% if question_details.current > 1 %}
<a href="{% url 'longs:mark' exam.id question_details.current|add:'-2' %}"
<a href="{% url 'longs:mark_question_overview' exam.id question_details.current|add:'-2' %}"
title="Previous question">Previous</a>
{% endif %}
{% if question_details.current >= question_details.total %}
{% else %}
<a href="{% url 'longs:mark' exam.id question_details.current %}" title="Next question">Next</a>
<a href="{% url 'longs:mark_question_overview' exam.id question_details.current %}" title="Next question">Next</a>
{% endif %}
</div>
</div>
+2 -2
View File
@@ -9,12 +9,12 @@
title="Edit the user answer using the admin interface">Admin
Edit (user answer)</a>
{% endif %}
<h2>Marking question <a href="{% url 'longs:mark' exam.id question_details.current|add:'-1' %}"
<h2>Marking question <a href="{% url 'longs:mark_question_overview' exam.id question_details.current|add:'-1' %}"
title="View question answers">{{question_details.current}}</a> of {{question_details.total}}</h2>
{% if not next_unmarked_id and not unmarked %}
<div class="alert alert-info sticky-alert" role="alert">Success! Marking question complete. <br />Return to <a
href="{% url 'longs:mark' exam.id question_details.current|add:'-1' %}">question
href="{% url 'longs:mark_question_overview' exam.id question_details.current|add:'-1' %}">question
overview</a>, <a href="{% url 'longs:mark_overview' pk=exam.pk %}">marking
overview</a><br />
{% if previous_cid %}
+1 -1
View File
@@ -14,7 +14,7 @@
<ul id="question-mark-list">
{% for question, unmarked_count in question_unmarked_map %}
<li data-markcount={{unmarked_count}} {% if unmarked_count %}class="unmarked" {% endif %}><a
href="{% url 'longs:mark' pk=exam.pk sk=forloop.counter0 %}">Question {{forloop.counter }}:
href="{% url 'longs:mark_question_overview' pk=exam.pk sk=forloop.counter0 %}">Question {{forloop.counter }}:
{{ question }}</a><br /> Answers to mark: {{unmarked_count}}</li>
{% endfor %}
</ul>