From 059b971e5497e78409fbe14b8caf694cf412d771 Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Thu, 23 Sep 2010 10:22:46 -0700 Subject: [PATCH] Refactor: pull up method --- app/models/deliverable.rb | 6 ++++++ app/models/fixed_deliverable.rb | 6 ------ app/models/hourly_deliverable.rb | 6 ------ 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/app/models/deliverable.rb b/app/models/deliverable.rb index 72562fd..5f0c89e 100644 --- a/app/models/deliverable.rb +++ b/app/models/deliverable.rb @@ -76,6 +76,12 @@ class Deliverable < ActiveRecord::Base (total(date) || 0.0) - budgets end + # The amount of money remaining after expenses have been taken out + # Profit left = Total - Labor spent - Overhead spent - Fixed - Markup + def profit_left(date=nil) + total_spent(date) - labor_budget_spent(date) - overhead_spent(date) - fixed_budget_total_spent(date) - fixed_markup_budget_total_spent(date) + end + def labor_budget_hours(date=nil) labor_budgets.sum(:hours) end diff --git a/app/models/fixed_deliverable.rb b/app/models/fixed_deliverable.rb index 491109c..104b1e1 100644 --- a/app/models/fixed_deliverable.rb +++ b/app/models/fixed_deliverable.rb @@ -20,12 +20,6 @@ class FixedDeliverable < Deliverable total end - # The amount of money remaining after expenses have been taken out - # Profit left = Total - Labor spent - Overhead spent - Fixed - Markup - def profit_left(date=nil) - total_spent(date) - labor_budget_spent(date) - overhead_spent(date) - fixed_budget_total_spent(date) - fixed_markup_budget_total_spent(date) - end - # Hardcoded value used as a wrapper for the old Budget plugin API. # # The Overhead plugin uses this in it's calcuations. diff --git a/app/models/hourly_deliverable.rb b/app/models/hourly_deliverable.rb index 73a3b4d..1053045 100644 --- a/app/models/hourly_deliverable.rb +++ b/app/models/hourly_deliverable.rb @@ -49,10 +49,4 @@ class HourlyDeliverable < Deliverable def clear_total write_attribute(:total, nil) end - - # The amount of money remaining after expenses have been taken out - # Profit left = Total - Labor spent - Overhead spent - Fixed - Markup - def profit_left(date=nil) - total_spent(date) - labor_budget_spent(date) - overhead_spent(date) - fixed_budget_total_spent(date) - fixed_markup_budget_total_spent(date) - end end