meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-20 07:21:12 +00:00
Code Issues Releases Wiki Activity

Use sum { ... } instead of map { ... }.sum (#34399).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@20581 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2020-12-06 01:36:39 +00:00
parent 7467faf937
commit f43b3685ff
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/issue.rb
View File

@ -1743,16 +1743,16 @@ class Issue < ActiveRecord::Base
if children.any?
child_with_total_estimated_hours = children.select {|c| c.total_estimated_hours.to_f > 0.0}
if child_with_total_estimated_hours.any?
average = child_with_total_estimated_hours.map(&:total_estimated_hours).sum.to_d / child_with_total_estimated_hours.count
average = child_with_total_estimated_hours.sum(&:total_estimated_hours).to_d / child_with_total_estimated_hours.count
else
average = 1.0.to_d
end
done = children.map do |c|
done = children.sum do |c|
estimated = (c.total_estimated_hours || 0.0).to_d
estimated = average unless estimated > 0.0
ratio = c.closed? ? 100 : (c.done_ratio || 0)
estimated * ratio
end.sum
end
progress = done / (average * children.count)
p.done_ratio = progress.floor
end

4
app/models/project.rb
View File

@ -677,12 +677,12 @@ class Project < ActiveRecord::Base
# progress on it's versions.
def completed_percent(options={:include_subprojects => false})
if options.delete(:include_subprojects)
total = self_and_descendants.collect(&:completed_percent).sum
total = self_and_descendants.sum(&:completed_percent)
total / self_and_descendants.count
else
if versions.count > 0
total = versions.collect(&:completed_percent).sum
total = versions.sum(&:completed_percent)
total / versions.count
else