From e2ac2a0a5086e31362e8c0a990c4a16e438da2dc Mon Sep 17 00:00:00 2001 From: Jaroslaw Michalski Date: Thu, 16 Nov 2023 13:54:52 +0000 Subject: [PATCH 1/3] add new variants Added: V-22OCT-02 (Omicron XBB) V-23AUG-01(Omicron BA.2.86) --- Layouts/cases.yaml | 66 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/Layouts/cases.yaml b/Layouts/cases.yaml index 1be6b8c..1e762a3 100644 --- a/Layouts/cases.yaml +++ b/Layouts/cases.yaml @@ -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: @@ -2034,6 +2046,22 @@ cards: metric: newWeeklyPercentage fill: false + - label: V-23AUG-01(Omicron BA.2.86) + << : *variantOmicronBA286 + type: line + colour: 21 + rollingAverage: false + metric: newWeeklyPercentage + fill: false + + - label: V-22OCT-02 (Omicron XBB) + << : *variantOmicronXBB + type: line + colour: 21 + rollingAverage: false + metric: newWeeklyPercentage + fill: false + - label: Other << : *variantOther type: line @@ -2153,6 +2181,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 @@ -2181,6 +2225,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)" @@ -2331,6 +2381,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 From 979e535f3c467e18a8f8c107f052e7c8033e7176 Mon Sep 17 00:00:00 2001 From: Jaroslaw Michalski Date: Fri, 17 Nov 2023 14:41:48 +0000 Subject: [PATCH 2/3] add new age catogories, remove chart It was going to be just 1 change - to fix misspelt word. Apart from that, some things were removed as they didn't make sense any more: - one of the charts, - headline value Also added new age categories: - 65_69, - 70_74 --- Layouts/vaccinations.yaml | 150 +++++++++++++++++++++++--------------- 1 file changed, 92 insertions(+), 58 deletions(-) diff --git a/Layouts/vaccinations.yaml b/Layouts/vaccinations.yaml index b5fe063..db69a7a 100644 --- a/Layouts/vaccinations.yaml +++ b/Layouts/vaccinations.yaml @@ -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 @@ -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 (%) @@ -1291,7 +1309,7 @@ cards: type: line colour: 9 rollingAverage: false - metric: cumVaccinationSpring23UptakeByVaccinationDatePercentage + metric: cumVaccinationAutumn23UptakeByVaccinationDatePercentage fill: false - label: 85 to 89 (%) @@ -1300,7 +1318,7 @@ cards: type: line colour: 3 rollingAverage: false - metric: cumVaccinationSpring23UptakeByVaccinationDatePercentage + metric: cumVaccinationAutumn23UptakeByVaccinationDatePercentage fill: false - label: 90+ (%) @@ -1309,7 +1327,7 @@ cards: type: line colour: 10 rollingAverage: false - metric: cumVaccinationSpring23UptakeByVaccinationDatePercentage + metric: cumVaccinationAutumn23UptakeByVaccinationDatePercentage fill: false - heading: Data table @@ -1319,8 +1337,24 @@ 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: @@ -1328,7 +1362,7 @@ cards: value: "75_79" - label: "Uptake 80 to 84 (%)" - metric: cumVaccinationSpring23UptakeByVaccinationDatePercentage + metric: cumVaccinationAutumn23UptakeByVaccinationDatePercentage value: vaccinationsAgeDemographics type: numeric filters: @@ -1336,7 +1370,7 @@ cards: value: "80_84" - label: "Uptake 85 to 89 (%)" - metric: cumVaccinationSpring23UptakeByVaccinationDatePercentage + metric: cumVaccinationAutumn23UptakeByVaccinationDatePercentage value: vaccinationsAgeDemographics type: numeric filters: @@ -1344,7 +1378,7 @@ cards: value: "85_89" - label: "Uptake 90+ (%)" - metric: cumVaccinationSpring23UptakeByVaccinationDatePercentage + metric: cumVaccinationAutumn23UptakeByVaccinationDatePercentage value: vaccinationsAgeDemographics type: numeric filters: @@ -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 -############################################################################################################################# \ No newline at end of file +# ############################################################################################################################# \ No newline at end of file From 1242730f922f92383327ba37d66bcf05a37e2b2a Mon Sep 17 00:00:00 2001 From: Jaroslaw Michalski Date: Thu, 23 Nov 2023 12:31:42 +0000 Subject: [PATCH 3/3] change colours and fix variant name Changed colours to 3 metrics using the same one (21), also changed variant name from V-23AUG-01(Omicron BA.2.86) to V-23AUG-01 (Omicron BA.2.86) --- Layouts/cases.yaml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Layouts/cases.yaml b/Layouts/cases.yaml index 1e762a3..e785879 100644 --- a/Layouts/cases.yaml +++ b/Layouts/cases.yaml @@ -166,7 +166,7 @@ variantOmicronEG51: &variantOmicronBA286 << : *baseVariants filters: parameter: variant - value: "V-23AUG-01(Omicron BA.2.86)" + value: "V-23AUG-01 (Omicron BA.2.86)" variantOther: &variantOther << : *baseVariants @@ -2046,10 +2046,10 @@ cards: metric: newWeeklyPercentage fill: false - - label: V-23AUG-01(Omicron BA.2.86) + - label: V-23AUG-01 (Omicron BA.2.86) << : *variantOmicronBA286 type: line - colour: 21 + colour: 2 rollingAverage: false metric: newWeeklyPercentage fill: false @@ -2057,7 +2057,7 @@ cards: - label: V-22OCT-02 (Omicron XBB) << : *variantOmicronXBB type: line - colour: 21 + colour: 5 rollingAverage: false metric: newWeeklyPercentage fill: false @@ -2181,13 +2181,13 @@ cards: parameter: variant value: "V-23JUL-01 (Omicron EG.5.1)" - - label: "V-23AUG-01(Omicron BA.2.86) %" + - 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)" + value: "V-23AUG-01 (Omicron BA.2.86)" - label: "V-22OCT-02 (Omicron XBB) %" metric: newWeeklyPercentage @@ -2228,8 +2228,8 @@ cards: - 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-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)" @@ -2381,13 +2381,13 @@ cards: parameter: variant value: "V-23JUL-01 (Omicron EG.5.1)" - - label: "V-23AUG-01(Omicron BA.2.86) %" + - 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)" + value: "V-23AUG-01 (Omicron BA.2.86)" - label: "V-22OCT-02 (Omicron XBB) %" metric: newWeeklyPercentage