jro_apps/redmine Commit - r14493:1a860d5320aa

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

Jean-Philippe Lang -

r14493:1a860d5320aa

parent child

Context file:

r14493:1a860d5320aa

app/models/issue.rb +5 -5

                    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

test/unit/issue_subtasking_test.rb +20 0

                  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!

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages