diff --git a/app/views/recurring_item_ranges/_form.rhtml b/app/views/recurring_item_ranges/_form.rhtml index 97270df90ad1ce6ffd67e1387f55f77eb81feba9..ef54c49ec5a3ccd191e25354033849fd33e8dc84 100644 --- a/app/views/recurring_item_ranges/_form.rhtml +++ b/app/views/recurring_item_ranges/_form.rhtml @@ -13,5 +13,8 @@ <p><label for="recurring_item_range_enddate">Enddate</label><br/> <%= date_select 'recurring_item_range', 'enddate', :include_blank => true %></p> +<p><label for="recurring_item_range_spread_out">Spread out</label><br/> +<%= check_box 'recurring_item_range', 'spread_out' %></p> + <!--[eoform:recurring_item_range]--> diff --git a/db/migrate/002_create_recurring_items.rb b/db/migrate/002_create_recurring_items.rb index d9f08968d2705d98e85aea979bc199df982a62cb..db36aa07d69fbbd505251c7c49f48d2e73ab6056 100644 --- a/db/migrate/002_create_recurring_items.rb +++ b/db/migrate/002_create_recurring_items.rb @@ -13,6 +13,7 @@ class CreateRecurringItems < ActiveRecord::Migration RecurringItem.create :description => "Pers lön" RecurringItem.create :description => "Pers lön 10" RecurringItem.create :description => "Telia" + RecurringItem.create :description => "Mat" end end diff --git a/db/migrate/005_create_recurring_item_ranges.rb b/db/migrate/005_create_recurring_item_ranges.rb index fec6a3f4f0235ef7fbcd738be6d34266b5fd7bf8..28f6fed23ec1e85fe8eecac596298faf9d1b0721 100644 --- a/db/migrate/005_create_recurring_item_ranges.rb +++ b/db/migrate/005_create_recurring_item_ranges.rb @@ -8,12 +8,14 @@ class CreateRecurringItemRanges < ActiveRecord::Migration t.column :startdate, :date t.column :enddate, :date t.column :schedule_id, :integer + t.column :spread_out, :boolean end if RAILS_ENV == "development" pay = RecurringItem.find_by_description("Pers lön").id pay10 = RecurringItem.find_by_description("Pers lön 10").id telia = RecurringItem.find_by_description("Telia").id + food = RecurringItem.find_by_description("Mat").id month = Schedule.find_by_name("Månad").id quarter = Schedule.find_by_name("Kvartal").id @@ -22,28 +24,39 @@ class CreateRecurringItemRanges < ActiveRecord::Migration :amount => "22200", :startdate => Date.civil(2006, 8, 25), :enddate => Date.civil(2006, 10, 24), - :schedule_id => month) + :schedule_id => month, + :spread_out => false) RecurringItemRange.create(:recurring_item_id => pay10, :amount => "-3700", :startdate => Date.civil(2006, 8, 25), :enddate => Date.civil(2006, 10, 24), - :schedule_id => month) + :schedule_id => month, + :spread_out => false) RecurringItemRange.create(:recurring_item_id => pay, :amount => "23200", :startdate => Date.civil(2006, 10, 25), - :schedule_id => month) + :schedule_id => month, + :spread_out => false) RecurringItemRange.create(:recurring_item_id => pay10, :amount => "-3900", :startdate => Date.civil(2006, 10, 25), - :schedule_id => month) + :schedule_id => month, + :spread_out => false) RecurringItemRange.create(:recurring_item_id => telia, :amount => "-1200", :startdate => Date.civil(2006, 9, 10), - :schedule_id => quarter) + :schedule_id => quarter, + :spread_out => false) + + RecurringItemRange.create(:recurring_item_id => food, + :amount => "-4000", + :startdate => Date.civil(2006, 8, 25), + :schedule_id => month, + :spread_out => true) end end