From f1160d237db8ea178eec3d4acac8bc8a1ad55ff1 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Sat, 11 Sep 2021 18:33:27 +0100
Subject: [PATCH] .

---
 longs/templates/longs/exam_scores.html   | 4 ++--
 longs/templates/longs/index.html         | 2 +-
 longs/templates/longs/mark.html          | 4 ++--
 longs/templates/longs/mark_answer.html   | 4 ++--
 longs/templates/longs/mark_overview.html | 2 +-
 longs/urls.py                            | 2 +-
 longs/views.py                           | 6 +++---
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/longs/templates/longs/exam_scores.html b/longs/templates/longs/exam_scores.html
index ceb99e38..ee5f0b49 100644
--- a/longs/templates/longs/exam_scores.html
+++ b/longs/templates/longs/exam_scores.html
@@ -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 %}
diff --git a/longs/templates/longs/index.html b/longs/templates/longs/index.html
index c0179a1e..5edac633 100644
--- a/longs/templates/longs/index.html
+++ b/longs/templates/longs/index.html
@@ -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 %}
diff --git a/longs/templates/longs/mark.html b/longs/templates/longs/mark.html
index 9193fe91..58417d10 100644
--- a/longs/templates/longs/mark.html
+++ b/longs/templates/longs/mark.html
@@ -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>
diff --git a/longs/templates/longs/mark_answer.html b/longs/templates/longs/mark_answer.html
index 9ffa8f7d..81b346b5 100644
--- a/longs/templates/longs/mark_answer.html
+++ b/longs/templates/longs/mark_answer.html
@@ -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 %}
diff --git a/longs/templates/longs/mark_overview.html b/longs/templates/longs/mark_overview.html
index 8f821129..e2b8bb5d 100644
--- a/longs/templates/longs/mark_overview.html
+++ b/longs/templates/longs/mark_overview.html
@@ -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>
diff --git a/longs/urls.py b/longs/urls.py
index 999b948e..a8837a46 100755
--- a/longs/urls.py
+++ b/longs/urls.py
@@ -67,7 +67,7 @@ urlpatterns = [
         name="question_review",
     ),
     path("exam/<int:exam_id>/<int:question_number>/<int:cid>/mark", views.mark_answer, name="mark_answer"),
-    path("exam/<int:pk>/<int:sk>/mark", views.mark, name="mark"),
+    path("exam/<int:pk>/<int:sk>/mark", views.mark_question_overview, name="mark_question_overview"),
     path("exam/<int:pk>/mark", views.LongExamViews.mark_overview, name="mark_overview"),
     #     path("exam/<int:pk>/<int:sk>/", views.exam_take, name="exam_take"),
     path(
diff --git a/longs/views.py b/longs/views.py
index d60d3cfd..0d580b86 100755
--- a/longs/views.py
+++ b/longs/views.py
@@ -697,7 +697,7 @@ def mark_answer(request, exam_id, question_number, cid):
             if "save" in request.POST:
                 return redirect("longs:mark_answer", exam_id=exam_id, question_number=question_number, cid=cid)
             #elif "previous" in request.POST:
-            #    return redirect("longs:mark", pk=exam_id, sk=n - 1)
+            #    return redirect("longs:mark_question_overview", pk=exam_id, sk=n - 1)
 
     else:
         form = MarkLongQuestionForm(initial={'score': answer.score})
@@ -722,7 +722,7 @@ def mark_answer(request, exam_id, question_number, cid):
 # @user_passes_test(user_is_admin, login_url="/accounts/login")
 @login_required
 @user_is_long_marker
-def mark(request, pk, sk):
+def mark_question_overview(request, pk, sk):
     exam = get_object_or_404(Exam, pk=pk)
 
     questions = exam.exam_questions.all()
@@ -746,7 +746,7 @@ def mark(request, pk, sk):
 
     return render(
         request,
-        "longs/mark.html",
+        "longs/mark_question_overview.html",
         {
             "exam": exam,
             "question": question,