diff --git a/cara/apps/calculator/static/css/report.css b/cara/apps/calculator/static/css/report.css index ce2e3790..5c787d35 100644 --- a/cara/apps/calculator/static/css/report.css +++ b/cara/apps/calculator/static/css/report.css @@ -81,6 +81,18 @@ p.notes { margin-left: 5% } +.icon_button { + padding: 0; + border: none; + background: none; +} + +.icon_button:focus { outline:0 !important; } + .nav-tabs .nav-item .nav-link.active { - background-color: #F5F5F6; + font-weight: bold; +} + +.nav-tabs .nav-item .nav-link{ + color: black; } \ No newline at end of file diff --git a/cara/apps/calculator/templates/base/calculator.report.html.j2 b/cara/apps/calculator/templates/base/calculator.report.html.j2 index d48b85d2..94af75a7 100644 --- a/cara/apps/calculator/templates/base/calculator.report.html.j2 +++ b/cara/apps/calculator/templates/base/calculator.report.html.j2 @@ -35,7 +35,7 @@ -
+
@@ -43,51 +43,73 @@ {% endblock report_preamble %} {% block report_results %} -

Results:

-

- {% 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 }}. - {% endblock report_summary %} -

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

-

- - - -

Alternative scenarios:

- - - - {% block report_scenarios_summary_table %} - - - - - - - - - - {% for scenario_name, scenario_stats in alternative_scenarios.stats.items() %} - - - - - - {% endfor %} - -
ScenarioP(I)Expected new cases
{{ scenario_name }} {{ scenario_stats.probability_of_infection | non_zero_percentage }}{{ scenario_stats.expected_new_cases | float_format }}
- {% endblock report_scenarios_summary_table %} - -

Notes for alternative scenarios:
-

    -
  1. This graph shows the concentration of infectious quanta in the air. The filtration of Type I and FFP2 masks, if worn, applies not only to the emission rate but also to the individual exposure (i.e. inhalation). - For this reason, scenarios with different types of mask will show the same concentration on the graph but have different absorbed doses and infection probabilities.
    2. -
  2. If you have selected more sophisticated options, such as HEPA filtration or FFP2 masks, this will be indicated in the plot as the "base scenario", representing the inputs inserted in the form.
    - The other alternative scenarios shown for comparison will not include either HEPA filtration or FFP2 masks.
    3. -
-
-

+
+
Results + +
+
+
+

+ {% 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 }}. + {% endblock report_summary %} +

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

+ +

+
+
+
+
+
Alternative scenarios + +
+
+
+

+ + {% block report_scenarios_summary_table %} + + + + + + + + + + {% for scenario_name, scenario_stats in alternative_scenarios.stats.items() %} + + + + + + {% endfor %} + +
ScenarioP(I)Expected new cases
{{ scenario_name }} {{ scenario_stats.probability_of_infection | non_zero_percentage }}{{ scenario_stats.expected_new_cases | float_format }}
+ {% endblock report_scenarios_summary_table %} + +

Notes for alternative scenarios:
+

    +
  1. This graph shows the concentration of infectious quanta in the air. The filtration of Type I and FFP2 masks, if worn, applies not only to the emission rate but also to the individual exposure (i.e. inhalation). + For this reason, scenarios with different types of mask will show the same concentration on the graph but have different absorbed doses and infection probabilities.
    2. +
  2. If you have selected more sophisticated options, such as HEPA filtration or FFP2 masks, this will be indicated in the plot as the "base scenario", representing the inputs inserted in the form.
    + The other alternative scenarios shown for comparison will not include either HEPA filtration or FFP2 masks.
    3. +
+
+

+

+
+
+
{% endblock report_results %} {% block report_footer %} 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 cd5fbcda..d5b57a7b 100644 --- a/cara/apps/calculator/themes/cern/templates/calculator.report.html.j2 +++ b/cara/apps/calculator/themes/cern/templates/calculator.report.html.j2 @@ -2,29 +2,54 @@ {% block report_preamble %} -

Applicable rules:
- Please ensure that this scenario conforms to current COVID-related Health & Safety requirements, under the applicable COVID Scale and measures in force at the time of the CARA assessment.
- The results of this simulation are colour coded according to the risk values authorized at CERN (approved in December 2020): -

  • Events with a P(i) less than 5% may go ahead without further mitigation measures.
    • -
  • Events with a P(i) between 5% and 15% shall be subject to ALARA principles (see footnote) to minimise the risk before proceeding.
    • -
  • Events with a P(i) exceeding 15% or a number of expected new cases that exceeds 1 may not take place until additional measures are in place and a risk reduction has been performed.
    • -
-

+ +
+
Applicable rules + +
+
+
+

+ Please ensure that this scenario conforms to current COVID-related Health & Safety requirements, under the applicable COVID Scale and measures in force at the time of the CARA assessment.
+ The results of this simulation are colour coded according to the risk values authorized at CERN (approved in December 2020): + +

+ + + +

+
+
+
{% endblock report_preamble %} {% block report_summary %} - 15) or (expected_new_cases >= 1)) %} - class="red_bkg">Not Acceptable: -{% elif 5 <= prob_inf <= 15 %} - class="yellow_bkg"> Attention: -{% elif prob_inf < 5 %} - class="green_bkg">Acceptable: -{% endif %} - -{{ super() }} + 15) or (expected_new_cases >= 1)) %} + > + {% elif 5 <= prob_inf <= 15 %} + >