From f8f2e464f91238137137fa0627f535416a623d0d Mon Sep 17 00:00:00 2001 From: Daniel Baark <5101747+baarkerlounger@users.noreply.github.com> Date: Tue, 16 Nov 2021 17:19:40 +0000 Subject: [PATCH 1/4] Width layout class (#94) --- app/views/case_logs/edit.html.erb | 2 +- app/views/case_logs/index.html.erb | 2 +- app/views/form/check_answers.html.erb | 2 +- app/views/form/page.html.erb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/case_logs/edit.html.erb b/app/views/case_logs/edit.html.erb index 25668b2ac..94fabb9a9 100644 --- a/app/views/case_logs/edit.html.erb +++ b/app/views/case_logs/edit.html.erb @@ -1,6 +1,6 @@ <%= turbo_frame_tag "case_log_form", target: "_top" do %>
-
+

Tasklist for log <%= @case_log.id %>

diff --git a/app/views/case_logs/index.html.erb b/app/views/case_logs/index.html.erb index 7352c304c..ea3d45436 100644 --- a/app/views/case_logs/index.html.erb +++ b/app/views/case_logs/index.html.erb @@ -2,7 +2,7 @@

Your logs

-
+
<%= link_to "Create new log", case_logs_path, method: :post, class: "govuk-button" %> diff --git a/app/views/form/check_answers.html.erb b/app/views/form/check_answers.html.erb index 26b153f8f..46cb5a4f9 100644 --- a/app/views/form/check_answers.html.erb +++ b/app/views/form/check_answers.html.erb @@ -1,6 +1,6 @@ <%= turbo_frame_tag "case_log_form", target: "_top" do %>
-
+

Check the answers you gave for <%= subsection.humanize(capitalize: false) %>

<%= display_answered_questions_summary(subsection, @case_log, form) %> <% form.pages_for_subsection(subsection).each do |page, page_info| %> diff --git a/app/views/form/page.html.erb b/app/views/form/page.html.erb index 238f11439..f29011b99 100644 --- a/app/views/form/page.html.erb +++ b/app/views/form/page.html.erb @@ -4,7 +4,7 @@ <%= turbo_frame_tag "case_log_form", target: "_top" do %>
-
+
<% if page_info["header"].present? %>

<%= page_info["header"] %> From 1f4775182a3ab1ebd8de9c0f9eecbbc65ce85e0f Mon Sep 17 00:00:00 2001 From: baarkerlounger Date: Tue, 16 Nov 2021 17:24:15 +0000 Subject: [PATCH 2/4] Fix conditional key --- config/forms/2021_2022.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json index 7ae709b1c..885d4dadf 100644 --- a/config/forms/2021_2022.json +++ b/config/forms/2021_2022.json @@ -1088,7 +1088,7 @@ "4": "Other" }, "conditional_for": { - "other_tenancy_type": ["Other"] + "tenancyother": ["Other"] } }, "tenancyother": { From 93efd969e51f28e6ae81e1b95fd322dbed3abd41 Mon Sep 17 00:00:00 2001 From: Daniel Baark <5101747+baarkerlounger@users.noreply.github.com> Date: Wed, 17 Nov 2021 08:56:47 +0000 Subject: [PATCH 3/4] Form changes and small fixes (#96) * Remove tenancy code question * Rubocop * Fix spec * Use Gov component gem header --- app/models/bulk_upload.rb | 10 ++++---- app/views/layouts/application.html.erb | 25 +++++--------------- config/forms/2021_2022.json | 12 ---------- db/migrate/20211116102527_change_datetime.rb | 11 ++++++++- db/schema.rb | 4 ++-- 5 files changed, 24 insertions(+), 38 deletions(-) diff --git a/app/models/bulk_upload.rb b/app/models/bulk_upload.rb index f546ea56d..dcab1753f 100644 --- a/app/models/bulk_upload.rb +++ b/app/models/bulk_upload.rb @@ -26,12 +26,14 @@ class BulkUpload else data_range = FIRST_DATA_ROW..last_row data_range.map do |row_num| - case_log = CaseLog.create + case_log = CaseLog.create! map_row(sheet.row(row_num)).each do |attr_key, attr_val| - begin - case_log.update_attribute(attr_key, attr_val) - rescue ArgumentError + update = case_log.update(attr_key => attr_val) + unless update + # TODO: determine what to do when a bulk upload contains field values that don't pass validations end + rescue ArgumentError + # TODO: determine what we want to do when bulk upload contains totally invalid data for a field. end end end diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 7ea45b6e4..ad52856b9 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -33,25 +33,12 @@ Skip to main content