From 34353bb3ce5c7caa4c71e3ee05a04e4b97ad9f60 Mon Sep 17 00:00:00 2001
From: Luis Aleixo <luis.aleixo@cern.ch>
Date: Mon, 30 May 2022 11:34:45 +0200
Subject: [PATCH] rearranged if statements on report.html.j2 file

---
 .../templates/cern/calculator.report.html.j2    | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/cara/apps/templates/cern/calculator.report.html.j2 b/cara/apps/templates/cern/calculator.report.html.j2
index 36178dc7..df24c1c4 100644
--- a/cara/apps/templates/cern/calculator.report.html.j2
+++ b/cara/apps/templates/cern/calculator.report.html.j2
@@ -9,9 +9,15 @@
   {% set long_range_prob_inf = prob_inf %}
 {% endif %}
 
-{% if ((long_range_prob_inf > 10) or (expected_new_cases >= 1)) %} {% set long_range_scale_warning = 'red' %}
-{% elif (2 <= long_range_prob_inf <= 10) %} {% set long_range_scale_warning = 'orange' %} 
-{% else %} {% set long_range_scale_warning = 'green' %} 
+{% if ((long_range_prob_inf > 10) or (expected_new_cases >= 1)) %} 
+  {% set long_range_scale_warning = 'red' %}
+  {% set long_range_warning_color= 'bg-danger' %}
+{% elif (2 <= long_range_prob_inf <= 10) %}
+   {% set long_range_scale_warning = 'orange' %} 
+   {% set long_range_warning_color = 'bg-warning' %} 
+{% else %} 
+  {% set long_range_scale_warning = 'green' %} 
+  {% set long_range_warning_color = 'bg-success' %} 
 {% endif %}
 
 {% if ((prob_inf > 10) or (expected_new_cases >= 1)) %} {% set scale_warning = 'red' %}
@@ -26,11 +32,6 @@
 {% endblock report_preamble_navtab %}
 
 {% block long_range_warning_animation %}
-  {% if long_range_scale_warning == 'red' %} {% set long_range_warning_color= 'bg-danger' %}
-  {% elif long_range_scale_warning == 'orange' %} {% set long_range_warning_color = 'bg-warning' %} 
-  {% elif long_range_scale_warning == 'green' %} {% set long_range_warning_color = 'bg-success' %} 
-  {% endif %}
-  
   <div class="intro-banner-vdo-play-btn {{long_range_warning_color}} m-auto d-flex align-items-center justify-content-center">
     <b>{{long_range_prob_inf | non_zero_percentage}}</b>
     <i class="glyphicon glyphicon-play whiteText" aria-hidden="true"></i>