deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Commits are arranged below their first parent.

Browse source
This commit is contained in:
Sato Hiroyuki 2013-02-27 23:43:33 +09:00
parent 14c2a37da2
commit 00d0e57e85
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
app/models/graph/json_builder.rb
View file

@ -181,7 +181,8 @@ module Graph
end end
time_range = leaves.last.time..leaves.first.time time_range = leaves.last.time..leaves.first.time
space = find_free_space(time_range, 2) space_base = get_space_base(leaves, map)
space = find_free_space(time_range, 2, space_base)
leaves.each do |l| leaves.each do |l|
l.spaces << space l.spaces << space
# Also add space to parent # Also add space to parent
@ -223,13 +224,29 @@ module Graph
end end
end end
def get_space_base(leaves, map)
space_base = 1
if leaves.last.parents.size > 0
first_parent = leaves.last.parents.first
if map.include?(first_parent.id)
first_p = map[first_parent.id]
if first_p.space > 0
space_base = first_p.space
end
end
end
space_base
end
def mark_reserved(time_range, space) def mark_reserved(time_range, space)
for day in time_range for day in time_range
@_reserved[day].push(space) @_reserved[day].push(space)
end end
end end
def find_free_space(time_range, space_step, space_base = 1, space_default = 1) def find_free_space(time_range, space_step, space_base = 1, space_default = nil)
space_default ||= space_base
reserved = [] reserved = []
for day in time_range for day in time_range
reserved += @_reserved[day] reserved += @_reserved[day]