dinislage/redmine-budget-plugin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Wrapped Budget.budget, .labor_budget, and .spent with checks for nil values in the deliverables.

Browse Source 
#1444
This commit is contained in:
Eric Davis
2008-07-16 09:03:07 -07:00
parent f21b9007eb
commit 2dd140efa5
2 changed files with 65 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/budget.rb
View File

@@ -38,12 +38,12 @@ class Budget
# Total budget all of the deliverables
def budget
return self.deliverables.collect(&:budget).inject { |sum, n| sum + n} || 0.0
return self.deliverables.collect(&:budget).delete_if { |d| d.blank?}.inject { |sum, n| sum + n} || 0.0
end
# Total labor budget all of the deliverables
def labor_budget
return self.deliverables.collect(&:labor_budget).inject { |sum, n| sum + n} || 0.0
return self.deliverables.collect(&:labor_budget).delete_if { |d| d.blank?}.inject { |sum, n| sum + n} || 0.0
end
# Amount of the budget spent. Expressed as as a percentage whole number
@@ -58,7 +58,7 @@ class Budget
# Total amount spent for all the deliverables
def spent
self.deliverables.collect(&:spent).inject { |sum, n| sum + n } || 0.0
self.deliverables.collect(&:spent).delete_if { |d| d.blank?}.inject { |sum, n| sum + n } || 0.0
end
# Amount of budget left on the deliverables