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

minor tweaks to alternative scenario text

Browse source
This commit is contained in:
jdevine 2020-11-26 09:29:31 +01:00
parent df034b7145
commit 0957987740
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cara/apps/calculator/report_generator.py
View file

@ -110,11 +110,11 @@ def manufacture_alternative_scenarios(form: FormData) -> typing.Dict[str, models
# Two special option cases - HEPA and/or FFP2 masks.
FFP2_being_worn = bool(form.mask_wearing == 'continuous' and form.mask_type == 'FFP2')
if FFP2_being_worn and form.hepa_option:
scenarios['Scenario with HEPA and FFP2 masks'] = form.build_model()
scenarios['Base scenario with HEPA and FFP2 masks'] = form.build_model()
elif FFP2_being_worn:
scenarios['Scenario with FFP2 masks'] = form.build_model()
scenarios['Base scenario with FFP2 masks'] = form.build_model()
elif form.hepa_option:
scenarios['Scenario with HEPA filter'] = form.build_model()
scenarios['Base scenario with HEPA filter'] = form.build_model()
# The remaining scenarios are based on Type I masks (possibly not worn)
# and no HEPA filtration.
@ -150,9 +150,9 @@ def comparison_plot(scenarios: typing.Dict[str, models.ExposureModel]):
times = None
dash_styled_scenarios = [
'Scenario with FFP2 masks',
'Scenario with HEPA filter',
'Scenario with HEPA and FFP2 masks',
'Base scenario with FFP2 masks',
'Base scenario with HEPA filter',
'Base scenario with HEPA and FFP2 masks',
]
for name, model in scenarios.items():

7
cara/apps/calculator/templates/report.html.j2
View file

@ -173,9 +173,12 @@
<p class="data_title">Alternative scenarios:</p>
<p class="data_text">
<strong> Note: </strong>this graph shows the concentration of viral quanta in the air.<br>
The filtration of Type I and FFP2 masks, if worn, applies to indiviudal exposure (inhalation only).<br>
<strong> Notes: </strong><br>
1) This graph shows the concentration of viral quanta in the air. The filtration of Type I and FFP2 masks, if worn, applies to indiviudal exposure (inhalation only).<br>
For this reason, scenarios with different types of mask will show the same concentration on the graph.<br>
2) If you have selected more sophisticated options, such as HEPA filtration or FF2 masks, this will be indicated in the plot as the "base scenario", identical to the main results shown above.<br>
The other alternative scenarios shown for comparison will not include either HEPA filtration or FFP2 masks. <br>
<br>
<img id="scenario_concentration_plot" src="{{ alternative_scenarios.plot }}" align="left" />
<table class="table table-striped w-auto">
<thead class="thead-light">