From abef352d64aca4d65764c5c9b2fabeeffeef8733 Mon Sep 17 00:00:00 2001 From: yomguy Date: Fri, 21 Dec 2012 17:25:29 +0100 Subject: [PATCH] modify seminar scenario --- teleforma/templates/teleforma/seminar_detail.html | 7 ++++--- teleforma/views/pro.py | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/teleforma/templates/teleforma/seminar_detail.html b/teleforma/templates/teleforma/seminar_detail.html index bde78eb8..b9048190 100644 --- a/teleforma/templates/teleforma/seminar_detail.html +++ b/teleforma/templates/teleforma/seminar_detail.html @@ -123,8 +123,8 @@ $(function() { {% endif %} {% endwith %} - {% if validated %} - + + {% if seminar_progress == 100 %} {% with seminar.docs_correct as docs %} {% if docs.all.count > 1 %} {% with _("Step 5 : read these corrected documents") as title %} @@ -142,11 +142,12 @@ $(function() { {% include "teleforma/inc/evaluation_form.html" %} {% endwith %} {% endwith %} + {% endif %} + {% if validated %} {% with _("Step 7 : download your testimonial") as title %} {% include "teleforma/inc/testimonial_list.html" %} {% endwith %} - {% endif %} {% endblock course_content %} diff --git a/teleforma/views/pro.py b/teleforma/views/pro.py index 0bd02c70..075d9264 100644 --- a/teleforma/views/pro.py +++ b/teleforma/views/pro.py @@ -138,7 +138,7 @@ def seminar_progress(user, seminar): questions = Question.objects.filter(seminar=seminar, status=3) for question in questions: total += question.weight - answer = Answer.objects.filter(question=question, status=3, user=user, validated=True) + answer = Answer.objects.filter(question=question, status=3, user=user) if answer: progress += question.weight -- 2.39.5