Skip to content

Commit

Permalink
Add vaccination record import columns help
Browse files Browse the repository at this point in the history 
This adds a section when importing vaccinations records which
lists the columns necessary for a succesful import, in a similar way to
what we have currently for class lists and cohort imports.
  • Loading branch information
@thomasleese
thomasleese committed Oct 7, 2024
1 parent 52c72e1 commit 0b87fbd
Show file tree
Hide file tree
Showing 4 changed files with 201 additions and 13 deletions.
2 changes: 1 addition & 1 deletion app/views/class_imports/new.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
row.with_cell do
tag.code("#{prefix}_RELATIONSHIP")
end
row.with_cell(text: "Optional, must be one of: Mother, Father, Guardian")
row.with_cell(text: "Optional, must be one of: " + tag.code("Mum") + ", " + tag.code("Dad") + " or " + tag.code("Guardian"))
end

body.with_row do |row|
Expand Down
20 changes: 10 additions & 10 deletions app/views/cohort_imports/new.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,15 @@
end
end

body.with_row do |row|
row.with_cell do
tag.code("CHILD_SCHOOL_URN")
end
row.with_cell do
tag.strong("Required") + ", must be 6 digits and numeric. Use " + tag.code("888888") + " for school unknown and " + tag.code("999999") + " for homeschooled."
end
end

body.with_row do |row|
row.with_cell do
tag.code("CHILD_NHS_NUMBER")
Expand Down Expand Up @@ -95,15 +104,6 @@
end
end

body.with_row do |row|
row.with_cell do
tag.code("CHILD_SCHOOL_URN")
end
row.with_cell do
tag.strong("Required") + ", must be 6 digits and numeric. Use " + tag.code("888888") + " for school unknown and " + tag.code("999999") + " for homeschooled."
end
end

%w(PARENT_1 PARENT_2).each do |prefix|
body.with_row do |row|
row.with_cell do
Expand All @@ -116,7 +116,7 @@
row.with_cell do
tag.code("#{prefix}_RELATIONSHIP")
end
row.with_cell(text: "Optional, must be one of: Mother, Father, Guardian")
row.with_cell(text: "Optional, must be one of: " + tag.code("Mum") + ", " + tag.code("Dad") + " or " + tag.code("Guardian"))
end

body.with_row do |row|
Expand Down
190 changes: 189 additions & 1 deletion app/views/immunisation_imports/new.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
) %>
<% end %>
<% title = "Upload vaccination records" %>
<% title = "Import vaccination records" %>
<% hint = if @programme.hpv?
"These will go to NHS England. Make sure the CSV you upload has the same format as your usual reporting template."
elsif @programme.flu?
Expand All @@ -24,5 +24,193 @@
label: { text: title, tag: "h1", size: "l" },
hint: { text: hint } %>
<%= govuk_details(summary_text: "How to format your CSV for vaccination records") do %>
<p class="nhsuk-body">Make sure the CSV you upload uses the following columns:</p>

<%= govuk_table(classes: "app-table--small") do |table|
table.with_head do |head|
head.with_row do |row|
row.with_cell(text: "Column name")
row.with_cell(text: "Notes")
end
end

table.with_body do |body|
body.with_row do |row|
row.with_cell do
tag.code("ORGANISATION_CODE")
end
row.with_cell do
tag.strong("Required") + ", must be a valid " + govuk_link_to("ODS code", "https://odsportal.digital.nhs.uk/")
end
end

body.with_row do |row|
row.with_cell do
tag.code("SCHOOL_URN")
end
row.with_cell do
tag.strong("Required") + ", must be 6 digits and numeric. Use " + tag.code("888888") + " for school unknown and " + tag.code("999999") + " for homeschooled."
end
end

body.with_row do |row|
row.with_cell do
tag.code("SCHOOL_NAME")
end
row.with_cell do
("Required if " + tag.code("SCHOOL_URN") + " is " + tag.code("888888")).html_safe
end
end

body.with_row do |row|
row.with_cell do
tag.code("NHS_NUMBER")
end
row.with_cell(text: "Optional, must be 10 digits and numeric")
end

