diff options
| author | Alban Gruin | 2017-09-05 11:42:45 +0200 |
|---|---|---|
| committer | Alban Gruin | 2017-09-05 11:42:45 +0200 |
| commit | 0426214423e7a43c31d62ecd4e7d8f29cb65d251 (patch) | |
| tree | a13bc170ab1c24f3724cdc0bf45e014be444de82 | |
| parent | f0158ff8d00119307bc8f8ec59de0b6a6f5be3c6 (diff) | |
Re-correction de l’affichage des remarques
| -rw-r--r-- | templates/mail/mail_timetable.txt | 2 | ||||
| -rw-r--r-- | templates/timetable.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/templates/mail/mail_timetable.txt b/templates/mail/mail_timetable.txt index 20da575..258db0c 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 != "" %} + {{ course.rooms.all|format_rooms }}{% endif %}{% if course.notes != "" and course.notes is not None %} 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 ba673ce..149068d 100644 --- a/templates/timetable.html +++ b/templates/timetable.html @@ -11,7 +11,7 @@ <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 != "" %}<br /> + <em>{{ course.rooms.all|format_rooms }}</em>{% endif %}{% if course.notes != "" and courses.notes is not None %}<br /> <small>Remarques : {{ course.notes }}</small>{% endif %} </li>{% endfor %} </ul> |