From 90ed1c9c1ddb29c065382f9b0fa42512e888293b Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 29 Jun 2015 20:28:09 +0100
Subject: [PATCH] Added additional selectors to events_in_bounds

---
 RIGS/models.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/RIGS/models.py b/RIGS/models.py
index 9515b208..6a1801a7 100644
--- a/RIGS/models.py
+++ b/RIGS/models.py
@@ -229,7 +229,14 @@ class EventManager(models.Manager):
             (models.Q(start_date__gte=start.date(), start_date__lte=end.date())) |  # Start date in bounds
             (models.Q(end_date__gte=start.date(), end_date__lte=end.date())) |  # End date in bounds
             (models.Q(access_at__gte=start, access_at__lte=end)) |  # Access at in bounds
-            (models.Q(meet_at__gte=start, meet_at__lte=end))  # Meet at in bounds
+            (models.Q(meet_at__gte=start, meet_at__lte=end)) | # Meet at in bounds
+
+            (models.Q(start_date__lte=start, end_date__gte=end)) | # Start before, end after
+            (models.Q(access_at__lte=start, start_date__gte=end)) | # Access before, start after
+            (models.Q(access_at__lte=start, end_date__gte=end)) | # Access before, end after
+            (models.Q(meet_at__lte=start, start_date__gte=end)) | # Meet before, start after
+            (models.Q(meet_at__lte=start, end_date__gte=end)) # Meet before, end after
+
         ).order_by('start_date', 'end_date', 'start_time', 'end_time', 'meet_at').select_related('person', 'organisation', 'venue', 'mic')
         return events