gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bugfix conference#calculate_items_per_week

Browse source
This commit is contained in:
Chrisbr 2014-06-03 14:00:33 +02:00
parent 84a26b8d02
commit 54ac8a8fb7
3 changed files with 29 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/models/conference.rb
View file

@ -270,14 +270,16 @@ class Conference < ActiveRecord::Base
def calculate_items_per_week(start_week, weeks, items)
sum = 0
result = []
last_key = start_week + 1
last_key = start_week - 1
items.each_with_index do |(key, value), index|
# Padding left
if index == 0
result = Array.new(key.to_i - start_week, 0)
# Padding middle
elsif last_key < (key.to_i - 1)
if !items.empty? && start_week > items.keys[0].to_i
start_week = items.keys[0].to_i
weeks += start_week - items.keys[0].to_i + 1
end
items.each do |key, value|
# Padding
if last_key < (key.to_i - 1)
result += Array.new(key.to_i - last_key - 1, sum)
end