diff --git a/app/controllers/duplicate_logs_controller.rb b/app/controllers/duplicate_logs_controller.rb
index 6dfc7074a..6996b78d4 100644
--- a/app/controllers/duplicate_logs_controller.rb
+++ b/app/controllers/duplicate_logs_controller.rb
@@ -3,5 +3,7 @@ class DuplicateLogsController < ApplicationController
@log = LettingsLog.find(params[:lettings_log_id])
@duplicate_logs = LettingsLog.duplicate_logs_for_organisation(current_user.organisation_id, @log)
@all_duplicates = [@log, *@duplicate_logs]
+ duplicate_check_question_ids = %w[startdate tenancycode postcode_full age1 sex1 ecstat1 tcharge]
+ @duplicate_check_questions = duplicate_check_question_ids.map { |question_id| @log.form.get_question(question_id, @log) }.compact
end
end
diff --git a/app/views/duplicate_logs/_check_answers_summary_list.html.erb b/app/views/duplicate_logs/_check_answers_summary_list.html.erb
deleted file mode 100644
index 4d1bbd8a4..000000000
--- a/app/views/duplicate_logs/_check_answers_summary_list.html.erb
+++ /dev/null
@@ -1,37 +0,0 @@
-<%= govuk_summary_list do |summary_list| %>
- <% questions.each do |question| %>
- <% summary_list.row do |row| %>
- <% row.key { get_question_label(question) } %>
-
- <% row.value do %>
- <%= simple_format(
- get_answer_label(question, @log),
- wrapper_tag: "span",
- class: "govuk-!-margin-right-4",
- ) %>
-
- <% extra_value = question.get_extra_check_answer_value(@log) %>
-
- <% if extra_value && question.answer_label(@log, current_user).present? %>
- <%= simple_format(
- extra_value,
- wrapper_tag: "span",
- class: "govuk-!-font-weight-regular app-!-colour-muted",
- ) %>
- <% end %>
-
- <% question.get_inferred_answers(@log).each do |inferred_answer| %>
- <%= inferred_answer %>
- <% end %>
- <% end %>
-
- <% if @log.collection_period_open_for_editing? %>
- <% row.action(
- text: question.action_text(@log),
- href: action_href(@log, question.page.id, referrer),
- visually_hidden_text: question.check_answer_label.to_s.downcase,
- ) %>
- <% end %>
- <% end %>
- <% end %>
-<% end %>
diff --git a/app/views/duplicate_logs/_duplicate_log_check_answers.erb b/app/views/duplicate_logs/_duplicate_log_check_answers.erb
new file mode 100644
index 000000000..3a724cdef
--- /dev/null
+++ b/app/views/duplicate_logs/_duplicate_log_check_answers.erb
@@ -0,0 +1,25 @@
+
+
+ <%= govuk_summary_list do |summary_list| %>
+ <% @duplicate_check_questions.each do |question| %>
+ <% summary_list.row do |row| %>
+ <% row.key { get_question_label(question) } %>
+
+ <% row.value do %>
+ <%= simple_format(
+ get_answer_label(question, @log),
+ wrapper_tag: "span",
+ class: "govuk-!-margin-right-4",
+ ) %>
+ <% end %>
+
+ <% row.action(
+ text: question.action_text(@log),
+ href: action_href(@log, question.page.id),
+ visually_hidden_text: question.check_answer_label.to_s.downcase,
+ ) %>
+ <% end %>
+ <% end %>
+ <% end %>
+
+
\ No newline at end of file
diff --git a/app/views/duplicate_logs/show.erb b/app/views/duplicate_logs/show.erb
index 919195655..64817f99c 100644
--- a/app/views/duplicate_logs/show.erb
+++ b/app/views/duplicate_logs/show.erb
@@ -10,6 +10,7 @@
<% @all_duplicates.each do |log| %>
<%= render partial: "duplicate_log", locals: { log: log } %>
+ <%= render partial: "duplicate_log_check_answers", locals: { log: log } %>
<% end %>
diff --git a/spec/requests/duplicate_logs_controller_spec.rb b/spec/requests/duplicate_logs_controller_spec.rb
index ce9069ed1..30dde4c45 100644
--- a/spec/requests/duplicate_logs_controller_spec.rb
+++ b/spec/requests/duplicate_logs_controller_spec.rb
@@ -8,6 +8,7 @@ RSpec.describe DuplicateLogsController, type: :request do
let(:lettings_log) do
create(
:lettings_log,
+ :completed,
created_by: user,
)
end
@@ -18,8 +19,8 @@ RSpec.describe DuplicateLogsController, type: :request do
end
describe "GET" do
- context "with multiple duplicate logs" do
- let(:duplicate_logs) { create_list(:lettings_log, 2) }
+ context "with multiple duplicate lettings logs" do
+ let(:duplicate_logs) { create_list(:lettings_log, 2, :completed) }
before do
allow(LettingsLog).to receive(:duplicate_logs_for_organisation).and_return(duplicate_logs)
@@ -31,6 +32,17 @@ RSpec.describe DuplicateLogsController, type: :request do
expect(page).to have_link("Log #{duplicate_logs.first.id}", href: "/lettings-logs/#{duplicate_logs.first.id}")
expect(page).to have_link("Log #{duplicate_logs.second.id}", href: "/lettings-logs/#{duplicate_logs.second.id}")
end
+
+ it "displays check your answers for each log with correct questions" do
+ expect(page).to have_content("Q5 - Tenancy start date", count: 3)
+ expect(page).to have_content("Q7 - Tenant code", count: 3)
+ expect(page).to have_content("Q12 - Postcode", count: 3)
+ expect(page).to have_content("Q32 - Lead tenant’s age", count: 3)
+ expect(page).to have_content("Q33 - Lead tenant’s gender identity", count: 3)
+ expect(page).to have_content("Q37 - Lead tenant’s working situation", count: 3)
+ expect(page).to have_content("Household rent and charges", count: 3)
+ expect(page).to have_link("Change", count: 21)
+ end
end
end
end