1.1 --- a/imipweb/data.py Sat May 16 18:26:55 2015 +0200
1.2 +++ b/imipweb/data.py Sat May 16 20:02:09 2015 +0200
1.3 @@ -21,7 +21,9 @@
1.4
1.5 from datetime import datetime, timedelta
1.6 from imiptools.data import get_tzid
1.7 -from imiptools.dates import format_datetime, get_datetime, get_start_of_day, to_date
1.8 +from imiptools.dates import end_date_from_calendar, end_date_to_calendar, \
1.9 + format_datetime, get_datetime, get_start_of_day, \
1.10 + to_date
1.11 from imiptools.period import Period
1.12
1.13 class PeriodError(Exception):
1.14 @@ -92,7 +94,8 @@
1.15 self.get_form_start(),
1.16 self.get_form_end(),
1.17 isinstance(self.end, datetime) or self.get_start() != self.get_end(),
1.18 - isinstance(self.start, datetime) or isinstance(self.end, datetime)
1.19 + isinstance(self.start, datetime) or isinstance(self.end, datetime),
1.20 + self.origin
1.21 )
1.22
1.23 def get_form_date(self, dt, attr=None):
1.24 @@ -299,30 +302,6 @@
1.25 else:
1.26 return {"VALUE" : "DATE"}
1.27
1.28 -def end_date_to_calendar(dt):
1.29 -
1.30 - """
1.31 - Change end dates to refer to the iCalendar "next day" dates, not the actual
1.32 - dates.
1.33 - """
1.34 -
1.35 - if not isinstance(dt, datetime):
1.36 - return dt + timedelta(1)
1.37 - else:
1.38 - return dt
1.39 -
1.40 -def end_date_from_calendar(dt):
1.41 -
1.42 - """
1.43 - Change end dates to refer to the actual dates, not the iCalendar "next day"
1.44 - dates.
1.45 - """
1.46 -
1.47 - if not isinstance(dt, datetime):
1.48 - return dt - timedelta(1)
1.49 - else:
1.50 - return dt
1.51 -
1.52 def event_period_from_period(period):
1.53 if isinstance(period, EventPeriod):
1.54 return period