add next quiz link

diff --git a/teleforma/templates/quiz/result.html b/teleforma/templates/quiz/result.html
index e1da6b5c0e2c20101f69748a0296ad1e1be02aed..e4e4f4596a4e24de5da63d8db0ee705f044aab90 100644 (file)
--- a/teleforma/templates/quiz/result.html
+++ b/teleforma/templates/quiz/result.html
@@ -104,7 +104,7 @@
       <a href="{% url 'teleforma-quiz' period_id=period.id course_id=course.pk quiz_name=quiz.url %}" class="component_icon button icon_loading">Refaire le quiz</a>
     </div>
     <div class="flex-item" id="flex">
-      <a class="component_icon button icon_next">Quiz suivant</a>
+      <a href="{% url 'teleforma-quiz' period_id=period.id course_id=course.pk quiz_name=quiz_next.url %}" class="component_icon button icon_next">Quiz suivant</a>
     </div>
   </div>
 

diff --git a/teleforma/templates/teleforma/course_detail.html b/teleforma/templates/teleforma/course_detail.html
index cbf69dc57f5d6e252cac38cd3de7ac174f7d75a1..111a0496650b6cc54879ab4dfe44da12ca6ea411 100644 (file)
--- a/teleforma/templates/teleforma/course_detail.html
+++ b/teleforma/templates/teleforma/course_detail.html
@@ -80,8 +80,8 @@
             <td class="border-top" width="5%" align="center">
               {% if quiz|quiz_validated:user %}
                 <img src="{{ STATIC_URL }}teleforma/images/ok.png" style="vertical-align:middle" alt="" title="{% trans "Validated" %}" />
-                {% else %}
-                    <img src="{{ STATIC_URL }}teleforma/images/delete.png" style="vertical-align:middle" alt="" title="{% trans ' not viewed yet' %}" />
+              {% else %}
+                <img src="{{ STATIC_URL }}teleforma/images/delete.png" style="vertical-align:middle" alt="" title="{% trans ' not viewed yet' %}" />
               {% endif %}
             </td>
           </tr>

diff --git a/teleforma/views/crfpa.py b/teleforma/views/crfpa.py
index 32bd922eb814cd9b0295a77bbd21aa6f18e1ab53..1fca611c4e5ee2a9f27a6efeaac579d6335b9c51 100644 (file)
--- a/teleforma/views/crfpa.py
+++ b/teleforma/views/crfpa.py
@@ -1212,6 +1212,9 @@ class QuizQuestionView(CourseAccessMixin, QuizTake):
         self.period = Period.objects.get(pk=self.kwargs['period_id'])
         self.course = Course.objects.get(pk=self.kwargs['course_id'])
         self.quiz = Quiz.objects.get(url=self.kwargs['quiz_name'])
+        self.quiz_next = self.course.quizzes.filter(id__gt=self.quiz.id).order_by('id').first()
+        if not self.quiz_next:
+            self.quiz_next = self.course.quizzes.first()
 
     def get_user(self):
         user_id = self.request.user.id
@@ -1225,6 +1228,7 @@ class QuizQuestionView(CourseAccessMixin, QuizTake):
         context['course_id'] = self.kwargs['course_id']
         context['course'] = self.course
         context['quiz'] = self.quiz
+        context['quiz_next'] = self.quiz_next
         return context
 
     def final_result_user(self):
@@ -1240,6 +1244,7 @@ class QuizQuestionView(CourseAccessMixin, QuizTake):
             'period': self.period,
             'course': self.course,
             'quiz': self.quiz,
+            'quiz_next': self.quiz_next,
             'all_courses': get_courses(self.user, num_order=True, period=self.period),
         }