From a7fac38fcbe80e9794a35c412ec99e04d509da03 Mon Sep 17 00:00:00 2001
From: aignatov-bio <aignatov@biosistemika.com>
Date: Mon, 13 Jul 2020 14:29:59 +0200
Subject: [PATCH 1/3] Improve pdf reports

---
 app/assets/stylesheets/reports.scss           |  2 +
 app/assets/stylesheets/reports_print.scss     | 48 ++++++++++++++++++-
 app/helpers/reports_helper.rb                 | 14 ++++--
 .../elements/_step_asset_element.html.erb     |  2 +-
 app/views/reports/footer.pdf.erb              |  2 +-
 app/views/reports/header.pdf.erb              |  2 +-
 app/views/reports/report.pdf.erb              |  2 +-
 7 files changed, 61 insertions(+), 11 deletions(-)

diff --git a/app/assets/stylesheets/reports.scss b/app/assets/stylesheets/reports.scss
index cd23ec5c8..c3d07e9c1 100644
--- a/app/assets/stylesheets/reports.scss
+++ b/app/assets/stylesheets/reports.scss
@@ -68,6 +68,7 @@ label {
 }
 
 .report-common-table-format {
+  page-break-inside: avoid;
   width: 100%;
 
   tr {
@@ -296,6 +297,7 @@ label {
         border-radius: 4px;
         padding: 2px 4px;
         color: $color-white;
+        white-space: nowrap;
       }
     }
   }
