Merge pull request #69 from UKHSA-Internal/sandbox

Sandbox -> development
UKHSA-Internal · May 26, 2023 · 098d8bb · 098d8bb
2 parents 2dc7c55 + 24965eb
commit 098d8bb
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 45 deletions.
diff --git a/app/landing/views.py b/app/landing/views.py
@@ -44,10 +44,7 @@
     'newAdmissionsRollingSum',
     'newAdmissionsDirection',
 
-    'cumPeopleVaccinatedFirstDoseByPublishDate',
-    'cumPeopleVaccinatedSecondDoseByPublishDate',
-    'cumPeopleVaccinatedThirdInjectionByPublishDate',
-    'cumPeopleVaccinatedAutumn22ByVaccinationDate50+',
+    'cumPeopleVaccinatedSpring23ByVaccinationDate75plus',
 
     'newDailyNsoDeathsByDeathDateChange',
     'newDailyNsoDeathsByDeathDateRollingSum',

diff --git a/app/postcode/assets/query_params.json b/app/postcode/assets/query_params.json
@@ -17,10 +17,7 @@
       "newAdmissionsChangePercentage",
       "newAdmissionsRollingSum",
       "newAdmissionsDirection",
-      "cumPeopleVaccinatedFirstDoseByPublishDate",
-      "cumPeopleVaccinatedSecondDoseByPublishDate",
-      "cumPeopleVaccinatedThirdInjectionByPublishDate",
-      "cumPeopleVaccinatedAutumn22ByVaccinationDate50+",
+      "cumPeopleVaccinatedSpring23ByVaccinationDate75plus",
       "newDailyNsoDeathsByDeathDateChange",
       "newDailyNsoDeathsByDeathDateRollingSum",
       "newDailyNsoDeathsByDeathDateChangePercentage",

diff --git a/app/templates/html/components/easy_read/vaccinations.html b/app/templates/html/components/easy_read/vaccinations.html
@@ -1,26 +1,7 @@
-{% set first = ("cumPeopleVaccinatedFirstDoseByPublishDate" | get_data(data)) %}
-{% set second = ("cumPeopleVaccinatedSecondDoseByPublishDate" | get_data(data)) %}
-{% set third = ("cumPeopleVaccinatedThirdInjectionByPublishDate" | get_data(data)) %}
-{% set booster = ("cumPeopleVaccinatedAutumn22ByVaccinationDate50+" | get_data(data)) %}
+{% set booster = ("cumPeopleVaccinatedSpring23ByVaccinationDate75plus" | get_data(data)) %}
 
-<h3 id="vaccinations">Vaccinations{% if first.areaName != "United Kingdom" %} in {{ first.areaName }}{% endif %}</h3>
+<h3 id="vaccinations">Vaccinations{% if booster.areaName != "United Kingdom" %} in {{ booster.areaName }}{% endif %}</h3>
 
 <p>
-	Vaccines are given in several doses.
-</p>
-
-<p>
-	<b>{{ first.value }}</b> people had been given a first dose by the end of {{ first.date }}.
-</p>
-
-<p>
-	<b>{{ second.value }}</b> people had been given a second dose by the end of {{ second.date }}.
-</p>
-
-<p>
-	<b>{{ third.value }}</b> people had been given a booster or third dose by the end of {{ third.date }}.
-</p>
-
-<p>
-	<b>{{ booster.value }}</b> people had been given an autumn booster by the end of {{ booster.date }}.
+	<b>{{ booster.value }}</b> people had been given a spring booster by the end of {{ booster.date }}.
 </p>
diff --git a/app/templates/html/easy_read.html b/app/templates/html/easy_read.html
@@ -20,7 +20,7 @@
 		{% set testingAreaName = "in " + ("newVirusTestsByPublishDate" | get_data(data)).areaName %}
 		{% set casesAreaName = "in " + ("newCasesBySpecimenDate" | get_data(data)).areaName %}
 		{% set admissionsAreaName = "in " + ("newAdmissions" | get_data(data)).areaName %}
-		{% set vaccinationsAreaName = "in " + ("cumPeopleVaccinatedFirstDoseByPublishDate" | get_data(data)).areaName %}
+		{% set vaccinationsAreaName = "in " + ("cumPeopleVaccinatedSpring23ByVaccinationDate75plus" | get_data(data)).areaName %}
 		{% set deathsAreaName = "in " + ("newDailyNsoDeathsByDeathDateRollingSum" | get_data(data)).areaName %}
 	{% endif %}
 

diff --git a/app/templates/latex/sections/vaccinations.tex b/app/templates/latex/sections/vaccinations.tex
@@ -1,16 +1,5 @@
-{% set first = ("cumPeopleVaccinatedFirstDoseByPublishDate" | get_data(data)) %}
-{% set second = ("cumPeopleVaccinatedSecondDoseByPublishDate" | get_data(data)) %}
-{% set third = ("cumPeopleVaccinatedThirdInjectionByPublishDate" | get_data(data)) %}
-{% set booster = ("cumPeopleVaccinatedAutumn22ByVaccinationDate50+" | get_data(data)) %}
+{% set booster = ("cumPeopleVaccinatedSpring23ByVaccinationDate75plus" | get_data(data)) %}
 
-\section{Vaccinations{% if first.areaName != "United Kingdom" %} in {{ first.areaName | trim_area_name }}{% endif %} }
+\section{Vaccinations{% if booster.areaName != "United Kingdom" %} in {{ booster.areaName | trim_area_name }}{% endif %} }
 
-Vaccines are given in several doses.
-
-{\bf {{ first.value }}} people had been given a first dose by the end of {{ first.date }}.
-
-{\bf {{ second.value }}} people had been given a second dose by the end of {{ second.date }}.
-
-{\bf {{ third.value }}} people had been given a booster or third dose by the end of {{ third.date }}.
-
-{\bf {{ booster.value }}} people had been given an autumn booster by the end of {{ booster.date }}.
+{\bf {{ booster.value }}} people had been given a spring booster by the end of {{ booster.date }}.