Merge branch 'feature/pi_thresholds' into 'master'

New threshold values on CERN theme

Closes #244

See merge request cara/cara!323
This commit is contained in:
Andre Henriques 2022-02-01 14:38:14 +01:00
commit b84d63ae25

View file

@ -7,9 +7,9 @@
{% endblock report_preamble_navtab %} {% endblock report_preamble_navtab %}
{% block warning_animation %} {% block warning_animation %}
{% if ((prob_inf > 15) or (expected_new_cases >= 1)) %} {% set warning_color= 'bg-danger' %} {% if ((prob_inf > 10) or (expected_new_cases >= 1)) %} {% set warning_color= 'bg-danger' %}
{% elif (5 <= prob_inf <= 15) %} {% set warning_color = 'bg-warning' %} {% elif (2 <= prob_inf <= 10) %} {% set warning_color = 'bg-warning' %}
{% elif (prob_inf < 5) %} {% set warning_color = 'bg-success' %} {% elif (prob_inf < 2) %} {% set warning_color = 'bg-success' %}
{% endif %} {% endif %}
<div class="intro-banner-vdo-play-btn {{warning_color}} m-auto d-flex align-items-center justify-content-center"> <div class="intro-banner-vdo-play-btn {{warning_color}} m-auto d-flex align-items-center justify-content-center">
@ -23,25 +23,25 @@
{% block report_summary %} {% block report_summary %}
<div class="flex-row align-self-center"> <div class="flex-row align-self-center">
{% if ((prob_inf > 15) or (expected_new_cases >= 1)) %} {% if ((prob_inf > 10) or (expected_new_cases >= 1)) %}
<div class="alert alert-danger mb-0" role="alert"> <div class="alert alert-danger mb-0" role="alert">
<strong>Not Acceptable:</strong> <strong>Not Acceptable:</strong>
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> and the <b>expected number of new cases is {{ expected_new_cases | float_format }}</b>*. 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> and the <b>expected number of new cases is {{ expected_new_cases | float_format }}</b>*.
</div> </div>
{% elif 5 <= prob_inf <= 15 %} {% elif 2 <= prob_inf <= 10 %}
<div class="alert alert-warning mb-0" role="alert"> <div class="alert alert-warning mb-0" role="alert">
<strong>Attention:</strong> <strong>Attention:</strong>
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> and the <b>expected number of new cases is {{ expected_new_cases | float_format }}</b>*. 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> and the <b>expected number of new cases is {{ expected_new_cases | float_format }}</b>*.
</div> </div>
{% elif prob_inf < 5 %} {% elif prob_inf < 2 %}
<div class="alert alert-success mb-0" role="alert"> <div class="alert alert-success mb-0" role="alert">
<strong>Acceptable:</strong> <strong>Acceptable:</strong>
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> and the <b>expected number of new cases is {{ expected_new_cases | float_format }}</b>*. 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> and the <b>expected number of new cases is {{ expected_new_cases | float_format }}</b>*.
</div> </div>
{% endif %} {% endif %}
{% if (prob_inf > 5) %} {% if (prob_inf > 2) %}
<br> <br>
{% if scale_warning.level == "green-1" %} {% if scale_warning.level == "green-1" %}
<div class="alert alert-dark mb-0" role="alert" style="height:fit-content"> <div class="alert alert-dark mb-0" role="alert" style="height:fit-content">
@ -67,13 +67,13 @@
{% endblock report_summary %} {% endblock report_summary %}
{% block report_summary_footnote %} {% block report_summary_footnote %}
{% if ((prob_inf > 15) or (expected_new_cases >= 1)) %} {% if ((prob_inf > 10) or (expected_new_cases >= 1)) %}
This exceeds the authorised risk threshold or number of expected new cases. This exceeds the authorised risk threshold or number of expected new cases.
The risk level must be reduced before this activity can be undertaken. The risk level must be reduced before this activity can be undertaken.
{% elif (5 <= prob_inf <= 15) %} {% elif (2 <= prob_inf <= 10) %}
This activity has an elevated level of risk, ALARA principles must be applied to minimise the level of risk before undertaking the activity. This activity has an elevated level of risk, ALARA principles must be applied to minimise the level of risk before undertaking the activity.
See the footnotes for more details on the ALARA principles. See the footnotes for more details on the ALARA principles.
{% elif (prob_inf < 5) %} {% elif (prob_inf < 2) %}
This level of risk is within acceptable parameters, no further actions are required. This level of risk is within acceptable parameters, no further actions are required.
{% endif %} {% endif %}
{% endblock report_summary_footnote %} {% endblock report_summary_footnote %}