From 363202a01e4f5d647c1663c5577df1762402ea66 Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Fri, 7 Oct 2016 15:40:29 +0200
Subject: [PATCH] Update event date display

---
 app/templates/agenda/includes/event_date.html | 39 +++++++++++++------
 lib/mezzanine-agenda                          |  2 +-
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/app/templates/agenda/includes/event_date.html b/app/templates/agenda/includes/event_date.html
index 1e9193f6..71ebf4b5 100644
--- a/app/templates/agenda/includes/event_date.html
+++ b/app/templates/agenda/includes/event_date.html
@@ -1,10 +1,11 @@
 {% load i18n %}
+{% load event_tags %}
 
 <!-- Start date only  -->
 {% if event.start and not event.end %}
     {{ event.start|date:"l j F" }}<br>
     <!-- Start date with hour  -->
-    {% if event.start|date:"H:i" != "23:59" %}
+    {% if event.start and event.start|date:"H:i" != "23:59" %}
         {{ event.start|date:"H\hi" }}
     {% endif %}
 
@@ -15,37 +16,51 @@
         {% if not event.periods.all %}
             {{ event.start|date:"l j F" }}<br>
             <!-- Start date with hour  -->
-            {% if event.start|date:"H:i" != "23:59" %}
-                {% if event.end|date:"H:i" != "23:59" %}
-                    {{ event.start|date:"H\hi" }} - {{ event.end|date:"H\hi" }}
-                {% else %}
-                    {{ event.start|date:"H\hi" }}
-                {% endif %}
+            {% if event.end and event.end|date:"H:i" != "23:59" %}
+                {{ event.start|date:"H\hi" }} - {{ event.end|date:"H\hi" }}
+            {% else %}
+                {{ event.start|date:"H\hi" }}
             {% endif %}
         {% else %}
             {{ event.start|date:"j F" }}<br>
             {% for period in event.periods.all %}
-                {% if period.date_to|date:"H:i" != "23:59" %}
+                {% if period.date_to and period.date_to|date:"H:i" != "23:59" %}
                     {{ period.date_from|date:"H\hi" }} - {{ period.date_to|date:"H\hi" }}<br>
                 {% else %}
-                    {{ period.date_from|date:"H\hi" }}<br>
+                    {% if forloop.last %} {% trans "and"%} {% elif not forloop.first %}, {% endif %}
+                        {{ period.date_from|date:"H\hi" }}
                 {% endif %}
             {% endfor %}
         {% endif %}
 
     <!-- Start and end date are the same month  -->
     {% elif event.start|date:"m.y" == event.end|date:"m.y" %}
+      {% if event.periods.all %}
+        {% with event.periods.all|same_time_in_periods as same_time_in_periods %}
         {% for period in event.periods.all %}
             {% if period.date_to and period.date_to|date:"H:i" != "23:59" %}
                 {{ period.date_from|date:"j F" }} {% trans "from" %} {{ period.date_from|date:"H\hi" }} {% trans "to" %} {{ period.date_to|date:"H\hi" }}<br>
             {% else %}
-                {{ period.date_from|date:"j F" }} {% trans "at" %} {{ period.date_from|date:"H\hi" }}<br>
+                {% if event.periods.all|length > 1 and not forloop.last %}
+                    {{ period.date_from|date:"j" }},
+                {% else %}
+                    {{ period.date_from|date:"j F" }}
+                    {% if event.periods.all|length > 1 and forloop.first %} {% trans "and" %}{% endif %}
+                {% endif %}
+                {% if same_time_in_periods and forloop.last %}
+                    <br>{{ period.date_from|date:"H\hi" }}
+                {% elif not same_time_in_periods %}
+                    <br>{{ period.date_from|date:"H\hi" }}<br>
+                {% endif %}
             {% endif %}
         {% endfor %}
-
+        {% endwith %}
+      {% else %}
+        {% trans "from" %} {{ event.start|date:"l j F" }} {% trans "to" %} {{ event.end|date:"l j F" }}<br>{{ event.start|date:"H\hi" }} - {{ event.end|date:"H\hi" }}
+      {% endif %}
     <!-- Start and end date are completely different  -->
     {% else %}
-        {{ event.start|date:"j F" }} {% if event.end|date:"H:i" != "23:59" %} {% trans "to" %} {{ event.end|date:"j F" }}<br>{{ event.start|date:"H\hi" }} {% endif %}
+        {{ event.start|date:"j F" }}  {% trans "to" %} {{ event.end|date:"j F" }}
     {% endif %}
 
 {% endif %}
diff --git a/lib/mezzanine-agenda b/lib/mezzanine-agenda
index 6debdb55..9f956d50 160000
--- a/lib/mezzanine-agenda
+++ b/lib/mezzanine-agenda
@@ -1 +1 @@
-Subproject commit 6debdb55579fa65eed3ecf0c01ae02b63eb03587
+Subproject commit 9f956d508a8d12f3d4e0df503f7e128049bb621b
-- 
2.39.5