From 6c34f7b35f2f080e7f93d82a704bc09c499af7dc Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Thu, 26 Jun 2008 15:33:53 -0700 Subject: [PATCH] Added Budget.labor_budget and Budget.labor_budget_spent. #1382 --- app/models/budget.rb | 12 +++++++++++- app/views/deliverables/_budget.html.erb | 13 ++++++++++++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/app/models/budget.rb b/app/models/budget.rb index 77dceda..f932f37 100644 --- a/app/models/budget.rb +++ b/app/models/budget.rb @@ -41,6 +41,11 @@ class Budget return self.deliverables.collect(&:budget).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 + end + # Amount of the budget spent. Expressed as as a percentage whole number def budget_ratio budget = self.budget # cache result @@ -60,7 +65,12 @@ class Budget def left return self.budget - self.spent end - + + # Amount of labor budget left on the deliverables + def labor_budget_left + return self.labor_budget - self.spent + end + # Amount spent over the budget def overruns if self.left >= 0 diff --git a/app/views/deliverables/_budget.html.erb b/app/views/deliverables/_budget.html.erb index b759826..d91c5dd 100644 --- a/app/views/deliverables/_budget.html.erb +++ b/app/views/deliverables/_budget.html.erb @@ -12,6 +12,17 @@ <% end %> + <% if allowed_management? %> + + + Labor Budget: + + + <%= h number_to_currency(budget.labor_budget, :precision => 0) %> + + + <% end %> + <% if allowed_management? %> @@ -29,7 +40,7 @@ Labor Budget Remaining: - <%= h number_to_currency(budget.left, :precision => 0) %> + <%= h number_to_currency(budget.labor_budget_left, :precision => 0) %> <% end %>