From 5d067077b1f433af574976b65b93512648e52e99 Mon Sep 17 00:00:00 2001
From: Urban Rotnik <urban.rotnik@gmail.com>
Date: Wed, 8 Jul 2020 10:48:29 +0200
Subject: [PATCH 1/2] Add logo and timestamp to PDF and Doc reports

---
 app/assets/images/logo.png                   | Bin 4652 -> 3767 bytes
 app/assets/stylesheets/reports_pdf.scss      |  30 +++++++++++++++++
 app/controllers/reports_controller.rb        |   4 ++-
 app/services/reports/docx/private_methods.rb |  13 ++++++++
 app/views/reports/footer.pdf.erb             |  17 ++++++++++
 app/views/reports/header.pdf.erb             |  33 +++++++++++++++++++
 config/locales/en.yml                        |   2 ++
 7 files changed, 98 insertions(+), 1 deletion(-)
 create mode 100644 app/views/reports/footer.pdf.erb
 create mode 100644 app/views/reports/header.pdf.erb

diff --git a/app/assets/images/logo.png b/app/assets/images/logo.png
index b368cd36d776fc7eba12a74c515b31b7a86fa503..6d54bb8822e2aa114470b816f849be621d9266aa 100644
GIT binary patch
literal 3767
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

literal 4652
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

