diff --git a/app/models/claim_checking_tasks.rb b/app/models/claim_checking_tasks.rb index 2b495e8c1b..86927a5fb0 100644 --- a/app/models/claim_checking_tasks.rb +++ b/app/models/claim_checking_tasks.rb @@ -12,7 +12,7 @@ def initialize(claim) delegate :policy, to: :claim def applicable_task_names - return %w[identity_confirmation visa arrival_date employment employment_contract] if policy.international_relocation_payments? + return %w[identity_confirmation visa arrival_date employment employment_contract employment_start] if policy.international_relocation_payments? @applicable_task_names ||= Task::NAMES.dup.tap do |task_names| task_names.delete("induction_confirmation") unless claim.policy == Policies::EarlyCareerPayments @@ -24,6 +24,7 @@ def applicable_task_names task_names.delete("visa") unless claim.policy.international_relocation_payments? task_names.delete("arrival_date") unless claim.policy.international_relocation_payments? task_names.delete("employment_contract") unless claim.policy.international_relocation_payments? + task_names.delete("employment_start") unless claim.policy.international_relocation_payments? end end diff --git a/app/models/policies/international_relocation_payments/admin_tasks_presenter.rb b/app/models/policies/international_relocation_payments/admin_tasks_presenter.rb index 16e87daf3a..5a3de04002 100644 --- a/app/models/policies/international_relocation_payments/admin_tasks_presenter.rb +++ b/app/models/policies/international_relocation_payments/admin_tasks_presenter.rb @@ -27,6 +27,12 @@ def employment_contract ] end + def employment_start + [ + ["Employment start date", eligibility.start_date&.to_fs(:govuk_date)] + ] + end + def identity_confirmation [ ["Nationality", eligibility.nationality], diff --git a/app/models/task.rb b/app/models/task.rb index c0a9e165cd..51e330ffa6 100644 --- a/app/models/task.rb +++ b/app/models/task.rb @@ -20,6 +20,7 @@ class Task < ApplicationRecord payroll_gender arrival_date employment_contract + employment_start visa ].freeze diff --git a/app/views/admin/tasks/employment_start.html.erb b/app/views/admin/tasks/employment_start.html.erb new file mode 100644 index 0000000000..cc32b639ba --- /dev/null +++ b/app/views/admin/tasks/employment_start.html.erb @@ -0,0 +1,27 @@ +<% content_for(:page_title) { page_title("Claim #{@claim.reference} employment start date check for #{@claim.policy.short_name}") } %> +<%= link_to "Back", admin_claim_tasks_path(claim_id: @claim.id), class: "govuk-back-link" %> +<%= render "shared/error_summary", instance: @task, errored_field_id_overrides: { "passed": "task_passed_true" } if @task.errors.any? %> + +
+ <%= render "claim_summary", claim: @claim, heading: "Employment start date check" %> + +
+

<%= @current_task_name.humanize %>

+
+ +
+ <%= render "admin/claims/answers", answers: @tasks_presenter.employment_start %> +
+ +
+ <% if !@task.passed.nil? %> + <%= render "task_outcome", task: @task %> + <% else %> + <%= render "form", task_name: "employment_start", claim: @claim %> + <% end %> + + <%= render partial: "admin/task_pagination" %> +
+
+ + diff --git a/config/locales/en.yml b/config/locales/en.yml index 240b6bf473..dd0adba51f 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -157,6 +157,7 @@ en: visa: "Check visa" arrival_date: "Check arrival date" employment_contract: "Check employment contract" + employment_start: "Check employment start date" undo_decision: approved: "Undo approval" rejected: "Undo rejection" @@ -792,6 +793,8 @@ en: title: "Does the claimant’s current school match the above information from their claim?" employment_contract: title: "Does the claimant’s employment contract match the above information from their claim?" + employment_start: + title: "Does the claimant’s employment start date match the above information from their claim?" further_education_payments: landing_page: Find out if you are eligible for any incentive payments for further education teachers diff --git a/spec/factories/policies/international_relocation_payments/eligibilities.rb b/spec/factories/policies/international_relocation_payments/eligibilities.rb index 5ac60aba1f..2addefdeba 100644 --- a/spec/factories/policies/international_relocation_payments/eligibilities.rb +++ b/spec/factories/policies/international_relocation_payments/eligibilities.rb @@ -23,5 +23,9 @@ trait :eligible_contract do one_year { true } end + + trait :eligible_start_date do + start_date { 1.month.ago } + end end end diff --git a/spec/support/admin_view_claim_feature_shared_examples.rb b/spec/support/admin_view_claim_feature_shared_examples.rb index 59a00ae4b1..7ae7a8943a 100644 --- a/spec/support/admin_view_claim_feature_shared_examples.rb +++ b/spec/support/admin_view_claim_feature_shared_examples.rb @@ -179,7 +179,7 @@ def expect_page_to_have_policy_sections(policy) when Policies::EarlyCareerPayments ["Identity confirmation", "Qualifications", "Induction confirmation", "Census subjects taught", "Employment", "Student loan plan", "Decision"] when Policies::InternationalRelocationPayments - ["Identity confirmation", "Visa", "Arrival date", "Employment", "Employment contract", "Decision"] + ["Identity confirmation", "Visa", "Arrival date", "Employment", "Employment contract", "Employment start", "Decision"] else raise "Unimplemented policy: #{policy}" end