many improvement

anatomy/templates/anatomy/base.html

@@ -18,6 +18,7 @@
                 href="{% url 'admin:index' %}">Admin</a></span>{% endif %}
     </div>
     <div class="content container">
+    <a href="{% url 'anatomy:exam_list' %}">Exams</a> 
         {% block navigation %}
         {% endblock %}
         <div class="row">

anatomy/templates/anatomy/exam_list.html

@@ -1,9 +1,29 @@
 {% extends 'anatomy/base.html' %}
 
 {% block content %}
-{% for exam in exams %}
 <div class="anatomy">
-    <h1><a href="{% url 'anatomy:exam_overview' pk=exam.pk %}">{{exam.name}}</a></h1>
-</div>
+ Active exams:<br/>
+ <ul>
+{% for exam in exams %}
+ {% if exam.active %}
+ <li>
+    <a href="{% url 'anatomy:exam_overview' pk=exam.pk %}">{{exam.name}}</a> <a href="{% url 'anatomy:mark_overview' pk=exam.pk %}">(mark)</a>
+ </li>
+    {% endif %}
 {% endfor %}
+ </ul>
+
+ Inactive exams:<br/>
+ <ul>
+{% for exam in exams %}
+ {% if not exam.active %}
+ <li>
+    <a href="{% url 'anatomy:exam_overview' pk=exam.pk %}">{{exam.name}}</a> <a href="{% url 'anatomy:mark_overview' pk=exam.pk %}">(mark)</a>
+ </li>
+    {% endif %}
+{% endfor %}
+ </ul>
+
+
+</div>
 {% endblock %}

anatomy/templates/anatomy/exam_overview.html

@@ -1,9 +1,17 @@
-{% extends 'anatomy/base.html' %}
+{% extends 'anatomy/exams.html' %}
 
 {% block content %}
 <div class="anatomy">
-    <h1>{{ exam.name }}</h1>
+    <h1>Exam: {{ exam.name }}</h1>
     This exam has {{question_number}} questions.
-    <p><button><a href="{% url 'anatomy:exam_take' pk=exam.pk sk=0 %}">Click here to start</a></button></p>
+    <p><button><a href="{% url 'anatomy:mark_overview' pk=exam.pk %}">Mark exam</a></button></p>
+    <!--<p><button><a href="{% url 'anatomy:exam_take' pk=exam.pk sk=0 %}">Click here to start</a></button></p>-->
+
+<ol>
+    {% for question in questions.all %}
+<li>{{ question }}</lid>
+        {% endfor %}
+</ol>
+
 </div>
 {% endblock %}

anatomy/templates/anatomy/exam_scores.html

@@ -1,4 +1,4 @@
-{% extends 'anatomy/base.html' %}
+{% extends 'anatomy/exams.html' %}
 
 {% block content %}
 <div class="anatomy">
@@ -33,8 +33,3 @@
     </table>
 </div>
 {% endblock %}
-
-{% block navigation %}
-<a href="{% url 'anatomy:exam_list' %}">Exams</a> <a href="{% url 'anatomy:mark_overview' pk=exam.pk %}">Marking
-    overview</a> <a href="{% url 'anatomy:exam_scores_cid' pk=exam.pk %}">Scores</a>
-{% endblock %}

anatomy/templates/anatomy/exams.html

@@ -0,0 +1,6 @@
+{% extends 'anatomy/base.html' %}
+
+{% block navigation %}
+<br/>
+{{exam.name}}-> <a href="{% url 'anatomy:exam_overview' pk=exam.pk %}">Overview</a> <a href="{% url 'anatomy:mark_overview' pk=exam.pk %}">Mark</a> <a href="{% url 'anatomy:exam_scores_cid' pk=exam.pk %}">Scores</a>
+{% endblock %}

anatomy/templates/anatomy/mark.html

@@ -1,4 +1,4 @@
-{% extends 'anatomy/base.html' %}
+{% extends 'anatomy/exams.html' %}
 
 {% block content %}
 <h2>Marking question {{question_details.current}} of {{question_details.total}}</h2>
@@ -40,8 +40,4 @@
 </form>
 <div class=dwv-container data-url="/media/anatomy/{{ question.image}}" />
 </div>
-{% endblock %}
-{% block navigation %}
-<a href="{% url 'anatomy:exam_list' %}">Exams</a> <a href="{% url 'anatomy:mark_overview' pk=exam.pk %}">Marking
-    overview</a> <a href="{% url 'anatomy:exam_scores_cid' pk=exam.pk %}">Scores</a>
 {% endblock %}

anatomy/templates/anatomy/mark_overview.html

@@ -1,8 +1,9 @@
-{% extends 'anatomy/base.html' %}
+{% extends 'anatomy/exams.html' %}
 
 {% block content %}
 <div class="anatomy">
-    <h2>{{ exam.name }}</h2>
+    <h2>Marking exam: {{ exam.name }}</h2>
+    Question order will be different on the test system (as it is randomly generated)
 
     <ul>
         {% for question in questions.all %}
@@ -12,9 +13,4 @@
     </ul>
     <p><button><a href="{% url 'anatomy:mark' pk=exam.pk sk=0 %}">Click here to start marking</a></button></p>
 </div>
-{% endblock %}
-
-{% block navigation %}
-<a href="{% url 'anatomy:exam_list' %}">Exams</a> <a href="{% url 'anatomy:mark_overview' pk=exam.pk %}">Marking
-    overview</a> <a href="{% url 'anatomy:exam_scores_cid' pk=exam.pk %}">Scores</a>
 {% endblock %}