Fix issue with testimonial

diff --git a/teleforma/management/commands/teleforma-revisions-from-bbb.py b/teleforma/management/commands/teleforma-revisions-from-bbb.py
index 6271a8fe5656832c253f67360d8e5b2ff45f8afd..a0ce3ec83e7d5a022efd5c986f42090ba3f81675 100644 (file)
--- a/teleforma/management/commands/teleforma-revisions-from-bbb.py
+++ b/teleforma/management/commands/teleforma-revisions-from-bbb.py
@@ -119,8 +119,8 @@ class Command(BaseCommand):
 
                 required_duration = (conf.date_end - conf.date_begin).total_seconds() * 0.9
                 
-                # print("Required duration: %d seconds" % required_duration)
-                # print("Total spent: %d seconds" % total_spent.total_seconds())
+                print("Required duration: %d seconds" % required_duration)
+                print("Total spent: %d seconds" % total_spent.total_seconds())
                 if total_spent.total_seconds() >= required_duration:
                     # Chercher une attestation existante
                     if seminar:
@@ -135,7 +135,7 @@ class Command(BaseCommand):
                             user=user,
                             seminar=None
                         ).first()
-                    # print("Existing testimonial: %s" % existing_testimonial)
+                    print("Existing testimonial: %s" % existing_testimonial)
 
                     if not existing_testimonial:
                         print("Creating testimonial for %s" % conf.title + " for user " + user.username)

diff --git a/teleforma/templates/teleforma/testimonials.html b/teleforma/templates/teleforma/testimonials.html
index 1b1fe1619e90dc584e37382a59538f62be13724a..cee9eea28a0ce46ff2a371f4b2f4ccbf5004f120 100644 (file)
--- a/teleforma/templates/teleforma/testimonials.html
+++ b/teleforma/templates/teleforma/testimonials.html
@@ -58,32 +58,33 @@
    <table class="listing" width="100%">
     <tbody id="spacing">
 
-    {% if testimonial.seminar %}
+    {% if testimonial.conference %}
     <tr>
-     <td><a href="{% url 'teleforma-seminar-testimonial' testimonial.seminar.id %}?format=pdf" target="_blank"><img src="{{ STATIC_URL }}/teleforma/images/application-msword.png" style="vertical-align:middle" alt="" /> {% trans "Training testimonial" %}</a></td>
-     <td>{% trans "validated on" %} {% if testimonial.date_modified %}{{ testimonial.date_modified|date:'j F Y' }}{% else %}{{ testimonial.date_added|date:'j F Y' }}{% endif %}</td>
-     <td><a href="{% url 'teleforma-seminar-testimonial-download' testimonial.seminar.id %}?format=pdf"><img src="{{ STATIC_URL }}teleforma/images/download.png" style="vertical-align:middle" alt="" title="{% trans "Download" %}" /></a></td>
-    </tr>
-
-    {% if show_fifpl %}<tr>
-     <td><a href="{% url 'teleforma-seminar-testimonial-payback' testimonial.seminar.id %}?format=pdf" target="_blank"><img src="{{ STATIC_URL }}/teleforma/images/application-msword.png" style="vertical-align:middle" alt="" /> {% trans "Payback testimonial" %} ({% trans "only to have support of the training costs" %})</td>
+     <td><a href="{% url 'teleforma-conference-testimonial' testimonial.conference.id %}?format=pdf" target="_blank"><img src="{{ STATIC_URL }}/teleforma/images/application-msword.png" style="vertical-align:middle" alt="" />Attestation de formation</a></td>
      <td>{% trans "validated on" %} {% if testimonial.date_modified %}{{ testimonial.date_modified|date:'j F Y' }}{% else %}{{ testimonial.date_added|date:'j F Y' }}{% endif %}</td>
-     <td><a href="{% url 'teleforma-seminar-testimonial-payback' testimonial.seminar.id %}?format=pdf" target="_blank"><img src="{{ STATIC_URL }}teleforma/images/download.png" style="vertical-align:middle" alt="" title="{% trans "Download" %}" /></a></td>
+     <td><a href="{% url 'teleforma-conference-testimonial-download' testimonial.conference.id %}?format=pdf"><img src="{{ STATIC_URL }}teleforma/images/download.png" style="vertical-align:middle" alt="" title="{% trans "Download" %}" /></a></td>
     </tr>
-    {% endif %}
-    {% elif testimonial.conference %}
+      {% if show_fifpl %}<tr>
+      <td><a href="{% url 'teleforma-conference-testimonial-payback' testimonial.conference.id %}?format=pdf" target="_blank"><img src="{{ STATIC_URL }}/teleforma/images/application-msword.png" style="vertical-align:middle" alt="" /> {% trans "Payback testimonial" %} ({% trans "only to have support of the training costs" %})</td>
+      <td>{% trans "validated on" %} {% if testimonial.date_modified %}{{ testimonial.date_modified|date:'j F Y' }}{% else %}{{ testimonial.date_added|date:'j F Y' }}{% endif %}</td>
+      <td><a href="{% url 'teleforma-conference-testimonial-payback' testimonial.conference.id %}?format=pdf" target="_blank"><img src="{{ STATIC_URL }}teleforma/images/download.png" style="vertical-align:middle" alt="" title="{% trans "Download" %}" /></a></td>
+      </tr>
+      {% endif %}
+    {% elif testimonial.seminar %}
     <tr>
