diff --git a/cara/apps/calculator/static/css/report.css b/cara/apps/calculator/static/css/report.css index 0ad87e49..00070236 100644 --- a/cara/apps/calculator/static/css/report.css +++ b/cara/apps/calculator/static/css/report.css @@ -16,6 +16,10 @@ h1 { padding-bottom: 15pt; } +p.data_italic { + font-style: italic; +} + p.data_title { font-weight: bold; } diff --git a/cara/apps/calculator/templates/report.html.j2 b/cara/apps/calculator/templates/report.html.j2 index 9d8586dc..3dea8cd5 100644 --- a/cara/apps/calculator/templates/report.html.j2 +++ b/cara/apps/calculator/templates/report.html.j2 @@ -43,6 +43,7 @@
Opening distance: {{ opening_distance }}
Windows open: {{ windows_open }}
When using the natural ventilation option, air flows are calculated using averaged hourly temperatures for the Geneva region, based on historical data for the month selected.
{% else %} No {% endif %} @@ -52,8 +53,22 @@Event data:
Number of attendees and infected people: {{ total_people }} in attendance, of whom {{ infected_people }} are infected.
Activity type: {{ activity_type }}
Number of attendees and infected people: {{ total_people }} in attendance, of whom {{ infected_people }} + {% if infected_people == 1 %} + is + {% else %} + are + {% endif %} + infected.
Activity type: + {% if activity_type == "office work" %} + Office work – typical scenario with all persons seated, talking. + {% elif activity_type == "workshop" %} + Workshop = assembly workshop environment, all persons doing light exercise, talking. + {% elif activity_type == "training" %} + Training – one person (the trainer) standing, talking, all others seated, talking quietly (whispering). It is assumed the trainer is the infected person, for the worst case scenario. + {% endif %} +
Start time: {{ activity_start }}    End time: {{ activity_finish }}
Break data:
Lunch break: {{ lunch_option }}
Lunch break: + {% if lunch_option%} + Yes
Coffee breaks: {{ coffee_breaks }} {% if coffee_breaks > 0 %} @@ -92,12 +110,18 @@
Mask wearing:
Masks worn at workstations? {{ mask_wearing }}
Mask type: Type 1 (default, for now)
Masks worn at workstations? + {% if mask_wearing == "removed" %} + No + {% else %} + Yes + {% endif %} +
Mask type: Type 1
Results:
-In this scenario, the estimated probability of one exposed occupant getting infected P(i) is {{ infection_probability }} % and the estimated basic reproduction rate (R0) rate is {{ reproduction_rate }}. This probability estimate is per simulated time period, i.e. if you have simulated a working day, which will be repeated n times per week, the cumulative probability of infection per person is n x P(i).
+
In this scenario, the estimated probability of one exposed occupant getting infected P(i) is {{ infection_probability }} % and the estimated basic reproduction rate (R0) is {{ reproduction_rate }}.
Exposure graph: