scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-09 21:36:44 +08:00
Code Issues Projects Releases Packages Wiki Activity

Refactor instance method 'ordered_modules' to scope

Browse source
This commit is contained in:
Urban Rotnik 2019-01-07 15:48:26 +01:00
parent 457e9990c5
commit 686f10cbd0
4 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/models/my_module.rb
View file

@ -74,6 +74,7 @@ class MyModule < ApplicationRecord
Time.current.utc, Time.current.utc,
Time.current.utc + 1.day) Time.current.utc + 1.day)
end) end)
scope :workflow_ordered, -> { order(workflow_order: :asc) }
# A module takes this much space in canvas (x, y) in database # A module takes this much space in canvas (x, y) in database
WIDTH = 30 WIDTH = 30

12
app/models/my_module_group.rb
View file

@ -10,10 +10,6 @@ class MyModuleGroup < ApplicationRecord
optional: true optional: true
has_many :my_modules, inverse_of: :my_module_group, dependent: :nullify has_many :my_modules, inverse_of: :my_module_group, dependent: :nullify
def ordered_modules
my_modules.order(workflow_order: :asc)
end
def deep_clone_to_experiment(current_user, experiment) def deep_clone_to_experiment(current_user, experiment)
clone = MyModuleGroup.new( clone = MyModuleGroup.new(
created_by: created_by, created_by: created_by,
@ -21,12 +17,12 @@ class MyModuleGroup < ApplicationRecord
) )
# Get clones of modules from this group, save them as hash # Get clones of modules from this group, save them as hash
cloned_modules = ordered_modules.each_with_object({}) do |m, hash| cloned_modules = my_modules.workflow_ordered.each_with_object({}) do |m, h|
hash[m.id] = m.deep_clone_to_experiment(current_user, experiment) h[m.id] = m.deep_clone_to_experiment(current_user, experiment)
hash h
end end
ordered_modules.each do |m| my_modules.workflow_ordered.each do |m|
# Copy connections # Copy connections
m.inputs.each do |inp| m.inputs.each do |inp|
Connection.create( Connection.create(

2
app/views/reports/new/modal/_experiment_contents_inner.html.erb
View file

@ -13,7 +13,7 @@
<% experiment.my_module_groups.each do |my_module_group| %> <% experiment.my_module_groups.each do |my_module_group| %>
<% if my_module_group.my_modules.exists? then %> <% if my_module_group.my_modules.exists? then %>
<% my_module_group.ordered_modules.each do |my_module| %> <% my_module_group.my_modules.workflow_ordered.each do |my_module| %>
<li> <li>
<%= form.check_box "modules[#{my_module.id}]", label: my_module.name %> <%= form.check_box "modules[#{my_module.id}]", label: my_module.name %>
</li> </li>

2
app/views/reports/new/modal/_project_contents_inner.html.erb
View file

@ -19,7 +19,7 @@
<% experiment.my_module_groups.each do |my_module_group| %> <% experiment.my_module_groups.each do |my_module_group| %>
<% next unless my_module_group.my_modules.is_archived(false).exists? %> <% next unless my_module_group.my_modules.is_archived(false).exists? %>
<% my_module_group.ordered_modules.is_archived(false).each do |my_module| %> <% my_module_group.my_modules.workflow_ordered.is_archived(false).each do |my_module| %>
<li> <li>
<%= form.check_box "modules[#{my_module.id}]", label: my_module.name %> <%= form.check_box "modules[#{my_module.id}]", label: my_module.name %>
</li> </li>