Merge branch 'feature/office-meeting-split' into 'master'

Separate the Meeting/Office profiles.

See merge request cara/cara!91

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.
 

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'}

cara/apps/calculator/templates/calculator.form.html.j2

@@ -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>

cara/apps/calculator/templates/report.html.j2

@@ -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" %}