Better handling of blended learning detection

diff --git a/teleforma/templates/teleforma/seminar_testimonial.html b/teleforma/templates/teleforma/seminar_testimonial.html
index 900fa6095d6b4aff261ec23869f22d882b4ffa7d..6f3f57cb8ad5a66dcbee3ba0d7e6eee32b2a85f6 100644 (file)
--- a/teleforma/templates/teleforma/seminar_testimonial.html
+++ b/teleforma/templates/teleforma/seminar_testimonial.html
@@ -36,17 +36,15 @@
       <tr><td class="bold">{% trans "Address" %} : </td><td>{{ testimonial.user.auditor.all.0.address }} {{ testimonial.user.auditor.all.0.postal_code }} {{ testimonial.user.auditor.all.0.city }}</td></tr>
       <tr><td class="bold">{% trans "Object" %} : </td><td>{{ seminar.title }}</td></tr>
       <tr><td class="bold">{% trans "Course" %} : </td><td>{{ seminar.course }}</td></tr>
-      <tr><td class="bold">{% trans "Training type" %} : </td><td>{% if seminar.conference and seminar.conference.webclass %}Blended-learning{% else %}E-learning{% endif %}</td></tr>
+      <tr><td class="bold">{% trans "Training type" %} : </td><td>{% if blended  %}Blended-learning{% else %}E-learning{% endif %}</td></tr>
       <tr><td class="bold">{% trans "Duration" %} : </td><td>
         {{ seminar.duration|hours }} {% trans "hours" %}
-        {% if seminar.conference and seminar.conference.webclass %}
-          {% with conference=seminar.conference %}
-            {% if seminar.conference.webclass_hours_complementary %}
-                  ({{conference.webclass_duration|fancy_seconds}} de webconférence en direct + {{conference.webclass_hours_complementary.as_seconds|fancy_seconds}} de
-                  validation des acquis)
-              </p>
-            {% endif %}
-          {% endwith %}
+        {% if blended %}
+          {% if conference.webclass_hours_complementary %}
+                ({{conference.webclass_duration|fancy_seconds}} de webconférence en direct + {{conference.webclass_hours_complementary.as_seconds|fancy_seconds}} de
+                validation des acquis)
+            </p>
+          {% endif %}
         {% endif %}
       </td></tr>
       <tr><td class="bold">{% trans "Training begin date" %} : </td><td>{{ first_revision.date|date:'j F Y' }}</td></tr>

diff --git a/teleforma/views/pro.py b/teleforma/views/pro.py
index b02e0baf4ea3f5e55708f163e830d0db2f73a0c2..29b089bfd4241ddd3590ca4a1c1ddbee8e183a8d 100644 (file)
--- a/teleforma/views/pro.py
+++ b/teleforma/views/pro.py
@@ -774,6 +774,7 @@ class TestimonialView(PDFTemplateResponseMixin, SeminarView):
     def get_context_data(self, **kwargs):
         context = super(TestimonialView, self).get_context_data(**kwargs)
         seminar = context['seminar']
+        
         revisions = SeminarRevision.objects.filter(seminar=seminar, user=self.request.user).order_by('date')
         if revisions:
             context['first_revision'] = revisions[0]
@@ -782,6 +783,12 @@ class TestimonialView(PDFTemplateResponseMixin, SeminarView):
         if testimonials:
             context['testimonial'] = testimonials[0]
 
+        context['blended'] = False
+        if seminar.conference:
+            if seminar.conference.webclass and seminar.conference in self.request.user.auditor.get().conferences.all():
+                context['blended'] = True
+                context['conference'] = seminar.conference
+
         return context
 
     @method_decorator(login_required)