Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Development => master #104

Merged
merged 8 commits into from
Nov 23, 2023
Merged

Development => master #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e2ac2a0
add new variants
Nov 16, 2023
6e826e5
Merge pull request #97 from UKHSA-Internal/COVP-174_add_new_variants
jaro-m Nov 17, 2023
fc92431
Merge pull request #100 from UKHSA-Internal/sandbox
adebayoolabintan Nov 17, 2023
979e535
add new age catogories, remove chart
Nov 17, 2023
f5a5170
Merge pull request #101 from UKHSA-Internal/COVP-171_minor_fixes
adebayoolabintan Nov 17, 2023
1242730
change colours and fix variant name
Nov 23, 2023
f307451
Merge pull request #102 from UKHSA-Internal/minor_fixes_to_variants_g…
jaro-m Nov 23, 2023
f3921df
Merge pull request #103 from UKHSA-Internal/sandbox
adebayoolabintan Nov 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 66 additions & 0 deletions Layouts/cases.yaml
View file
Open in desktop
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
View file
Open in desktop
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

#############################################################################################################################
# #############################################################################################################################
Loading