meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-02-06 09:03:25 +00:00
Code Issues Releases Wiki Activity

Calculate done_ratio based on children instead of leaves (#20995).

Browse Source 
Patch by Jens Krämer.

git-svn-id: http://svn.redmine.org/redmine/trunk@14875 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2015-11-14 09:58:52 +00:00
parent 5735db1a91
commit 1a860d5320
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/models/issue.rb
View File

@ -1529,16 +1529,16 @@ class Issue < ActiveRecord::Base
if p.done_ratio_derived?
# done ratio = weighted average ratio of leaves
unless Issue.use_status_for_done_ratio? && p.status && p.status.default_done_ratio
leaves_count = p.leaves.count
if leaves_count > 0
average = p.leaves.where("estimated_hours > 0").average(:estimated_hours).to_f
child_count = p.children.count
if child_count > 0
average = p.children.where("estimated_hours > 0").average(:estimated_hours).to_f
if average == 0
average = 1
end
done = p.leaves.joins(:status).
done = p.children.joins(:status).
sum("COALESCE(CASE WHEN estimated_hours > 0 THEN estimated_hours ELSE NULL END, #{average}) " +
"* (CASE WHEN is_closed = #{self.class.connection.quoted_true} THEN 100 ELSE COALESCE(done_ratio, 0) END)").to_f
progress = done / (average * leaves_count)
progress = done / (average * child_count)
p.done_ratio = progress.round
end
end

20
test/unit/issue_subtasking_test.rb
View File

@ -185,6 +185,26 @@ class IssueSubtaskingTest < ActiveSupport::TestCase
end
end
def test_done_ratio_of_parent_should_reflect_children
root = Issue.generate!
child1 = root.generate_child!
child2 = child1.generate_child!
assert_equal 0, root.done_ratio
assert_equal 0, child1.done_ratio
assert_equal 0, child2.done_ratio
with_settings :issue_done_ratio => 'issue_status' do
status = IssueStatus.find(4)
status.update_attribute :default_done_ratio, 50
child1.update_attribute :status, status
assert_equal 50, child1.done_ratio
root.reload
assert_equal 50, root.done_ratio
end
end
def test_parent_dates_should_be_editable_with_parent_issue_dates_set_to_independent
with_settings :parent_issue_dates => 'independent' do
issue = Issue.generate_with_child!