Skip to content

Commit

Permalink
Merge pull request #104 from UKHSA-Internal/development
Browse files Browse the repository at this point in the history
Development => master
  • Loading branch information
adebayoolabintan authored Nov 23, 2023
2 parents fefd809 + f3921df commit 64b7261
Show file tree
Hide file tree
Showing 2 changed files with 158 additions and 58 deletions.
66 changes: 66 additions & 0 deletions Layouts/cases.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,18 @@ variantOmicronEG51: &variantOmicronEG51
parameter: variant
value: "V-23JUL-01 (Omicron EG.5.1)"

variantOmicronEG51: &variantOmicronXBB
<< : *baseVariants
filters:
parameter: variant
value: "V-22OCT-02 (Omicron XBB)"

variantOmicronEG51: &variantOmicronBA286
<< : *baseVariants
filters:
parameter: variant
value: "V-23AUG-01 (Omicron BA.2.86)"

variantOther: &variantOther
<< : *baseVariants
filters:
Expand Down Expand Up @@ -1970,6 +1982,22 @@ cards:
metric: newWeeklyPercentage
fill: false

- label: V-23AUG-01 (Omicron BA.2.86)
<< : *variantOmicronBA286
type: line
colour: 2
rollingAverage: false
metric: newWeeklyPercentage
fill: false

- label: V-22OCT-02 (Omicron XBB)
<< : *variantOmicronXBB
type: line
colour: 5
rollingAverage: false
metric: newWeeklyPercentage
fill: false

- label: Other
<< : *variantOther
type: line
Expand Down Expand Up @@ -2089,6 +2117,22 @@ cards:
parameter: variant
value: "V-23JUL-01 (Omicron EG.5.1)"

- label: "V-23AUG-01 (Omicron BA.2.86) %"
metric: newWeeklyPercentage
value: variants
type: numeric
filters:
parameter: variant
value: "V-23AUG-01 (Omicron BA.2.86)"

- label: "V-22OCT-02 (Omicron XBB) %"
metric: newWeeklyPercentage
value: variants
type: numeric
filters:
parameter: variant
value: "V-22OCT-02 (Omicron XBB)"

- label: "Other %"
metric: newWeeklyPercentage
value: variants
Expand Down Expand Up @@ -2117,6 +2161,12 @@ cards:
- label: Other
value: "Other"

- label: V-22OCT-02 (Omicron XBB)
value: "V-22OCT-02 (Omicron XBB)"

- label: V-23AUG-01 (Omicron BA.2.86)
value: "V-23AUG-01 (Omicron BA.2.86)"

- label: V-23JUL-01 (Omicron EG.5.1)
value: "V-23JUL-01 (Omicron EG.5.1)"

Expand Down Expand Up @@ -2267,6 +2317,22 @@ cards:
parameter: variant
value: "V-23JUL-01 (Omicron EG.5.1)"

- label: "V-23AUG-01 (Omicron BA.2.86) %"
metric: newWeeklyPercentage
value: variants
type: numeric
filters:
parameter: variant
value: "V-23AUG-01 (Omicron BA.2.86)"

- label: "V-22OCT-02 (Omicron XBB) %"
metric: newWeeklyPercentage
value: variants
type: numeric
filters:
parameter: variant
value: "V-22OCT-02 (Omicron XBB)"

- label: "Other %"
metric: newWeeklyPercentage
value: variants
Expand Down
150 changes: 92 additions & 58 deletions Layouts/vaccinations.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ headlineNumbers:
value: cumPeopleVaccinatedAutumn23ByVaccinationDate65plus
tooltip: Total number of people who have received the second dose of COVID-19 vaccine, reported up to {date}

- label: Atumn 2023 vaccinations uptake (%)
- label: Autumn 2023 vaccinations uptake (%)
value: cumVaccinationAutumn23UptakeByVaccinationDatePercentage65plus
tooltip: Total number of people who have received a booster or third dose of COVID-19 vaccine, reported up to {date}

- caption: Vaccinations given
valueItems:
- label: Total
value: cumVaccinesGivenByPublishDate
tooltip: Total number of COVID-19 vaccines given, reported up to {date}
# - caption: Vaccinations given
# valueItems:
# - label: Total
# value: cumVaccinesGivenByPublishDate
# tooltip: Total number of COVID-19 vaccines given, reported up to {date}

baseVaccinationAgeDemographics: &baseVaccinationAgeDemographics
value: vaccinationsAgeDemographics
Expand Down Expand Up @@ -1276,13 +1276,31 @@ cards:
tabType: chart

fields:
- label: 65 to 69 (%)
<< : *vaccinationAgeDemographics65_69
tooltip: Percentage of people aged 65 to 69 who received a spring booster dose of COVID-19 vaccine
type: line
colour: 3
rollingAverage: false
metric: cumVaccinationAutumn23UptakeByVaccinationDatePercentage
fill: false

- label: 70 to 74 (%)
<< : *vaccinationAgeDemographics70_74
tooltip: Percentage of people aged 75 to 79 who received a spring booster dose of COVID-19 vaccine
type: line
colour: 5
rollingAverage: false
metric: cumVaccinationAutumn23UptakeByVaccinationDatePercentage
fill: false

- label: 75 to 79 (%)
<< : *vaccinationAgeDemographics75_79
tooltip: Percentage of people aged 75 to 79 who received a spring booster dose of COVID-19 vaccine
type: line
colour: 0
rollingAverage: false
metric: cumVaccinationSpring23UptakeByVaccinationDatePercentage
metric: cumVaccinationAutumn23UptakeByVaccinationDatePercentage
fill: false

