From 0e0a5488f54d7b1dcf2b620d9312bf5b4b16a1ab Mon Sep 17 00:00:00 2001
From: Andre Henriques <andre.henriques@cern.ch>
Date: Wed, 9 Mar 2022 13:51:10 +0100
Subject: [PATCH] Add new 'Large meeting' activity

---
 cara/apps/calculator/model_generator.py            | 12 +++++++++---
 cara/apps/templates/base/calculator.form.html.j2   |  6 ++++--
 cara/apps/templates/base/calculator.report.html.j2 |  6 ++++--
 cara/apps/templates/base/userguide.html.j2         |  3 ++-
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/cara/apps/calculator/model_generator.py b/cara/apps/calculator/model_generator.py
index 595094bc..cccce020 100644
--- a/cara/apps/calculator/model_generator.py
+++ b/cara/apps/calculator/model_generator.py
@@ -387,11 +387,16 @@ class FormData:
                 # Nightshift control room, 10% speaking.
                 {'Speaking': 1, 'Breathing': 9}
             ),
-            'meeting': (
+            'smallmeeting': (
                 'Seated',
                 # Conversation of N people is approximately 1/N% of the time speaking.
                 {'Speaking': 1, 'Breathing': self.total_people - 1}
             ),
+            'largemeeting': (
+                'Standing',
+                # each infected person spends 1/3 of time speaking.
+                {'Speaking': 1, 'Breathing': 2}
+            ),
             'callcentre': ('Seated', 'Speaking'),
             'library': ('Seated', 'Breathing'),
             'training': ('Standing', 'Speaking'),
@@ -428,7 +433,8 @@ class FormData:
             'office': 'Seated',
             'controlroom-day': 'Seated',
             'controlroom-night': 'Seated',
-            'meeting': 'Seated',
+            'smallmeeting': 'Seated',
+            'largemeeting': 'Seated',
             'callcentre': 'Seated',
             'library': 'Seated',
             'training': 'Seated',
@@ -695,7 +701,7 @@ def baseline_raw_form_data():
     }
 
 
-ACTIVITY_TYPES = {'office', 'meeting', 'training', 'callcentre', 'controlroom-day', 'controlroom-night', 'library', 'workshop', 'lab', 'gym'}
+ACTIVITY_TYPES = {'office', 'smallmeeting', 'largemeeting', 'training', 'callcentre', 'controlroom-day', 'controlroom-night', 'library', 'workshop', 'lab', 'gym'}
 MECHANICAL_VENTILATION_TYPES = {'mech_type_air_changes', 'mech_type_air_supply', 'not-applicable'}
 MASK_TYPES = {'Type I', 'FFP2'}
 MASK_WEARING_OPTIONS = {'mask_on', 'mask_off'}
diff --git a/cara/apps/templates/base/calculator.form.html.j2 b/cara/apps/templates/base/calculator.form.html.j2
index 81cdae06..03986daa 100644
--- a/cara/apps/templates/base/calculator.form.html.j2
+++ b/cara/apps/templates/base/calculator.form.html.j2
@@ -317,7 +317,8 @@
     <div class="col-sm-6">
       <select id="activity_type" name="activity_type" class="form-control">
         <option value="office">Office</option>
-        <option value="meeting">Meeting</option>
+        <option value="smallmeeting">Small meeting (<10 occ.)</option>
+        <option value="largemeeting">Large meeting (>=10 occ.)</option>
         <option value="callcentre">Call Centre</option>
         <option value="controlroom-day">Control Room - Day shift</option>
         <option value="controlroom-night">Control Room - Night shift</option>
@@ -542,7 +543,8 @@
   The type of activity applies to both the infected and exposed persons:
   <ul>
     <li>Office = all seated, talking 33% of the time,</li>
-    <li>Meeting = all seated, talking time shared between all persons,</li>
+    <li>Small meeting (< 10 occ.) = all seated, talking time shared between all persons,</li>
+    <li>Large meeting (>= 10 occ.) = speaker is standing and speaking 33% of the time, other occupants are seated,</li>							
     <li>Call Centre = all seated, continuous talking,</li>
     <li>Control Room (day shift) = all seated, talking 50% of the time,</li>
     <li>Control Room (night shift) = all seated, talking 10% of the time,</li>
diff --git a/cara/apps/templates/base/calculator.report.html.j2 b/cara/apps/templates/base/calculator.report.html.j2
index b113710b..5afae2cf 100644
--- a/cara/apps/templates/base/calculator.report.html.j2
+++ b/cara/apps/templates/base/calculator.report.html.j2
@@ -289,8 +289,10 @@
 							Activity type:
 							{% if form.activity_type == "office" %}
 							Office – typical scenario with all persons seated, speaking occasionally (speaking assumed for 1/3rd of the time).
-							{% elif form.activity_type == "meeting" %}
-							Meeting – typical scenario with all persons seated, one person speaking at a time.
+							{% elif form.activity_type == "smallmeeting" %}
+							Small meeting – typical scenario with all persons seated, one person speaking at a time.
+							{% elif form.activity_type == "largemeeting" %}
+							Large meeting – infected occupant(s) is standing and speaking 1/3rd of the time, while the other occupants are seated.							
 							{% elif form.activity_type == "callcentre" %}
 							Call Centre = typical office-like scenario with all persons seated, all speaking continuously.
 							{% elif form.activity_type == "controlroom-day" %}
diff --git a/cara/apps/templates/base/userguide.html.j2 b/cara/apps/templates/base/userguide.html.j2
index 9de64992..8685fbc0 100644
--- a/cara/apps/templates/base/userguide.html.j2
+++ b/cara/apps/templates/base/userguide.html.j2
@@ -154,7 +154,8 @@ Within the number of people occupying the space, you should specify how many are
 <p>There are a few predefined activities in the tool at present.</p>
 <ul>
 <li><strong>Office </strong> = All persons seated, talking occasionally (1/3rd of the time, with normal breathing the other 2/3rds of the time). Everyone (exposed and infected occupants) is treated the same in this model.</li>
-<li><strong>Meeting</strong> = All persons seated, having a conversation (approximately each occupant is 1/N % of the time talking, where N is the number of occupants). Everyone (exposed and infected occupants) is treated the same in this model.</li>
+<li><strong>Small meeting</strong> = Less than 10 participants. All persons seated, having a conversation (approximately each occupant is 1/N % of the time talking, where N is the number of occupants). Everyone (exposed and infected occupants) is treated the same in this model.</li>
+<li><strong>Large Meeting</strong> = 10 or more participants. Similar to a seminar with 'speakers and audience'. Infected occupant(s) is standing and speaking 1/3rd of the time, while the other occupants are seated.</li>
 <li><strong>Library</strong> = All persons seated, breathing only (not talking), all the time.</li>
 <li><strong>Call Centre</strong> = All persons seated, all talking simultaneously, all the time. This is a conservative profile, i.e. will show an increased <code>P(i)</code> compared to office/meeting activity. Everyone (exposed and infected occupants) is treated the same in this model.</li>
 <li><strong>Control Room (day shift)</strong> = All persons seated, all talking 50% of the time. This is a conservative profile, i.e. will show an increased <code>P(i)</code> compared to office/meeting activity. Everyone (exposed and infected occupants) is treated the same in this model.</li>