diff --git a/app/assets/images/logo.png b/app/assets/images/logo.png index b368cd36d..6d54bb882 100644 Binary files a/app/assets/images/logo.png and b/app/assets/images/logo.png differ 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..71018f528 100644 --- a/app/services/reports/docx/private_methods.rb +++ b/app/services/reports/docx/private_methods.rb @@ -235,50 +235,29 @@ 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 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 = { 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 @@ + + +
+ + <%= wicked_pdf_stylesheet_link_tag "application" %> + <%= wicked_pdf_stylesheet_link_tag "reports_pdf" %> + <%= bootstrap_cdn_link_tag %> + <%= font_awesome_cdn_link_tag %> + + + + + 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 @@ + + + + + <%= wicked_pdf_stylesheet_link_tag "application" %> + <%= wicked_pdf_stylesheet_link_tag "reports_pdf" %> + <%= bootstrap_cdn_link_tag %> + <%= font_awesome_cdn_link_tag %> + + + + +