From f672ee4208225b37c9bd8994db1eabf283ee538f Mon Sep 17 00:00:00 2001
From: Andre Henriques <andre.henriques@cern.ch>
Date: Fri, 4 Jun 2021 12:25:29 +0000
Subject: [PATCH 1/3] change CERN theme text for COVID measures

---
 .../calculator/themes/cern/templates/calculator.report.html.j2  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cara/apps/calculator/themes/cern/templates/calculator.report.html.j2 b/cara/apps/calculator/themes/cern/templates/calculator.report.html.j2
index 4d6769f8..85d8860b 100644
--- a/cara/apps/calculator/themes/cern/templates/calculator.report.html.j2
+++ b/cara/apps/calculator/themes/cern/templates/calculator.report.html.j2
@@ -3,7 +3,7 @@
 
 {% block report_preamble %}
   <p><strong>Applicable rules: <br>
-  Please ensure that this scenario conforms to current <a href="https://hse.cern/covid-19-information"> CERN HSE rules</a> (minimum ventilation requirements, mask wearing and the maximum number of people permitted in a space).</strong> <br>
+  Please ensure that this scenario conforms to current COVID-related <a href="https://hse.cern/covid-19-information"> Health & Safety requirements</a>, under the applicable COVID Scale and measures in force at the time of the CARA assessment.</strong> <br>
   The results of this simulation are colour coded according to the risk values authorized at CERN (approved in December 2020):
   <ul><li>Events with a <span class="green_bkg">P(i) less than 5%</span> may go ahead without further mitigation measures.</li>
     <li>Events with a <span class="yellow_bkg">P(i) between 5% and 15%</span> shall be subject to ALARA principles (see footnote) to minimise the risk before proceeding.</li>

From c7c2969bb891d2329df83553554f3bf15b55971f Mon Sep 17 00:00:00 2001
From: Andre Henriques <andre.henriques@cern.ch>
Date: Fri, 4 Jun 2021 12:38:36 +0000
Subject: [PATCH 2/3] update of report text

---
 cara/apps/calculator/templates/base/calculator.report.html.j2 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cara/apps/calculator/templates/base/calculator.report.html.j2 b/cara/apps/calculator/templates/base/calculator.report.html.j2
index 9b618988..2ad82bfa 100644
--- a/cara/apps/calculator/templates/base/calculator.report.html.j2
+++ b/cara/apps/calculator/templates/base/calculator.report.html.j2
@@ -209,7 +209,8 @@
 	<p class="result_title">Results:</p>
 		<p class="data_text">
 		{% block report_summary %}
-        In this scenario, the estimated probability of one exposed occupant getting infected P(i) is {{ prob_inf | non_zero_percentage }} and the expected number of new cases is {{ expected_new_cases | float_format }}.
+        Taking into account the uncertainties tied to the model variables, in this scenario, the <b>probability of one exposed occupant getting infected P(i) is {{ prob_inf | non_zero_percentage }}</b><a href="#section1">[*]</a> and the <b>expected number of new cases is {{ expected_new_cases | float_format }}</b>.
+	<p id="section1">[*] The results are based on the parameters and assumptions published in the <a href="https://cds.cern.ch/record/2756083"> CERN Open Report CERN-OPEN-2021-004</a></p>
         {% endblock report_summary %}
         </p>
 	<p class="data_title">Exposure graph:</p>

From 1d34db3a81e7fb99ce08dfaa1ca1efcd1766c0bf Mon Sep 17 00:00:00 2001
From: Andre Henriques <andre.henriques@cern.ch>
Date: Fri, 4 Jun 2021 12:40:37 +0000
Subject: [PATCH 3/3] delete repeated events section

---
 .../templates/base/calculator.report.html.j2  | 24 -------------------
 1 file changed, 24 deletions(-)

diff --git a/cara/apps/calculator/templates/base/calculator.report.html.j2 b/cara/apps/calculator/templates/base/calculator.report.html.j2
index 2ad82bfa..4896ebf0 100644
--- a/cara/apps/calculator/templates/base/calculator.report.html.j2
+++ b/cara/apps/calculator/templates/base/calculator.report.html.j2
@@ -216,30 +216,6 @@
 	<p class="data_title">Exposure graph:</p>
 	<img id="scenario_concentration_plot" src="{{ scenario_plot_src }}">
 
-    <p class="data_title">Repeated events:</p>
-    <p class="data_text">
-		The P(i) and expected number of new cases if repeating this scenario event - provided the infected person emits the same amount of viruses each day and the exposed person is subject to the same daily exposure time:
-
-        <table class="table table-striped w-auto">
-            <thead class="thead-light">
-                <tr>
-                    <th># of repeated events</th>
-                    <th>P(i)</th>
-                    <th>Expected new cases</th>
-                </tr>
-            </thead>
-            <tbody>
-            {% for repeat_event in repeated_events %}
-                <tr>
-                    <td>{{ repeat_event.repeats }}</td>
-                    <td>{{ repeat_event.probability_of_infection | non_zero_percentage }}</td>
-                    <td style="text-align:right">{{ repeat_event.expected_new_cases | float_format }}</td>
-                </tr>
-            {% endfor %}
-            </tbody>
-        </table>
-    </p>
-
     <p class="data_title">Alternative scenarios:</p>
     <p class="data_text">
     <img id="scenario_concentration_plot" src="{{ alternative_scenarios.plot }}" align="left" />