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 probability of one exposed occupant getting infected is " + long_range_prob_inf | non_zero_percentage + " and the expected number of new cases is " + expected_new_cases | float_format + "*." %}

{% if long_range_scale_warning == 'red' %} {% elif long_range_scale_warning == 'orange' %} {% elif long_range_scale_warning == 'green' %} {% 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 probability of one exposed occupant getting infected is {{long_range_prob_inf | non_zero_percentage}} and the expected number of new cases is {{expected_new_cases | float_format}}*. +
{% if form.short_range_option == "short_range_yes" %}
- {% set report_message = "In this scenario, assuming short-range interactions occur, the probability of one exposed occupant getting infected can go as high as " + prob_inf | non_zero_percentage + "." %} {% if scale_warning == 'red' %} {% elif scale_warning == 'orange' %} {% elif scale_warning == 'green' %} {% endif %} + In this scenario, assuming short-range interactions occur, the probability of one exposed occupant getting infected can go as high as {{prob_inf | non_zero_percentage}}. + {% endif %} {% if (prob_inf > 2) %}