From 0b5db3584ba2b940918d7c911d52551fdba1cb70 Mon Sep 17 00:00:00 2001
From: Richard Mansfield <richard@dragonfly.co.nz>
Date: Mon, 11 Aug 2014 11:06:14 +1200
Subject: [PATCH] Display questions in order on the marking page

---
 quiz/templates/quiz/sitting_detail.html | 4 ++--
 quiz/views.py                           | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/quiz/templates/quiz/sitting_detail.html b/quiz/templates/quiz/sitting_detail.html
index 1fbfbd5..f8c1238 100644
--- a/quiz/templates/quiz/sitting_detail.html
+++ b/quiz/templates/quiz/sitting_detail.html
@@ -25,7 +25,7 @@ Result of {{ sitting.quiz.title }} for {{ sitting.user }}
   </thead>
 
   <tbody>
-{% for question, answer in sitting.questions_with_user_answers.items %}
+{% for question in questions %}
 
 	<tr>
       <td>
@@ -34,7 +34,7 @@ Result of {{ sitting.quiz.title }} for {{ sitting.user }}
         <div style="max-width: 100px;"><img src="{{ question.figure.url }}" alt="{{ question.figure }}"/></div>
         {% endif %}
       </td>
-	  <td>{{ question|answer_choice_to_string:answer }}</td>
+	  <td>{{ question|answer_choice_to_string:question.user_answer }}</td>
 	  <td>
 		{% if question.id in sitting.get_incorrect_questions %}
 		  <p>incorrect</p>
diff --git a/quiz/views.py b/quiz/views.py
index dd7a5d5..f977d5c 100644
--- a/quiz/views.py
+++ b/quiz/views.py
@@ -111,6 +111,10 @@ class QuizMarkingDetail(QuizMarkerMixin, DetailView):
 
         return self.get(request)
 
+    def get_context_data(self, **kwargs):
+        context = super(QuizMarkingDetail, self).get_context_data(**kwargs)
+        context['questions'] = context['sitting'].get_questions(with_answers=True)
+        return context
 
 class QuizTake(FormView):
     form_class = QuestionForm
-- 
2.39.5