Start using start dates for exams

rapids/templates/rapids/exams.html

@@ -3,7 +3,7 @@
 {% block navigation %}
     {{block.super}}
     <br/>
-    Exams: {{exam.name}}->
+    Exams: {{exam}}->
     <a href="{% url 'rapids:exam_overview' pk=exam.pk %}">Overview</a> /
     {% if exam.exam_mode %}
         <a href="{% url 'rapids:mark_overview' pk=exam.pk %}">Mark</a> /

rapids/templates/rapids/mark_overview.html

@@ -1,20 +1,20 @@
-{% extends 'rapids/exams.html' %}
-
-{% block content %}
-<div class="rapids">
-    <h2>Marking exam: {{ exam.name }}</h2>
-    You can start marking from a particular question by clicking on it below.
-
-    <div>
-    <button class="show-all-button">Show all</button><button class="show-unmarked-button">Show unmarked</button>
-    </div>
-    <div id="stark-marking-button"><a href="{% url 'rapids:mark' exam_pk=exam.pk sk=0 %}"><button>Click here to start marking</button></a></div>
-
-    <ul id="question-mark-list">
-        {% for question, unmarked_count, unmarked_count2 in question_unmarked_map %}
-        <li data-markcount={{unmarked_count}} {% if unmarked_count %}class="unmarked" {% endif %}><a href="{% url 'rapids:mark' exam_pk=exam.pk sk=forloop.counter0 %}">Question {{forloop.counter }}:
-                {{ question }}</a><br />Unmarked answers: {{unmarked_count}}</li>
-        {% endfor %}
-    </ul>
-</div>
+{% extends 'rapids/exams.html' %}
+
+{% block content %}
+    <div class="rapids">
+        <h2>Marking exam: {{ exam }}</h2>
+        You can start marking from a particular question by clicking on it below.
+
+        <div>
+            <button class="show-all-button">Show all</button><button class="show-unmarked-button">Show unmarked</button>
+        </div>
+        <div id="stark-marking-button"><a href="{% url 'rapids:mark' exam_pk=exam.pk sk=0 %}"><button>Click here to start marking</button></a></div>
+
+        <ul id="question-mark-list">
+            {% for question, unmarked_count, unmarked_count2 in question_unmarked_map %}
+                <li data-markcount={{unmarked_count}} {% if unmarked_count %}class="unmarked" {% endif %}><a href="{% url 'rapids:mark' exam_pk=exam.pk sk=forloop.counter0 %}">Question {{forloop.counter }}:
+                    {{ question }}</a><br />Unmarked answers: {{unmarked_count}}</li>
+            {% endfor %}
+        </ul>
+    </div>
 {% endblock %}

rapids/templates/rapids/question_display_block.html

@@ -30,7 +30,7 @@
     </div>
     <div>
         Exam(s): {% for exam in question.exams.all %}
-            <a href="{% url 'rapids:exam_overview' pk=exam.pk %}">{{ exam.name }}</a>,
+            <a href="{% url 'rapids:exam_overview' pk=exam.pk %}">{{ exam }}</a>,
         {% endfor %}
 
 {% comment %}         <button id="add-to-exam" data-exam_json_edit_url="{% url 'generic:generic_exam_json_edit' %}"

rapids/templates/rapids/question_link_header.html

@@ -1,25 +1,25 @@
 
-    <div class="floating-header">
+<div class="floating-header">
 
-        <a href="{% url 'rapids:rapid_update' pk=question.pk %}" title="Edit the Rapid">Edit</a>
-        <a href="{% url 'rapids:rapid_clone' pk=question.pk %}" title="Clone the Rapid (duplicate everything but the images)">Clone</a>
-        <a href="{% url 'rapids:question_delete' pk=question.pk %}" title="Delete the Rapid">Delete</a>
-        <a href="{% url 'rapids:question_answer_update' pk=question.pk %}" title="Update the question answers">Edit Answers</a>
-        <a href="#" onclick="return window.create_popup_window('{% url 'feedback_create' question_type='rapid' pk=question.pk %}')"> Add Note</a>
-        {% if request.user.is_superuser %}
-            <a href="{% url 'admin:rapids_rapid_change' question.id %}" title="Edit the Rapid using the admin interface">Admin Edit</a>
-            <a href="{% url 'rapids:question_user_answers' question.id %}" title="View user answers associated with this question">User answers</a>
-        {% endif %}
-        {% if exam %}
-            <div>
+    <a href="{% url 'rapids:rapid_update' pk=question.pk %}" title="Edit the Rapid">Edit</a>
+    <a href="{% url 'rapids:rapid_clone' pk=question.pk %}" title="Clone the Rapid (duplicate everything but the images)">Clone</a>
+    <a href="{% url 'rapids:question_delete' pk=question.pk %}" title="Delete the Rapid">Delete</a>
+    <a href="{% url 'rapids:question_answer_update' pk=question.pk %}" title="Update the question answers">Edit Answers</a>
+    <a href="#" onclick="return window.create_popup_window('{% url 'feedback_create' question_type='rapid' pk=question.pk %}')"> Add Note</a>
+    {% if request.user.is_superuser %}
+        <a href="{% url 'admin:rapids_rapid_change' question.id %}" title="Edit the Rapid using the admin interface">Admin Edit</a>
+        <a href="{% url 'rapids:question_user_answers' question.id %}" title="View user answers associated with this question">User answers</a>
+    {% endif %}
+    {% if exam %}
+        <div>
 
-                {% if previous > -1 %}
-                    <a href="{% url 'rapids:exam_question_detail' exam.id previous %}">Previous question</a>
-                {% endif %}
-                Viewing question as part of exam: <a href="{% url 'rapids:exam_overview' exam.id %}">{{exam.name}}</a> [{{pos}}/{{exam_length}}]
-                {% if next %}
-                    <a href="{% url 'rapids:exam_question_detail' exam.id next %}">Next question</a>
-                {% endif %}
-            </div>
-        {% endif %}
-    </div>
+            {% if previous > -1 %}
+                <a href="{% url 'rapids:exam_question_detail' exam.id previous %}">Previous question</a>
+            {% endif %}
+            Viewing question as part of exam: <a href="{% url 'rapids:exam_overview' exam.id %}">{{exam}}</a> [{{pos}}/{{exam_length}}]
+            {% if next %}
+                <a href="{% url 'rapids:exam_question_detail' exam.id next %}">Next question</a>
+            {% endif %}
+        </div>
+    {% endif %}
+</div>

rapids/tests/test_rapids_exams.py

@@ -340,7 +340,7 @@ def test_exams(db, client):
             .find("li", attrs={"data-exam-id": exam.pk})
         )
         assert search_exam
-        assert exam.name in str(search_exam)
+        assert str(exam) in str(search_exam)
         assert len(search_exam.find("button", {"class": "start-button"})) > 0
         # assert "Active" in assigned_exams # check it is active
 
@@ -356,8 +356,8 @@ def test_exams(db, client):
             .find_all("li", attrs={"data-exam-id": exam.pk})
         )
         assert results_exam
-        assert exam.name in str(results_exam)
-        assert exam.name + " test" not in str(results_exam)
+        assert str(exam) in str(results_exam)
+        assert str(exam) + " test" not in str(results_exam)
         assert "Results Published" not in str(
             results_exam
         )  # It should not be published yet