From 6149e5a7e46509236326781601e4c92e00256851 Mon Sep 17 00:00:00 2001
From: Luis Aleixo <luis.aleixo@cern.ch>
Date: Thu, 8 Jul 2021 12:55:32 +0200
Subject: [PATCH] Merge request fixes: commas and different location for the
 new template code

---
 cara/apps/calculator/report_generator.py            |  2 +-
 .../templates/base/calculator.report.html.j2        | 13 +------------
 .../themes/cern/templates/calculator.report.html.j2 | 10 ++++++++++
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/cara/apps/calculator/report_generator.py b/cara/apps/calculator/report_generator.py
index 966d5de4..6f377157 100644
--- a/cara/apps/calculator/report_generator.py
+++ b/cara/apps/calculator/report_generator.py
@@ -342,7 +342,7 @@ class ReportGenerator:
         context = {
             'model': model,
             'form': form,
-            'creation_date': time
+            'creation_date': time,
         }
 
         context.update(calculate_report_data(model))
diff --git a/cara/apps/calculator/templates/base/calculator.report.html.j2 b/cara/apps/calculator/templates/base/calculator.report.html.j2
index 3142b36b..a22372cc 100644
--- a/cara/apps/calculator/templates/base/calculator.report.html.j2
+++ b/cara/apps/calculator/templates/base/calculator.report.html.j2
@@ -212,19 +212,8 @@
 		<p class="data_text">
 		{% block report_summary %}
         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><a href="#section1">[*]</a> and the <b>expected number of new cases is {{ expected_new_cases | float_format }}</b>.
-		
-		{% if (prob_inf > 5) %}
-		
-		<div class="flex" style="width:60%">
-			<img class="warning_image_png" src="{{ calculator_prefix }}{{ scale_warning.display_png}}">
-			<div class="alert alert-dark warning_text" role="alert">
-				{{scale_warning.display_text}}
-			</div>
-		</div>
-		{% endif %}
-		
-		<p id="section1">[*] The results are based on the parameters and assumptions published in the CERN Open Report <a href="https://cds.cern.ch/record/2756083"> CERN-OPEN-2021-004</a></p>
         {% endblock report_summary %}
+		<p id="section1">[*] The results are based on the parameters and assumptions published in the CERN Open Report <a href="https://cds.cern.ch/record/2756083"> CERN-OPEN-2021-004</a></p>
         </p>
 
 		<img id="scenario_concentration_plot" src="{{ scenario_plot_src }}">
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 85d8860b..3c088547 100644
--- a/cara/apps/calculator/themes/cern/templates/calculator.report.html.j2
+++ b/cara/apps/calculator/themes/cern/templates/calculator.report.html.j2
@@ -26,6 +26,16 @@
 
 {{ super() }}
 
+{% if (prob_inf > 5) %}
+		
+  <div class="flex" style="width:60%">
+    <img class="warning_image_png" src="{{ calculator_prefix }}{{ scale_warning.display_png}}">
+    <div class="alert alert-dark warning_text" role="alert">
+      {{scale_warning.display_text}}
+    </div>
+  </div>
+{% endif %}
+
 {% if ((prob_inf > 15) or (expected_new_cases >= 1)) %}
   This exceeds the authorised risk threshold or number of expected new cases.
   The risk level must be reduced before this activity can be undertaken.