1.1 --- a/imipweb/event.py Sun May 17 01:12:05 2015 +0200
1.2 +++ b/imipweb/event.py Sun May 17 01:40:24 2015 +0200
1.3 @@ -219,7 +219,7 @@
1.4 "Set in the given 'obj' the given 'period' as the main start and end."
1.5
1.6 result = self.set_datetime_in_object(period.get_start(), period.start_attr and period.start_attr.get("TZID"), "DTSTART", obj)
1.7 - result = self.set_datetime_in_object(period.get_calendar_end(), period.end_attr and period.end_attr.get("TZID"), "DTEND", obj) or result
1.8 + result = self.set_datetime_in_object(period.get_end(), period.end_attr and period.end_attr.get("TZID"), "DTEND", obj) or result
1.9 return result
1.10
1.11 def set_periods_in_object(self, obj, periods):
1.12 @@ -237,7 +237,7 @@
1.13 for p in periods:
1.14 if p.origin != "RRULE":
1.15 tzid = p.start_attr and p.start_attr.get("TZID") or p.end_attr and p.end_attr.get("TZID")
1.16 - new_rdates.append(get_period_item(p.get_start(), p.get_calendar_end(), tzid))
1.17 + new_rdates.append(get_period_item(p.get_start(), p.get_end(), tzid))
1.18
1.19 obj["RDATE"] = new_rdates
1.20
1.21 @@ -334,7 +334,7 @@
1.22 else:
1.23 dtend, dtend_attr = dtstart, dtstart_attr
1.24
1.25 - return EventPeriod(dtstart, end_date_from_calendar(dtend), dtstart_attr, dtend_attr)
1.26 + return EventPeriod(dtstart, dtend, dtstart_attr, dtend_attr)
1.27
1.28 def get_main_period(self):
1.29