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

HourlyDeliverable profit was being counted twice because HourlyDeliverable.profit would return the actual profit or the profit percent already. #1389

Browse Source
This commit is contained in:
Eric Davis
2008-06-30 15:32:00 -07:00
parent 5e36cf455e
commit a5d88b67a8
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/models/budget.rb
View File

@@ -103,16 +103,8 @@ class Budget
def profit
return 0.0 unless self.deliverables.size > 0
profit = 0.0
# Fixed profit
profit += self.deliverables.collect(&:profit).delete_if { |d| d.blank?}.inject { |sum, n| sum + n } || 0.0
# Percentage Rate
self.deliverables.delete_if { |d| d.profit_percent.blank?}.each do |deliverable|
profit += deliverable.budget * (deliverable.profit_percent.to_f / 100 )
end
return profit
# Covers fixed and percentage profit though the +profit+ method being overloaded on the Deliverable types
return self.deliverables.collect(&:profit).delete_if { |d| d.blank?}.inject { |sum, n| sum + n } || 0.0
end
# Dollar amount of time that has been logged to the project itself

4
spec/models/budget_spec.rb
View File

@@ -340,8 +340,8 @@ describe Budget, '.profit' do
it 'should be calculated by the total profit of the deliverables with % amounts' do
@project = mock_model(Project)
@deliverable1 = mock_model(HourlyDeliverable, :project_id => @project, :profit_percent => 10, :budget => 2000.0, :profit => nil)
@deliverable2 = mock_model(HourlyDeliverable, :project_id => @project, :profit_percent => 10, :budget => 1000.0, :profit => nil)
@deliverable1 = mock_model(HourlyDeliverable, :project_id => @project, :profit_percent => 10, :budget => 2000.0, :profit => 200)
@deliverable2 = mock_model(HourlyDeliverable, :project_id => @project, :profit_percent => 10, :budget => 1000.0, :profit => 100)
Deliverable.stub!(:find_all_by_project_id).and_return([@deliverable1, @deliverable2])
Project.stub!(:find).with(@project.id).and_return(@project)