CERN Covid Scale icons update; position relative with flex layout
This commit is contained in:
parent
b62f5a989d
commit
fac63cf4c0
8 changed files with 26 additions and 7 deletions
|
|
@ -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 <b>Green - 1</b>, which means the incidence rate in the local community is <b>{incidence_rate}</b>. 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 <b>Yellow - 2</b>, which means the incidence rate in the local community is <b>{incidence_rate}</b>. 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 <b>{onsite_access}</b>. 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 <b>Orange - 3</b>, which means the incidence rate in the local community is <b>{incidence_rate}</b>. 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 <b>{onsite_access}</b>. 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 <b>Red - 4</b>, which means the incidence rate in the local community is <b>{incidence_rate}</b>. 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 <b>{onsite_access}</b>. Please reduce the value below the threshold of <b>{threshold}</b>.'
|
||||
}
|
||||
return scale_level
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 6.8 KiB |
BIN
cara/apps/calculator/static/images/warning_scale/Level1.png
Normal file
BIN
cara/apps/calculator/static/images/warning_scale/Level1.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 8.4 KiB |
BIN
cara/apps/calculator/static/images/warning_scale/Level2.png
Normal file
BIN
cara/apps/calculator/static/images/warning_scale/Level2.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 8.5 KiB |
BIN
cara/apps/calculator/static/images/warning_scale/Level3.png
Normal file
BIN
cara/apps/calculator/static/images/warning_scale/Level3.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 8.5 KiB |
BIN
cara/apps/calculator/static/images/warning_scale/Level4.png
Normal file
BIN
cara/apps/calculator/static/images/warning_scale/Level4.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 8.4 KiB |
|
|
@ -215,9 +215,9 @@
|
|||
|
||||
{% if (prob_inf > 5) %}
|
||||
|
||||
<div class="flex_space_between">
|
||||
<img class="alert" src="{{ calculator_prefix }}{{ scale_warning.display_png }}">
|
||||
<div class="alert alert-dark" role="alert" style="width: 50%">
|
||||
<div class="flex">
|
||||
<img class="alert" src="{{ calculator_prefix }}{{ scale_warning.display_png}}" style="padding-top: 0; padding-bottom: 0; padding-left: 2%">
|
||||
<div class="alert alert-dark" role="alert" style="width: 50%; margin-left: 10%">
|
||||
{{scale_warning.display_text}}
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Reference in a new issue