meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-01-31 11:37:14 +00:00
Code Issues Releases Wiki Activity

Progress of version should be calculated the same way as parent tasks (#24457, #4682).

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/trunk@22803 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Marius Balteanu 2024-05-02 20:58:03 +00:00
parent 3433731585
commit cd8d4fe444
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/models/version.rb
View File

@ -78,9 +78,11 @@ module FixedIssuesExtension
# Used to weight unestimated issues in progress calculation
def estimated_average
if @estimated_average.nil?
average = average(:estimated_hours).to_f
if average == 0
average = 1
issues_with_total_estimated_hours = select {|c| c.total_estimated_hours.to_f > 0.0}
if issues_with_total_estimated_hours.any?
average = issues_with_total_estimated_hours.map(&:total_estimated_hours).sum.to_f / issues_with_total_estimated_hours.count
else
average = 1.0
end
@estimated_average = average
end
@ -98,9 +100,12 @@ module FixedIssuesExtension
@issues_progress[open] ||= begin
progress = 0
if count > 0
ratio = open ? 'done_ratio' : 100
done = open(open).sum("COALESCE(estimated_hours, #{estimated_average}) * #{ratio}").to_f
done = open(open).map {|c|
estimated = c.total_estimated_hours.to_f
estimated = estimated_average unless estimated > 0.0
ratio = c.closed? ? 100 : (c.done_ratio || 0)
estimated * ratio
}.sum
progress = done / (estimated_average * count)
end
progress

10
test/unit/version_test.rb
View File

@ -117,6 +117,16 @@ class VersionTest < ActiveSupport::TestCase
assert_progress_equal (100.0)/3, v.closed_percent
end
def test_progress_should_consider_closed_issues_with_0h_estimated_as_completed
project = Project.find(1)
closed = IssueStatus.where(:is_closed => true).first
v = Version.create!(:project => project, :name => 'Progress')
add_issue(v, :done_ratio => 100, :estimated_hours => 0)
add_issue(v, :done_ratio => 100, :estimated_hours => 0, :status => closed)
assert_progress_equal 100, v.completed_percent
assert_progress_equal 50, v.closed_percent
end
def test_progress_should_consider_estimated_hours_to_weight_issues
project = Project.find(1)
v = Version.create!(:project => project, :name => 'Progress')