Merge lp:~mhall119/summit/fix-newschedule-times into lp:summit

Proposed by Michael Hall
Status: Merged
Approved by: Chris Johnston
Approved revision: 257
Merged at revision: 257
Proposed branch: lp:~mhall119/summit/fix-newschedule-times
Merge into: lp:summit
Diff against target: 32 lines (+5/-2)
2 files modified
summit/schedule/models/summitmodel.py (+3/-0)
summit/schedule/views.py (+2/-2)
To merge this branch: bzr merge lp:~mhall119/summit/fix-newschedule-times
Reviewer Review Type Date Requested Status
Chris Johnston Approve
Review via email: mp+89814@code.launchpad.net

Commit message

Fix localtime conversion issues

Description of the change

Fix localtime conversion issues

To post a comment you must log in.
Revision history for this message
Chris Johnston (cjohnston) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'summit/schedule/models/summitmodel.py'
--- summit/schedule/models/summitmodel.py 2012-01-21 21:56:56 +0000
+++ summit/schedule/models/summitmodel.py 2012-01-24 02:31:26 +0000
@@ -103,6 +103,9 @@
103 datetime = datetime.astimezone(pytz.utc)103 datetime = datetime.astimezone(pytz.utc)
104 return datetime.replace(tzinfo=None)104 return datetime.replace(tzinfo=None)
105105
106 def as_localtime(self, datetime):
107 return pytz.timezone(self.timezone).localize(datetime)
108
106 @property109 @property
107 def start(self):110 def start(self):
108 try:111 try:
109112
=== modified file 'summit/schedule/views.py'
--- summit/schedule/views.py 2012-01-22 20:35:48 +0000
+++ summit/schedule/views.py 2012-01-24 02:31:26 +0000
@@ -69,12 +69,12 @@
6969
70@summit_required70@summit_required
71def daily_schedule(request, summit, attendee, date):71def daily_schedule(request, summit, attendee, date):
72 viewdate = datetime.datetime.strptime(date, "%Y-%m-%d")72 viewdate = summit.as_localtime(datetime.datetime.strptime(date, "%Y-%m-%d"))
73 utc_date = summit.delocalize(viewdate)73 utc_date = summit.delocalize(viewdate)
74 day = datetime.timedelta(days=1)74 day = datetime.timedelta(days=1)
7575
76 schedule = SortedDict()76 schedule = SortedDict()
77 for slot in summit.slot_set.filter(start_utc__gte=utc_date.date, end_utc__lte=(utc_date+day)).order_by('start_utc'):77 for slot in summit.slot_set.filter(start_utc__gte=utc_date, end_utc__lte=(utc_date+day)).order_by('start_utc'):
78 if not (slot.type == 'open' or slot.type == 'plenary'):78 if not (slot.type == 'open' or slot.type == 'plenary'):
79 continue79 continue
80 if not slot in schedule:80 if not slot in schedule:

Subscribers

People subscribed via source and target branches