arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-21 23:42:14 +00:00
Code Issues Projects Releases Wiki Activity

Improved how events are selected for display on web-calendar

Browse Source
This commit is contained in:
David Taylor
2015-06-29 14:42:53 +01:00
parent ab516c2f90
commit 0b63bbcc5b
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
RIGS/views.py
View File

@@ -300,10 +300,9 @@ class SecureAPIRequest(generic.View):
# Probably a calendar request
start_datetime = datetime.datetime.strptime( start, "%Y-%m-%dT%H:%M:%SZ" )
end_datetime = datetime.datetime.strptime( end, "%Y-%m-%dT%H:%M:%SZ" )
all_objects = self.models[model].objects
objects = self.models[model].objects.events_in_bounds(start_datetime,end_datetime)
results = []
filter = Q(start_date__lte=end_datetime) & Q(start_date__gte=start_datetime)
objects = all_objects.filter(filter).select_related('person', 'organisation', 'venue', 'mic').order_by('-start_date')
for item in objects:
data = {
'pk': item.pk,