Browse Source

Use enums as well for consistency

pull/82/head
baarkerlounger 4 years ago
parent
commit
0c70752679
  1. 7
      app/constants/db_enums.rb
  2. 1
      app/models/case_log.rb
  3. 2
      app/validations/soft_validations.rb
  4. 2
      app/views/form/_validation_override_question.html.erb

7
app/constants/db_enums.rb

@ -213,6 +213,13 @@ module DbEnums
} }
end end
def self.override_soft_validation
{
"No" => 0,
"Yes" => 1,
}
end
def self.benefits def self.benefits
{ {
"All" => 1, "All" => 1,

1
app/models/case_log.rb

@ -65,6 +65,7 @@ class CaseLog < ApplicationRecord
enum leftreg: DbEnums.leftreg, _suffix: true enum leftreg: DbEnums.leftreg, _suffix: true
enum illness: DbEnums.illness, _suffix: true enum illness: DbEnums.illness, _suffix: true
enum preg_occ: DbEnums.pregnancy, _suffix: true enum preg_occ: DbEnums.pregnancy, _suffix: true
enum override_net_income_validation: DbEnums.override_soft_validation, _suffix: true
enum housingneeds_a: DbEnums.polar, _suffix: true enum housingneeds_a: DbEnums.polar, _suffix: true
enum housingneeds_b: DbEnums.polar, _suffix: true enum housingneeds_b: DbEnums.polar, _suffix: true
enum housingneeds_c: DbEnums.polar, _suffix: true enum housingneeds_c: DbEnums.polar, _suffix: true

2
app/validations/soft_validations.rb

@ -8,7 +8,7 @@ module SoftValidations
end end
def soft_errors_overridden? def soft_errors_overridden?
!public_send(soft_errors.keys.first).zero? if soft_errors.present? public_send(soft_errors.keys.first) == "Yes" if soft_errors.present?
end end
private private

2
app/views/form/_validation_override_question.html.erb

@ -9,7 +9,7 @@
<%= f.govuk_check_box page_info["soft_validations"]&.keys&.first, page_info["soft_validations"]&.keys&.first, <%= f.govuk_check_box page_info["soft_validations"]&.keys&.first, page_info["soft_validations"]&.keys&.first,
label: { text: "Yes" }, label: { text: "Yes" },
checked: @case_log[page_info["soft_validations"]&.keys&.first] == 1 checked: @case_log[page_info["soft_validations"]&.keys&.first] == "Yes"
%> %>
<% end %> <% end %>
</div> </div>

Loading…
Cancel
Save