diff --git a/cara/apps/calculator/report_generator.py b/cara/apps/calculator/report_generator.py index 45dea024..966d5de4 100644 --- a/cara/apps/calculator/report_generator.py +++ b/cara/apps/calculator/report_generator.py @@ -279,22 +279,22 @@ def comparison_report(scenarios: typing.Dict[str, models.ExposureModel]): def get_level_warning(scale_warning, incidence_rate, onsite_access, threshold) -> dict: if scale_warning == 'Green - 1': scale_level = { - 'display_png': 'cara/apps/calculator/static/images/warning_level3.jpeg', + 'display_png': '/static/images/warning_scale/level1.png', 'display_text': f'Note: the current CERN COVID Scale is Green - 1, which means the incidence rate in the local community is {incidence_rate}. Align your risk assessment with the guidance and instructions provided by the HSE Unit.' } elif scale_warning == 'Yellow - 2': scale_level = { - 'display_png': 'cara/apps/calculator/static/images/warning_level3.jpeg', + 'display_png': '/static/images/warning_scale/level2.png', 'display_text': f'Note: the current CERN COVID Scale is Yellow - 2, which means the incidence rate in the local community is {incidence_rate}. There is a reduced chance that asymptomatic or pre-symptomatic infected individuals circulate within the CERN site which, during this stage, corresponds to an average daily on-site access {onsite_access}. See with your supervisor if this scenario is acceptable.' } elif scale_warning == 'Orange - 3': scale_level = { - 'display_png': 'cara/apps/calculator/static/images/warning_level3.jpeg', + 'display_png': '/static/images/warning_scale/level3.png', 'display_text': f'Warning: the current CERN COVID Scale is Orange - 3, which means the incidence rate in the local community is {incidence_rate}. There is a slight chance that asymptomatic or pre-symptomatic infected individuals circulate within the CERN site which, during this stage, corresponds to an average daily on-site access {onsite_access}. See with your supervisor if any additional measures can be applied (ALARA).' } elif scale_warning == 'Red - 4': scale_level = { - 'display_png': '/static/images/warning_level3.jpeg', + 'display_png': '/static/images/warning_scale/level4.png', 'display_text': f'Warning: the current CERN COVID Scale is Red - 4, which means the incidence rate in the local community is {incidence_rate}. There is a strong chance that asymptomatic or pre-symptomatic infected individuals circulate within the CERN site which, during this stage, corresponds to an average daily on-site access {onsite_access}. Please reduce the value below the threshold of {threshold}.' } return scale_level diff --git a/cara/apps/calculator/static/css/report.css b/cara/apps/calculator/static/css/report.css index 094374fa..9d6ed56a 100644 --- a/cara/apps/calculator/static/css/report.css +++ b/cara/apps/calculator/static/css/report.css @@ -70,7 +70,26 @@ p.notes { } /* Flexbox layouts */ +.flex { + display: flex; +} + .flex_space_between { display: flex; justify-content: space-between; } + +.flex_flex_start { + display: flex; + justify-content: flex-start; +} + +.flex_direction_column { + display: flex; + flex-direction: column; +} + +.flex_direction_row { + display: flex; + flex-direction: row; +} \ No newline at end of file diff --git a/cara/apps/calculator/static/images/warning_level3.jpeg b/cara/apps/calculator/static/images/warning_level3.jpeg deleted file mode 100644 index 3c7c6bf2..00000000 Binary files a/cara/apps/calculator/static/images/warning_level3.jpeg and /dev/null differ diff --git a/cara/apps/calculator/static/images/warning_scale/Level1.png b/cara/apps/calculator/static/images/warning_scale/Level1.png new file mode 100644 index 00000000..1942b118 Binary files /dev/null and b/cara/apps/calculator/static/images/warning_scale/Level1.png differ diff --git a/cara/apps/calculator/static/images/warning_scale/Level2.png b/cara/apps/calculator/static/images/warning_scale/Level2.png new file mode 100644 index 00000000..90b927ce Binary files /dev/null and b/cara/apps/calculator/static/images/warning_scale/Level2.png differ diff --git a/cara/apps/calculator/static/images/warning_scale/Level3.png b/cara/apps/calculator/static/images/warning_scale/Level3.png new file mode 100644 index 00000000..0c136985 Binary files /dev/null and b/cara/apps/calculator/static/images/warning_scale/Level3.png differ diff --git a/cara/apps/calculator/static/images/warning_scale/Level4.png b/cara/apps/calculator/static/images/warning_scale/Level4.png new file mode 100644 index 00000000..52c2d415 Binary files /dev/null and b/cara/apps/calculator/static/images/warning_scale/Level4.png differ diff --git a/cara/apps/calculator/templates/base/calculator.report.html.j2 b/cara/apps/calculator/templates/base/calculator.report.html.j2 index 54f4b222..34e127a9 100644 --- a/cara/apps/calculator/templates/base/calculator.report.html.j2 +++ b/cara/apps/calculator/templates/base/calculator.report.html.j2 @@ -215,9 +215,9 @@ {% if (prob_inf > 5) %} -