diff --git a/caimira/apps/templates/base/calculator.report.html.j2 b/caimira/apps/templates/base/calculator.report.html.j2
index cc6190c5..76c3d3f9 100644
--- a/caimira/apps/templates/base/calculator.report.html.j2
+++ b/caimira/apps/templates/base/calculator.report.html.j2
@@ -138,7 +138,7 @@
{% if form.short_range_option == "short_range_yes" %}
- In this scenario, assuming short-range interactions occur, the probability of one exposed occupant getting infected can go as high as {{ prob_inf | non_zero_percentage }} and the expected number of new cases is {{ expected_new_cases | float_format }}.
+ In this scenario, the probability the occupant(s) exposed to short-range interactions get infected can go as high as {{ prob_inf | non_zero_percentage }} and the expected number of new cases increases to {{ expected_new_cases | float_format }}.
{% endif %}
{% block probabilistic_exposure_probability %}
@@ -610,17 +610,16 @@
{% endif %}
{% if form.short_range_option == "short_range_yes" %}
-
- Short-range interactions: {{ form.short_range_interactions|length }}
-
-
- Total number of people having short-range interactions: {{ form.short_range_occupants }}
-
+ Total number of occupants having short-range interactions: {{ form.short_range_occupants }}
{% for interaction in form.short_range_interactions %}
- - Expiratory activity {{ loop.index if form.short_range_interactions|length > 1 }}: {{ "Shouting/Singing" if interaction.expiration == "Shouting" else interaction.expiration }}
- - Start time {{ loop.index if form.short_range_interactions|length > 1 }}: {{ interaction.start_time }}
- - Duration {{ loop.index if form.short_range_interactions|length > 1 }}: {{ interaction.duration }} {{ "minutes" if interaction.duration|float > 1 else "minute" }}
+ - Interaction no. {{ loop.index }}:
+
+ - Expiratory activity: {{ "Shouting/Singing" if interaction.expiration == "Shouting" else interaction.expiration }}
+ - Start time: {{ interaction.start_time }}
+ - Duration: {{ interaction.duration }} {{ "minutes" if interaction.duration|float > 1 else "minute" }}
+
+
{% endfor %}
{% endif %}
diff --git a/caimira/apps/templates/cern/calculator.report.html.j2 b/caimira/apps/templates/cern/calculator.report.html.j2
index 0e0a0175..701c2ab0 100644
--- a/caimira/apps/templates/cern/calculator.report.html.j2
+++ b/caimira/apps/templates/cern/calculator.report.html.j2
@@ -84,7 +84,7 @@
Acceptable:
{% endif %}
- In this scenario, assuming short-range interactions occur, the probability of one exposed occupant getting infected can go as high as {{prob_inf | non_zero_percentage}} and the expected number of new cases is {{ expected_new_cases | float_format }}.
+ In this scenario, the probability the occupant(s) exposed to short-range interactions get infected can go as high as {{ prob_inf | non_zero_percentage }} and the expected number of new cases increases to {{ expected_new_cases | float_format }}.
{% endif %}