diff --git a/cara/apps/calculator/report_generator.py b/cara/apps/calculator/report_generator.py index 258ed6bf..1bbf967d 100644 --- a/cara/apps/calculator/report_generator.py +++ b/cara/apps/calculator/report_generator.py @@ -308,13 +308,6 @@ class ReportGenerator: context['permalink'] = generate_permalink(base_url, self.calculator_prefix, form) context['calculator_prefix'] = self.calculator_prefix - # For further information about these values visit https://gitlab.cern.ch/cara/cara/-/merge_requests/321. - context['scale_warning'] = { - 'level': 'red-4', # 'red-4' - 'orange-3' - 'yellow-2' - 'green-1' - 'risk': 'strong', # 'strong' - 'medium' - 'reduced' - '' - 'onsite_access': '4’000', # '4’000' - '5’000' - '6’500' - '8’000' - 'threshold': '2%' # '2%' - '' - '' - '' - } return context def _template_environment(self) -> jinja2.Environment: diff --git a/cara/apps/static/css/style.css b/cara/apps/static/css/style.css index 93eb34c7..28d28bb4 100644 --- a/cara/apps/static/css/style.css +++ b/cara/apps/static/css/style.css @@ -299,7 +299,7 @@ footer img { #download-pdf, #pdf_qrcode_aref { display: none; } - #cern_level{ + #scale_warning{ height: 15em; margin-top: 1em; } diff --git a/cara/apps/templates/cern/calculator.report.html.j2 b/cara/apps/templates/cern/calculator.report.html.j2 index 36e65cd2..3b523eba 100644 --- a/cara/apps/templates/cern/calculator.report.html.j2 +++ b/cara/apps/templates/cern/calculator.report.html.j2 @@ -1,8 +1,9 @@ {% extends "base/calculator.report.html.j2" %} -{% if ((prob_inf > 10) or (expected_new_cases >= 1)) %} {% set cern_level = 'red' %} -{% elif (2 <= prob_inf <= 10) %} {% set cern_level = 'orange' %} -{% else %} {% set cern_level = 'green' %} +{% set cern_level = 'yellow-2' %} +{% if ((prob_inf > 10) or (expected_new_cases >= 1)) %} {% set scale_warning = 'red' %} +{% elif (2 <= prob_inf <= 10) %} {% set scale_warning = 'orange' %} +{% else %} {% set scale_warning = 'green' %} {% endif %} {% block report_preamble_navtab %} @@ -12,9 +13,9 @@ {% endblock report_preamble_navtab %} {% block warning_animation %} - {% if cern_level == 'red' %} {% set warning_color= 'bg-danger' %} - {% elif cern_level == 'orange' %} {% set warning_color = 'bg-warning' %} - {% elif cern_level == 'green' %} {% set warning_color = 'bg-success' %} + {% if scale_warning == 'red' %} {% set warning_color= 'bg-danger' %} + {% elif scale_warning == 'orange' %} {% set warning_color = 'bg-warning' %} + {% elif scale_warning == 'green' %} {% set warning_color = 'bg-success' %} {% endif %}
@@ -28,18 +29,18 @@ {% block report_summary %}
- {% if cern_level == 'red' %} + {% if scale_warning == 'red' %} - {% elif cern_level == 'orange' %} + {% elif scale_warning == 'orange' %} - {% elif cern_level == 'green' %} + {% elif scale_warning == 'green' %} -
+