mirror of
https://github.com/scinote-eln/scinote-web.git
synced 2025-02-07 15:33:50 +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
36 lines
1.6 KiB
Text
36 lines
1.6 KiB
Text
<% if result.blank? and @result.present? then result = @result end %>
|
|
<% result_text = result.result_text %>
|
|
<% comments = result.comments %>
|
|
<% timestamp = result.created_at %>
|
|
<% name = result.name %>
|
|
<div class="report-element report-result-element report-result-text-element" data-ts="<%= timestamp.to_i %>" data-type="result_text" data-id="<%= result.id %>" data-modal-title="<%=t "projects.reports.elements.modals.result_contents.head_title", result: result.name %>" data-name="<%= name %>" data-icon-class="glyphicon-asterisk">
|
|
<div class="report-element-header">
|
|
<div class="row">
|
|
<div class="pull-left result-icon">
|
|
<span class="glyphicon glyphicon-asterisk"></span>
|
|
</div>
|
|
<div class="pull-left result-name">
|
|
<%= name %>
|
|
</div>
|
|
<div class="pull-left user-time">
|
|
<%=t "projects.reports.elements.result_text.user_time", user: result.user.full_name, timestamp: l(timestamp, format: :full) %>
|
|
</div>
|
|
<div class="pull-right controls">
|
|
<%= render partial: "reports/elements/element_controls.html.erb" %>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="report-element-body">
|
|
<div class="row">
|
|
<div class="col-xs-12 text-container ql-editor">
|
|
<%= auto_link(smart_annotation_parser(simple_format(sanitize_input(result_text.text))),
|
|
link: :urls,
|
|
sanitize: false,
|
|
html: { target: '_blank' }).html_safe %>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<div class="report-element-children">
|
|
<%= children if (defined? children and children.present?) %>
|
|
</div>
|
|
</div>
|