diff --git a/caimira/apps/templates/base/calculator.form.html.j2 b/caimira/apps/templates/base/calculator.form.html.j2 index 576cf535..8277f829 100644 --- a/caimira/apps/templates/base/calculator.form.html.j2 +++ b/caimira/apps/templates/base/calculator.form.html.j2 @@ -400,7 +400,7 @@ diff --git a/caimira/apps/templates/base/calculator.report.html.j2 b/caimira/apps/templates/base/calculator.report.html.j2 index 5e640393..d5e4902e 100644 --- a/caimira/apps/templates/base/calculator.report.html.j2 +++ b/caimira/apps/templates/base/calculator.report.html.j2 @@ -74,132 +74,147 @@
-
-
-
-
- Probability of infection (%)
- {% if form.short_range_option == "short_range_yes" %} - Without short-range interactions - {% endif %} -
-
- -
- {% block long_range_warning_animation %} -
- {{long_range_prob_inf | non_zero_percentage}} - - - - -
- {% endblock long_range_warning_animation %} -
-
-
- {% if form.short_range_option == "short_range_yes" %} +

+

+
Probability of infection (%)
- With short-range interactions + {% if form.short_range_option == "short_range_yes" %} + Without short-range interactions + {% endif %}

- +
- {% block warning_animation %} + {% block long_range_warning_animation %}
- {{prob_inf | non_zero_percentage}} - - - - -
- {% endblock warning_animation %} + {{long_range_prob_inf | non_zero_percentage}} + + + + +
+ {% endblock long_range_warning_animation %}
- {% endif %} -
- {% block report_summary %} -
- +
{% if form.short_range_option == "short_range_yes" %} -
- +
+ {% block report_summary_footnote %} + {% endblock report_summary_footnote %}
-
- {% block report_summary_footnote %} - {% endblock report_summary_footnote %} -
-

* The results are based on the parameters and assumptions published in the CARA publication: doi.org/10.1098/rsfs.2021.0076.


- {% if form.short_range_option == "short_range_yes" %} - {% if 'Speaking' in form.short_range_interactions|string or 'Shouting' in form.short_range_interactions|string %} - - +

* The results are based on the parameters and assumptions published in the CARA publication: doi.org/10.1098/rsfs.2021.0076.


+ {% if form.short_range_option == "short_range_yes" %} + {% if 'Speaking' in form.short_range_interactions|string or 'Shouting' in form.short_range_interactions|string %} + + + {% endif %} + {% endif %} - - {% endif %} -
- -
- -
+
+ +

+
+
+
+
+
Result uncertainties + +
+
+
+
+
+ +
-
- - +
+ + +
+ {% if form.conditional_probability_plot %} +
+ +
+ {% endif %}
-
- {% if form.conditional_probability_plot %} -
-
Probability of infection for a given viral load:
- -
- {% endif %}
@@ -224,7 +239,7 @@ {% endif %}