pingu_98/cara
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

updated VE and added default values on UI components

Browse source
This commit is contained in:
Luis Aleixo 2022-10-06 11:49:36 +02:00
parent 01c2454e0d
commit 9e4d1c0937
3 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
caimira/apps/calculator/model_generator.py
View file

@ -139,8 +139,8 @@ class FormData:
'total_people': _NO_DEFAULT,
'vaccine_option': False,
'vaccine_booster_option': False,
'vaccine_type': _NO_DEFAULT,
'vaccine_booster_type': _NO_DEFAULT,
'vaccine_type': 'AZD1222_(AstraZeneca)',
'vaccine_booster_type': 'AZD1222_(AstraZeneca)',
'ventilation_type': 'no_ventilation',
'virus_type': 'SARS_CoV_2',
'volume_type': _NO_DEFAULT,
@ -809,8 +809,8 @@ def baseline_raw_form_data() -> typing.Dict[str, typing.Union[str, float]]:
'room_volume': '75',
'simulation_name': 'Test',
'total_people': '10',
'vaccine_option': '',
'vaccine_booster_option': '',
'vaccine_option': '0',
'vaccine_booster_option': '0',
'vaccine_type': 'Ad26.COV2.S_(Janssen)',
'vaccine_booster_type': 'AZD1222_(AstraZeneca)',
'ventilation_type': 'natural_ventilation',

7
caimira/apps/templates/base/calculator.report.html.j2
View file

@ -375,11 +375,12 @@
</ul>
</div>
</div>
{% if form.vaccine_option %}
<br>
<div class="card">
<div class="card-header"><strong>Vaccination data:</strong></div>
<div class="card-body">
{% if form.vaccine_option %}
<ul>
<li>Primary vaccine: {{ form.vaccine_type | replace("_", " ") }}
{% if form.vaccine_booster_option %}
@ -387,9 +388,11 @@
{% endif %}
<li>Vaccine effectiveness: {{ model.exposed.host_immunity | percentage | non_zero_percentage }} </li>
</ul>
{% else %}
<p>No vaccination selected.</p>
{% endif %}
</div>
</div>
{% endif %}
<br>
<div class="card">
<div class="card-header"><strong>Ventilation data:</strong></div>

21
caimira/data/__init__.py
View file

@ -48,21 +48,21 @@ GenevaTemperatures = {
# Studies: An Ongoing Systematic Review - Updated September 8, 2022.
# https://view-hub.org/resources
vaccine_primary_host_immunity = {
'AZD1222_(AstraZeneca)': 0.56474,
'AZD1222_(AstraZeneca)': 0.589293,
'AZD1222_(AstraZeneca)_and_BNT162b2_(Pfizer)': 0.7865,
'AZD1222_(AstraZeneca)_and_any_mRNA_-_heterologous': 0.752143,
'AZD1222_(AstraZeneca)_and_any_mRNA_-_heterologous': 0.81,
'Ad26.COV2.S_(Janssen)': 0.551278,
'Any_mRNA_-_heterologous': 0.93875,
'BBIBP-CorV_(Beijing_CNBG)': 0.4325,
'BNT162b2_(Pfizer)': 0.628452,
'BNT162b2_(Pfizer)_and_mRNA-1273_(Moderna)': 0.569803,
'CoronaVac_(Sinovac)': 0.292923,
'BNT162b2_(Pfizer)': 0.660272,
'BNT162b2_(Pfizer)_and_mRNA-1273_(Moderna)': 0.586319,
'CoronaVac_(Sinovac)': 0.317333,
'CoronaVac_(Sinovac)_and_AZD1222_(AstraZeneca)': 0.472,
'CoronaVac_(Sinovac)_and_AZD1222_(AstraZeneca)_-_heterologous': 0.74,
'CoronaVac_(Sinovac)_and_BNT162b2_(Pfizer)': 0.7965,
'Covishield': 0.98,
'Sputnik_V_(Gamaleya)': 0.696,
'mRNA-1273_(Moderna)': 0.690527,
'mRNA-1273_(Moderna)': 0.730148,
}
vaccine_booster_host_immunity = [
@ -73,16 +73,15 @@ vaccine_booster_host_immunity = [
{'primary series vaccine': 'Ad26.COV2.S_(Janssen)', 'booster vaccine': 'Ad26.COV2.S_(Janssen)', 'VE': 0.492667},
{'primary series vaccine': 'Ad26.COV2.S_(Janssen)', 'booster vaccine': 'BNT162b2_(Pfizer)_or_mRNA-1273_(Moderna)', 'VE': 0.79},
{'primary series vaccine': 'BNT162b2_(Pfizer)', 'booster vaccine': 'AZD1222_(AstraZeneca)', 'VE': 0.801},
{'primary series vaccine': 'BNT162b2_(Pfizer)', 'booster vaccine': 'BNT162b2_(Pfizer)', 'VE': 0.599132},
{'primary series vaccine': 'BNT162b2_(Pfizer)', 'booster vaccine': 'BNT162b2_(Pfizer)', 'VE': 0.60712},
{'primary series vaccine': 'BNT162b2_(Pfizer)', 'booster vaccine': 'BNT162b2_(Pfizer)_or_mRNA-1273_(Moderna)', 'VE': 0.632633},
{'primary series vaccine': 'BNT162b2_(Pfizer)', 'booster vaccine': 'mRNA-1273_(Moderna)', 'VE': 0.716786},
{'primary series vaccine': 'BNT162b2_(Pfizer)_and_mRNA-1273_(Moderna)', 'booster vaccine': 'BNT162b2_(Pfizer)_and_mRNA-1273_(Moderna)', 'VE': 0.645},
{'primary series vaccine': 'BNT162b2_(Pfizer)_(3_doses)', 'booster vaccine': 'BNT162b2_(Pfizer)_(4th_dose)', 'VE': 0.962},
{'primary series vaccine': 'CoronaVac_(Sinovac)', 'booster vaccine': 'AZD1222_(AstraZeneca)', 'VE': 0.9405},
{'primary series vaccine': 'CoronaVac_(Sinovac)', 'booster vaccine': 'BNT162b2_(Pfizer)', 'VE': 0.649941},
{'primary series vaccine': 'CoronaVac_(Sinovac)', 'booster vaccine': 'CoronaVac_(Sinovac)', 'VE': 0.605429},
{'primary series vaccine': 'CoronaVac_(Sinovac)', 'booster vaccine': 'CoronaVac_(Sinovac)', 'VE': 0.289857},
{'primary series vaccine': 'CoronaVac_(Sinovac)', 'booster vaccine': 'BNT162b2_(Pfizer)', 'VE': 0.690563},
{'primary series vaccine': 'CoronaVac_(Sinovac)', 'booster vaccine': 'CoronaVac_(Sinovac)', 'VE': 0.52225},
{'primary series vaccine': 'mRNA-1273_(Moderna)', 'booster vaccine': 'BNT162b2_(Pfizer)', 'VE': 0.842143},
{'primary series vaccine': 'mRNA-1273_(Moderna)', 'booster vaccine': 'BNT162b2_(Pfizer)_or_mRNA-1273_(Moderna)', 'VE': 0.632633},
{'primary series vaccine': 'mRNA-1273_(Moderna)', 'booster vaccine': 'mRNA-1273_(Moderna)', 'VE': 0.618512}
{'primary series vaccine': 'mRNA-1273_(Moderna)', 'booster vaccine': 'mRNA-1273_(Moderna)', 'VE': 0.633238}
]