From 78920718408ab411680b7f5dd003b70c4e458e37 Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Tue, 5 Sep 2017 10:38:23 +0200
Subject: Correction de l’affichage des remarques

---
 templates/mail/mail_timetable.txt | 2 +-
 templates/timetable.html          | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'templates')

diff --git a/templates/mail/mail_timetable.txt b/templates/mail/mail_timetable.txt
index 7cc6b26..20da575 100644
--- a/templates/mail/mail_timetable.txt
+++ b/templates/mail/mail_timetable.txt
@@ -1,6 +1,6 @@
 {% load rooms %}{% autoescape off %}{% for day in courses %}{% filter title %}{{ day.0.begin|date:"l j F o" }}{% endfilter %} - de {{ day.0.begin|date:"H:i" }} à {% with day|last as last %}{{ last.end|date:"H:i" }}{% endwith %}
 {% for course in day %} * {{ course.name }} ({{ course.type }}), de {{ course.begin|date:"H:i" }} à {{ course.end|date:"H:i" }}{% if course.rooms.all|length > 0 %}
-   {{ course.rooms.all|format_rooms }}{% endif %}{% if course.notes is not None %}
+   {{ course.rooms.all|format_rooms }}{% endif %}{% if course.notes != "" %}
    Remarques : {{ course.notes }}{% endif %}
 
 {% endfor %}{% empty %}Aucun cours pour le groupe {{ group }} pendant la semaine {{ week }}.
diff --git a/templates/timetable.html b/templates/timetable.html
index 264a25c..ba673ce 100644
--- a/templates/timetable.html
+++ b/templates/timetable.html
@@ -9,7 +9,11 @@
       <section>
         <h3>{% filter title %}{{ day.0.begin|date:"l j F o" }}{% endfilter %} &ndash; de {{ day.0.begin|date:"H:i" }} à {% with day|last as last %}{{ last.end|date:"H:i" }}{% endwith %}</h3>
         <ul>{% for course in day %}
-          <li class="course"><b>{{ course.name }}</b> ({{ course.type }}), de {{ course.begin|date:"H:i" }} à {{ course.end|date:"H:i" }}{% if course.rooms.all|length > 0 %}<br /><em>{{ course.rooms.all|format_rooms }}</em>{% endif %}{% if course.notes is not None %}<br /><small>Remarques : {{ course.notes }}</small>{% endif %}</li>{% endfor %}
+          <li class="course">
+            <b>{{ course.name }}</b> ({{ course.type }}), de {{ course.begin|date:"H:i" }} à {{ course.end|date:"H:i" }}{% if course.rooms.all|length > 0 %}<br />
+            <em>{{ course.rooms.all|format_rooms }}</em>{% endif %}{% if course.notes != "" %}<br />
+            <small>Remarques : {{ course.notes }}</small>{% endif %}
+          </li>{% endfor %}
         </ul>
       </section>{% endfor %}
       <p><a class="subscribe" href="{% url "subscribe" group.timetable.slug group.slug year week %}">S’abonner à cet emploi du temps</a></p>{% endblock %}
-- 
cgit v1.2.1