body.with_row do |row|
row.with_cell do
tag.code("PERSON_FORENAME")
end
row.with_cell do
tag.strong("Required")
end
end

body.with_row do |row|
row.with_cell do
tag.code("PERSON_SURNAME")
end
row.with_cell do
tag.strong("Required")
end
end

body.with_row do |row|
row.with_cell do
tag.code("PERSON_DOB")
end
row.with_cell do
tag.strong("Required")
end
end

body.with_row do |row|
row.with_cell do
tag.code("PERSON_GENDER_CODE")
end
row.with_cell do
tag.strong("Required") + ", must be " + tag.code("Not known") + ", " + tag.code("Male") + ", " + tag.code("Female") + ", " + tag.code("Not specified")
end
end

body.with_row do |row|
row.with_cell do
tag.code("PERSON_POSTCODE")
end
row.with_cell do
tag.strong("Required") + ", must be formatted as a valid postcode"
end
end

body.with_row do |row|
row.with_cell do
tag.code("DATE_OF_VACCINATION")
end
row.with_cell do
tag.strong("Required") + ", must use " + tag.code("YYYYMMDD") + " format"
end
end

body.with_row do |row|
row.with_cell do
tag.code("VACCINE_GIVEN")
end
row.with_cell do
tag.strong("Required") + ", must be " + @programme.vaccines.pluck(:nivs_name).map { tag.code(_1) }.to_sentence(last_word_connector: ", or ", two_words_connector: " or ").html_safe
end
end

body.with_row do |row|
row.with_cell do
tag.code("BATCH_NUMBER")
end
row.with_cell do
tag.strong("Required")
end
end

body.with_row do |row|
row.with_cell do
tag.code("BATCH_EXPIRY_DATE")
end
row.with_cell do
tag.strong("Required") + ", must use " + tag.code("YYYYMMDD") + " format"
end
end

body.with_row do |row|
row.with_cell do
tag.code("ANATOMICAL_SITE")
end
row.with_cell do
tag.strong("Required") + ", must be " + tag.code("Left Buttock") + ", " + tag.code("Right Buttock") + ", " + tag.code("Left Thigh") + ", " + tag.code("Right Thigh") + ", " + tag.code("Left Upper Arm") + ", " + tag.code("Right Upper Arm") + " or " + tag.code("Nasal")
end
end

if @programme.hpv?
body.with_row do |row|
row.with_cell do
tag.code("DOSE_SEQUENCE")
end
row.with_cell do
tag.strong("Required") + ", must be " + tag.code("1") + ", " + tag.code("2") + " or " + tag.code("3")
end
end
end

body.with_row do |row|
row.with_cell do
tag.code("VACCINATED")
end
row.with_cell do
("Optional, must be " + tag.code("Y") + " or " + tag.code("N") + ". If omitted, " + tag.code("Y") + " is assumed.").html_safe
end
end

if @programme.hpv?
body.with_row do |row|
row.with_cell do
tag.code("CARE_SETTING")
end
row.with_cell do
("Required if " + tag.code("VACCINATED") + " is " + tag.code("Y") + ". Must be " + tag.code("1") + " (school) or " + tag.code("2") + " (care setting)").html_safe
end
end
end

body.with_row do |row|
row.with_cell do
tag.code("PERFORMING_PROFESSIONAL_FORENAME")
end
row.with_cell do
("Required if " + tag.code("VACCINATED") + " is " + tag.code("Y")).html_safe
end
end

body.with_row do |row|
row.with_cell do
tag.code("PERFORMING_PROFESSIONAL_SURNAME")
end
row.with_cell do
("Required if " + tag.code("VACCINATED") + " is " + tag.code("Y")).html_safe
end
end
end
end %>
<% end %>
<%= f.govuk_submit %>
<% end %>
2 changes: 1 addition & 1 deletion spec/features/import_vaccination_records_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def and_i_choose_to_import_child_records
end

def then_i_should_see_the_upload_page
expect(page).to have_content("Upload vaccination records")
expect(page).to have_content("Import vaccination records")
end

def when_i_continue_without_uploading_a_file
Expand Down

0 comments on commit 0b87fbd

Please sign in to comment.