1.1 --- a/imipweb/resource.py Sat Mar 28 00:52:14 2015 +0100
1.2 +++ b/imipweb/resource.py Sat Mar 28 00:55:12 2015 +0100
1.3 @@ -23,7 +23,8 @@
1.4 from imiptools.client import Client
1.5 from imiptools.data import get_uri, get_window_end, Object, uri_values
1.6 from imiptools.dates import format_datetime, format_time
1.7 -from imiptools.period import remove_period, remove_affected_period, update_freebusy
1.8 +from imiptools.period import FreeBusyPeriod, \
1.9 + remove_period, remove_affected_period, update_freebusy
1.10 from imipweb.env import CGIEnvironment
1.11 import babel.dates
1.12 import imip_store
1.13 @@ -132,19 +133,20 @@
1.14
1.15 # Convert the periods to more substantial free/busy items.
1.16
1.17 - for start, end in periods:
1.18 + for p in periods:
1.19
1.20 # Subtract any recurrences from the free/busy details of a
1.21 # parent object.
1.22
1.23 - if recurrenceid or start not in recurrenceids:
1.24 - summary.append((
1.25 - start, end, uid,
1.26 - obj.get_value("TRANSP"),
1.27 - recurrenceid,
1.28 - obj.get_value("SUMMARY"),
1.29 - obj.get_value("ORGANIZER")
1.30 - ))
1.31 + if recurrenceid or p.start not in recurrenceids:
1.32 + summary.append(
1.33 + FreeBusyPeriod(
1.34 + p.start, p.end, uid,
1.35 + obj.get_value("TRANSP"),
1.36 + recurrenceid,
1.37 + obj.get_value("SUMMARY"),
1.38 + obj.get_value("ORGANIZER")
1.39 + ))
1.40 return summary
1.41
1.42 # Preference methods.