From 484e3d851bed9f9e28ae011d05c1b19be5f49738 Mon Sep 17 00:00:00 2001 From: Kat Date: Mon, 30 Jan 2023 09:28:00 +0000 Subject: [PATCH] Always display person known pages and update headers --- app/models/form/sales/pages/person_known.rb | 6 +----- app/views/form/headers/_person_1_known_page.erb | 1 - app/views/form/headers/_person_2_known_page.erb | 2 +- app/views/form/headers/_person_3_known_page.erb | 2 +- app/views/form/headers/_person_4_known_page.erb | 2 +- app/views/form/headers/_person_5_known_page.erb | 1 + 6 files changed, 5 insertions(+), 9 deletions(-) delete mode 100644 app/views/form/headers/_person_1_known_page.erb create mode 100644 app/views/form/headers/_person_5_known_page.erb diff --git a/app/models/form/sales/pages/person_known.rb b/app/models/form/sales/pages/person_known.rb index 695e15fe9..078ce3520 100644 --- a/app/models/form/sales/pages/person_known.rb +++ b/app/models/form/sales/pages/person_known.rb @@ -12,10 +12,6 @@ class Form::Sales::Pages::PersonKnown < Form::Sales::Pages::Person end def depends_on - if @person_index == 2 - (@person_index..6).map { |index| { "hhmemb" => index, "jointpur" => 2 } } - else - (@person_index..6).map { |index| { "hhmemb" => index } } - end + { "jointpur" => 2 } if @person_index == 2 end end diff --git a/app/views/form/headers/_person_1_known_page.erb b/app/views/form/headers/_person_1_known_page.erb deleted file mode 100644 index b179fcdb8..000000000 --- a/app/views/form/headers/_person_1_known_page.erb +++ /dev/null @@ -1 +0,0 @@ -You have given us the details for 0 of the <%= log.hholdcount %> other people in the household diff --git a/app/views/form/headers/_person_2_known_page.erb b/app/views/form/headers/_person_2_known_page.erb index e305e36f4..b179fcdb8 100644 --- a/app/views/form/headers/_person_2_known_page.erb +++ b/app/views/form/headers/_person_2_known_page.erb @@ -1 +1 @@ -You have given us the details for 1 of the <%= log.hholdcount %> other people in the household +You have given us the details for 0 of the <%= log.hholdcount %> other people in the household diff --git a/app/views/form/headers/_person_3_known_page.erb b/app/views/form/headers/_person_3_known_page.erb index 2fd31a963..678db7c27 100644 --- a/app/views/form/headers/_person_3_known_page.erb +++ b/app/views/form/headers/_person_3_known_page.erb @@ -1 +1 @@ -You have given us the details for 2 of the <%= log.hholdcount %> other people in the household +You have given us the details for <%= log.joint_purchase? ? 0 : 1 %> of the <%= log.hholdcount %> other people in the household diff --git a/app/views/form/headers/_person_4_known_page.erb b/app/views/form/headers/_person_4_known_page.erb index b96949344..5b82c4776 100644 --- a/app/views/form/headers/_person_4_known_page.erb +++ b/app/views/form/headers/_person_4_known_page.erb @@ -1 +1 @@ -You have given us the details for 3 of the <%= log.hholdcount %> other people in the household +You have given us the details for <%= log.joint_purchase? ? 1 : 2 %> of the <%= log.hholdcount %> other people in the household diff --git a/app/views/form/headers/_person_5_known_page.erb b/app/views/form/headers/_person_5_known_page.erb new file mode 100644 index 000000000..5d53e86be --- /dev/null +++ b/app/views/form/headers/_person_5_known_page.erb @@ -0,0 +1 @@ +You have given us the details for <%= log.joint_purchase? ? 2 : 3 %> of the <%= log.hholdcount %> other people in the household