diff --git a/cara/apps/calculator/report_generator.py b/cara/apps/calculator/report_generator.py index 317ced76..be8f8322 100644 --- a/cara/apps/calculator/report_generator.py +++ b/cara/apps/calculator/report_generator.py @@ -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(): diff --git a/cara/apps/calculator/templates/report.html.j2 b/cara/apps/calculator/templates/report.html.j2 index 651571a6..e3c4f699 100644 --- a/cara/apps/calculator/templates/report.html.j2 +++ b/cara/apps/calculator/templates/report.html.j2 @@ -173,9 +173,12 @@

Alternative scenarios:

- Note: 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).
+ Notes:
+ 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).
For this reason, scenarios with different types of mask will show the same concentration on the graph.
+ 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.
+ The other alternative scenarios shown for comparison will not include either HEPA filtration or FFP2 masks.
+