diff --git a/app/assets/stylesheets/reports_print.scss b/app/assets/stylesheets/reports_print.scss
index f0dd6ee79..f0953b2ad 100644
--- a/app/assets/stylesheets/reports_print.scss
+++ b/app/assets/stylesheets/reports_print.scss
@@ -42,20 +42,24 @@ div.print-report {
   .report-project-header-element {
     & > .report-element-body .project-name {
       color: $color-black;
+      white-space: nowrap;
     }
 
     &:hover > .report-element-body .project-name {
       color: $color-black;
+      white-space: nowrap;
     }
   }
 
   .report-module-element:hover {
     & > .report-element-body .module-name {
       color: $color-black;
+      white-space: nowrap;
     }
 
     &:hover > .report-element-body .module-name {
       color: $color-black;
+      white-space: nowrap;
     }
   }
 
@@ -72,10 +76,12 @@ div.print-report {
   .report-step-element {
     & > .report-element-body .step-name {
       color: $color-black;
+      width: 100%;
     }
 
     &:hover > .report-element-body .step-name {
       color: $color-black;
+      width: 100%;
     }
   }
 
@@ -92,30 +98,42 @@ div.print-report {
   .report-step-table-element {
     & > .report-element-header .table-name {
       color: $color-black;
+      white-space: nowrap;
     }
 
     &:hover > .report-element-header .table-name {
       color: $color-black;
+      white-space: nowrap;
     }
   }
 
   .report-step-asset-element {
     & > .report-element-header .file-name {
-      color: $color-black;
+      em {
+        color: $color-black;
+        white-space: nowrap;
+      }
     }
 
     &:hover > .report-element-header .file-name {
-      color: $color-black;
+      em {
+        color: $color-black;
+        white-space: nowrap;
+      }
     }
   }
 
   .report-step-checklist-element {
+    page-break-inside: avoid;
+
     & > .report-element-header .checklist-name {
       color: $color-black;
+      white-space: nowrap;
     }
 
     &:hover > .report-element-header .checklist-name {
       color: $color-black;
+      white-space: nowrap;
     }
   }
 
@@ -123,12 +141,14 @@ div.print-report {
     & > .report-element-header {
       .comments-icon,.comments-name {
         color: $color-black !important;
+        white-space: nowrap;
       }
     }
 
     &:hover > .report-element-header {
       .comments-icon,.comments-name {
         color: $color-black !important;
+        white-space: nowrap;
       }
     }
   }
@@ -151,12 +171,14 @@ div.print-report {
     & > .report-element-header {
       .activity-icon,.activity-name {
         color: $color-black !important;
+        white-space: nowrap;
       }
     }
 
     &:hover > .report-element-header {
       .activity-icon,.activity-name {
         color: $color-black !important;
+        white-space: nowrap;
       }
     }
   }
@@ -165,12 +187,34 @@ div.print-report {
     & > .report-element-header {
       .repository-icon,.repository-name {
         color: $color-black !important;
+        white-space: nowrap;
       }
     }
 
     &:hover > .report-element-header {
       .repository-icon,.repository-name {
         color: $color-black !important;
+        white-space: nowrap;
+      }
+    }
+  }
+
+  .report-result-element {
+    & > .report-element-header {
+      .result-icon,
+      .result-name,
+      .file-name{
+        color: $color-black !important;
+        white-space: nowrap;
+      }
+    }
+
+    &:hover > .report-element-header {
+      .result-icon,
+      .result-name,
+      .file-name {
+        color: $color-black !important;
+        white-space: nowrap;
       }
     }
   }
diff --git a/app/helpers/reports_helper.rb b/app/helpers/reports_helper.rb
index f44f2b5f3..45c60cd2b 100644
--- a/app/helpers/reports_helper.rb
+++ b/app/helpers/reports_helper.rb
@@ -115,11 +115,15 @@ module ReportsHelper
                         media: 'all')
   end
 
-  def font_awesome_cdn_link_tag
-    stylesheet_link_tag(
-      'https://maxcdn.bootstrapcdn.com/font-awesome' \
-      '/4.6.3/css/font-awesome.min.css'
-    )
+  def font_awesome_report_pack_tag
+    if running_in_development?
+      options = { media: 'all' }
+      wds = Webpacker.dev_server
+      options[:host] = "#{wds.host}:#{wds.port}"
+      stylesheet_pack_tag('fontawesome', options)
+    else
+      wicked_pdf_stylesheet_pack_tag 'fontawesome'
+    end
   end
 
   def assigned_repository_or_snapshot(my_module, element_id, snapshot, repository)
diff --git a/app/views/reports/elements/_step_asset_element.html.erb b/app/views/reports/elements/_step_asset_element.html.erb
index ef768927b..0f4632bc8 100644
--- a/app/views/reports/elements/_step_asset_element.html.erb
+++ b/app/views/reports/elements/_step_asset_element.html.erb
@@ -17,7 +17,7 @@
         <% else %>
           <em><%=t 'projects.reports.elements.step_asset.file_name',
                    file: truncate(asset.file_name,
-                                  length: Constants::FILENAME_TRUNCATION_LENGTH) %></em>
+                                  length: Constants::FILENAME_TRUNCATION_LENGTH) -%></em>
         <% end %>
       </div>
       <div class="pull-left user-time">
diff --git a/app/views/reports/footer.pdf.erb b/app/views/reports/footer.pdf.erb
index 46e88af38..530f5df86 100644
--- a/app/views/reports/footer.pdf.erb
+++ b/app/views/reports/footer.pdf.erb
@@ -5,7 +5,7 @@
   <%= wicked_pdf_stylesheet_link_tag "application" %>
   <%= wicked_pdf_stylesheet_link_tag "reports_pdf" %>
   <%= bootstrap_cdn_link_tag %>
-  <%= font_awesome_cdn_link_tag %>
+  <%= font_awesome_report_pack_tag %>
 </head>
 <body class="print-footer-body" style="height: 50px">
   <div class="print-footer">
diff --git a/app/views/reports/header.pdf.erb b/app/views/reports/header.pdf.erb
index c06c7551d..aa9f2975a 100644
--- a/app/views/reports/header.pdf.erb
+++ b/app/views/reports/header.pdf.erb
@@ -5,7 +5,7 @@
   <%= wicked_pdf_stylesheet_link_tag "application" %>
   <%= wicked_pdf_stylesheet_link_tag "reports_pdf" %>
   <%= bootstrap_cdn_link_tag %>
-  <%= font_awesome_cdn_link_tag %>
+  <%= font_awesome_report_pack_tag %>
 
   <script>
     function number_pages() {
diff --git a/app/views/reports/report.pdf.erb b/app/views/reports/report.pdf.erb
index 5c72fdccf..0054998b6 100644
--- a/app/views/reports/report.pdf.erb
+++ b/app/views/reports/report.pdf.erb
@@ -5,7 +5,7 @@
     <%= wicked_pdf_stylesheet_link_tag "application" %>
     <%= wicked_pdf_stylesheet_link_tag "reports_pdf" %>
     <%= bootstrap_cdn_link_tag %>
-    <%= font_awesome_cdn_link_tag %>
+    <%= font_awesome_report_pack_tag %>
   </head>
   <body class="print-report-body">
     <div class="print-report">

From f8c6d9f26021436e8ffc4dfc7fc07ca827089659 Mon Sep 17 00:00:00 2001
From: aignatov-bio <aignatov@biosistemika.com>
Date: Mon, 13 Jul 2020 14:31:57 +0200
Subject: [PATCH 2/3] Fix markup

---
 app/views/reports/elements/_step_asset_element.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/reports/elements/_step_asset_element.html.erb b/app/views/reports/elements/_step_asset_element.html.erb
index 0f4632bc8..ef768927b 100644
--- a/app/views/reports/elements/_step_asset_element.html.erb
+++ b/app/views/reports/elements/_step_asset_element.html.erb
@@ -17,7 +17,7 @@
         <% else %>
           <em><%=t 'projects.reports.elements.step_asset.file_name',
                    file: truncate(asset.file_name,
-                                  length: Constants::FILENAME_TRUNCATION_LENGTH) -%></em>
+                                  length: Constants::FILENAME_TRUNCATION_LENGTH) %></em>
         <% end %>
       </div>
       <div class="pull-left user-time">

From c73998b6bf83adb03cf34d9b1a53262c9a46f83d Mon Sep 17 00:00:00 2001
From: aignatov-bio <aignatov@biosistemika.com>
Date: Mon, 13 Jul 2020 16:32:28 +0200
Subject: [PATCH 3/3] Fix markup

---
 app/helpers/reports_helper.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/helpers/reports_helper.rb b/app/helpers/reports_helper.rb
index 45c60cd2b..30011507f 100644
--- a/app/helpers/reports_helper.rb
+++ b/app/helpers/reports_helper.rb
@@ -117,10 +117,8 @@ module ReportsHelper
 
   def font_awesome_report_pack_tag
     if running_in_development?
-      options = { media: 'all' }
       wds = Webpacker.dev_server
-      options[:host] = "#{wds.host}:#{wds.port}"
-      stylesheet_pack_tag('fontawesome', options)
+      stylesheet_pack_tag('fontawesome', media: 'all', host: "#{wds.host}:#{wds.port}")
     else
       wicked_pdf_stylesheet_pack_tag 'fontawesome'
     end