Skip to content

OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub

refactor: Extract methods to deal with % complete modes

Christophe Bliard4b6056b33352
diff --git a/app/models/work_package.rb b/app/models/work_package.rb
index f4d2c99c043..20c9795f0e8 100644
--- a/app/models/work_package.rb
+++ b/app/models/work_package.rb
@@ -215,6 +215,14 @@ class WorkPackage < ApplicationRecord
Setting.work_package_done_ratio == "field"
end
+ def self.work_weighted_average_mode?
+ Setting.total_percent_complete_mode == "work_weighted_average"
+ end
+
+ def self.simple_average_mode?
+ Setting.total_percent_complete_mode == "simple_average"
+ end
+
def self.complete_on_status_closed?
Setting.percent_complete_on_status_closed == "set_100p"
end
diff --git a/app/services/work_packages/update_ancestors_service.rb b/app/services/work_packages/update_ancestors_service.rb
index 5c1769d8a85..ee62a135a18 100644
--- a/app/services/work_packages/update_ancestors_service.rb
+++ b/app/services/work_packages/update_ancestors_service.rb
@@ -124,10 +124,9 @@ class WorkPackages::UpdateAncestorsService < BaseServices::BaseCallable
def compute_derived_done_ratio(work_package, loader)
return if no_children?(work_package, loader)
- case Setting.total_percent_complete_mode
- when "work_weighted_average"
+ if WorkPackage.work_weighted_average_mode?
calculate_work_weighted_average_percent_complete(work_package)
- when "simple_average"
+ elsif WorkPackage.simple_average_mode?
calculate_simple_average_percent_complete(work_package, loader)
end
end
diff --git a/app/workers/work_packages/progress/sql_commands.rb b/app/workers/work_packages/progress/sql_commands.rb
index 6d367d0f7f9..2453936a416 100644
--- a/app/workers/work_packages/progress/sql_commands.rb
+++ b/app/workers/work_packages/progress/sql_commands.rb
@@ -185,9 +185,9 @@ module WorkPackages::Progress::SqlCommands
# packages having children.
def update_totals
update_work_and_remaining_work_totals
- if Setting.total_percent_complete_mode == "work_weighted_average"
+ if WorkPackage.work_weighted_average_mode?
update_total_percent_complete_in_work_weighted_average_mode
- elsif Setting.total_percent_complete_mode == "simple_average"
+ elsif WorkPackage.simple_average_mode?
update_total_percent_complete_in_simple_average_mode
end
end