diff --git a/app/assets/stylesheets/reports_pdf.scss b/app/assets/stylesheets/reports_pdf.scss
index c1645b527..e30387c0f 100644
--- a/app/assets/stylesheets/reports_pdf.scss
+++ b/app/assets/stylesheets/reports_pdf.scss
@@ -21,3 +21,33 @@ tr {
 thead {
   display: table-row-group;
 }
+
+.print-header-body {
+  .print-header {
+    line-height: 50px;
+
+    .logo-img {
+      display: inline-block;
+      margin: 0 0 0 30px;
+
+      img {
+        width: 100px;
+      }
+    }
+
+    .page-numbers {
+      display: inline-block;
+      float: right;
+      margin: 0 30px 0 0;
+    }
+  }
+}
+
+.print-footer-body {
+  .print-footer {
+    line-height: 50px;
+
+    margin-right: 30px;
+    text-align: right;
+  }
+}
diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb
index 3a1266a1f..836106386 100644
--- a/app/controllers/reports_controller.rb
+++ b/app/controllers/reports_controller.rb
@@ -148,7 +148,9 @@ class ReportsController < ApplicationController
     content = I18n.t('projects.reports.new.no_content_for_PDF_html') if content.blank?
     respond_to do |format|
       format.pdf do
-        render pdf: 'report', header: { right: '[page] of [topage]' },
+        render pdf: 'report', header: { html: { template: 'reports/header.pdf.erb' }},
+                              footer: { html: { template: 'reports/footer.pdf.erb',
+                                                locals: { current_time: I18n.l(Time.zone.now, format: :full) }}},
                               locals: { content: content },
                               template: 'reports/report.pdf.erb',
                               disable_javascript: true
diff --git a/app/services/reports/docx/private_methods.rb b/app/services/reports/docx/private_methods.rb
index 292c6f00f..82916d130 100644
--- a/app/services/reports/docx/private_methods.rb
+++ b/app/services/reports/docx/private_methods.rb
@@ -235,6 +235,19 @@ module Reports::Docx::PrivateMethods
 
     @docx.page_numbers true, align: :right
 
+    path = Rails.root.join('app', 'assets', 'images', 'logo.png')
+
+    @docx.img path.to_s do
+      height 20
+      width 100
+      align :left
+    end
+    @docx.p do
+      text I18n.t('projects.reports.new.generate_PDF.generated_on', timestamp: I18n.l(Time.zone.now, format: :full))
+      br
+    end
+
+
     generate_html_styles
   end
 
diff --git a/app/views/reports/footer.pdf.erb b/app/views/reports/footer.pdf.erb
new file mode 100644
index 000000000..46e88af38
--- /dev/null
+++ b/app/views/reports/footer.pdf.erb
@@ -0,0 +1,17 @@
+<!doctype html>
+<html>
+<head>
+  <meta charset='utf-8' />
+  <%= wicked_pdf_stylesheet_link_tag "application" %>
+  <%= wicked_pdf_stylesheet_link_tag "reports_pdf" %>
+  <%= bootstrap_cdn_link_tag %>
+  <%= font_awesome_cdn_link_tag %>
+</head>
+<body class="print-footer-body" style="height: 50px">
+  <div class="print-footer">
+    <p>
+      <%= t('projects.reports.new.generate_PDF.generated_on', timestamp: current_time) %>
+    </p>
+  </div>
+</body>
+</html>
diff --git a/app/views/reports/header.pdf.erb b/app/views/reports/header.pdf.erb
new file mode 100644
index 000000000..c06c7551d
--- /dev/null
+++ b/app/views/reports/header.pdf.erb
@@ -0,0 +1,33 @@
+<!doctype html>
+<html>
+<head>
+  <meta charset='utf-8' />
+  <%= wicked_pdf_stylesheet_link_tag "application" %>
+  <%= wicked_pdf_stylesheet_link_tag "reports_pdf" %>
+  <%= bootstrap_cdn_link_tag %>
+  <%= font_awesome_cdn_link_tag %>
+
+  <script>
+    function number_pages() {
+      var vars={};
+      var x=document.location.search.substring(1).split('&');
+      for(var i in x) {var z=x[i].split('=',2);vars[z[0]] = decodeURIComponent(z[1]);}
+      var x=['frompage','topage','page','webpage','section','subsection','subsubsection'];
+      for(var i in x) {
+        var y = document.getElementsByClassName(x[i]);
+        for(var j=0; j<y.length; ++j) y[j].textContent = vars[x[i]];
+      }
+    }
+  </script>
+</head>
+<body class="print-header-body" onload="number_pages()" style="height: 50px;">
+  <div class="print-header">
+    <div class="logo-img">
+      <%= image_tag wicked_pdf_asset_base64('logo.png') %>
+    </div>
+    <div class="page-numbers">
+      Page <span class="page"></span> of <span class="topage"></span>
+    </div>
+  </div>
+</body>
+</html>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index c9dbc69c8..d4737baba 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -429,6 +429,8 @@ en:
           here: "here"
           no_columns: "You do not have File columns in selected Inventory. Add a File column to selected Inventory or select another Inventory containing File columns."
           nothing_selected: "Nothing selected"
+        generate_PDF:
+          generated_on: "Report generated by SciNote on: %{timestamp}"
       elements:
         modals:
           project_contents:

From 2e1d1cc210f570e8bd8825b6a76a88b935843108 Mon Sep 17 00:00:00 2001
From: Urban Rotnik <urban.rotnik@gmail.com>
Date: Wed, 8 Jul 2020 11:35:25 +0200
Subject: [PATCH 2/2] Clean styles

---
 app/services/reports/docx/private_methods.rb | 42 ++------------------
 1 file changed, 4 insertions(+), 38 deletions(-)

diff --git a/app/services/reports/docx/private_methods.rb b/app/services/reports/docx/private_methods.rb
index 82916d130..71018f528 100644
--- a/app/services/reports/docx/private_methods.rb
+++ b/app/services/reports/docx/private_methods.rb
@@ -247,51 +247,17 @@ module Reports::Docx::PrivateMethods
       br
     end
 
-
     generate_html_styles
   end
 
   def generate_html_styles
     @docx.style do
-      id 'h1'
-      name 'h1'
-      bold true
-      size 64
-    end
-
-    @docx.style do
-      id 'h2'
-      name 'h2'
-      bold true
-      size 48
-    end
-
-    @docx.style do
-      id 'h3'
-      name 'h3'
-      bold true
+      id 'Heading1'
+      name 'heading 1'
+      font 'Arial'
       size 36
-    end
-
-    @docx.style do
-      id 'h4'
-      name 'h4'
+      bottom 120
       bold true
-      size 32
-    end
-
-    @docx.style do
-      id 'h5'
-      name 'h5'
-      bold true
-      size 26
-    end
-
-    @docx.style do
-      id 'h6'
-      name 'h6'
-      bold true
-      size 24
     end
 
     @link_style = {