Merge pull request #35 from UKHSA-Internal/sandbox

Sandbox -> development
UKHSA-Internal · Nov 17, 2023 · 37c060e · 37c060e
2 parents 48a5673 + 20fec65
commit 37c060e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/app/utils/assets.py b/app/utils/assets.py
@@ -153,10 +153,14 @@ class MetricData:
             "newPeopleVaccinatedSpring22ByVaccinationDate",
             "cumPeopleVaccinatedSpring22ByVaccinationDate",
             "cumVaccinationSpring22UptakeByVaccinationDatePercentage",
-            
+
             "newPeopleVaccinatedSpring23ByVaccinationDate",
             "cumPeopleVaccinatedSpring23ByVaccinationDate",
             "cumVaccinationSpring23UptakeByVaccinationDatePercentage",
+
+            "newPeopleVaccinatedAutumn23ByVaccinationDate",
+            "cumPeopleVaccinatedAutumn23ByVaccinationDate",
+            "cumVaccinationAutumn23UptakeByVaccinationDatePercentage",
         ]
     }
 

diff --git 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,
+    "cumVaccinationAutumn23UptakeByVaccinationDatePercentage65plus": float,
 
     "vaccinationsAgeDemographics": list,
 
@@ -802,6 +805,9 @@ class DBQueries(NamedTuple):
         "newPeopleVaccinatedSpring23ByVaccinationDate75plus": int,
         "cumPeopleVaccinatedSpring23ByVaccinationDate75plus": int,
         "cumVaccinationSpring23UptakeByVaccinationDatePercentage75plus": float,
+        "newPeopleVaccinatedAutumn23ByVaccinationDate65plus": int,
+        "cumPeopleVaccinatedAutumn23ByVaccinationDate65plus": int,
+        "cumVaccinationAutumn23UptakeByVaccinationDatePercentage65plus": float,
 
         "vaccinationsAgeDemographics": list,