Merge lp:~aelkner/schooltool/daily_calendar_bug into lp:schooltool/1.7

[Alan Elkner]

=== modified file 'CHANGES.txt'
--- CHANGES.txt	2010-10-04 13:48:16 +0000
+++ CHANGES.txt	2010-10-13 07:40:34 +0000
@@ -5,7 +5,7 @@
 1.5.3 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Fixed Section meeting time misalignment in calendar (https://launchpad.net/bugs/611797)
 
 
 1.5.2 (2010-10-04)

=== modified file 'src/schooltool/app/browser/cal.py'
--- src/schooltool/app/browser/cal.py	2010-08-30 16:09:34 +0000
+++ src/schooltool/app/browser/cal.py	2010-10-13 07:40:34 +0000
@@ -1337,31 +1337,34 @@
                     break
         return max(width) or 1
 
-    def _setRange(self, events):
-        """Set the starthour and endhour attributes according to events.
+    def _setRange(self, events, periods):
+        """Set the starthour and endhour attributes according to events and
+        periods.
 
         The range of the hours to display is the union of the range
         8:00-18:00 and time spans of all the events in the events
-        list.
+        list and all the periods as well.
         """
-        for event in events:
+        time_blocks = ([(event.dtstart, event.duration) for event in events] +
+            [(dtstart, duration) for id, dtstart, duration in periods])
+        for dtstart, duration in time_blocks:
             start = self.timezone.localize(datetime.combine(self.cursor,
                                             time(self.starthour)))
             end = self.timezone.localize(datetime.combine(self.cursor,
                    time()) + timedelta(hours=self.endhour)) # endhour may be 24
-            if event.dtstart < start:
+            if dtstart < start:
                 newstart = max(self.timezone.localize(
                                         datetime.combine(self.cursor, time())),
-                                        event.dtstart.astimezone(self.timezone))
+                                        dtstart.astimezone(self.timezone))
                 self.starthour = newstart.hour
 
-            if event.dtstart + event.duration > end and \
-                event.dtstart.astimezone(self.timezone).day <= self.cursor.day:
+            if dtstart + duration > end and \
+                dtstart.astimezone(self.timezone).day <= self.cursor.day:
                 newend = min(self.timezone.localize(
                                         datetime.combine(self.cursor,
                                                         time())) + timedelta(1),
-                            event.dtstart.astimezone(self.timezone) +
-                                        event.duration + timedelta(0, 3599))
+                            dtstart.astimezone(self.timezone) +
+                                        duration + timedelta(0, 3599))
                 self.endhour = newend.hour
                 if self.endhour == 0:
                     self.endhour = 24
@@ -1403,7 +1406,15 @@
         # Filter allday events
         simple_events = [event for event in all_events
                          if not event.allday]
-        self._setRange(simple_events)
+        # use daily_calendar_rows view to get the periods
+        view = getMultiAdapter((self.context, self.request),
+                                    name='daily_calendar_rows')
+        if 'getPeriods' in dir(view):
+            periods = view.getPeriods(self.cursor)
+        else:
+            periods = []
+        # set this view's start and end hours from the events and periods
+        self._setRange(simple_events, periods)
         slots = Slots()
         top = 0
         for title, start, duration in self.calendarRows(simple_events):

=== modified file 'src/schooltool/app/browser/tests/test_cal.py'
--- src/schooltool/app/browser/tests/test_cal.py	2010-01-10 17:31:54 +0000
+++ src/schooltool/app/browser/tests/test_cal.py	2010-10-13 07:40:34 +0000
@@ -3517,24 +3517,28 @@
         view = DailyCalendarView(cal, TestRequest())
         view.cursor = date(2004, 8, 16)
 
-        def do_test(events, expected):
+        def do_test(events, periods, expected):
             view.starthour, view.endhour = 8, 19
-            view._setRange(events)
+            view._setRange(events, periods)
             self.assertEquals((view.starthour, view.endhour), expected)
 
-        do_test([], (8, 19))
+        do_test([], [], (8, 19))
 
         events = [createEvent('2004-08-16 7:00', '1min', 'workout')]
-        do_test(events, (7, 19))
+        do_test(events, [], (7, 19))
 
         events = [createEvent('2004-08-15 8:00', '1d', "long workout")]
-        do_test(events, (0, 19))
+        do_test(events, [], (0, 19))
 
         events = [createEvent('2004-08-16 20:00', '30min', "late workout")]
-        do_test(events, (8, 21))
+        do_test(events, [], (8, 21))
 
         events = [createEvent('2004-08-16 20:00', '5h', "long late workout")]
-        do_test(events, (8, 24))
+        do_test(events, [], (8, 24))
+
+        dummy_event = createEvent('2004-08-16 7:00', '1min', 'workout')
+        periods = [('', dummy_event.dtstart, dummy_event.duration)]
+        do_test(events, periods, (7, 24))
 
     def test__setRange_timezones(self):
         from schooltool.app.browser.cal import DailyCalendarView
@@ -3550,7 +3554,7 @@
 
         def do_test(events, expected):
             view.starthour, view.endhour = 8, 19
-            view._setRange(events)
+            view._setRange(events, [])
             self.assertEquals((view.starthour, view.endhour), expected)
 
         for tz in (utc, london, vilnius, eastern):