From cc479941c95fc487d1bbe8ed49af825177c55a81 Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Sun, 26 Feb 2017 21:38:08 +0100
Subject: Différentes améliorations concernant l'affichage des emplois du temps
- Affichage des remarques concernant les cours sur les emplois du temps et
dans les mails - Meilleur formatage des salles - Meilleure gestion des
retours à la ligne dans les mails
---
templates/mail/mail_timetable.txt | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'templates/mail')
diff --git a/templates/mail/mail_timetable.txt b/templates/mail/mail_timetable.txt
index a14ce9a..f6b8364 100644
--- a/templates/mail/mail_timetable.txt
+++ b/templates/mail/mail_timetable.txt
@@ -1,7 +1,7 @@
-{% 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 %}
- Salle{% if course.rooms.all|length > 1 %}s{% endif %} {% for room in course.rooms.all %}{{ room }} {% endfor %}{% endif %}
+{% 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 %}
+ Remarques : {{ course.notes }}{% endif %}
{% endfor %}{% empty %}Aucun cours pour le groupe {{ group }} pendant la semaine {{ week }}.
{% endfor %}{% endautoescape %}
--
cgit v1.2.1