got rid of mass assignment in certain areas
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
class PaidTimeOff < ActiveRecord::Base
|
class PaidTimeOff < ActiveRecord::Base
|
||||||
attr_accessible :pto_earned, :pto_taken, :sick_days_earned, :sick_days_taken, :user_id
|
attr_accessible :pto_earned, :pto_taken, :sick_days_earned, :sick_days_taken
|
||||||
belongs_to :user
|
belongs_to :user
|
||||||
has_many :schedule, :foreign_key => :user_id, :primary_key => :user_id
|
has_many :schedule, :foreign_key => :user_id, :primary_key => :user_id
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
class Retirement < ActiveRecord::Base
|
class Retirement < ActiveRecord::Base
|
||||||
attr_accessible :employee_contrib, :employer_contrib, :total, :user_id
|
attr_accessible :employee_contrib, :employer_contrib, :total
|
||||||
belongs_to :user
|
belongs_to :user
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
class Schedule < ActiveRecord::Base
|
class Schedule < ActiveRecord::Base
|
||||||
attr_accessible :date_begin, :date_end, :event_desc, :event_name, :event_type, :user_id
|
attr_accessible :date_begin, :date_end, :event_desc, :event_name, :event_type
|
||||||
belongs_to :paid_time_off
|
belongs_to :paid_time_off
|
||||||
|
|
||||||
validates_presence_of :date_begin, :date_end
|
validates_presence_of :date_begin, :date_end
|
||||||
|
|||||||
+30
-4
@@ -108,19 +108,38 @@ paid_time_off = [
|
|||||||
schedule = [
|
schedule = [
|
||||||
{
|
{
|
||||||
:user_id => 2,
|
:user_id => 2,
|
||||||
|
:date_begin => Date.new(2014, 7, 30),
|
||||||
|
:date_end => Date.new(2014, 8, 2),
|
||||||
|
:event_type => "pto",
|
||||||
|
:event_desc => "vacation to france",
|
||||||
|
:event_name => "My 2014 Vacation"
|
||||||
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
:user_id => 3,
|
:user_id => 3,
|
||||||
|
:date_begin => Date.new(2013, 9, 1),
|
||||||
|
:date_end => Date.new(2013, 9, 12),
|
||||||
|
:event_type => "pto",
|
||||||
|
:event_desc => "Going Home to see folks",
|
||||||
|
:event_name => "Visit Parents"
|
||||||
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
:user_id => 4,
|
:user_id => 4,
|
||||||
|
:date_begin => Date.new(2013, 9, 13),
|
||||||
|
:date_end => Date.new(2013, 9, 20),
|
||||||
|
:event_type => "pto",
|
||||||
|
:event_desc => "Taking kids to Grand Canyon",
|
||||||
|
:event_name => "AZ Trip"
|
||||||
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
:user_id => 5,
|
:user_id => 5,
|
||||||
|
:date_begin => Date.new(2013, 12, 20),
|
||||||
|
:date_end => Date.new(2013, 12, 30),
|
||||||
|
:event_type => "pto",
|
||||||
|
:event_desc => "Xmas Staycation",
|
||||||
|
:event_name => "Christmas Leave"
|
||||||
}
|
}
|
||||||
|
|
||||||
]
|
]
|
||||||
@@ -131,13 +150,20 @@ users.each do |user_info|
|
|||||||
end
|
end
|
||||||
|
|
||||||
retirements.each do |r|
|
retirements.each do |r|
|
||||||
Retirement.create!(r)
|
ret = Retirement.new(r.reject {|k| k == :user_id})
|
||||||
|
ret.user_id = r[:user_id]
|
||||||
|
ret.save
|
||||||
end
|
end
|
||||||
|
|
||||||
paid_time_off.each do |pto|
|
paid_time_off.each do |pto|
|
||||||
PaidTimeOff.create!(pto)
|
ptoff = PaidTimeOff.new(pto.reject {|k| k == :user_id})
|
||||||
|
ptoff.user_id = pto[:user_id]
|
||||||
|
ptoff.save
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
schedule.each do |event|
|
schedule.each do |event|
|
||||||
Schedule.create!(event)
|
sched = Schedule.new(event.reject {|k| k == :user_id})
|
||||||
|
sched.user_id = event[:user_id]
|
||||||
|
sched.save
|
||||||
end
|
end
|
||||||
Reference in New Issue
Block a user