From b9d2f1e9aa0bd181b5ec3374dde97779ab319a55 Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 20 Apr 2015 00:15:10 +0100
Subject: [PATCH 1/2] Fix for issue #57

---
 RIGS/templates/RIGS/event_table.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/RIGS/templates/RIGS/event_table.html b/RIGS/templates/RIGS/event_table.html
index bddced3d..60aa7afd 100644
--- a/RIGS/templates/RIGS/event_table.html
+++ b/RIGS/templates/RIGS/event_table.html
@@ -69,7 +69,7 @@
                                     {{ event.start_date|date:"(Y-m-d)" }}<br/>
                                 </dd>
                             {% endif %}
-                            {% if event.end_time and event.start_time != event.end_time %}
+                            {% if event.end_time and (event.start_time != event.end_time or event.start_date != event.end_date) %}
                                 <dt>Event ends</dt>
                                 <dd>
                                     {{ event.end_time|date:"H:i" }}<br/>

From 12123f7b253251e3d331327cb8534df1c8404a4a Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 20 Apr 2015 00:59:00 +0100
Subject: [PATCH 2/2] Actual fix for #57 (Django templates don't like
 parenthesis in logic)

---
 RIGS/templates/RIGS/event_table.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/RIGS/templates/RIGS/event_table.html b/RIGS/templates/RIGS/event_table.html
index 60aa7afd..cf87f53d 100644
--- a/RIGS/templates/RIGS/event_table.html
+++ b/RIGS/templates/RIGS/event_table.html
@@ -69,13 +69,13 @@
                                     {{ event.start_date|date:"(Y-m-d)" }}<br/>
                                 </dd>
                             {% endif %}
-                            {% if event.end_time and (event.start_time != event.end_time or event.start_date != event.end_date) %}
+                            {% if event.end_time%}{% if event.start_date != event.end_date or event.start_time != event.end_time %}
                                 <dt>Event ends</dt>
                                 <dd>
                                     {{ event.end_time|date:"H:i" }}<br/>
                                     {{ event.end_date|date:"(Y-m-d)" }}
                                 </dd>
-                            {% endif %}
+                            {% endif %}{% endif %}
                         </dl>
                     {% endif %}
                 </td>