Start using start dates for exams

templates/cid_scores.html

@@ -20,7 +20,7 @@
                     <h4>{{exam_type|title}}</h4>
                     <ul class='{{exam_type|lower}}'>
                         {% for exam in exams  %}
-                            <li class="exam" data-exam-id="{{exam.pk}}">{{exam.name}}
+                            <li class="exam" data-exam-id="{{exam.pk}}">{{exam}}
                                 {% if exam.active %}
                                     <a href="{{exam.get_take_url}}?cid={{cid}}&passcode={{passcode}}" target="_blank" title="Click to take exam">
                                         <button class="small-url-button start-button">Start</button>
@@ -47,7 +47,7 @@
                         <h4>{{exam_type|title}}</h4>
                         <ul class='{{exam_type|lower}}'>
                             {% for exam in exams %}
-                                <li class="exam" data-exam-id="{{exam.pk}}"><a href="{% url exam_type|add:':exam_scores_cid_user' pk=exam.pk cid=cid passcode=passcode %}">{{exam.name}}</a> {% if exam.active %}[Active]{% endif %} {% if exam.publish_results %}[Results Published]{% endif %}</li>
+                                <li class="exam" data-exam-id="{{exam.pk}}"><a href="{% url exam_type|add:':exam_scores_cid_user' pk=exam.pk cid=cid passcode=passcode %}">{{exam}}</a> {% if exam.active %}[Active]{% endif %} {% if exam.publish_results %}[Results Published]{% endif %}</li>
                             {% endfor %}
                         </ul>
                     {% endif %}

templates/exam_cids.html

@@ -4,9 +4,9 @@
 
     {% load thumbnail %}
     <div class="{{app_name}}">
-        <h1>Exam: {{ exam.name }}</h1>
+        <h1>Exam: {{ exam }}</h1>
 
-{% include "generic/exam_cids.html" %}
+        {% include "generic/exam_cids.html" %}
 
     </div>
 {% endblock %}

templates/exam_cids_edit.html

@@ -3,9 +3,9 @@
 {% block content %}
 
     <div class="{{app_name}}">
-        <h1>Exam: {{ exam.name }}</h1>
+        <h1>Exam: {{ exam }}</h1>
 
-{% include "generic/exam_cids_edit.html" %}
+        {% include "generic/exam_cids_edit.html" %}
 
     </div>
 {% endblock %}

templates/exam_inactive.html

@@ -1,8 +1,8 @@
 {% extends 'base.html' %}
 
 {% block content %}
-<div class="">
-<h2>{{exam.name}}</h2>
-Exam is currently inactive.
-</div>
+    <div class="">
+        <h2>{{exam}}</h2>
+        Exam is currently inactive.
+    </div>
 {% endblock %}

templates/exam_list.html

@@ -8,7 +8,7 @@
             {% for exam in exams %}
                 {% if exam.active %}
                     <li class="exam-item">
-                        <a href="{% url app_name|add:':exam_overview' pk=exam.pk %}" class="flex-col-2 exam-name">{{exam.name}}</a>
+                        <a href="{% url app_name|add:':exam_overview' pk=exam.pk %}" class="flex-col-2 exam-name">{{exam}}</a>
                         {% if marking %}<a href="{% url app_name|add:':mark_overview' pk=exam.pk %}" class="flex-col-half">Mark</a>{% endif %}
                         <span class="flex-col">
                             <a href="{% url app_name|add:':exam_cids' exam_id=exam.pk %}">Candidates</a> <span class="candidate-counts">[<span title="Number of active CID users">
@@ -35,7 +35,7 @@
             {% for exam in exams %}
                 {% if not exam.active %}
                     <li class="exam-item">
-                        <a href="{% url app_name|add:':exam_overview' pk=exam.pk %}" class="flex-col-2 exam-name">{{exam.name}}</a>
+                        <a href="{% url app_name|add:':exam_overview' pk=exam.pk %}" class="flex-col-2 exam-name">{{exam}}</a>
                         {% if marking %}<a href="{% url app_name|add:':mark_overview' pk=exam.pk %}" class="flex-col-half">Mark</a>{% endif %}
                         <span class="flex-col">
                             <a href="{% url app_name|add:':exam_cids' exam_id=exam.pk %}">Candidates</a>

templates/exam_stats.html

@@ -1,7 +1,7 @@
 {% extends 'base.html' %}
 
 {% block content %}
-    <h2>{{exam.name}}: Stats</h2>
+    <h2>{{exam}}: Stats</h2>
     {% if exam.stats_candidates < 4 %}
         Not enough data points...
     {% else %}

templates/exam_users_edit.html

@@ -3,9 +3,9 @@
 {% block content %}
 
     <div class="{{app_name}}">
-        <h1>Exam: {{ exam.name }}</h1>
+        <h1>Exam: {{ exam }}</h1>
 
-{% include "generic/exam_users_edit.html" %}
+        {% include "generic/exam_users_edit.html" %}
 
     </div>
 {% endblock %}

templates/user_score_header.html

@@ -1,18 +1,18 @@
 
 {% if view_all_results %}
     <div class="alert alert-info" role="alert">
-        Exam state: 
-        
+        Exam state:
+
         {% if exam.active %}
             This exam is available to take.
-            {% else %}
+        {% else %}
             This exam is NOT available to take.
         {% endif %}
-            
-        
+
+
         {% if exam.publish_results %}
             Results are published.
-            {% else %}
+        {% else %}
             Results are NOT published.
         {% endif %}
 
@@ -24,6 +24,6 @@
         <div class="alert alert-info" role="alert">Results are not currently published. You can see your own answers below.</a></div>
     {% endif %}
 {% endif %}
-<h2>Exam: {{ exam.name }}</h2>
+<h2>Exam: {{ exam }}</h2>
 <h3>Candidate: {{ cid|default_if_none:request.user.username }}</h3>
 Answers:

templates/user_scores.html

@@ -20,7 +20,7 @@
                     <h4>{{exam_type|title}}</h4>
                     <ul class='{{exam_type|lower}}'>
                         {% for exam in exams  %}
-                            <li class="exam" data-exam-id="{{exam.pk}}">{{exam.name}}
+                            <li class="exam" data-exam-id="{{exam.pk}}">{{exam}}
                                 {% if exam.active %}
                                     <a href="{{exam.get_take_url}}" target="_blank" title="Click to take exam">
                                         <button class="small-url-button start-button">Start</button>
@@ -55,7 +55,7 @@
                                         <a href= "{% url exam_type|add:':exam_scores_user' pk=exam.pk %}" title="Click to view results">
                                     {% endif %}
 
-                                    {{exam.name}}</a> {% if exam.active %}[Active]{% endif %} {% if exam.publish_results %}[Results Published]{% endif %}</li>
+                                    {{exam}}</a> {% if exam.active %}[Active]{% endif %} {% if exam.publish_results %}[Results Published]{% endif %}</li>
                             {% endfor %}
                         </ul>
                     {% endif %}