diff --git a/cara/apps/calculator/static/css/form.css b/cara/apps/calculator/static/css/form.css index 294badd0..7353f6bd 100644 --- a/cara/apps/calculator/static/css/form.css +++ b/cara/apps/calculator/static/css/form.css @@ -77,8 +77,8 @@ border-style: solid; border-width: 5px 5px 0px 5px; border-color: rgba(55, 64, 70, 0.9) transparent transparent transparent; - transition-duration: 0s; /* If the mouse leaves the element, - the transition effects for the + transition-duration: 0s; /* If the mouse leaves the element, + the transition effects for the tooltip arrow are "turned off" */ transform-origin: top; /* Orientation setting for the slide-down effect */ diff --git a/cara/apps/calculator/static/css/report.css b/cara/apps/calculator/static/css/report.css index 5967818d..694f5639 100644 --- a/cara/apps/calculator/static/css/report.css +++ b/cara/apps/calculator/static/css/report.css @@ -50,4 +50,22 @@ p.disclaimer { p.notes { font-size: 10pt; +} + +.red_bkg { + color: #000000; + background-color: #CD5C5C; + text-decoration: none; +} + +.yellow_bkg { + color: #000000; + background-color: #FFFF00; + text-decoration: none; +} + +.green_bkg { + color: #000000; + background-color: #90EE90; + text-decoration: none; } \ No newline at end of file diff --git a/cara/apps/calculator/templates/report.html.j2 b/cara/apps/calculator/templates/report.html.j2 index 29f3a28e..70b4922b 100644 --- a/cara/apps/calculator/templates/report.html.j2 +++ b/cara/apps/calculator/templates/report.html.j2 @@ -20,7 +20,15 @@
Created {{ creation_date }} using model version {{ form.model_version }}
Applicable rules:
- Please ensure that this scenario conforms to current CERN HSE rules (minimum ventilation requirements, mask wearing and the maximum number of people permitted in a space).
Simulation:
Simulation Name: {{ form.simulation_name }}
Room Number: {{ form.room_number }}
@@ -61,9 +69,9 @@ Sliding / Side-Hung {% endif %}Opening distance: {{ form.opening_distance }} m
Windows open: +
Windows open: {% if form.windows_open == "interval" %} - Periodically for {{ form.windows_duration | readable_minutes}} + Periodically for {{ form.windows_duration | readable_minutes}} every {{ form.windows_frequency | readable_minutes}} {% elif form.windows_open == "always" %} Permanently @@ -156,9 +164,27 @@
Results:
- In this scenario, the estimated probability of one exposed occupant getting infected P(i) is {{ prob_inf | int_format }}% - and the expected number of new cases is {{ expected_new_cases | float_format }}. -
+ 15 %} + class="red_bkg">Not Acceptable: +{% elif 5 <= prob_inf <= 15 %} + class="yellow_bkg"> Attention: +{% elif prob_inf < 5 %} + class="green_bkg">Acceptable: +{% endif %} + + +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. + 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. + See the footnotes for more details on the ALARA principles. +{% elif (prob_inf < 5) %} + This level of risk is within acceptable parameters, no further actions are required. +{% endif %}
Exposure graph:
Alternative scenarios:
-
| Scenario | @@ -199,9 +225,15 @@||
|---|---|---|
| {{ scenario_name }} | -{{ scenario_stats.probability_of_infection | non_zero_percentage }} | + {%if ( scenario_stats.probability_of_infection > 15) %} +|
| {{ scenario_name }} | +{{ scenario_stats.probability_of_infection | non_zero_percentage }} | {{ scenario_stats.expected_new_cases | float_format }} |