From de405f2212fa64ad2a6a11f6d18186571021ad8c Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Mon, 13 Feb 2017 19:39:41 +0100
Subject: Regroupement des deux mails d'emploi du temps dans une seule
 template, c'est plus propre

---
 management/commands/sendmails.py  | 11 +++--------
 templates/mail/mail_noevent.txt   |  2 --
 templates/mail/mail_timetable.txt |  2 +-
 3 files changed, 4 insertions(+), 11 deletions(-)
 delete mode 100644 templates/mail/mail_noevent.txt

diff --git a/management/commands/sendmails.py b/management/commands/sendmails.py
index e30bb1b..9a05a9c 100644
--- a/management/commands/sendmails.py
+++ b/management/commands/sendmails.py
@@ -40,7 +40,6 @@ class Command(BaseCommand):
         mails = []
 
         footer = loader.get_template("mail/mail_footer.txt")
-        no_event = loader.get_template("mail/mail_noevent.txt")
         timetable = loader.get_template("mail/mail_timetable.txt")
 
         print("Generating messages...")
@@ -48,13 +47,9 @@ class Command(BaseCommand):
             if subscription.group.id not in content:
                 courses = Course.objects.get_courses_for_group(subscription.group, begin__gte=start, begin__lt=end)
 
-                if len(courses) > 0:
-                    grouped_courses = group_courses(courses)
-                    context = Context({"courses": grouped_courses, "week": week})
-                    content[subscription.group.id] = timetable.render(context)
-                else:
-                    context = Context({"group": subscription.group, "week": week})
-                    content[subscription.group.id] = no_event.render(context)
+                grouped_courses = group_courses(courses)
+                context = Context({"courses": grouped_courses, "group": subscription.group, "week": week})
+                content[subscription.group.id] = timetable.render(context)
 
             context = Context({"admins": settings.ADMINS, "token": subscription.token, "domain": settings.DEFAULT_DOMAIN})
             mail_content = content[subscription.group.id] + footer.render(context)
diff --git a/templates/mail/mail_noevent.txt b/templates/mail/mail_noevent.txt
deleted file mode 100644
index dc01189..0000000
--- a/templates/mail/mail_noevent.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Aucun cours pour le groupe {{ group }} pendant la semaine {{ week }}.
-
diff --git a/templates/mail/mail_timetable.txt b/templates/mail/mail_timetable.txt
index 65b5c01..06a2b1c 100644
--- a/templates/mail/mail_timetable.txt
+++ b/templates/mail/mail_timetable.txt
@@ -2,5 +2,5 @@
 {% 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 %}
-{% endfor %}
+{% endfor %}{% empty %}Aucun cours pour le groupe {{ group }} pendant la semaine {{ week }}.
 {% endfor %}{% endautoescape %}
-- 
cgit v1.2.1