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

[Michael Hall]

Fix localtime conversion issues

Fix localtime conversion issues

[Chris Johnston (cjohnston)]

review: Approve

=== 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 @@
             datetime = datetime.astimezone(pytz.utc)
         return datetime.replace(tzinfo=None)
 
+    def as_localtime(self, datetime):
+        return pytz.timezone(self.timezone).localize(datetime)
+
     @property
     def start(self):
         try:
 
=== 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 @@
 
 @summit_required
 def daily_schedule(request, summit, attendee, date):
-    viewdate = datetime.datetime.strptime(date, "%Y-%m-%d")
+    viewdate = summit.as_localtime(datetime.datetime.strptime(date, "%Y-%m-%d"))
     utc_date = summit.delocalize(viewdate)
     day = datetime.timedelta(days=1)
 
     schedule = SortedDict()
-    for slot in summit.slot_set.filter(start_utc__gte=utc_date.date, end_utc__lte=(utc_date+day)).order_by('start_utc'):
+    for slot in summit.slot_set.filter(start_utc__gte=utc_date, end_utc__lte=(utc_date+day)).order_by('start_utc'):
         if not (slot.type == 'open' or slot.type == 'plenary'):
             continue
         if not slot in schedule: