diff --git a/app/models/budget.rb b/app/models/budget.rb index 0ff6310..2d45fe2 100644 --- a/app/models/budget.rb +++ b/app/models/budget.rb @@ -111,7 +111,7 @@ class Budget def amount_missing_on_issues time_logs = TimeEntry.find_all_by_project_id_and_issue_id(self.project, nil) - return time_logs.collect(&:cost).inject { |sum, n| sum + n} + return time_logs.collect(&:cost).sum end # Dollar amount of time that has been logged to issues that are not assigned to deliverables @@ -127,6 +127,6 @@ class Budget time_logs = missing_issues.collect(&:time_entries).flatten - return time_logs.collect(&:cost).inject { |sum, n| sum + n} + return time_logs.collect(&:cost).sum end end diff --git a/app/models/fixed_deliverable.rb b/app/models/fixed_deliverable.rb index dd6ba10..8ebc878 100644 --- a/app/models/fixed_deliverable.rb +++ b/app/models/fixed_deliverable.rb @@ -17,7 +17,7 @@ class FixedDeliverable < Deliverable # Get all timelogs assigned time_logs = self.issues.collect(&:time_entries).flatten - return total + time_logs.collect(&:cost).inject { |sum, n| sum + n} + return total + time_logs.collect(&:cost).sum end diff --git a/app/models/hourly_deliverable.rb b/app/models/hourly_deliverable.rb index 3102c59..c91c20f 100644 --- a/app/models/hourly_deliverable.rb +++ b/app/models/hourly_deliverable.rb @@ -10,7 +10,7 @@ class HourlyDeliverable < Deliverable # Get all timelogs assigned time_logs = self.issues.collect(&:time_entries).flatten - return time_logs.collect(&:cost).inject { |sum, n| sum + n} + return time_logs.collect(&:cost).sum end def profit # :nodoc: diff --git a/app/models/member_spent.rb b/app/models/member_spent.rb index f8f2dd4..76bb05f 100644 --- a/app/models/member_spent.rb +++ b/app/models/member_spent.rb @@ -25,8 +25,8 @@ class MemberSpent project.members.each do |member| member_time_entries = time_entries.select { |tl| tl.user_id == member.user.id} - spent = member_time_entries.collect(&:cost).inject { |sum, n| sum + n} - hours = member_time_entries.collect(&:hours).inject { |sum, n| sum + n} + spent = member_time_entries.collect(&:cost).sum + hours = member_time_entries.collect(&:hours).sum membership << MemberSpent.new({ :user => member.user,