From 071cbbb7b0a86de7055135b9eecf929d600a2f22 Mon Sep 17 00:00:00 2001
From: Luis Aleixo <luis.aleixo@cern.ch>
Date: Tue, 31 May 2022 14:54:17 +0200
Subject: [PATCH] Modified message declaration on the if statements of the
 report for different warning levels

---
 .../templates/cern/calculator.report.html.j2   | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/cara/apps/templates/cern/calculator.report.html.j2 b/cara/apps/templates/cern/calculator.report.html.j2
index 3174f109..c55cd6dd 100644
--- a/cara/apps/templates/cern/calculator.report.html.j2
+++ b/cara/apps/templates/cern/calculator.report.html.j2
@@ -56,44 +56,34 @@
 {% endblock warning_animation %}
 
 {% block report_summary %}
-  {% set long_range_report_message =  "Taking into account the uncertainties tied to the model variables, in this scenario and assuming all occupants are exposed equally (i.e. without short-range interactions), the <b>probability of one exposed occupant getting infected is " + long_range_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">
       <br>
       {% if long_range_scale_warning == 'red' %}
         <div class="alert alert-danger mb-0" role="alert">
           <strong>Not Acceptable:</strong>
-              {{ long_range_report_message }}
-        </div>
       {% elif long_range_scale_warning == 'orange' %}
         <div class="alert alert-warning mb-0" role="alert">
           <strong>Attention:</strong>
-              {{ long_range_report_message }}
-        </div>
       {% elif long_range_scale_warning == 'green' %}
         <div class="alert alert-success mb-0" role="alert">
           <strong>Acceptable:</strong>
-              {{ long_range_report_message }}
-        </div>
       {% endif %}
+        Taking into account the uncertainties tied to the model variables, in this scenario and assuming all occupants are exposed equally (i.e. without short-range interactions), the <b>probability of one exposed occupant getting infected is {{long_range_prob_inf | non_zero_percentage}}</b> and the <b>expected number of new cases is {{expected_new_cases | float_format}}</b>*.
+      </div>
       {% if form.short_range_option == "short_range_yes" %} 
         <br>
-        {% set report_message =  "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>." %}
         {% if scale_warning == 'red' %}
           <div class="alert alert-danger mb-0" role="alert">
             <strong>Not Acceptable:</strong>
-                {{ report_message }}
-          </div>
         {% elif scale_warning == 'orange' %}
           <div class="alert alert-warning mb-0" role="alert">
             <strong>Attention:</strong>
-                {{ report_message }}
-          </div>
         {% elif scale_warning == 'green' %}
           <div class="alert alert-success mb-0" role="alert">
             <strong>Acceptable:</strong>
-                {{ report_message }}
-          </div>
         {% 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>.
+        </div>
       {% endif %}
       {% if (prob_inf > 2) %}
         <br>