diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json index 6881a3285..210089009 100644 --- a/config/forms/2021_2022.json +++ b/config/forms/2021_2022.json @@ -1580,7 +1580,7 @@ "brent", "scharge", "pscharge", - "supcharge" + "supcharg" ], "result-field": "tcharge" }, @@ -1595,7 +1595,7 @@ "brent", "scharge", "pscharge", - "supcharge" + "supcharg" ], "result-field": "tcharge" }, @@ -1610,11 +1610,11 @@ "brent", "scharge", "pscharge", - "supcharge" + "supcharg" ], "result-field": "tcharge" }, - "supcharge": { + "supcharg": { "check_answer_label": "Support Charge", "header": "What is the support charge?", "hint_text": "This is to fund housing-related support services included in the tenancy agreement", @@ -1625,7 +1625,7 @@ "brent", "scharge", "pscharge", - "supcharge" + "supcharg" ], "result-field": "tcharge" }, diff --git a/db/migrate/20211101192151_rename_fields.rb b/db/migrate/20211101192151_rename_fields.rb index 59e103f3e..5333a48cd 100644 --- a/db/migrate/20211101192151_rename_fields.rb +++ b/db/migrate/20211101192151_rename_fields.rb @@ -87,7 +87,7 @@ class RenameFields < ActiveRecord::Migration[6.1] rename_column :case_logs, :basic_rent, :brent rename_column :case_logs, :service_charge, :scharge rename_column :case_logs, :personal_service_charge, :pscharge - rename_column :case_logs, :support_charge, :supcharge + rename_column :case_logs, :support_charge, :supcharg rename_column :case_logs, :total_charge, :tcharge rename_column :case_logs, :time_lived_in_la, :layear rename_column :case_logs, :time_on_la_waiting_list, :lawaitlist diff --git a/db/schema.rb b/db/schema.rb index d21fd49c0..9a4c49a1a 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -94,7 +94,7 @@ ActiveRecord::Schema.define(version: 2021_11_03_090530) do t.integer "brent" t.integer "scharge" t.integer "pscharge" - t.string "supcharge" + t.string "supcharg" t.string "tcharge" t.string "outstanding_amount" t.string "layear" diff --git a/docs/api/DLUHC-CORE-Data.v1.json b/docs/api/DLUHC-CORE-Data.v1.json index 3398a4bde..47c068472 100644 --- a/docs/api/DLUHC-CORE-Data.v1.json +++ b/docs/api/DLUHC-CORE-Data.v1.json @@ -330,7 +330,7 @@ "brent": 200, "scharge": 50, "pscharge": 40, - "supcharge": 35, + "supcharg": 35, "tcharge": 325, "outstanding_amount": "Yes", "layear": "1 to 2 years", @@ -919,7 +919,7 @@ "pscharge": { "type": "number" }, - "supcharge": { + "supcharg": { "type": "number" }, "tcharge": { @@ -1119,7 +1119,7 @@ "brent", "scharge", "pscharge", - "supcharge", + "supcharg", "tcharge", "outstanding_amount", "layear", diff --git a/spec/features/case_log_spec.rb b/spec/features/case_log_spec.rb index d392d67c0..749cebb5a 100644 --- a/spec/features/case_log_spec.rb +++ b/spec/features/case_log_spec.rb @@ -170,7 +170,7 @@ RSpec.describe "Test Features" do fill_in("case-log-pscharge-field", with: 1) expect(page).to have_field("case-log-tcharge-field", with: "6") - fill_in("case-log-supcharge-field", with: 4) + fill_in("case-log-supcharg-field", with: 4) expect(page).to have_field("case-log-tcharge-field", with: "10") end diff --git a/spec/fixtures/complete_case_log.json b/spec/fixtures/complete_case_log.json index 353118f72..bd92c1fac 100644 --- a/spec/fixtures/complete_case_log.json +++ b/spec/fixtures/complete_case_log.json @@ -76,7 +76,7 @@ "brent": 200, "scharge": 50, "pscharge": 40, - "supcharge": 35, + "supcharg": 35, "tcharge": 325, "outstanding_amount": "Yes", "layear": "1 to 2 years", diff --git a/spec/fixtures/forms/test_form.json b/spec/fixtures/forms/test_form.json index c268ae1b8..a52768299 100644 --- a/spec/fixtures/forms/test_form.json +++ b/spec/fixtures/forms/test_form.json @@ -386,7 +386,7 @@ "brent", "scharge", "pscharge", - "supcharge" + "supcharg" ], "result-field": "tcharge" }, @@ -401,7 +401,7 @@ "brent", "scharge", "pscharge", - "supcharge" + "supcharg" ], "result-field": "tcharge" }, @@ -416,11 +416,11 @@ "brent", "scharge", "pscharge", - "supcharge" + "supcharg" ], "result-field": "tcharge" }, - "supcharge": { + "supcharg": { "check_answer_label": "Support Charge", "header": "What is the support charge?", "hint_text": "This is to fund housing-related support services included in the tenancy agreement", @@ -431,7 +431,7 @@ "brent", "scharge", "pscharge", - "supcharge" + "supcharg" ], "result-field": "tcharge" }, diff --git a/spec/helpers/question_attribute_helper_spec.rb b/spec/helpers/question_attribute_helper_spec.rb index 40c574351..9ec3248d0 100644 --- a/spec/helpers/question_attribute_helper_spec.rb +++ b/spec/helpers/question_attribute_helper_spec.rb @@ -28,7 +28,7 @@ RSpec.describe QuestionAttributeHelper do "type" => "numeric", "min" => 0, "step" => 1, - "fields-to-add" => %w[brent scharge pscharge supcharge], + "fields-to-add" => %w[brent scharge pscharge supcharg], "result-field" => "tcharge", "conditional_for" => { "next_question": ">1",