From 616e56f8a9b5d37389ca1902e3e846423893dc56 Mon Sep 17 00:00:00 2001
From: Luis Aleixo <luis.aleixo@cern.ch>
Date: Thu, 24 Mar 2022 11:11:51 +0100
Subject: [PATCH] Adapted P(I) message and changed "show long range cumulative
 dose" label

---
 cara/apps/templates/base/calculator.report.html.j2 | 7 +++----
 cara/apps/templates/cern/calculator.report.html.j2 | 8 ++++----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/cara/apps/templates/base/calculator.report.html.j2 b/cara/apps/templates/base/calculator.report.html.j2
index 8cc383fd..4f96448c 100644
--- a/cara/apps/templates/base/calculator.report.html.j2
+++ b/cara/apps/templates/base/calculator.report.html.j2
@@ -78,7 +78,7 @@
 										<div class="col-md-8 pr-0 pl-0 d-flex">
 											{% block report_summary %}
 												<div class="align-self-center alert alert-dark mb-0" role="alert">
-													Taking into account the uncertainties tied to the model variables, in this scenario, the <b>probability of one exposed occupant getting infected is {{ prob_inf | non_zero_percentage }}</b> and the <b>expected number of new cases is {{ expected_new_cases | float_format }}</b>*.
+													Taking into account the uncertainties tied to the model variables, in this scenario and assuming all occupants are exposed equally, the <b>probability of one exposed occupant getting infected is {{ prob_inf | non_zero_percentage }}</b> and the <b>expected number of new cases is {{ expected_new_cases | float_format }}</b>*.
 												</div>
 											{% endblock report_summary %}
 										</div>
@@ -93,9 +93,8 @@
 									{% if 'Speaking' in form.short_range_interactions|string or 'Shouting' in form.short_range_interactions|string %}
 										<button class="btn btn-sm btn-primary" id="button_full_exposure" disabled>Show full exposure</button>
 										<button class="btn btn-sm btn-primary ml-0" id="button_hide_high_concentration">Hide high concentration</button>
-									{% endif %}	
-									<input type="checkbox" id="long_range_cumulative_checkbox">
-									<label class="form-check-label" for="long_range_cumulative_checkbox" id="lr_cumulative_checkbox_label">Show long range cumulative doses</label>
+									{% endif %}
+									<input type="checkbox" id="long_range_cumulative_checkbox"><label class="form-check-label ml-1" for="long_range_cumulative_checkbox" id="lr_cumulative_checkbox_label">Show doses from long range exposure alone</label>
 								{% endif %}
 								<div id="concentration_plot" style="height: 400px"></div>
 								<script type="application/javascript">
diff --git a/cara/apps/templates/cern/calculator.report.html.j2 b/cara/apps/templates/cern/calculator.report.html.j2
index 36e65cd2..2dbe8ae1 100644
--- a/cara/apps/templates/cern/calculator.report.html.j2
+++ b/cara/apps/templates/cern/calculator.report.html.j2
@@ -27,22 +27,22 @@
 {% endblock warning_animation %}
 
 {% block report_summary %}
+  {% set report_message =  "Taking into account the uncertainties tied to the model variables, in this scenario and assuming all occupants are exposed equally, the <b>probability of one exposed occupant getting infected is " + prob_inf | non_zero_percentage + "</b> and the <b>expected number of new cases is " + expected_new_cases | float_format + "</b>*." %}
   <div class="flex-row align-self-center">
       {% if cern_level == 'red' %}
         <div class="alert alert-danger mb-0" role="alert">
           <strong>Not Acceptable:</strong>
-              Taking into account the uncertainties tied to the model variables, in this scenario, the <b>probability of one exposed occupant getting infected is {{ prob_inf | non_zero_percentage }}</b> and the <b>expected number of new cases is {{ expected_new_cases | float_format }}</b>*.
-
+              {{ report_message }}
         </div>
       {% elif cern_level == 'orange' %}
         <div class="alert alert-warning mb-0" role="alert">
           <strong>Attention:</strong>
-              Taking into account the uncertainties tied to the model variables, in this scenario, the <b>probability of one exposed occupant getting infected is {{ prob_inf | non_zero_percentage }}</b> and the <b>expected number of new cases is {{ expected_new_cases | float_format }}</b>*.
+              {{ report_message }}
         </div>
       {% elif cern_level == 'green' %}
         <div class="alert alert-success mb-0" role="alert">
           <strong>Acceptable:</strong>
-              Taking into account the uncertainties tied to the model variables, in this scenario, the <b>probability of one exposed occupant getting infected is {{ prob_inf | non_zero_percentage }}</b> and the <b>expected number of new cases is {{ expected_new_cases | float_format }}</b>*.
+              {{ report_message }}
         </div>
       {% endif %}