Advertisement
andrey_zavyalov

Untitled

Apr 8th, 2020
244
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 2.24 KB | None | 0 0
  1. diff --git a/app/models/report/pdf_generator.rb b/app/models/report/pdf_generator.rb
  2. index cd708ee0f..5aabcb363 100644
  3. --- a/app/models/report/pdf_generator.rb
  4. +++ b/app/models/report/pdf_generator.rb
  5. @@ -49,7 +49,9 @@ class Report
  6.      end
  7.  
  8.      def current_version
  9. -      if owner.hc_practitioner?
  10. +      if @batch_session.trial.medcan?
  11. +        'V2'
  12. +      elsif owner.hc_practitioner?
  13.          'V4'
  14.        else
  15.          'V2'
  16. @@ -109,8 +111,11 @@ class Report
  17.      end
  18.  
  19.      def rendered_view
  20. -      report_type = owner.details.category + '-report-body-pdf'
  21. +      report_category = @batch_session.trial.medcan? ? 'medcan' : owner.details.category
  22. +      report_type = report_category + '-report-body-pdf'
  23. +
  24.        template = owner.details.try(:category) == 'legal' ? 'legal.pdf.erb' : 'report.pdf.erb'
  25. +
  26.        comparative_group = Experiment::Healthcare.comparative_group_description(@user, @batch_session)
  27.  
  28.        ActionController::Base.render(pdf: filename,
  29. @@ -124,7 +129,8 @@ class Report
  30.                                                '@batch_session': @batch_session,
  31.                                                '@trends': trends,
  32.                                                '@missing_fields': missing_fields,
  33. -                                              '@comparative_group': comparative_group })
  34. +                                              '@comparative_group': comparative_group,
  35. +                                              '@report_category': report_category })
  36.      end
  37.  
  38.      def trends
  39. diff --git a/app/views/reports/V2/report.pdf.erb b/app/views/reports/V2/report.pdf.erb
  40. index 0e6765cb6..3c64a973c 100644
  41. --- a/app/views/reports/V2/report.pdf.erb
  42. +++ b/app/views/reports/V2/report.pdf.erb
  43. @@ -26,11 +26,11 @@
  44.    </head>
  45.    <body class="<%= @report_type %>">
  46.      <div class="report-header">
  47. -      <%= render "reports/#{@version}/#{current_admin_user.details.category}/header" %>
  48. +      <%= render "reports/#{@version}/#{@report_category}/header" %>
  49.      </div>
  50.      <br />
  51.      <br />
  52. -      <%= render "reports/#{@version}/#{current_admin_user.details.category}/body" %>
  53. +      <%= render "reports/#{@version}/#{@report_category}/body" %>
  54.        <div class='pdf-footer'></div>
  55.    </body>
  56.  </html>
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement