From 9a37b750013ed679d3e38a135cd3b6da3c772d34 Mon Sep 17 00:00:00 2001 From: Ivan Kljun Date: Mon, 31 Jul 2023 15:45:39 +0200 Subject: [PATCH] Applied hound linter suggestions --- app/assets/stylesheets/layouts/print_protocol.scss | 3 ++- app/assets/stylesheets/reports.scss | 4 ++-- app/services/reports/docx/draw_step_checklist.rb | 6 +++--- app/views/protocols/print.html.erb | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/assets/stylesheets/layouts/print_protocol.scss b/app/assets/stylesheets/layouts/print_protocol.scss index 4a1baed47..ba28ce355 100644 --- a/app/assets/stylesheets/layouts/print_protocol.scss +++ b/app/assets/stylesheets/layouts/print_protocol.scss @@ -82,7 +82,6 @@ hr { .print-checklist-item { display: flex; - gap: .7em; margin-bottom: 1em; span { @@ -90,6 +89,8 @@ hr { } div { + margin-bottom: .7em; + margin-left: .7em; white-space: pre-line; } } diff --git a/app/assets/stylesheets/reports.scss b/app/assets/stylesheets/reports.scss index 9494b8e27..317682217 100644 --- a/app/assets/stylesheets/reports.scss +++ b/app/assets/stylesheets/reports.scss @@ -536,11 +536,11 @@ label { } .report-checklist-item { - display: -webkit-box; /* for wkhtmltopdf compatibility */ + display: -webkit-box; // for wkhtmltopdf compatibility display: flex; justify-content: start; margin-top: .5em; - -webkit-box-pack: start; /* for wkhtmltopdf compatibility */ + -webkit-box-pack: start; // for wkhtmltopdf compatibility div:nth-child(2) { margin-top: .2em; diff --git a/app/services/reports/docx/draw_step_checklist.rb b/app/services/reports/docx/draw_step_checklist.rb index 420a3c516..4de639599 100644 --- a/app/services/reports/docx/draw_step_checklist.rb +++ b/app/services/reports/docx/draw_step_checklist.rb @@ -24,15 +24,15 @@ module Reports::Docx::DrawStepChecklist items.each do |item| li do text_array = SmartAnnotations::TagToText.new(user, team, item.text).text.split("\n") - + text_array.each_with_index do |line, index| # Add the text line text line - + # If this isn't the last line in the array, start a new paragraph for the next line br if index < text_array.length - 1 end - + text " (#{I18n.t('projects.reports.elements.step_checklist.checked')})", color: '2dbe61' if item.checked end end diff --git a/app/views/protocols/print.html.erb b/app/views/protocols/print.html.erb index 26b282ec4..37b8629f0 100644 --- a/app/views/protocols/print.html.erb +++ b/app/views/protocols/print.html.erb @@ -68,7 +68,7 @@ <% else %> <% end %> - # +
<%= smart_annotation_parser(checklist_item.text, current_team).html_safe %>
<%# Should stay in one line %> <% end %>