From 80916ae67962babc98d33fb44a2abeb1eaef9228 Mon Sep 17 00:00:00 2001
From: Edward Betts <edward@4angle.com>
Date: Mon, 1 Jan 2024 00:43:09 +0000
Subject: [PATCH 1/2] Show more future events

---
 agenda/data.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/agenda/data.py b/agenda/data.py
index c776c42..38346e2 100644
--- a/agenda/data.py
+++ b/agenda/data.py
@@ -360,7 +360,7 @@ async def get_data(
     two_weeks_ago = today - timedelta(weeks=2)
     last_week = today - timedelta(weeks=1)
     last_year = today - timedelta(days=365)
-    next_year = today + timedelta(days=365)
+    next_year = today + timedelta(days=2 * 365)
 
     minus_365 = now - timedelta(days=365)
     plus_365 = now + timedelta(days=365)
@@ -478,9 +478,7 @@ async def get_data(
     busy_events = [
         e
         for e in sorted(events, key=lambda e: e.as_date)
-        if e.as_date > today
-        and e.as_date < (today + timedelta(days=365 * 2))
-        and busy_event(e)
+        if e.as_date > today and e.as_date < next_year and busy_event(e)
     ]
 
     gaps = find_gaps(busy_events)

From f49b0ce732ab33d6a92c0bca03d21a77f03ec9ee Mon Sep 17 00:00:00 2001
From: Edward Betts <edward@4angle.com>
Date: Mon, 1 Jan 2024 00:43:24 +0000
Subject: [PATCH 2/2] Improve end time display

---
 templates/index.html | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/templates/index.html b/templates/index.html
index fdc2336..2dcf2c8 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -171,8 +171,13 @@
       </div>
 
       <div class="col-md-2{{ cell_bg }}">
-        {% if event.end_date and event.end_as_date != event.as_date %}
-          {{event.end_date}}
+        {% if event.end_date %}
+          {% if event.end_as_date == event.as_date and event.has_time %}
+            end: {{event.end_date.strftime("%H:%M") }}
+            (duration: {{event.end_date - event.date}})
+          {% elif event.end_date != event.date %}
+            {{event.end_date}}
+          {% endif %}
         {% endif %}
       </div>