diff --git a/cara/apps/calculator/templates/report.html.j2 b/cara/apps/calculator/templates/report.html.j2 index cb9628ae..2b94d3e7 100644 --- a/cara/apps/calculator/templates/report.html.j2 +++ b/cara/apps/calculator/templates/report.html.j2 @@ -24,7 +24,7 @@ The results of this simulation are colour coded according to the risk values authorized at CERN (approved in December 2020):
Results:
15 %}
+{% if ((prob_inf > 15) or (expected_new_cases >= 1)) %}
class="red_bkg">Not Acceptable:
{% elif 5 <= prob_inf <= 15 %}
class="yellow_bkg"> Attention:
@@ -215,8 +215,8 @@
In this scenario, the estimated probability of one exposed occupant getting infected P(i) is {{ prob_inf | non_zero_percentage }} and the expected number of new cases is {{ expected_new_cases | float_format }}.
-{% if (prob_inf > 15) %}
- This exceeds the authorised risk threshold.
+{% if ((prob_inf > 15) or (expected_new_cases >= 1)) %}
+ This exceeds the authorised risk threshold or number of expected new cases.
The risk level must be reduced before this activity can be undertaken.
{% elif (5 <= prob_inf <= 15) %}
This activity has an elevated level of risk, ALARA principles must be applied to minimise the level of risk before undertaking the activity.
@@ -264,7 +264,7 @@ In this scenario, the estimated probability of one exposed occupant getting infe
{% for scenario_name, scenario_stats in alternative_scenarios.stats.items() %}
- {%if ( scenario_stats.probability_of_infection > 15) %}
+ {%if (( scenario_stats.probability_of_infection > 15) or (scenario_stats.expected_new_cases >= 1)) %}
{% elif (5 <= scenario_stats.probability_of_infection <= 15) %}