-     <td><a href="{% url 'teleforma-conference-testimonial' testimonial.conference.id %}?format=pdf" target="_blank"><img src="{{ STATIC_URL }}/teleforma/images/application-msword.png" style="vertical-align:middle" alt="" /> {% trans "Training testimonial" %}</a></td>
+     <td><a href="{% url 'teleforma-seminar-testimonial' testimonial.seminar.id %}?format=pdf" target="_blank"><img src="{{ STATIC_URL }}/teleforma/images/application-msword.png" style="vertical-align:middle" alt="" /> {% trans "Training testimonial" %}</a></td>
      <td>{% trans "validated on" %} {% if testimonial.date_modified %}{{ testimonial.date_modified|date:'j F Y' }}{% else %}{{ testimonial.date_added|date:'j F Y' }}{% endif %}</td>
-     <td><a href="{% url 'teleforma-conference-testimonial-download' testimonial.conference.id %}?format=pdf"><img src="{{ STATIC_URL }}teleforma/images/download.png" style="vertical-align:middle" alt="" title="{% trans "Download" %}" /></a></td>
+     <td><a href="{% url 'teleforma-seminar-testimonial-download' testimonial.seminar.id %}?format=pdf"><img src="{{ STATIC_URL }}teleforma/images/download.png" style="vertical-align:middle" alt="" title="{% trans "Download" %}" /></a></td>
     </tr>
 
-    {% if show_fifpl %}<tr>
-     <td><a href="{% url 'teleforma-conference-testimonial-payback' testimonial.conference.id %}?format=pdf" target="_blank"><img src="{{ STATIC_URL }}/teleforma/images/application-msword.png" style="vertical-align:middle" alt="" /> {% trans "Payback testimonial" %} ({% trans "only to have support of the training costs" %})</td>
-     <td>{% trans "validated on" %} {% if testimonial.date_modified %}{{ testimonial.date_modified|date:'j F Y' }}{% else %}{{ testimonial.date_added|date:'j F Y' }}{% endif %}</td>
-     <td><a href="{% url 'teleforma-conference-testimonial-payback' testimonial.conference.id %}?format=pdf" target="_blank"><img src="{{ STATIC_URL }}teleforma/images/download.png" style="vertical-align:middle" alt="" title="{% trans "Download" %}" /></a></td>
-    </tr>
-    {% endif %}
+      {% if show_fifpl %}<tr>
+      <td><a href="{% url 'teleforma-seminar-testimonial-payback' testimonial.seminar.id %}?format=pdf" target="_blank"><img src="{{ STATIC_URL }}/teleforma/images/application-msword.png" style="vertical-align:middle" alt="" /> {% trans "Payback testimonial" %} ({% trans "only to have support of the training costs" %})</td>
+      <td>{% trans "validated on" %} {% if testimonial.date_modified %}{{ testimonial.date_modified|date:'j F Y' }}{% else %}{{ testimonial.date_added|date:'j F Y' }}{% endif %}</td>
+      <td><a href="{% url 'teleforma-seminar-testimonial-payback' testimonial.seminar.id %}?format=pdf" target="_blank"><img src="{{ STATIC_URL }}teleforma/images/download.png" style="vertical-align:middle" alt="" title="{% trans "Download" %}" /></a></td>
+      </tr>
+      {% endif %}
+
+
     {% endif %}
 
     </tbody>

diff --git a/teleforma/views/pro.py b/teleforma/views/pro.py
index 666721573d7039eb6335c185d8c6efc873a0b5e1..659df3975e049bc997dcd3597e607fd7622bcad4 100644 (file)
--- a/teleforma/views/pro.py
+++ b/teleforma/views/pro.py
@@ -929,15 +929,15 @@ class TestimonialListView(ListView):
         user = self.request.user
         testimonials = Testimonial.objects.filter(user=user)
         for testimonial in testimonials:
-            if testimonial.seminar:
+            if testimonial.conference:
+                # Attestation de conférence (webconf sans séminaire associé)
+                # Pour les conférences, pas de validation nécessaire, juste vérifier que l'attestation existe
+                t.append(testimonial)
+            elif testimonial.seminar:
                 # Attestation de séminaire
                 seminar = testimonial.seminar
                 if seminar_validated(user, seminar) and (get_seminar_delta(user, seminar) >= 0 or testimonial.date_added <= REVISION_DATE_FILTER):
                     t.append(testimonial)
-            elif testimonial.conference:
-                # Attestation de conférence (webconf sans séminaire associé)
-                # Pour les conférences, pas de validation nécessaire, juste vérifier que l'attestation existe
-                t.append(testimonial)
         return t
 
     def get_context_data(self, **kwargs):