added new activity type conference/training

caimira/apps/calculator/model_generator.py

@@ -492,6 +492,7 @@ class FormData:
             'callcentre': ('Seated', 'Speaking'),
             'library': ('Seated', 'Breathing'),
             'training': ('Standing', 'Speaking'),
+            'training_attendee': ('Seated', 'Breathing'),
             'lab': (
                 'Light activity',
                 #Model 1/2 of time spent speaking in a lab.
@@ -530,6 +531,7 @@ class FormData:
             'callcentre': 'Seated',
             'library': 'Seated',
             'training': 'Seated',
+            'training_attendee': 'Seated',
             'workshop': 'Moderate activity',
             'lab':'Light activity',
             'gym':'Heavy exercise',
@@ -803,7 +805,7 @@ def baseline_raw_form_data() -> typing.Dict[str, typing.Union[str, float]]:
     }
 
 
-ACTIVITY_TYPES = {'office', 'smallmeeting', 'largemeeting', 'training', 'callcentre', 'controlroom-day', 'controlroom-night', 'library', 'workshop', 'lab', 'gym'}
+ACTIVITY_TYPES = {'office', 'smallmeeting', 'largemeeting', 'training', 'training_attendee', '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'}

caimira/apps/templates/base/calculator.form.html.j2

@@ -362,7 +362,8 @@
         <option value="library">Library</option>
         <option value="lab">Laboratory</option>
         <option value="workshop">Workshop</option>
-        <option value="training">Conference/Training</option>
+        <option value="training">Conference/Training (speaker infected)</option>
+        <option value="training_attendee">Conference/Training (attendee infected)</option>
         <option value="gym">Gym</option>
       </select>
     </div>
@@ -645,8 +646,9 @@
     <li>Library = all seated, no talking, just breathing,</li>
     <li>Laboratory = light physical activity, talking 50% of the time,</li>
     <li>Workshop = moderate physical activity, talking 50% of the time,</li>
-    <li>Conference/Training = speaker/trainer standing and talking, rest seated and talking quietly.
+    <li>Conference/Training (speaker infected) = speaker/trainer standing and talking, rest seated and talking quietly.
     Speaker/Trainer assumed infected (worst case scenario),</li>
+    <li>Conference/Training (attendee infected) = someone in the audience is infected, all are seated and breathing.</li>
     <li>Gym = heavy exercise, no talking, just breathing.</li>
   </ul>
   <b>Activity breaks:</b><br>

caimira/apps/templates/base/calculator.report.html.j2

@@ -473,7 +473,9 @@
 							{% elif form.activity_type == "workshop" %}
 							Workshop = assembly workshop environment, all persons doing moderate physical activity, speaking 50% of the time.
 							{% elif form.activity_type == "training" %}
-							Conference/Training – one person (the speaker/trainer) standing, talking, all others seated, talking quietly (whispering). It is assumed the speaker/trainer is the infected person, for the worst case scenario.
+							Conference/Training (speaker infected) – one person (the speaker/trainer) standing, talking, all others seated, talking quietly (whispering). It is assumed the speaker/trainer is the infected person, for the worst case scenario.
+							{% elif form.activity_type == "training_attendee" %}
+							Conference/Training (attendee infected) – the infected person(s) are in the audience. All persons seated and breathing. 
 							{% elif form.activity_type == "lab" %}
 							Laboratory = Lab or technical environment, all persons doing light physical activity, speaking 50% of the time.
 							{% elif form.activity_type == "gym" %}

caimira/apps/templates/base/userguide.html.j2

@@ -143,9 +143,11 @@ For general and recurrent layout simply select the <b>Recurrent exposure</b> opt
 <li><strong>Control Room (night shift)</strong> = All persons seated, all talking 10% of the time. Everyone (exposed and infected occupants) is treated the same in this model.</li>
 <li><strong>Lab</strong> = Based on a typical lab or technical working area, all persons are doing light activity and talking 50% of the time. Everyone (exposed and infected occupants) is treated the same in this model.</li>
 <li><strong>Workshop</strong> = Based on a mechanical assembly workshop or equipment installation scenario, all persons are doing moderate activity and talking 50% of the time. This activity is equally applicable to bicycling, or walking on a gradient, in the LHC tunnels. Everyone (exposed and infected occupants) is treated the same in this model.</li>
-<li><strong>Conference/Training</strong> = Based on a typical conference/training course scenario.
+<li><strong>Conference/Training (speaker infected)</strong> = Based on a typical conference/training course scenario.
 One individual (the speaker/trainer) is standing and talking, with all other individuals seated and talking quietly (whispering).
 In this case it is assumed that the infected person is the speaker/trainer, because this is the worst case in terms of viral shedding.</li>
+<li><strong>Conference/Training (attendee infected)</strong> = All individuals seated and breathing.
+In this case it is assumed that the infected person is not the speaker/trainer.</li>
 <li><strong>Gym</strong> = All persons are doing heavy exercise and breathing (not talking). Everyone (exposed and infected occupants) is treated the same in this model.</li>
 </ul>
 <br><h3>Timings</h3>
@@ -196,7 +198,7 @@ If not, then you can input separate breaks. This is particularly different when
 <p>The model allows for a simulation with either a continuous wearing of face masks throughout the duration of the event, or have the removed at all times - i.e. all occupants (infected and exposed alike) wear or not masks for the duration of the simulation. 
 Please bear in mind the user inputs shall be aligned with the current applicable public health &amp; safety instructions. 
 Please check what are the applicable rules, before deciding which assumptions are used for the simulation.</p>
-<p>If you have selected the Conference/Training activity type, this equates to the speakr/trainer and all participants either wearing masks throughout the conference/training (Yes), or removing them when seated/standing at their socially distanced positions within the conference/training room (No). 
+<p>If you have selected the Conference/Training activity type, this equates to the speaker/trainer and all participants either wearing masks throughout the conference/training (Yes), or removing them when seated/standing at their socially distanced positions within the conference/training room (No). 
 Please confirm what are the applicable rules, before deciding which assumptions are used for the simulation</p>
 <p>For the time being only the Type 1 surgical and FFP2 masks can be selected.</p>
 <br>