gergely/calendar-social
1
0
Fork 2
Code Issues 24 Pull Requests 3 Releases Wiki Activity

Fix the ordering of events #19

Merged
gergely merged 1 commits from event-ordering-fix into master 2018-07-02 17:31:26 +02:00
Conversation 0 Commits 1 Files Changed 1 +2 -1
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
calsocial/calendar_system/gregorian.py
View File

@@ -154,6 +154,7 @@ class GregorianCalendar(CalendarSystem):
end_timestamp = start_timestamp + timedelta(days=1) end_timestamp = start_timestamp + timedelta(days=1)
events = events.filter(((Event.start_time >= start_timestamp) & (Event.start_time < end_timestamp)) | events = events.filter(((Event.start_time >= start_timestamp) & (Event.start_time < end_timestamp)) |
((Event.end_time >= start_timestamp) & (Event.end_time < end_timestamp))) ((Event.end_time >= start_timestamp) & (Event.end_time < end_timestamp))) \
.order_by('start_time', 'end_time')
return events return events