mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2024-09-21 07:26:15 +08:00
Refactor step position + 1 into a method
This commit is contained in:
parent
05963eb245
commit
26848ecaef
|
@ -229,12 +229,12 @@ class StepsController < ApplicationController
|
||||||
|
|
||||||
flash[:success] = t(
|
flash[:success] = t(
|
||||||
'protocols.steps.destroy.success_flash',
|
'protocols.steps.destroy.success_flash',
|
||||||
step: (@step.position + 1).to_s
|
step: (@step.position_plus_one).to_s
|
||||||
)
|
)
|
||||||
else
|
else
|
||||||
flash[:error] = t(
|
flash[:error] = t(
|
||||||
'protocols.steps.destroy.error_flash',
|
'protocols.steps.destroy.error_flash',
|
||||||
step: (@step.position + 1).to_s
|
step: (@step.position_plus_one).to_s
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -97,6 +97,10 @@ class Step < ApplicationRecord
|
||||||
protocol.present? ? protocol.my_module : nil
|
protocol.present? ? protocol.my_module : nil
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def position_plus_one
|
||||||
|
position + 1
|
||||||
|
end
|
||||||
|
|
||||||
def last_comments(last_id = 1, per_page = Constants::COMMENTS_SEARCH_LIMIT)
|
def last_comments(last_id = 1, per_page = Constants::COMMENTS_SEARCH_LIMIT)
|
||||||
last_id = Constants::INFINITY if last_id <= 1
|
last_id = Constants::INFINITY if last_id <= 1
|
||||||
comments = StepComment.joins(:step)
|
comments = StepComment.joins(:step)
|
||||||
|
|
|
@ -189,7 +189,7 @@ class TeamZipExport < ZipExport
|
||||||
if type == :step
|
if type == :step
|
||||||
name = "#{directory}/" \
|
name = "#{directory}/" \
|
||||||
"#{append_file_suffix(asset.file_file_name,
|
"#{append_file_suffix(asset.file_file_name,
|
||||||
"_#{i}_Step#{element.step.position + 1}")}"
|
"_#{i}_Step#{element.step.position_plus_one}")}"
|
||||||
elsif type == :result
|
elsif type == :result
|
||||||
name = "#{directory}/#{append_file_suffix(asset.file_file_name,
|
name = "#{directory}/#{append_file_suffix(asset.file_file_name,
|
||||||
"_#{i}")}"
|
"_#{i}")}"
|
||||||
|
@ -212,7 +212,7 @@ class TeamZipExport < ZipExport
|
||||||
|
|
||||||
if type == :step
|
if type == :step
|
||||||
name = "#{directory}/#{to_filesystem_name(table_name)}" \
|
name = "#{directory}/#{to_filesystem_name(table_name)}" \
|
||||||
"_#{i}_Step#{element.step.position + 1}.csv"
|
"_#{i}_Step#{element.step.position_plus_one}.csv"
|
||||||
elsif type == :result
|
elsif type == :result
|
||||||
name = "#{directory}/#{to_filesystem_name(table_name)}.csv"
|
name = "#{directory}/#{to_filesystem_name(table_name)}.csv"
|
||||||
end
|
end
|
||||||
|
|
|
@ -70,7 +70,7 @@
|
||||||
<% protocol.steps.order(:position).each do |step| %>
|
<% protocol.steps.order(:position).each do |step| %>
|
||||||
<div class ="step <%= step.completed? ? "completed" : "not-completed" %>">
|
<div class ="step <%= step.completed? ? "completed" : "not-completed" %>">
|
||||||
<div class="badge-num">
|
<div class="badge-num">
|
||||||
<span class="badge size-digit-<%= (step.position + 1).to_s.length %>"><%= step.position + 1 %></span>
|
<span class="badge size-digit-<%= (step.position_plus_one).to_s.length %>"><%= step.position_plus_one %></span>
|
||||||
</div>
|
</div>
|
||||||
<div class="panel panel-default">
|
<div class="panel panel-default">
|
||||||
<div class="panel-heading">
|
<div class="panel-heading">
|
||||||
|
|
|
@ -7,7 +7,14 @@
|
||||||
<% checklists = step.checklists %>
|
<% checklists = step.checklists %>
|
||||||
<% comments = step.step_comments %>
|
<% comments = step.step_comments %>
|
||||||
<% pdf_export_ready = defined?(export_all) && export_all %>
|
<% pdf_export_ready = defined?(export_all) && export_all %>
|
||||||
<div class="report-element report-step-element" data-ts="<%= timestamp.to_i %>" data-type="step" data-id='{ "step_id": <%= step.id %> }' data-scroll-id="<%= step.id %>" data-modal-title="<%=t "projects.reports.elements.modals.step_contents.head_title", step: step.name %>" data-name="<%=t "projects.reports.elements.step.sidebar_name", pos: (step.position + 1), name: step.name %>" data-icon-class="fas fa-arrow-circle-right">
|
<div class="report-element report-step-element"
|
||||||
|
data-ts="<%= timestamp.to_i %>"
|
||||||
|
data-type="step"
|
||||||
|
data-id='{ "step_id": <%= step.id %> }'
|
||||||
|
data-scroll-id="<%= step.id %>"
|
||||||
|
data-modal-title="<%=t "projects.reports.elements.modals.step_contents.head_title", step: step.name %>"
|
||||||
|
data-name="<%=t "projects.reports.elements.step.sidebar_name", pos: (step.position_plus_one), name: step.name %>"
|
||||||
|
data-icon-class="fas fa-arrow-circle-right">
|
||||||
<div class="report-element-header">
|
<div class="report-element-header">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="pull-left user-time">
|
<div class="pull-left user-time">
|
||||||
|
@ -23,7 +30,7 @@
|
||||||
<div class="pull-left step-name">
|
<div class="pull-left step-name">
|
||||||
<h5>
|
<h5>
|
||||||
<span class="fas fa-arrow-circle-right"></span>
|
<span class="fas fa-arrow-circle-right"></span>
|
||||||
<b><%=t "projects.reports.elements.step.step_pos", pos: (step.position + 1) %></b> <%= step.name %>
|
<b><%=t "projects.reports.elements.step.step_pos", pos: (step.position_plus_one) %></b> <%= step.name %>
|
||||||
<%= step_status_label(step) %>
|
<%= step_status_label(step) %>
|
||||||
</h5>
|
</h5>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<div class ="step <%= step.completed? ? "completed" : "not-completed" %>">
|
<div class ="step <%= step.completed? ? "completed" : "not-completed" %>">
|
||||||
<div class="badge-num">
|
<div class="badge-num">
|
||||||
<span class="badge size-digit-<%= (step.position + 1).to_s.length %>"><%= step.position + 1 %></span>
|
<span class="badge size-digit-<%= (step.position_plus_one).to_s.length %>"><%= step.position_plus_one %></span>
|
||||||
</div>
|
</div>
|
||||||
<div class="panel panel-default">
|
<div class="panel panel-default">
|
||||||
<div class="panel-heading">
|
<div class="panel-heading">
|
||||||
|
|
Loading…
Reference in a new issue