Skip to content

Commit fab5774

Browse files
committed
Clarify MMR historical dose sequence validation message
This follows on from commit 9035a26 and QA feedback. Update the dose sequence validation copy to use a single clearer error message. Jira-Issue: MAV-2312
1 parent 78b5add commit fab5774

2 files changed

Lines changed: 6 additions & 9 deletions

File tree

app/models/immunisation_import_row.rb

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -851,13 +851,13 @@ def validate_dose_sequence
851851
two_words_connector: " or "
852852
)
853853

854+
dose_sequence_error_message =
855+
"Enter a numeric which must be either #{dose_sequence_examples}."
856+
854857
if dose_sequence.present? ||
855858
parsed_vaccination_description_string&.dig(:dose_sequence).present?
856859
if dose_sequence_value.nil?
857-
errors.add(
858-
field.header,
859-
"Enter a dose sequence number, for example, #{dose_sequence_examples}."
860-
)
860+
errors.add(field.header, dose_sequence_error_message)
861861
elsif maximum_dose_sequence
862862
if dose_sequence_value < 1
863863
errors.add(field.header, "must be greater than 0")
@@ -879,10 +879,7 @@ def validate_dose_sequence
879879
end
880880
)
881881
else
882-
errors.add(
883-
field.header,
884-
"Enter a dose sequence number, for example, #{dose_sequence_examples}."
885-
)
882+
errors.add(field.header, dose_sequence_error_message)
886883
end
887884
end
888885
end

spec/models/immunisation_import_row_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@
582582
it "has the correct error message" do
583583
immunisation_import_row.valid?
584584
expect(immunisation_import_row.errors["DOSE_SEQUENCE"]).to include(
585-
"Enter a dose sequence number, for example, 1 or 2."
585+
"Enter a numeric which must be either 1 or 2."
586586
)
587587
end
588588
end

0 commit comments

Comments
 (0)