mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2025-02-07 23:44:55 +08:00
53699193a2
Conflicts: app/assets/javascripts/comments.js.erb app/assets/javascripts/protocols/index.js app/assets/javascripts/protocols/steps.js.erb app/assets/javascripts/samples/sample_datatable.js.erb app/controllers/my_module_comments_controller.rb app/controllers/project_comments_controller.rb app/controllers/result_comments_controller.rb app/controllers/step_comments_controller.rb app/datatables/sample_datatable.rb app/views/my_module_comments/_comment.html.erb app/views/project_comments/_comment.html.erb app/views/projects/show/_experiment.html.erb app/views/reports/elements/_experiment_element.html.erb app/views/reports/elements/_result_comments_element.html.erb app/views/reports/elements/_result_text_element.html.erb app/views/reports/elements/_step_checklist_element.html.erb app/views/reports/elements/_step_comments_element.html.erb app/views/reports/elements/_step_element.html.erb app/views/result_comments/_comment.html.erb app/views/results/_result_text.html.erb app/views/step_comments/_comment.html.erb app/views/steps/_step.html.erb db/schema.rb
43 lines
2 KiB
Text
43 lines
2 KiB
Text
<% if step.blank? and @step.present? then step = @step end %>
|
|
<% timestamp = step.completed_on %>
|
|
<% tables = step.tables %>
|
|
<% assets = step.assets %>
|
|
<% checklists = step.checklists %>
|
|
<% comments = step.comments %>
|
|
<div class="report-element report-step-element" data-ts="<%= timestamp.to_i %>" data-type="step" data-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="glyphicon-circle-arrow-right">
|
|
<div class="report-element-header">
|
|
<div class="row">
|
|
<div class="pull-left user-time">
|
|
<%=t "projects.reports.elements.step.user_time", user: step.user.full_name , timestamp: l(timestamp, format: :full) %>
|
|
</div>
|
|
<div class="pull-right controls">
|
|
<%= render partial: "reports/elements/element_controls.html.erb", locals: { show_sort: true } %>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="report-element-body">
|
|
<div class="row">
|
|
<div class="pull-left step-name">
|
|
<h5>
|
|
<span class="glyphicon glyphicon-circle-arrow-right"></span>
|
|
<b><%=t "projects.reports.elements.step.step_pos", pos: (step.position + 1) %></b> <%= step.name %>
|
|
</h5>
|
|
</div>
|
|
</div>
|
|
<div class="row">
|
|
<div class="col-xs-12 ql-editor">
|
|
<% if strip_tags(step.description).present? %>
|
|
<%= auto_link(smart_annotation_parser(simple_format(sanitize_input(step.description))),
|
|
link: :urls,
|
|
sanitize: false,
|
|
html: { target: '_blank' }).html_safe %>
|
|
<% else %>
|
|
<em><%=t "projects.reports.elements.step.no_description" %></em>
|
|
<% end %>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="report-element-children">
|
|
<%= children if (defined? children and children.present?) %>
|
|
</div>
|
|
</div>
|