diff --git a/app/models/case_log.rb b/app/models/case_log.rb index f21b3338d..911e72525 100644 --- a/app/models/case_log.rb +++ b/app/models/case_log.rb @@ -193,7 +193,11 @@ class CaseLog < ApplicationRecord end end - + def incref + if net_income_known == "Prefer not to say" + 1 + end + end private @@ -253,6 +257,10 @@ private dynamically_not_required << "ecstat#{n}" end + if net_income_known != "Prefer not to say" + dynamically_not_required << "incref" + end + required.delete_if { |key, _value| dynamically_not_required.include?(key) } end end diff --git a/db/migrate/20211111151625_add_incref_field.rb b/db/migrate/20211111151625_add_incref_field.rb new file mode 100644 index 000000000..ece9a458b --- /dev/null +++ b/db/migrate/20211111151625_add_incref_field.rb @@ -0,0 +1,7 @@ +class AddIncrefField < ActiveRecord::Migration[6.1] + def change + change_table :case_logs, bulk: true do |t| + t.column :incref, :integer + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 5b1c02e62..4b2e52c89 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2021_11_11_143319) do +ActiveRecord::Schema.define(version: 2021_11_11_151625) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -153,6 +153,7 @@ ActiveRecord::Schema.define(version: 2021_11_11_143319) do t.integer "mrcmonth" t.integer "mrcyear" t.integer "other_hhmemb" + t.integer "incref" t.index ["discarded_at"], name: "index_case_logs_on_discarded_at" end diff --git a/spec/controllers/case_logs_controller_spec.rb b/spec/controllers/case_logs_controller_spec.rb index 007b76f8c..8192173fc 100644 --- a/spec/controllers/case_logs_controller_spec.rb +++ b/spec/controllers/case_logs_controller_spec.rb @@ -181,10 +181,10 @@ RSpec.describe CaseLogsController, type: :controller do context "partition date" do let(:case_log_with_date) do { - :"mrcdate(1i)" => "2021", - :"mrcdate(2i)" => "05", - :"mrcdate(3i)" => "04", - :page => "major_repairs_date", + "mrcdate(1i)": "2021", + "mrcdate(2i)": "05", + "mrcdate(3i)": "04", + page: "major_repairs_date", } end it "saves full and partial dates" do