- label: 80 to 84 (%)
Expand All @@ -1291,7 +1309,7 @@ cards:
type: line
colour: 9
rollingAverage: false
metric: cumVaccinationSpring23UptakeByVaccinationDatePercentage
metric: cumVaccinationAutumn23UptakeByVaccinationDatePercentage
fill: false

- label: 85 to 89 (%)
Expand All @@ -1300,7 +1318,7 @@ cards:
type: line
colour: 3
rollingAverage: false
metric: cumVaccinationSpring23UptakeByVaccinationDatePercentage
metric: cumVaccinationAutumn23UptakeByVaccinationDatePercentage
fill: false

- label: 90+ (%)
Expand All @@ -1309,7 +1327,7 @@ cards:
type: line
colour: 10
rollingAverage: false
metric: cumVaccinationSpring23UptakeByVaccinationDatePercentage
metric: cumVaccinationAutumn23UptakeByVaccinationDatePercentage
fill: false

- heading: Data table
Expand All @@ -1319,32 +1337,48 @@ cards:
value: date
type: date

- label: "Uptake 65 to 69 (%)"
metric: cumVaccinationAutumn23UptakeByVaccinationDatePercentage
value: vaccinationsAgeDemographics
type: numeric
filters:
parameter: age
value: "65_69"

- label: "Uptake 70 to 74 (%)"
metric: cumVaccinationAutumn23UptakeByVaccinationDatePercentage
value: vaccinationsAgeDemographics
type: numeric
filters:
parameter: age
value: "70_74"

- label: "Uptake 75 to 79 (%)"
metric: cumVaccinationSpring23UptakeByVaccinationDatePercentage
metric: cumVaccinationAutumn23UptakeByVaccinationDatePercentage
value: vaccinationsAgeDemographics
type: numeric
filters:
parameter: age
value: "75_79"

- label: "Uptake 80 to 84 (%)"
metric: cumVaccinationSpring23UptakeByVaccinationDatePercentage
metric: cumVaccinationAutumn23UptakeByVaccinationDatePercentage
value: vaccinationsAgeDemographics
type: numeric
filters:
parameter: age
value: "80_84"

- label: "Uptake 85 to 89 (%)"
metric: cumVaccinationSpring23UptakeByVaccinationDatePercentage
metric: cumVaccinationAutumn23UptakeByVaccinationDatePercentage
value: vaccinationsAgeDemographics
type: numeric
filters:
parameter: age
value: "85_89"

- label: "Uptake 90+ (%)"
metric: cumVaccinationSpring23UptakeByVaccinationDatePercentage
metric: cumVaccinationAutumn23UptakeByVaccinationDatePercentage
value: vaccinationsAgeDemographics
type: numeric
filters:
Expand Down Expand Up @@ -2706,57 +2740,57 @@ cards:

#############################################################################################################################

# nations only
# # nations only

- heading: Number of vaccines given, by report date
cardType: chart
locationAware:
included:
areaType:
- nation
# - heading: Number of vaccines given, by report date
# cardType: chart
# locationAware:
# included:
# areaType:
# - nation

fullWidth: true
abstract: >
The number of COVID-19 vaccinations (all doses) given to people of all ages.
# fullWidth: true
# abstract: >
# The number of COVID-19 vaccinations (all doses) given to people of all ages.

download:
- newVaccinesGivenByPublishDate
- cumVaccinesGivenByPublishDate
- newPeopleVaccinatedFirstDoseByPublishDate
- cumPeopleVaccinatedFirstDoseByPublishDate
- newPeopleVaccinatedSecondDoseByPublishDate
- cumPeopleVaccinatedSecondDoseByPublishDate
- newPeopleVaccinatedThirdInjectionByPublishDate
- cumPeopleVaccinatedThirdInjectionByPublishDate
# download:
# - newVaccinesGivenByPublishDate
# - cumVaccinesGivenByPublishDate
# - newPeopleVaccinatedFirstDoseByPublishDate
# - cumPeopleVaccinatedFirstDoseByPublishDate
# - newPeopleVaccinatedSecondDoseByPublishDate
# - cumPeopleVaccinatedSecondDoseByPublishDate
# - newPeopleVaccinatedThirdInjectionByPublishDate
# - cumPeopleVaccinatedThirdInjectionByPublishDate

tabs:
- heading: Total
tabType: chart
# tabs:
# - heading: Total
# tabType: chart

fields:
- label: total
value: cumVaccinesGivenByPublishDate
tooltip: Total reported number of COVID-19 vaccines given
type: bar
colour: 0
rollingAverage: false
# fields:
# - label: total
# value: cumVaccinesGivenByPublishDate
# tooltip: Total reported number of COVID-19 vaccines given
# type: bar
# colour: 0
# rollingAverage: false

- heading: Data table
tabType: table
# - heading: Data table
# tabType: table

fields:
- label: Report date
value: date
type: date
tooltip: Date
# fields:
# - label: Report date
# value: date
# type: date
# tooltip: Date

- label: "total"
value: cumVaccinesGivenByPublishDate
type: numeric
tooltip: Total number of COVID-19 vaccines given
# - label: "total"
# value: cumVaccinesGivenByPublishDate
# type: numeric
# tooltip: Total number of COVID-19 vaccines given

- heading: About
tabType: metadata
filename: cardMetadata/vaccinations/cardVaccinationsGivenDaily.md
# - heading: About
# tabType: metadata
# filename: cardMetadata/vaccinations/cardVaccinationsGivenDaily.md

#############################################################################################################################
# #############################################################################################################################

0 comments on commit 64b7261

Please sign in to comment.