1.1 --- a/EventAggregatorSupport.py Wed Mar 25 01:16:06 2009 +0100
1.2 +++ b/EventAggregatorSupport.py Thu Mar 26 00:17:36 2009 +0100
1.3 @@ -351,4 +351,55 @@
1.4
1.5 return min(first, last), last
1.6
1.7 +def getCoverage(start, end, events):
1.8 +
1.9 + """
1.10 + Within the period defined by the 'start' and 'end' dates, determine the
1.11 + coverage of the days in the period by the given 'events', returning a set of
1.12 + covered days, along with a list of slots, where each slot contains a tuple
1.13 + of the form (set of covered days, events).
1.14 + """
1.15 +
1.16 + all_events = []
1.17 + full_coverage = set()
1.18 +
1.19 + # Get event details.
1.20 +
1.21 + for event in events:
1.22 + event_page, event_details = event
1.23 +
1.24 + # Test for the event in the period.
1.25 +
1.26 + if event_details["start"] <= end and event_details["end"] >= start:
1.27 +
1.28 + # Find the coverage of this period for the event.
1.29 +
1.30 + event_start = max(event_details["start"], start)
1.31 + event_end = min(event_details["end"], end)
1.32 + event_coverage = set(daterange(event_start, event_end))
1.33 +
1.34 + # Update the overall coverage.
1.35 +
1.36 + full_coverage.update(event_coverage)
1.37 +
1.38 + # Try and fit the event into the events list.
1.39 +
1.40 + for i, (coverage, covered_events) in enumerate(all_events):
1.41 +
1.42 + # Where the event does not overlap with the current
1.43 + # element, add it alongside existing events.
1.44 +
1.45 + if not coverage.intersection(event_coverage):
1.46 + covered_events.append(event)
1.47 + all_events[i] = coverage.union(event_coverage), covered_events
1.48 + break
1.49 +
1.50 + # Make a new element in the list if the event cannot be
1.51 + # marked alongside existing events.
1.52 +
1.53 + else:
1.54 + all_events.append((event_coverage, [event]))
1.55 +
1.56 + return full_coverage, all_events
1.57 +
1.58 # vim: tabstop=4 expandtab shiftwidth=4
2.1 --- a/macros/EventAggregator.py Wed Mar 25 01:16:06 2009 +0100
2.2 +++ b/macros/EventAggregator.py Thu Mar 26 00:17:36 2009 +0100
2.3 @@ -268,48 +268,11 @@
2.4 # Find events in this week and determine how to mark them on the
2.5 # calendar.
2.6
2.7 - week_events = []
2.8 - week_coverage = set()
2.9 -
2.10 week_start = (year, month, max(first_day, 1))
2.11 week_end = (year, month, min(first_day + 6, number_of_days))
2.12
2.13 - # Get event details.
2.14 -
2.15 - for event in shown_events.get((year, month), []):
2.16 - event_page, event_details = event
2.17 -
2.18 - # Test for the event in the current week.
2.19 -
2.20 - if event_details["start"] <= week_end and event_details["end"] >= week_start:
2.21 -
2.22 - # Find the coverage of this week for the event.
2.23 -
2.24 - event_start = max(event_details["start"], week_start)
2.25 - event_end = min(event_details["end"], week_end)
2.26 - event_coverage = set(EventAggregatorSupport.daterange(event_start, event_end))
2.27 -
2.28 - # Update the overall coverage.
2.29 -
2.30 - week_coverage.update(event_coverage)
2.31 -
2.32 - # Try and fit the event into the events list.
2.33 -
2.34 - for i, (coverage, events) in enumerate(week_events):
2.35 -
2.36 - # Where the event does not overlap with the current
2.37 - # element, add it alongside existing events.
2.38 -
2.39 - if not coverage.intersection(event_coverage):
2.40 - events.append(event)
2.41 - week_events[i] = coverage.union(event_coverage), events
2.42 - break
2.43 -
2.44 - # Make a new element in the list if the event cannot be
2.45 - # marked alongside existing events.
2.46 -
2.47 - else:
2.48 - week_events.append((event_coverage, [event]))
2.49 + week_coverage, week_events = EventAggregatorSupport.getCoverage(
2.50 + week_start, week_end, shown_events.get((year, month), []))
2.51
2.52 # Output a week, starting with the day numbers.
2.53