scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-08 07:55:14 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #615 from okriuchykhin/ok_SCI_1008

Browse source 
Fix task and step ordering in reports [SCI-1008]
This commit is contained in:
okriuchykhin 2017-05-12 16:44:57 +02:00 committed by GitHub
commit a8bbc3c3ba
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/concerns/report_actions.rb
View file

@ -52,7 +52,7 @@ module ReportActions
def generate_experiment_contents_json(experiment, selected_modules) def generate_experiment_contents_json(experiment, selected_modules)
res = [] 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) next unless selected_modules.include?(my_module.id)
res << generate_new_el(false) res << generate_new_el(false)

2
app/models/protocol.rb
View file

@ -372,7 +372,7 @@ class Protocol < ActiveRecord::Base
end end
def completed_steps def completed_steps
steps.select(&:completed) steps.where(completed: true)
end end
def space_taken def space_taken

2
config/initializers/extends/report_extends.rb
View file

@ -52,7 +52,7 @@ module ReportExtends
true, true,
[:step], [:step],
proc do |my_module| proc do |my_module|
my_module.protocol.completed_steps my_module.protocol.completed_steps.order(:position)
end), end),
ModuleElement.new(:result_assets, ModuleElement.new(:result_assets,
true, true,