Skip to content

Commit 35a8f0c

Browse files
authored
Merge pull request #3239 from nhsuk/remove-absent-from-school
Remove "absent from school" outcome
2 parents 4901025 + 48ed15b commit 35a8f0c

File tree

8 files changed

+3
-19
lines changed

8 files changed

+3
-19
lines changed

app/models/immunisation_import_row.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,7 @@ class ImmunisationImportRow
7777
"unwell" => :not_well,
7878
"vaccination contraindicated" => :contraindications,
7979
"already had elsewhere" => :already_had,
80-
"did not attend" => :absent_from_session,
81-
"absent from school" => :absent_from_school
80+
"did not attend" => :absent_from_session
8281
}.freeze
8382

8483
SCHOOL_URN_HOME_EDUCATED = "999999"

app/models/patient_session/session_status.rb

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,7 @@ class PatientSession::SessionStatus < ApplicationRecord
5050
had_contraindications: 3,
5151
refused: 4,
5252
absent_from_session: 5,
53-
unwell: 6,
54-
absent_from_school: 7
53+
unwell: 6
5554
},
5655
default: :none_yet,
5756
validate: true
@@ -70,8 +69,6 @@ def assign_status
7069
:absent_from_session
7170
elsif status_should_be_unwell?
7271
:unwell
73-
elsif status_should_be_absent_from_school?
74-
:absent_from_school
7572
else
7673
:none_yet
7774
end
@@ -105,10 +102,6 @@ def status_should_be_unwell?
105102
vaccination_record&.not_well?
106103
end
107104

108-
def status_should_be_absent_from_school?
109-
vaccination_record&.absent_from_school?
110-
end
111-
112105
def latest_consents
113106
@latest_consents ||= ConsentGrouper.call(consents, programme_id:)
114107
end

app/models/vaccination_record.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ class VaccinationRecord < ApplicationRecord
128128
not_well: 2,
129129
contraindications: 3,
130130
already_had: 4,
131-
absent_from_school: 5,
132131
absent_from_session: 6
133132
},
134133
validate: true

config/locales/en.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,6 @@ en:
210210
right_arm_lower_position: Right arm (lower position)
211211
right_arm_upper_position: Right arm (upper position)
212212
outcomes:
213-
absent_from_school: Absent from school
214213
absent_from_session: Absent from session
215214
administered: Vaccinated
216215
already_had: Already had the vaccine
@@ -584,7 +583,6 @@ en:
584583
will_be_vaccinated_elsewhere: they will be given the vaccine elsewhere
585584
vaccination_mailer:
586585
reasons_did_not_vaccinate:
587-
absent_from_school: they were off school
588586
absent_from_session: they were not in the vaccination session
589587
already_had: they've already had the vaccine
590588
contraindications: they had contraindications

config/locales/patient_session_statuses.en.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ en:
5454
not_well: "%{full_name} was not well enough"
5555
contraindications: "%{full_name} had contraindications"
5656
already_had: "%{full_name} has already had the vaccine"
57-
absent_from_school: "%{full_name} was absent from school"
5857
absent_from_session: "%{full_name} was absent from the session"
5958
gave_consent: "Their %{who_responded} gave consent"
6059
triaged_do_not_vaccinate: "Do not vaccinate in programme"

config/locales/status.en.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ en:
4242
unknown: grey
4343
session:
4444
label:
45-
absent_from_school: Absent from school
4645
absent_from_session: Absent from session
4746
already_had: Already had vaccine
4847
had_contraindications: Had contraindications
@@ -51,7 +50,6 @@ en:
5150
unwell: Unwell
5251
vaccinated: Vaccinated
5352
colour:
54-
absent_from_school: dark-orange
5553
absent_from_session: dark-orange
5654
already_had: green
5755
had_contraindications: red

spec/models/immunisation_import_row_spec.rb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1414,8 +1414,7 @@
14141414
"unwell" => "not_well",
14151415
"vaccination contraindicated" => "contraindications",
14161416
"already had elsewhere" => "already_had",
1417-
"did not attend" => "absent_from_session",
1418-
"absent from school" => "absent_from_school"
1417+
"did not attend" => "absent_from_session"
14191418
}.each do |input_reason, expected_enum|
14201419
context "with reason '#{input_reason}'" do
14211420
let(:data) do

spec/models/patient_session/session_status_spec.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
refused
4343
absent_from_session
4444
unwell
45-
absent_from_school
4645
]
4746
)
4847
end

0 commit comments

Comments
 (0)