[#4183] Implemented Contract#profit_left.
This commit is contained in:
1 parent
361b971100
commit
41e221119c
2 files changed
+52
-6
No files matched your search
@@ -38,12 +38,6 @@ class Contract < ActiveRecord::Base
|
|||||||
define_method(mthd) { "TODO in later release" }
|
define_method(mthd) { "TODO in later release" }
|
||||||
end
|
end
|
||||||
|
|
||||||
[
|
|
||||||
:profit_spent
|
|
||||||
].each do |mthd|
|
|
||||||
define_method(mthd) { "TODO" }
|
|
||||||
end
|
|
||||||
|
|
||||||
# OPTIMIZE: N+1
|
# OPTIMIZE: N+1
|
||||||
def labor_budget
|
def labor_budget
|
||||||
deliverables.inject(0) {|total, deliverable| total += deliverable.labor_budget_total }
|
deliverables.inject(0) {|total, deliverable| total += deliverable.labor_budget_total }
|
||||||
@@ -91,6 +85,12 @@ class Contract < ActiveRecord::Base
|
|||||||
deliverables.inject(0) {|total, deliverable| total += deliverable.profit_budget }
|
deliverables.inject(0) {|total, deliverable| total += deliverable.profit_budget }
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# OPTIMIZE: N+1
|
||||||
|
def profit_left
|
||||||
|
deliverables.inject(0) {|total, deliverable| total += deliverable.profit_left }
|
||||||
|
end
|
||||||
|
alias_method :profit_spent, :profit_left
|
||||||
|
|
||||||
PaymentTerms = {
|
PaymentTerms = {
|
||||||
:net_0 => :text_payment_terms_net_0,
|
:net_0 => :text_payment_terms_net_0,
|
||||||
:net_15 => :text_payment_terms_net_15,
|
:net_15 => :text_payment_terms_net_15,
|
||||||
|
|||||||
@@ -209,4 +209,50 @@ class ContractTest < ActiveSupport::TestCase
|
|||||||
assert_equal 12_250, contract.total_spent
|
assert_equal 12_250, contract.total_spent
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
context "#profit_left" do
|
||||||
|
should "sum all of the profit left on all of the Deliverables" do
|
||||||
|
configure_overhead_plugin
|
||||||
|
|
||||||
|
contract = Contract.generate!(:billable_rate => 150.0)
|
||||||
|
|
||||||
|
@project = Project.generate!
|
||||||
|
@developer = User.generate!
|
||||||
|
@manager = User.generate!
|
||||||
|
@role = Role.generate!
|
||||||
|
User.add_to_project(@developer, @project, @role)
|
||||||
|
User.add_to_project(@manager, @project, @role)
|
||||||
|
@rate = Rate.generate!(:project => @project,
|
||||||
|
:user => @developer,
|
||||||
|
:date_in_effect => Date.yesterday,
|
||||||
|
:amount => 55)
|
||||||
|
@rate = Rate.generate!(:project => @project,
|
||||||
|
:user => @manager,
|
||||||
|
:date_in_effect => Date.yesterday,
|
||||||
|
:amount => 75)
|
||||||
|
|
||||||
|
contract.deliverables << @deliverable_1 = FixedDeliverable.generate!(:total => 2000)
|
||||||
|
@deliverable_1.issues << @issue1 = Issue.generate_for_project!(@project)
|
||||||
|
TimeEntry.generate!(:hours => 15, :issue => @issue1, :project => @project,
|
||||||
|
:activity => @billable_activity,
|
||||||
|
:user => @developer)
|
||||||
|
TimeEntry.generate!(:hours => 4, :issue => @issue1, :project => @project,
|
||||||
|
:activity => @non_billable_activity,
|
||||||
|
:user => @manager)
|
||||||
|
|
||||||
|
contract.deliverables << @deliverable_2 = HourlyDeliverable.generate!(:contract => contract)
|
||||||
|
@deliverable_2.issues << @issue2 = Issue.generate_for_project!(@project)
|
||||||
|
TimeEntry.generate!(:hours => 15, :issue => @issue2, :project => @project,
|
||||||
|
:activity => @billable_activity,
|
||||||
|
:user => @developer)
|
||||||
|
TimeEntry.generate!(:hours => 4, :issue => @issue2, :project => @project,
|
||||||
|
:activity => @non_billable_activity,
|
||||||
|
:user => @manager)
|
||||||
|
|
||||||
|
assert_equal 875, @deliverable_1.profit_left
|
||||||
|
assert_equal 1125, @deliverable_2.profit_left
|
||||||
|
assert_equal 2000, contract.profit_left
|
||||||
|
end
|
||||||
|
|
||||||
|
end
|
||||||
end
|
end
|
||||||
Reference in new issue
Block a user