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

Separate the Meeting/Office profiles.

Browse source
This commit is contained in:
Phil Elson 2020-11-13 16:54:35 +01:00
parent 22c93b05f6
commit 55e406e94b
3 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cara/apps/calculator/model_generator.py
View file

@ -177,7 +177,12 @@ class FormData:
'office': (
'Seated',
# Mostly silent in the office, but 1/3rd of time talking.
{'Talking': 1, 'Breathing': 2}
{'Talking': 1, 'Breathing': 2}
),
'meeting': (
'Seated',
# Conversation of N people is approximately 1/N% of the time talking.
{'Talking': 1, 'Breathing': self.total_people - 1}
),
'callcentre': ('Seated', 'Talking'),
'training': ('Light exercise', 'Talking'),
@ -203,6 +208,7 @@ class FormData:
def exposed_population(self) -> models.Population:
scenario_activity = {
'office': 'Seated',
'meeting': 'Seated',
'callcentre': 'Seated',
'training': 'Light exercise',
'workshop': 'Light exercise',
@ -382,7 +388,7 @@ def baseline_raw_form_data():
}
ACTIVITY_TYPES = {'office', 'training', 'callcentre', 'workshop'}
ACTIVITY_TYPES = {'office', 'meeting', 'training', 'callcentre', 'workshop'}
EVENT_TYPES = {'single_event', 'recurrent_event'}
MECHANICAL_VENTILATION_TYPES = {'air_changes', 'air_supply', 'not-applicable'}
MASK_TYPES = {'Type I', 'FFP2'}

6
cara/apps/calculator/templates/calculator.form.html.j2
View file

@ -110,7 +110,8 @@
<hr width="80%">
Activity type: <select id="activity_type" name="activity_type">
<option value="office">Office/Meeting</option>
<option value="office">Office</option>
<option value="meeting">Meeting</option>
<option value="callcentre">Call Centre</option>
<option value="workshop">Workshop</option>
<option value="training">Training</option>
@ -207,7 +208,8 @@
<b>Activity types:</b><br>
The type of activity that includes both the infected and exposed persons:
<ul>
<li>Office/Meeting = typical scenario all persons seated, in conversation (talking 33% of the time, otherwise breathing normally).</li>
<li>Office = typical scenario all persons seated, in conversation (talking 33% of the time, otherwise breathing normally).</li>
<li>Meeting = typical scenario all persons seated, in conversation.</li>
<li>Workshop = assembly workshop environment, all persons doing light exercise, talking.</li>
<li>Call Centre = A conservative assumption for office spaces, assumes all occupants are seated and talking continuously.</li>
<li>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.</li>

4
cara/apps/calculator/templates/report.html.j2
View file

@ -70,7 +70,9 @@
<li><p class="data_text">
Activity type:
{% if form.activity_type == "office" %}
Office/Meeting – typical scenario with all persons seated, talking occasionally.
Office – typical scenario with all persons seated, talking occasionally.
{% elif form.activity_type == "meeting" %}
Meeting – typical scenario with all persons seated, one person talking at a time.
{% elif form.activity_type == "callcentre" %}
Call Centre = typical office scenario with all persons seated, all talking continuously.
{% elif form.activity_type == "workshop" %}