From 0ef9c7eff60c62d98fa31baa179de907c4bb98d1 Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Thu, 11 May 2017 15:30:19 +0200 Subject: [PATCH 1/2] Fix task ordering in reports [SCI-1008] --- app/controllers/concerns/report_actions.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/concerns/report_actions.rb b/app/controllers/concerns/report_actions.rb index e301aa1a6..d6ce386c1 100644 --- a/app/controllers/concerns/report_actions.rb +++ b/app/controllers/concerns/report_actions.rb @@ -52,7 +52,7 @@ module ReportActions def generate_experiment_contents_json(experiment, selected_modules) res = [] - experiment.my_modules.each do |my_module| + experiment.my_modules.order(:workflow_order).each do |my_module| next unless selected_modules.include?(my_module.id) res << generate_new_el(false) From 5d55720aad206a58f9843ca729ce46d1387ac9dd Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Thu, 11 May 2017 15:56:33 +0200 Subject: [PATCH 2/2] Fix steps ordering in reports [SCI-1008] --- app/models/protocol.rb | 2 +- config/initializers/extends/report_extends.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/protocol.rb b/app/models/protocol.rb index dd10997a4..8f4049561 100644 --- a/app/models/protocol.rb +++ b/app/models/protocol.rb @@ -372,7 +372,7 @@ class Protocol < ActiveRecord::Base end def completed_steps - steps.select(&:completed) + steps.where(completed: true) end def space_taken diff --git a/config/initializers/extends/report_extends.rb b/config/initializers/extends/report_extends.rb index d243c6bb0..3245d8af0 100644 --- a/config/initializers/extends/report_extends.rb +++ b/config/initializers/extends/report_extends.rb @@ -52,7 +52,7 @@ module ReportExtends true, [:step], proc do |my_module| - my_module.protocol.completed_steps + my_module.protocol.completed_steps.order(:position) end), ModuleElement.new(:result_assets, true,