From 2b19ea163f7833b21b59cf4c4343636d7d864f09 Mon Sep 17 00:00:00 2001 From: Luis Aleixo Date: Thu, 10 Nov 2022 11:25:16 +0100 Subject: [PATCH] updated userguide for VE data and moved vaccination block under virus type --- caimira/apps/calculator/static/js/form.js | 2 +- .../templates/base/calculator.form.html.j2 | 89 ++++++++++--------- caimira/apps/templates/base/userguide.html.j2 | 5 ++ setup.cfg | 2 + 4 files changed, 53 insertions(+), 45 deletions(-) diff --git a/caimira/apps/calculator/static/js/form.js b/caimira/apps/calculator/static/js/form.js index 20c0b5b4..86c23880 100644 --- a/caimira/apps/calculator/static/js/form.js +++ b/caimira/apps/calculator/static/js/form.js @@ -1309,7 +1309,7 @@ vaccine_primary_host_immunity = [ ] vaccine_booster_host_immunity = [ - {'primary series vaccine': 'AZD1222_(AstraZeneca)', 'booster vaccine': 'AZD1222_(AstraZeneca),'}, + {'primary series vaccine': 'AZD1222_(AstraZeneca)', 'booster vaccine': 'AZD1222_(AstraZeneca)',}, {'primary series vaccine': 'AZD1222_(AstraZeneca)', 'booster vaccine': 'BNT162b2_(Pfizer)',}, {'primary series vaccine': 'AZD1222_(AstraZeneca)', 'booster vaccine': 'BNT162b2_(Pfizer)_or_mRNA-1273_(Moderna)',}, {'primary series vaccine': 'AZD1222_(AstraZeneca)', 'booster vaccine': 'mRNA-1273_(Moderna)',}, diff --git a/caimira/apps/templates/base/calculator.form.html.j2 b/caimira/apps/templates/base/calculator.form.html.j2 index c1fad444..5959d555 100644 --- a/caimira/apps/templates/base/calculator.form.html.j2 +++ b/caimira/apps/templates/base/calculator.form.html.j2 @@ -58,7 +58,7 @@ Virus data: -
+
?

@@ -76,6 +76,49 @@
+
+
Vaccinated? 💉
+
+ + + + +
+
+ +
+
+
+
+ +
+
+ +
+

With booster?

+
+ + + + +
+
+ +
+
+
+
+ +
+
+ +
+
+
Room data: @@ -325,7 +368,7 @@ -
+
@@ -359,48 +402,6 @@
-
-
Vaccinated? 💉
-
- - - - -
-
- -
-
-
-
- -
-
- -
-

With booster?

-
- - - - -
-
- -
-
-
-
- -
-
- -
-
diff --git a/caimira/apps/templates/base/userguide.html.j2 b/caimira/apps/templates/base/userguide.html.j2 index 14929ff9..95a2361d 100644 --- a/caimira/apps/templates/base/userguide.html.j2 +++ b/caimira/apps/templates/base/userguide.html.j2 @@ -51,6 +51,11 @@ The local population in Manaus had very high levels of Covid-19 antibodies (> This factor has been taken into account by the authors of the study, via statistical adjustments to the transmission value (i.e. it has been increased, to account for spread in a population with significant acquired Covid-19 immunity). However, this value may be revised in the future as more studies of the Gamma VOC transmission in different geographical locations become available.


+

Vaccine effectiveness

+
+

The vaccination input corresponds to the vaccine type(s) administrated to the exposed population, assuming every exposed (or the occupant in question) has received the vaccine cocktail selected by the user. +The respective vaccine effectiveness values were extracted from data available in Results of COVID-19 Vaccine Effectiveness Studies: An Ongoing Systematic Review - Updated September 8, 2022, using this script.

+

Room Data


Please enter either the room volume (in m³) or both the floor area (m²) and the room height (m). diff --git a/setup.cfg b/setup.cfg index c2f968b6..46f08728 100644 --- a/setup.cfg +++ b/setup.cfg @@ -29,3 +29,5 @@ ignore_missing_imports = True [mypy-timezonefinder.*] ignore_missing_imports = True +[mypy-pandas.*] +ignore_missing_imports = True