1.1 --- a/EventAggregatorSupport/View.py Tue Jan 28 23:30:33 2014 +0100
1.2 +++ b/EventAggregatorSupport/View.py Wed Jan 29 19:20:21 2014 +0100
1.3 @@ -1339,7 +1339,7 @@
1.4
1.5 day_rows = []
1.6
1.7 - for period, limit, times in scale:
1.8 + for period, limit, start_times, end_times in scale:
1.9
1.10 # Ignore timespans before this day.
1.11
1.12 @@ -1363,7 +1363,7 @@
1.13 rowspans[event] += 1
1.14 day_row.append((location, event))
1.15
1.16 - day_rows.append((period, day_row, times))
1.17 + day_rows.append((period, day_row, start_times, end_times))
1.18
1.19 # Output the locations.
1.20
1.21 @@ -1393,7 +1393,7 @@
1.22 last_period = period = None
1.23 events_written = set()
1.24
1.25 - for period, day_row, times in day_rows:
1.26 + for period, day_row, start_times, end_times in day_rows:
1.27
1.28 # Write a heading describing the time.
1.29
1.30 @@ -1402,7 +1402,7 @@
1.31 # Show times only for distinct periods.
1.32
1.33 if not last_period or period.start != last_period.start:
1.34 - append(self.writeDayScaleHeading(times))
1.35 + append(self.writeDayScaleHeading(start_times))
1.36 else:
1.37 append(self.writeDayScaleHeading([]))
1.38
1.39 @@ -1432,7 +1432,7 @@
1.40 if period is not None:
1.41 if period.end == date:
1.42 append(fmt.table_row(on=1))
1.43 - append(self.writeDayScaleHeading(times))
1.44 + append(self.writeDayScaleHeading(end_times))
1.45
1.46 for slot in day_row:
1.47 append(self.writeDaySpacer())