Merge lp:~mhall119/summit/fixes-916058 into lp:summit/production

Proposed by Michael Hall
Status: Merged
Approved by: Chris Johnston
Approved revision: 161
Merged at revision: 161
Proposed branch: lp:~mhall119/summit/fixes-916058
Merge into: lp:summit/production
Diff against target: 13 lines (+1/-2)
1 file modified
summit/schedule/render.py (+1/-2)
To merge this branch: bzr merge lp:~mhall119/summit/fixes-916058
Reviewer Review Type Date Requested Status
Chris Johnston Approve
Review via email: mp+88850@code.launchpad.net

Commit message

Fix layout problem in track view where meetings were showing up on the first day, rather than their appropriate day, in the schedule view.

Description of the change

previous calculation for 'left' was failing when room_num==0, because it would then multiply that zero by everything else, only producing 0px in the end. This changes it so extra space to account for multiple rooms is added to the value of 'left', rather than being part of the multiplication to determine 'left'.

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

Looks good

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'summit/schedule/render.py'
2--- summit/schedule/render.py 2011-11-30 17:46:39 +0000
3+++ summit/schedule/render.py 2012-01-17 13:18:24 +0000
4@@ -488,8 +488,7 @@
5 if slot.type == 'plenary':
6 meeting_width = (
7 112*day_width/len(self.meetings[slot]))
8- pos['left'] = (
9- room_num * (date_num + 1) * meeting_width)
10+ pos['left'] = (date_num * meeting_width) + (room_num * 112)
11 else:
12 pos['left'] = (date_num * day_width + room_num) * 112
13 # Top is calculated based on time from first slot of the

Subscribers

People subscribed via source and target branches

to all changes: