From e4a2fa2de3ccdfb453af118bff69bd9c3ba9901f Mon Sep 17 00:00:00 2001 From: Jaroslaw Michalski Date: Mon, 6 Nov 2023 08:14:14 +0000 Subject: [PATCH 1/2] add Atumn23 metrics --- app/utils/assets.py | 6 +++++- app/utils/constants.py | 6 ++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/utils/assets.py b/app/utils/assets.py index d83d26c..d217009 100644 --- a/app/utils/assets.py +++ b/app/utils/assets.py @@ -153,10 +153,14 @@ class MetricData: "newPeopleVaccinatedSpring22ByVaccinationDate", "cumPeopleVaccinatedSpring22ByVaccinationDate", "cumVaccinationSpring22UptakeByVaccinationDatePercentage", - + "newPeopleVaccinatedSpring23ByVaccinationDate", "cumPeopleVaccinatedSpring23ByVaccinationDate", "cumVaccinationSpring23UptakeByVaccinationDatePercentage", + + "newPeopleVaccinatedAutumn23ByVaccinationDate", + "cumPeopleVaccinatedAutumn23ByVaccinationDate", + "cumPeopleVaccinatedAutumn23UptakeByVaccinationDatePercentage", ] } diff --git a/app/utils/constants.py b/app/utils/constants.py index cf926c9..a7737dc 100644 --- a/app/utils/constants.py +++ b/app/utils/constants.py @@ -435,6 +435,9 @@ class DBQueries(NamedTuple): "newPeopleVaccinatedSpring23ByVaccinationDate75plus": int, "cumPeopleVaccinatedSpring23ByVaccinationDate75plus": int, "cumVaccinationSpring23UptakeByVaccinationDatePercentage75plus": float, + "newPeopleVaccinatedAutumn23ByVaccinationDate65plus": int, + "cumPeopleVaccinatedAutumn23ByVaccinationDate65plus": int, + "cumPeopleVaccinatedAutumn23UptakeByVaccinationDatePercentage65plus": float, "vaccinationsAgeDemographics": list, @@ -802,6 +805,9 @@ class DBQueries(NamedTuple): "newPeopleVaccinatedSpring23ByVaccinationDate75plus": int, "cumPeopleVaccinatedSpring23ByVaccinationDate75plus": int, "cumVaccinationSpring23UptakeByVaccinationDatePercentage75plus": float, + "newPeopleVaccinatedAutumn23ByVaccinationDate65plus": int, + "cumPeopleVaccinatedAutumn23ByVaccinationDate65plus": int, + "cumPeopleVaccinatedAutumn23UptakeByVaccinationDatePercentage65plus": float, "vaccinationsAgeDemographics": list, From 3647326671eb3bc4b33c6bd9894d5f41b14e9bf3 Mon Sep 17 00:00:00 2001 From: Jaroslaw Michalski Date: Mon, 13 Nov 2023 16:21:16 +0000 Subject: [PATCH 2/2] change metric name cumPeopleVaccinatedAutumn23UptakeByVaccinationDatePercentage -> cumVaccinationAutumn23UptakeByVaccinationDatePercentage --- app/utils/assets.py | 2 +- app/utils/constants.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/utils/assets.py b/app/utils/assets.py index d217009..014f72a 100644 --- a/app/utils/assets.py +++ b/app/utils/assets.py @@ -160,7 +160,7 @@ class MetricData: "newPeopleVaccinatedAutumn23ByVaccinationDate", "cumPeopleVaccinatedAutumn23ByVaccinationDate", - "cumPeopleVaccinatedAutumn23UptakeByVaccinationDatePercentage", + "cumVaccinationAutumn23UptakeByVaccinationDatePercentage", ] } diff --git a/app/utils/constants.py b/app/utils/constants.py index a7737dc..4a93c13 100644 --- a/app/utils/constants.py +++ b/app/utils/constants.py @@ -437,7 +437,7 @@ class DBQueries(NamedTuple): "cumVaccinationSpring23UptakeByVaccinationDatePercentage75plus": float, "newPeopleVaccinatedAutumn23ByVaccinationDate65plus": int, "cumPeopleVaccinatedAutumn23ByVaccinationDate65plus": int, - "cumPeopleVaccinatedAutumn23UptakeByVaccinationDatePercentage65plus": float, + "cumVaccinationAutumn23UptakeByVaccinationDatePercentage65plus": float, "vaccinationsAgeDemographics": list, @@ -807,7 +807,7 @@ class DBQueries(NamedTuple): "cumVaccinationSpring23UptakeByVaccinationDatePercentage75plus": float, "newPeopleVaccinatedAutumn23ByVaccinationDate65plus": int, "cumPeopleVaccinatedAutumn23ByVaccinationDate65plus": int, - "cumPeopleVaccinatedAutumn23UptakeByVaccinationDatePercentage65plus": float, + "cumVaccinationAutumn23UptakeByVaccinationDatePercentage65plus": float, "vaccinationsAgeDemographics": list,