pingu_98/cara
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge request fixes: commas and different location for the new template code

Browse source
This commit is contained in:
Luis Aleixo 2021-07-08 12:55:32 +02:00
parent 67e766dec2
commit 6149e5a7e4
3 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cara/apps/calculator/report_generator.py
View file

@ -342,7 +342,7 @@ class ReportGenerator:
context = {
'model': model,
'form': form,
'creation_date': time
'creation_date': time,
}
context.update(calculate_report_data(model))

13
cara/apps/calculator/templates/base/calculator.report.html.j2
View file

@ -212,19 +212,8 @@
<p class="data_text">
{% block report_summary %}
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><a href="#section1">[*]</a> and the <b>expected number of new cases is {{ expected_new_cases | float_format }}</b>.
{% if (prob_inf > 5) %}
<div class="flex" style="width:60%">
<img class="warning_image_png" src="{{ calculator_prefix }}{{ scale_warning.display_png}}">
<div class="alert alert-dark warning_text" role="alert">
{{scale_warning.display_text}}
</div>
</div>
{% endif %}
<p id="section1">[*] The results are based on the parameters and assumptions published in the CERN Open Report <a href="https://cds.cern.ch/record/2756083"> CERN-OPEN-2021-004</a></p>
{% endblock report_summary %}
<p id="section1">[*] The results are based on the parameters and assumptions published in the CERN Open Report <a href="https://cds.cern.ch/record/2756083"> CERN-OPEN-2021-004</a></p>
</p>
<img id="scenario_concentration_plot" src="{{ scenario_plot_src }}">

10
cara/apps/calculator/themes/cern/templates/calculator.report.html.j2
View file

@ -26,6 +26,16 @@
{{ super() }}
{% if (prob_inf > 5) %}
<div class="flex" style="width:60%">
<img class="warning_image_png" src="{{ calculator_prefix }}{{ scale_warning.display_png}}">
<div class="alert alert-dark warning_text" role="alert">
{{scale_warning.display_text}}
</div>
</div>
{% 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.