diff --git a/cara/apps/calculator/report_generator.py b/cara/apps/calculator/report_generator.py index 966d5de4..6f377157 100644 --- a/cara/apps/calculator/report_generator.py +++ b/cara/apps/calculator/report_generator.py @@ -342,7 +342,7 @@ class ReportGenerator: context = { 'model': model, 'form': form, - 'creation_date': time + 'creation_date': time, } context.update(calculate_report_data(model)) diff --git a/cara/apps/calculator/templates/base/calculator.report.html.j2 b/cara/apps/calculator/templates/base/calculator.report.html.j2 index 3142b36b..a22372cc 100644 --- a/cara/apps/calculator/templates/base/calculator.report.html.j2 +++ b/cara/apps/calculator/templates/base/calculator.report.html.j2 @@ -212,19 +212,8 @@

{% block report_summary %} Taking into account the uncertainties tied to the model variables, in this scenario, the probability of one exposed occupant getting infected is {{ prob_inf | non_zero_percentage }}[*] and the expected number of new cases is {{ expected_new_cases | float_format }}. - - {% if (prob_inf > 5) %} - -

- - -
- {% endif %} - -

[*] The results are based on the parameters and assumptions published in the CERN Open Report CERN-OPEN-2021-004

{% endblock report_summary %} +

[*] The results are based on the parameters and assumptions published in the CERN Open Report CERN-OPEN-2021-004

diff --git a/cara/apps/calculator/themes/cern/templates/calculator.report.html.j2 b/cara/apps/calculator/themes/cern/templates/calculator.report.html.j2 index 85d8860b..3c088547 100644 --- a/cara/apps/calculator/themes/cern/templates/calculator.report.html.j2 +++ b/cara/apps/calculator/themes/cern/templates/calculator.report.html.j2 @@ -26,6 +26,16 @@ {{ super() }} +{% if (prob_inf > 5) %} + +
+ + +
+{% endif %} + {% 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.