]> git.parisson.com Git - teleforma.git/commitdiff
quiz must be validated for seminar validation
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 22 Jan 2016 13:39:42 +0000 (14:39 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Fri, 22 Jan 2016 13:39:42 +0000 (14:39 +0100)
teleforma/context_processors.py
teleforma/views/pro.py

index 49edb4c749bc937eb447b1203ce434e150941ba9..fb84e5e1d651153d5dc2e50b85a2859217d94e8a 100644 (file)
@@ -68,7 +68,8 @@ def seminar_progress(user, seminar):
 def seminar_validated(user, seminar):
     validated = []
     questions = seminar.question.filter(status=3)
-    if questions:
+    quiz_validations = QuizValidation.objects.filter(user=user, quiz=seminar.quiz, validated=True)
+    if questions and quiz_validations:
         for question in questions:
             answers = Answer.objects.filter(question=question, user=user,
                                             validated=True, treated=True)
index 70cc42b3ffc6eb9cb4f2cfa132ab5a6ca758a2bb..3199f12ae8cc99b19826ec9844a4e4c6a86588b4 100644 (file)
@@ -170,8 +170,8 @@ class SeminarView(SeminarAccessMixin, DetailView):
         seminar = context['seminar']
         user = self.request.user
 
-        progress = seminar_progress(user, seminar)
         validated = seminar_validated(user, seminar)
+        progress = seminar_progress(user, seminar)
         context['seminar_progress'] = progress
         context['seminar_validated'] = validated