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

Added missing conditions to alternative scenarios and. bug fix

Browse source
This commit is contained in:
Luis Aleixo 2022-06-14 16:16:26 +02:00
parent d0b5e9b2a7
commit e777a71d2a
2 changed files with 10 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
cara/apps/calculator/static/css/report.css
View file

@ -63,24 +63,6 @@ p.notes {
width: 100pt;
}
.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;
}
.icon_button {
border: none;
background: none;
@ -113,9 +95,6 @@ p.notes {
#rules,
#data {
display: contents!important;
.card {
page-break-inside: avoid!important;
break-inside: avoid!important;
}
#link_reproduce_results {
display: none!important;
@ -144,6 +123,10 @@ p.notes {
.pi-box {
max-width: 260px!important;
}
.card {
page-break-inside: avoid!important;
break-inside: avoid!important;
}
#link-results {
display: none;
}

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

@ -135,12 +135,12 @@
</thead>
<tbody>
{% for scenario_name, scenario_stats in alternative_scenarios.stats.items() %}
{%if (( scenario_stats.probability_of_infection > 15) or (scenario_stats.expected_new_cases >= 1)) %}
<tr class="red_bkg">
{% elif (5 <= scenario_stats.probability_of_infection <= 15) %}
<tr class="yellow_bkg">
{% elif (scenario_stats.probability_of_infection < 5) %}
<tr class="green_bkg">
{%if (( scenario_stats.probability_of_infection > 10) or (scenario_stats.expected_new_cases >= 1)) %}
<tr class="alert-danger">
{% elif (2 <= scenario_stats.probability_of_infection <= 10) %}
<tr class="alert-warning">
{% elif (scenario_stats.probability_of_infection < 2) %}
<tr class="alert-success">
{% endif%}
<td> {{ scenario_name }}</td>
<td> {{ scenario_stats.probability_of_infection | non_zero_percentage }}</td>