Repository :
http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
---------------------------------------------------------------
commit 42606bc33ca01235414ec95c84515f4482333b6b
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Tue Dec 11 19:13:11 2012 +0100
Set the end date of the meeting according to the stop time.
This is necessary to be able to handle meeting in a timezone going from 00:00 to
23:59
Ref #10
---------------------------------------------------------------
fedocal/fedocallib/__init__.py | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/fedocal/fedocallib/__init__.py b/fedocal/fedocallib/__init__.py
index d46cb0a..f2ff36d 100644
--- a/fedocal/fedocallib/__init__.py
+++ b/fedocal/fedocallib/__init__.py
@@ -288,8 +288,9 @@ def get_meetings(session, calendar, year=None, month=None, day=None,
minutes=start_delta)
startdt = convert_time(startdt, 'UTC', tzone)
- stopdt = datetime(meeting.meeting_date.year,
- meeting.meeting_date.month, meeting.meeting_date.day,
+ stopdt = datetime(meeting.meeting_date_end.year,
+ meeting.meeting_date_end.month,
+ meeting.meeting_date_end.day,
meeting.meeting_time_stop.hour,
meeting.meeting_time_stop.minute, 0) + timedelta(
minutes=stop_delta)
@@ -733,7 +734,7 @@ def add_meeting(session, calendarobj, fas_user,
meeting_name=meeting_name,
meeting_manager=managers,
meeting_date=meeting_time_start.date(),
- meeting_date_end=None,
+ meeting_date_end=meeting_time_stop.date(),
meeting_time_start=meeting_time_start,
meeting_time_stop=meeting_time_stop,
meeting_information=meeting_information,