From ac04710d1b086dec7be561db9099f51ecae6a09e Mon Sep 17 00:00:00 2001
From: Luis Aleixo <luis.aleixo@cern.ch>
Date: Thu, 23 May 2024 09:55:17 +0200
Subject: [PATCH] ui modifications

---
 .../templates/base/calculator.report.html.j2  | 19 +++++++++----------
 .../templates/cern/calculator.report.html.j2  |  2 +-
 2 files changed, 10 insertions(+), 11 deletions(-)

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" %}
 													<br>
 													<div class="align-self-center alert alert-dark mb-0" role="alert">
-														In this scenario, assuming <b>short-range interactions</b> occur, the <b>probability of one exposed occupant getting infected can go as high as {{ prob_inf | non_zero_percentage }}</b> and the <b>expected number of new cases is {{ expected_new_cases | float_format }}</b>.
+														In this scenario, the <b>probability the occupant(s) exposed to short-range interactions get infected can go as high as {{ prob_inf | non_zero_percentage }}</b> and the <b>expected number of new cases increases to {{ expected_new_cases | float_format }}</b>.
 													</div>
 												{% endif %}
 												{% block probabilistic_exposure_probability %}
@@ -610,17 +610,16 @@
 							{% endif %}
 							</p></li>
 							{% if form.short_range_option == "short_range_yes" %}
-							<li><p class="data_text">
-							Short-range interactions: {{ form.short_range_interactions|length }}
-							</p></li>
-							<li><p class="data_text">
-							Total number of people having short-range interactions: {{ form.short_range_occupants }}
-							</p></li>
+							<li><p class="data_text">Total number of occupants having short-range interactions: {{ form.short_range_occupants }}</p></li>
 							<ul>
 							{% for interaction in form.short_range_interactions %}
-								<li>Expiratory activity {{ loop.index if form.short_range_interactions|length > 1 }}: {{ "Shouting/Singing" if interaction.expiration == "Shouting" else interaction.expiration }} </li>
-								<li>Start time {{ loop.index if form.short_range_interactions|length > 1 }}: {{ interaction.start_time }} </li>
-								<li>Duration {{ loop.index if form.short_range_interactions|length > 1 }}: {{ interaction.duration }} {{ "minutes" if interaction.duration|float > 1 else "minute" }}</li>
+							<li>Interaction no. {{ loop.index }}:
+							<ul>
+								<li>Expiratory activity: {{ "Shouting/Singing" if interaction.expiration == "Shouting" else interaction.expiration }} </li>
+								<li>Start time: {{ interaction.start_time }} </li>
+								<li>Duration: {{ interaction.duration }} {{ "minutes" if interaction.duration|float > 1 else "minute" }}</li>
+							</ul>
+							</li>
 							{% endfor %}
 							</ul>
 							{% 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 @@
           <div class="alert alert-success mb-0" role="alert">
             <strong>Acceptable:</strong>
         {% endif %}
-        In this scenario, assuming <b>short-range interactions</b> occur, the <b>probability of one exposed occupant getting infected can go as high as {{prob_inf | non_zero_percentage}}</b> and the <b>expected number of new cases is {{ expected_new_cases | float_format }}</b>.
+        In this scenario, the <b>probability the occupant(s) exposed to short-range interactions get infected can go as high as {{ prob_inf | non_zero_percentage }}</b> and the <b>expected number of new cases increases to {{ expected_new_cases | float_format }}</b>.
         </div>
       {% endif %}