Merge ssh://penracourses.org.uk:/home/django/rad

longs/templates/longs/ciduseranswer_detail.html

@@ -1,5 +1,4 @@
-
-{% extends 'rapids/base.html' %}
+{% extends 'longs/base.html' %}
 
 {% block content %}
 CID: {{ciduseranswer.cid}}
@@ -8,11 +7,16 @@ CID: {{ciduseranswer.cid}}
 {{ciduseranswer.question}}
 
 <h3>Answers</h3>
-{{ciduseranswer.model_observations}}<br/>
-{{ciduseranswer.model_interpretation}}<br/>
-{{ciduseranswer.model_principle_diagnosis}}<br/>
-{{ciduseranswer.model_differential_diagnosis}}<br/>
-{{ciduseranswer.model_management}}<br/>
+<h4>Observation</h4>
+<pre>{{ciduseranswer.answer_observations}}</pre><br />
+<h4>Interpretation</h4>
+<pre>{{ciduseranswer.answer_interpretation}}</pre><br />
+<h4>Principle Diagnosis</h4>
+<pre>{{ciduseranswer.answer_principle_diagnosis}}</pre><br />
+<h4>Differential Diagnosis</h4>
+<pre>{{ciduseranswer.answer_differential_diagnosis}}</pre><br />
+<h4>Managment</h4>
+<pre>{{ciduseranswer.answer_management}}</pre><br />
 
 
 

longs/templates/longs/exam_overview.html

@@ -43,6 +43,7 @@
                     <a href="{% url 'longs:exam_question_detail' exam.id forloop.counter0 %}"
                         title="View the question">View</a> / <a href="{% url 'longs:long_update' question.id %}"
                         title="Edit the question">Edit</a>
+                        <span class="id">[id: {{question.pk}}]</span>
                 </div>
             </span>
             <span class="flex-col-3">

longs/templates/longs/exam_scores.html

@@ -44,14 +44,14 @@
             <tr>
                 <th>Candidate</th>
                 {% for cid in cids %}
-                <th>{{cid}}</th>
+                <th><a href="{% url 'longs:exam_scores_cid_user' exam.pk cid %}">{{cid}}</a></th>
                 {% endfor %}
 
             </tr>
         </thead>
         {% for question in questions %}
         <tr>
-            <td>Question {{forloop.counter}}</td>
+            <td><a href="{% url 'longs:mark' 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 %}

longs/templates/longs/long_display_block.html

@@ -2,6 +2,9 @@
     <div class="date">
         {{ question.created_date|date:"d/m/Y" }}
     </div>
+    <div class="id">
+        ID: {{ question.id }}
+    </div>
     <p class="pre-whitespace"><b>Description:</b> {{ question.description }}</p>
 
     <p class="pre-whitespace"><b>History:</b> {{ question.history }}</p>

longs/templates/longs/mark.html

@@ -1,7 +1,8 @@
 {% extends 'longs/exams.html' %}
 
 {% block content %}
-<a href="{% url 'longs:exam_question_detail' exam.id question_details.current %}" title="View the Question">View</a>
+<a href="{% url 'longs:exam_question_detail' exam.id question_details.current|add:'-1' %}"
+    title="View the Question">View</a>
 <a href="{% url 'longs:long_update' question.id %}" title="Edit the Question">Edit</a> <a
     href="{% url 'admin:longs_long_change' question.id %}" title="Edit the Question using the admin interface">Admin
     Edit</a>

longs/templates/longs/mark_answer.html

@@ -13,9 +13,19 @@
         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" role="alert">Success! Marking question complete. <a
-        href="{% url 'longs:mark_overview' pk=exam.pk %}">Return to marking
-        overview</a></div>
+<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
+        overview</a>, <a href="{% url 'longs:mark_overview' pk=exam.pk %}">marking
+        overview</a><br />
+    {% if previous_cid %}
+    <a href="{% url 'longs:mark_answer' pk=exam.pk sk=question_details.current|add:'-1' cid=previous_cid %}">Previous
+        candidate</a>
+    {% endif %}
+    {% if next_cid %}
+    <a href="{% url 'longs:mark_answer' pk=exam.pk sk=question_details.current|add:'-1' cid=next_cid %}">Next
+        candidate</a>
+    {% endif %}
+</div>
 {% endif %}
 
 <span>Marking CID: {{answer.cid}} ({{unmarked|length}} answer(s) left to mark)</span>
@@ -89,4 +99,11 @@
         {% endif %}
     </form>
 </div>
+{% if previous_cid %}
+<a href="{% url 'longs:mark_answer' pk=exam.pk sk=question_details.current|add:'-1' cid=previous_cid %}">Previous
+    candidate</a>
+{% endif %}
+{% if next_cid %}
+<a href="{% url 'longs:mark_answer' pk=exam.pk sk=question_details.current|add:'-1' cid=next_cid %}">Next candidate</a>
+{% endif %}
 {% endblock %}

longs/templates/longs/mark_overview.html

@@ -6,16 +6,16 @@
     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>
+        <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 'longs:mark' pk=exam.pk sk=0 %}"><button>Click here to start marking</button></a></div>
+    <div id="stark-marking-button"><a href="{% url 'longs:mark' pk=exam.pk sk=0 %}"><button>Click here to start
+                marking</button></a></div>
 
     <ul id="question-mark-list">
-        {% for question in questions.all %}
-        <li data-markcount={{question.get_unmarked_answer_count}} 
-        {% if question.get_unmarked_answer_count %}class="unmarked" {% endif %}
-            ><a href="{% url 'longs:mark' pk=exam.pk sk=forloop.counter0 %}">Question {{forloop.counter }}:
-                {{ question }}</a><br /> Answers to mark: {{question.get_unmarked_answer_count}}</li>
+        {% 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 }}:
+                {{ question }}</a><br /> Answers to mark: {{unmarked_count}}</li>
         {% endfor %}
     </ul>
 </div>