Display questions in order on the marking page

diff --git a/quiz/templates/quiz/sitting_detail.html b/quiz/templates/quiz/sitting_detail.html
index 1fbfbd524120276f95b91c736851931a3c505153..f8c123892dff710b11c6f478ebad3520acb2bbdd 100644 (file)
--- 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 dd7a5d5c65160c1011e99f8b3734ff9ad09d061e..f977d5ca6fd624cd093422302fb33439989431a5 100644 (file)
--- 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