Modified activity parameters and updated calculator scenarios

cara/apps/calculator/README.md

@@ -103,7 +103,7 @@ There are three predefined activities in the tool at present.
 
 **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.
 
-**Workshop** = Based on a mechanical assembly workshop, all persons are doing light exercise (standing, moving around, using tools) and talking. Everyone (occupants and infected occupants) is treated the same in this model.
+**Workshop** = Based on a mechanical assembly workshop, all persons are standing and talking 50% of the time. Everyone (occupants and infected occupants) is treated the same in this model.
 
 **Training** = Based on a typical training course scenario.
 One individual (the trainer) is doing light exercise (standing) and talking, with all other individuals seated and talking quietly (whispering).

cara/apps/calculator/model_generator.py

@@ -185,8 +185,11 @@ class FormData:
                 {'Talking': 1, 'Breathing': self.total_people - 1}
             ),
             'callcentre': ('Seated', 'Talking'),
-            'training': ('Light exercise', 'Talking'),
-            'workshop': ('Light exercise', 'Talking'),
+            'training': ('Standing', 'Talking'),
+            'workshop': (
+                'Standing',
+                #Model 1/2 of time spent talking in a workshop.
+                {'Talking': 1, 'Breathing': 1})
         }
 
         [activity_defn, expiration_defn] = scenario_activity_and_expiration[self.activity_type]
@@ -210,8 +213,8 @@ class FormData:
             'office': 'Seated',
             'meeting': 'Seated',
             'callcentre': 'Seated',
-            'training': 'Light exercise',
-            'workshop': 'Light exercise',
+            'training': 'Seated',
+            'workshop': 'Standing',
         }
 
         activity_defn = scenario_activity[self.activity_type]

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

@@ -196,7 +196,7 @@
   <b>Ventilation data:</b> <br>
   <ul>
     <li>Mechanical ventilation = check the rates with a specialist.</li>
-    <li>Natural ventilation = the window opening distance is between the fixed frame and movable part when open.</li> 
+    <li>Natural ventilation = the window opening distance is between the fixed frame and movable part when open.</li>
     <li>HEPA filtration = the air flow of the device. The following values are based on the different fan velocities of a specific commercial device proposed by the HSE Unit:</li>
     <ul>
         <li>Level 6 (max) = 430 m^3/h (noisy)</li>
@@ -209,8 +209,8 @@
   The type of activity that includes both the infected and exposed persons:
   <ul>
     <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>Meeting = typical scenario all persons seated, in conversation (talking time is shared equally between all persons).</li>
+    <li>Workshop = assembly workshop environment, all persons standing, talking (50% of the time spent 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>
   </ul>

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

@@ -70,13 +70,13 @@
 		<li><p class="data_text">
 		Activity type:
 		{% if form.activity_type == "office" %}
-		Office – typical scenario with all persons seated, talking occasionally.
+		Office – typical scenario with all persons seated, talking occasionally (talking assumed for 1/3rd of the time).
 		{% 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" %}
-		Workshop = assembly workshop environment, all persons doing light exercise, talking.
+		Workshop = assembly workshop environment, all persons standing, talking 50% of the time.
 		{% elif form.activity_type == "training" %}
 		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.
 		{% endif %}

cara/models.py

@@ -390,8 +390,8 @@ class Activity:
 
 
 Activity.types = {
-    'Resting': Activity(0.49, 0.49),
-    'Seated': Activity(0.54, 0.54),
+    'Seated': Activity(0.51, 0.51),
+    'Standing': Activity(0.57, 0.57),
     'Light exercise': Activity(1.38, 1.38),
     'Moderate exercise': Activity(2.35, 2.35),
     'Heavy exercise': Activity(3.30, 3.30),