diff --git a/app/controllers/case_logs_controller.rb b/app/controllers/case_logs_controller.rb
index aa6982ac2..d84e6187e 100644
--- a/app/controllers/case_logs_controller.rb
+++ b/app/controllers/case_logs_controller.rb
@@ -28,7 +28,23 @@ class CaseLogsController < ApplicationController
answers_for_page = page_params(questions_for_page).select { |k, _v| questions_for_page.include?(k) }
@case_log.update!(answers_for_page)
next_page = form.next_page(previous_page)
- redirect_to(send("case_log_#{next_page}_path", @case_log))
+ redirect_path = if next_page == :check_answers
+ subsection = form.subsection_for_page(previous_page)
+ "case_log_#{subsection}_check_answers_path"
+ else
+ "case_log_#{next_page}_path"
+ end
+
+ redirect_to(send(redirect_path, @case_log))
+ end
+
+ def check_answers
+ @case_log = CaseLog.find(params[:case_log_id])
+ form = Form.new(2021, 2022)
+ current_url = request.env["PATH_INFO"]
+ subsection = current_url.split("/")[-2]
+ subsection_pages = form.pages_for_subsection(subsection)
+ render "form/check_answers", locals: { case_log: @case_log, subsection_pages: subsection_pages, subsection: subsection.humanize(capitalize: false) }
end
form = Form.new(2021, 2022)
diff --git a/app/helpers/check_answers_helper.rb b/app/helpers/check_answers_helper.rb
new file mode 100644
index 000000000..4fd46ce9d
--- /dev/null
+++ b/app/helpers/check_answers_helper.rb
@@ -0,0 +1,39 @@
+module CheckAnswersHelper
+ def get_answered_questions_total(subsection_pages, case_log)
+ questions = subsection_pages.values.flat_map do |page|
+ page["questions"].keys
+ end
+ questions.count { |question| case_log[question].present? }
+ end
+
+ def get_total_number_of_questions(subsection_pages)
+ questions = subsection_pages.values.flat_map do |page|
+ page["questions"].keys
+ end
+ questions.count
+ end
+
+ def create_update_answer_link(case_log_answer, case_log_id, page)
+ link_name = case_log_answer.blank? ? "Answer" : "Change"
+ link_to(link_name, "/case_logs/#{case_log_id}/#{page}", class: "govuk-link").html_safe
+ end
+
+ def create_next_missing_question_link(case_log_id, subsection_pages, case_log)
+ pages_to_fill_in = []
+ subsection_pages.each do |page_title, page_info|
+ page_info["questions"].any? { |question| case_log[question].blank? }
+ pages_to_fill_in << page_title
+ end
+ url = "/case_logs/#{case_log_id}/#{pages_to_fill_in.first}"
+ link_to("Answer the missing questions", url, class: "govuk-link").html_safe
+ end
+
+ def display_answered_questions_summary(subsection_pages, case_log)
+ if get_answered_questions_total(subsection_pages, case_log) == get_total_number_of_questions(subsection_pages)
+ 'You answered all the questions
'.html_safe
+ else
+ "You answered #{get_answered_questions_total(subsection_pages, case_log)} of #{get_total_number_of_questions(subsection_pages)} questions
+ #{create_next_missing_question_link(case_log['id'], subsection_pages, case_log)}".html_safe
+ end
+ end
+end
diff --git a/app/models/form.rb b/app/models/form.rb
index 1be383ea0..00c3503af 100644
--- a/app/models/form.rb
+++ b/app/models/form.rb
@@ -50,7 +50,7 @@ class Form
def next_page(previous_page)
subsection = subsection_for_page(previous_page)
previous_page_idx = pages_for_subsection(subsection).keys.index(previous_page)
- pages_for_subsection(subsection).keys[previous_page_idx + 1] || previous_page # Placeholder until we have a check answers page
+ pages_for_subsection(subsection).keys[previous_page_idx + 1] || :check_answers
end
def previous_page(current_page)
diff --git a/app/views/form/_check_answers_table.html.erb b/app/views/form/_check_answers_table.html.erb
new file mode 100644
index 000000000..88567bc9c
--- /dev/null
+++ b/app/views/form/_check_answers_table.html.erb
@@ -0,0 +1,13 @@
+
+
+
-
+ <%= question_info["check_answer_label"].to_s %>
+
-
+
-
+ <%= case_log[question_title] %>
+
+ -
+ <%= create_update_answer_link(case_log[question_title], case_log["id"], page)%>
+
+
+
diff --git a/app/views/form/_checkbox_question.html.erb b/app/views/form/_checkbox_question.html.erb
index e41ab5029..0a958fb0e 100644
--- a/app/views/form/_checkbox_question.html.erb
+++ b/app/views/form/_checkbox_question.html.erb
@@ -6,7 +6,7 @@
<% if key.starts_with?("divider") %>
<%= f.govuk_check_box_divider %>
<% else %>
- <%= f.govuk_check_box question_key, key, label: { text: val } %>
+ <%= f.govuk_check_box question_key, val, label: { text: val } %>
<% end %>
<% end %>
<% end %>
diff --git a/app/views/form/_radio_question.html.erb b/app/views/form/_radio_question.html.erb
index 3681bb21d..e525cf159 100644
--- a/app/views/form/_radio_question.html.erb
+++ b/app/views/form/_radio_question.html.erb
@@ -6,8 +6,8 @@
<% question["answer_options"].map do |key, val| %>
<% if key.starts_with?("divider") %>
<%= f.govuk_radio_divider %>
- <% else %>
- <%= f.govuk_radio_button question_key, key, label: { text: val } %>
+ <% else %>
+ <%= f.govuk_radio_button question_key, val, label: { text: val } %>
<% end %>
<% end %>
<% end %>
diff --git a/app/views/form/check_answers.html.erb b/app/views/form/check_answers.html.erb
new file mode 100644
index 000000000..a2102146d
--- /dev/null
+++ b/app/views/form/check_answers.html.erb
@@ -0,0 +1,16 @@
+<%= turbo_frame_tag "case_log_form", target: "_top" do %>
+
+
+
Check the answers you gave for <%= subsection %>
+ <%= display_answered_questions_summary(subsection_pages, case_log) %>
+ <% subsection_pages.each do |page, page_info| %>
+ <% page_info["questions"].each do |question_title, question_info| %>
+ <%= render partial: 'form/check_answers_table', locals: { question_title: question_title, question_info: question_info, case_log: case_log, page: page } %>
+ <%end %>
+ <% end %>
+ <%= form_with action: '/case_logs', method: "next_page", builder: GOVUKDesignSystemFormBuilder::FormBuilder do |f| %>
+ <%= f.govuk_submit "Save and continue" %>
+ <% end %>
+
+