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

Refactored Deliverable.progress so it doesn't depend on the custom issue status

Browse Source 
for done ratio patch.  The plugin will test for the presence of the setting and
if it's true in order to control the logic.

  #1390
This commit is contained in:
Eric Davis committed 2008-06-30 15:57:42 -07:00
1 parent 430f3de418
commit 6c638ffb83
2 files changed
+71 -31
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/models/deliverable.rb
+12 -3
View File
@@ -45,9 +45,8 @@ class Deliverable < ActiveRecord::Base
end end
# Percentage of the deliverable that is compelte based on the progress of the # Percentage of the deliverable that is compelte based on the progress of the
# assigned issues. Currently requires the +default_done_ratio+ patch. # assigned issues.
def progress def progress
# TODO LATER: Shouldn't require the default_done_ratio patch
return 0 unless self.issues.size > 0 return 0 unless self.issues.size > 0
total ||= self.issues.collect(&:estimated_hours).delete_if {|e| e.nil? }.inject {|sum, n| sum + n} || 0 total ||= self.issues.collect(&:estimated_hours).delete_if {|e| e.nil? }.inject {|sum, n| sum + n} || 0
@@ -56,7 +55,11 @@ class Deliverable < ActiveRecord::Base
balance = 0.0 balance = 0.0
self.issues.each do |issue| self.issues.each do |issue|
balance += issue.status.default_done_ratio * issue.estimated_hours unless issue.estimated_hours.nil? if use_issue_status_for_done_ratios?
balance += issue.status.default_done_ratio * issue.estimated_hours unless issue.estimated_hours.nil?
else
balance += issue.done_ratio * issue.estimated_hours unless issue.estimated_hours.nil?
end
end end
return (balance / total).round return (balance / total).round
@@ -173,4 +176,10 @@ class Deliverable < ActiveRecord::Base
(user == user && user.allowed_to?(:manage_budget, project)) (user == user && user.allowed_to?(:manage_budget, project))
end end
private
def use_issue_status_for_done_ratios?
return defined?(Setting.issue_status_for_done_ratio?) && Setting.issue_status_for_done_ratio?
end
end end
spec/models/deliverable_spec.rb
+59 -28
View File
@@ -132,37 +132,68 @@ end
describe Deliverable, '.progress' do describe Deliverable, '.progress' do
before(:each) do before(:each) do
@status_in_progress = mock_model(IssueStatus) Setting.stub!(:issue_status_for_done_ratio?).and_return(false)
@status_in_progress.stub!(:default_done_ratio).and_return(50)
@status_new = mock_model(IssueStatus)
@status_new.stub!(:default_done_ratio).and_return(0)
@status_pending = mock_model(IssueStatus)
@status_pending.stub!(:default_done_ratio).and_return(80)
@status_complete = mock_model(IssueStatus)
@status_complete.stub!(:default_done_ratio).and_return(100)
end end
it 'should be calculated by the weighted average of the estimated hours of issues' do describe 'using the issue done ratio' do
@issue1 = mock_model(Issue) it 'should be calculated by the weighted average of the estimated hours of issues' do
@issue1.should_receive(:status).and_return(@status_in_progress) @issue1 = mock_model(Issue)
@issue1.should_receive(:estimated_hours).exactly(3).times.and_return(3.0) @issue1.should_receive(:done_ratio).and_return(50)
@issue2 = mock_model(Issue) @issue1.should_receive(:estimated_hours).exactly(3).times.and_return(3.0)
@issue2.should_receive(:status).and_return(@status_new) @issue2 = mock_model(Issue)
@issue2.should_receive(:estimated_hours).exactly(3).times.and_return(2.0) @issue2.should_receive(:done_ratio).and_return(0)
@issue3 = mock_model(Issue) @issue2.should_receive(:estimated_hours).exactly(3).times.and_return(2.0)
@issue3.should_receive(:status).and_return(@status_pending) @issue3 = mock_model(Issue)
@issue3.should_receive(:estimated_hours).exactly(3).times.and_return(10.0) @issue3.should_receive(:done_ratio).and_return(80)
@issue4 = mock_model(Issue) @issue3.should_receive(:estimated_hours).exactly(3).times.and_return(10.0)
@issue4.should_receive(:status).and_return(@status_complete) @issue4 = mock_model(Issue)
@issue4.should_receive(:estimated_hours).exactly(3).times.and_return(1.0) @issue4.should_receive(:done_ratio).and_return(100)
@issues = [@issue1, @issue2, @issue3, @issue4] @issue4.should_receive(:estimated_hours).exactly(3).times.and_return(1.0)
@issues.stub!(:count).and_return(4) @issues = [@issue1, @issue2, @issue3, @issue4]
@issues.stub!(:count).and_return(4)
@deliverable = Deliverable.new({ :subject => 'test' }) @deliverable = Deliverable.new({ :subject => 'test' })
@deliverable.should_receive(:issues).exactly(3).times.and_return(@issues) @deliverable.should_receive(:issues).exactly(3).times.and_return(@issues)
@deliverable.progress.should eql(66) @deliverable.progress.should eql(66)
end
end
describe 'using the status done ratio patch' do
before(:each) do
Setting.stub!(:issue_status_for_done_ratio?).and_return(true)
@status_in_progress = mock_model(IssueStatus)
@status_in_progress.stub!(:default_done_ratio).and_return(50)
@status_new = mock_model(IssueStatus)
@status_new.stub!(:default_done_ratio).and_return(0)
@status_pending = mock_model(IssueStatus)
@status_pending.stub!(:default_done_ratio).and_return(80)
@status_complete = mock_model(IssueStatus)
@status_complete.stub!(:default_done_ratio).and_return(100)
end
it 'should be calculated by the weighted average of the estimated hours of issues' do
@issue1 = mock_model(Issue)
@issue1.should_receive(:status).and_return(@status_in_progress)
@issue1.should_receive(:estimated_hours).exactly(3).times.and_return(3.0)
@issue2 = mock_model(Issue)
@issue2.should_receive(:status).and_return(@status_new)
@issue2.should_receive(:estimated_hours).exactly(3).times.and_return(2.0)
@issue3 = mock_model(Issue)
@issue3.should_receive(:status).and_return(@status_pending)
@issue3.should_receive(:estimated_hours).exactly(3).times.and_return(10.0)
@issue4 = mock_model(Issue)
@issue4.should_receive(:status).and_return(@status_complete)
@issue4.should_receive(:estimated_hours).exactly(3).times.and_return(1.0)
@issues = [@issue1, @issue2, @issue3, @issue4]
@issues.stub!(:count).and_return(4)
@deliverable = Deliverable.new({ :subject => 'test' })
@deliverable.should_receive(:issues).exactly(3).times.and_return(@issues)
@deliverable.progress.should eql(66)
end
end end
it 'should return 0 if there are no assigned issues' do it 'should return 0 if there are no assigned issues' do
@@ -174,7 +205,7 @@ describe Deliverable, '.progress' do
it 'should not count issues with no estimated time' do it 'should not count issues with no estimated time' do
@issue1 = mock_model(Issue) @issue1 = mock_model(Issue)
@issue1.should_receive(:status).and_return(@status_in_progress) @issue1.should_receive(:done_ratio).and_return(50)
@issue1.should_receive(:estimated_hours).exactly(3).times.and_return(3.0) @issue1.should_receive(:estimated_hours).exactly(3).times.and_return(3.0)
@issue2 = mock_model(Issue) @issue2 = mock_model(Issue)
@issue2.should_receive(:estimated_hours).exactly(2).times.and_return(nil) @issue2.should_receive(:estimated_hours).exactly(2).times.and_return(nil)