1.1 --- a/imipweb/calendar.py Tue Feb 09 15:57:23 2016 +0100
1.2 +++ b/imipweb/calendar.py Wed Mar 02 21:17:11 2016 +0100
1.3 @@ -3,7 +3,7 @@
1.4 """
1.5 A Web interface to an event calendar.
1.6
1.7 -Copyright (C) 2014, 2015 Paul Boddie <paul@boddie.org.uk>
1.8 +Copyright (C) 2014, 2015, 2016 Paul Boddie <paul@boddie.org.uk>
1.9
1.10 This program is free software; you can redistribute it and/or modify it under
1.11 the terms of the GNU General Public License as published by the Free Software
1.12 @@ -26,7 +26,6 @@
1.13 get_start_of_next_day, get_timestamp, ends_on_same_day, \
1.14 to_date, to_timezone
1.15 from imiptools.period import add_day_start_points, add_empty_days, add_slots, \
1.16 - get_overlapping, \
1.17 get_scale, get_slots, get_spans, partition_by_day, \
1.18 remove_end_slot, Period, Point
1.19 from imipweb.resource import FormUtilities, ResourceClient
1.20 @@ -323,8 +322,8 @@
1.21 view_end = view_period.get_end()
1.22 duration = view_period.get_duration()
1.23
1.24 - preceding_events = view_start and get_overlapping(freebusy, Period(None, view_start, self.get_tzid())) or []
1.25 - following_events = view_end and get_overlapping(freebusy, Period(view_end, None, self.get_tzid())) or []
1.26 + preceding_events = view_start and freebusy.get_overlapping(Period(None, view_start, self.get_tzid())) or []
1.27 + following_events = view_end and freebusy.get_overlapping(Period(view_end, None, self.get_tzid())) or []
1.28
1.29 last_preceding = preceding_events and to_date(preceding_events[-1].get_end()) + timedelta(1) or None
1.30 first_following = following_events and to_date(following_events[0].get_start()) or None