Added Budget.labor_budget and Budget.labor_budget_spent. #1382

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

app/views/deliverables/_budget.html.erb

@@ -12,6 +12,17 @@
   </tr>
   <% end %>
 
+  <% if allowed_management? %>
+  <tr>
+    <td>
+      Labor Budget:
+    </td>
+    <td class="calculation-column">
+      <%= h number_to_currency(budget.labor_budget, :precision => 0) %>
+    </td>
+  </tr>
+  <% end %>
+
   <% if allowed_management? %>
   <tr>
     <td>
@@ -29,7 +40,7 @@
       Labor Budget Remaining:
     </td>
     <td class="calculation-column">
-      <%= h number_to_currency(budget.left, :precision => 0) %>
+      <%= h number_to_currency(budget.labor_budget_left, :precision => 0) %>
     </td>
   </tr>
   <% end %>