diff --git a/cara/apps/calculator/README.md b/cara/apps/calculator/README.md index 641e3081..77393c1c 100644 --- a/cara/apps/calculator/README.md +++ b/cara/apps/calculator/README.md @@ -97,7 +97,9 @@ As an example, for a shared office with 4 people, where one person is infected, There are three predefined activities in the tool at present. -**Office / Meeting ** = All persons seated, talking occasionally (1/3rd of the time, with normal breathing the other 2/3rds of the time). Everyone (occupants and infected occupants) is treated the same in this model. +**Office ** = All persons seated, talking occasionally (1/3rd of the time, with normal breathing the other 2/3rds of the time). Everyone (occupants and infected occupants) is treated the same in this model. + +**Meeting** = All persons seated, conversation of N people is approximately (1/N% of the time talking). Everyone (occupants and infected occupants) is treated the same in this model. **Call Centre** = All persons seated, all talking simultaneously, all the time. This is a conservative profile (i.e. will show in increased ``P(i)`` compared to office/meeting) if used for office activity. diff --git a/cara/apps/calculator/model_generator.py b/cara/apps/calculator/model_generator.py index 3dd6a5e4..9ee7bd20 100644 --- a/cara/apps/calculator/model_generator.py +++ b/cara/apps/calculator/model_generator.py @@ -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'} diff --git a/cara/apps/calculator/templates/calculator.form.html.j2 b/cara/apps/calculator/templates/calculator.form.html.j2 index 9fd342bd..495ab3de 100644 --- a/cara/apps/calculator/templates/calculator.form.html.j2 +++ b/cara/apps/calculator/templates/calculator.form.html.j2 @@ -110,7 +110,8 @@