From 737a28874071326063b8a9ff7eb944b5cab68c16 Mon Sep 17 00:00:00 2001 From: Richard Pattinson Date: Thu, 14 Nov 2024 16:05:01 +0000 Subject: [PATCH] mend --- app/components/induction_summary_component.rb | 2 +- .../qualifications/certificates_controller.rb | 2 +- app/views/qualifications/certificates/_eyts.html.erb | 2 +- .../qualifications/certificates/_induction.html.erb | 4 ++-- app/views/qualifications/certificates/_npq.html.erb | 2 +- app/views/qualifications/certificates/_qts.html.erb | 2 +- config/database.yml | 2 +- spec/components/induction_summary_component_spec.rb | 12 ------------ spec/rails_helper.rb | 2 +- 9 files changed, 9 insertions(+), 21 deletions(-) diff --git a/app/components/induction_summary_component.rb b/app/components/induction_summary_component.rb index 79bffbef..0735bae6 100644 --- a/app/components/induction_summary_component.rb +++ b/app/components/induction_summary_component.rb @@ -71,7 +71,7 @@ def rows } ] - if details.respond_to?(:certificate_url) && details.certificate_url.present? + if details.status == "Pass" @rows << { key: { text: "Certificate" diff --git a/app/controllers/qualifications/certificates_controller.rb b/app/controllers/qualifications/certificates_controller.rb index a7f5d65f..0f47de72 100644 --- a/app/controllers/qualifications/certificates_controller.rb +++ b/app/controllers/qualifications/certificates_controller.rb @@ -13,7 +13,7 @@ def show formats: [:html], locals: { teacher: @teacher, qualification: @qualification }, layout: "layouts/certificate") - grover = Grover.new(html, format: 'A4', display_url: request.base_url) + grover = Grover.new(html, format: 'A4', display_url: ENV["HOSTING_DOMAIN"]) pdf = grover.to_pdf send_data pdf, filename: "#{@teacher.name}_#{@qualification.type.downcase}_certificate.pdf", type: 'application/pdf', disposition: 'attachment' diff --git a/app/views/qualifications/certificates/_eyts.html.erb b/app/views/qualifications/certificates/_eyts.html.erb index 4345063f..f88930fc 100644 --- a/app/views/qualifications/certificates/_eyts.html.erb +++ b/app/views/qualifications/certificates/_eyts.html.erb @@ -1,7 +1,7 @@ Department for Education
-

Early years
Teacher Status

+

Early Years
Teacher Status

This is to certify that: <%= teacher.name %>

Teacher Reference Number: <%= teacher.trn %>

 

diff --git a/app/views/qualifications/certificates/_induction.html.erb b/app/views/qualifications/certificates/_induction.html.erb index 65eb7675..c59eac0b 100644 --- a/app/views/qualifications/certificates/_induction.html.erb +++ b/app/views/qualifications/certificates/_induction.html.erb @@ -11,9 +11,9 @@ institution. The holder of this certificate is a qualified teacher and has obtained the required
qualifications and completed the necessary training for the profession of school teacher in England.

 

-

Date Induction Completed: <%= qualification.awarded_at.to_fs(:long_uk) %>

+

Date Induction Completed: <%= qualification.details.periods.first.end_date.to_date.to_fs(:long_uk) %>

 

Congratulations and best wishes for your future career.

 

-

Any potential employer can independently confirm your teacher status online at:
https://teacherservices.education.gov.uk

+

Any potential employer can independently confirm your teacher status online at:
https://www.gov.uk/guidance/check-a-teachers-record

\ No newline at end of file diff --git a/app/views/qualifications/certificates/_npq.html.erb b/app/views/qualifications/certificates/_npq.html.erb index a098eb41..2f0e1d36 100644 --- a/app/views/qualifications/certificates/_npq.html.erb +++ b/app/views/qualifications/certificates/_npq.html.erb @@ -2,7 +2,7 @@

This is to certify that:

-

<%= teacher.name %>

+

<%= teacher.name %>

has been awarded the

diff --git a/app/views/qualifications/certificates/_qts.html.erb b/app/views/qualifications/certificates/_qts.html.erb index fee2966e..4217f2b8 100644 --- a/app/views/qualifications/certificates/_qts.html.erb +++ b/app/views/qualifications/certificates/_qts.html.erb @@ -19,5 +19,5 @@

 

Congratulations and best wishes for your future career

 

-

Any potential employer can independently confirm your teacher status online at:
https://teacherservices.education.gov.uk

+

Any potential employer can independently confirm your teacher status online at:
https://www.gov.uk/guidance/check-a-teachers-record

diff --git a/config/database.yml b/config/database.yml index 508fa0d6..8448bb56 100644 --- a/config/database.yml +++ b/config/database.yml @@ -1,7 +1,7 @@ default: &default adapter: postgresql encoding: unicode - url: <%= ENV.fetch('DATABASE_URL', 'postgres://postgres@localhost:5432') %> + url: <%= ENV.fetch('DATABASE_URL', 'postgres://postgres@localhost:5434') %> development: <<: *default diff --git a/spec/components/induction_summary_component_spec.rb b/spec/components/induction_summary_component_spec.rb index daef2c2e..0f62eb13 100644 --- a/spec/components/induction_summary_component_spec.rb +++ b/spec/components/induction_summary_component_spec.rb @@ -57,17 +57,5 @@ expect(rendered.css(".govuk-summary-list__key").map(&:text)).not_to include("Completed") expect(rendered.css(".govuk-summary-list__key").map(&:text)).not_to include("End date") end - - context "when the certificate URL is missing" do - let(:induction) do - fake_quals_data.fetch("induction").tap do |data| - data.delete(:certificate_url) - end - end - - it "does not render the certificate row when certificate URL is missing" do - expect(rendered.css(".govuk-summary-list__key").map(&:text)).not_to include("Certificate") - end - end end end diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index f6f4a6ed..86506c1c 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -17,7 +17,7 @@ WebMock.disable_net_connect!(allow_localhost: true) Capybara.register_driver(:cuprite) do |app| - Capybara::Cuprite::Driver.new(app, timeout: 30, process_timeout: 40, window_size: [1200, 800]) + Capybara::Cuprite::Driver.new(app, timeout: 160, process_timeout: 80, window_size: [1200, 800]) end Capybara.default_driver = :cuprite Capybara.javascript_driver = :cuprite