diff --git a/cara/apps/calculator/README.md b/cara/apps/calculator/README.md index 2cd6df60..4fa1f4ad 100644 --- a/cara/apps/calculator/README.md +++ b/cara/apps/calculator/README.md @@ -101,6 +101,8 @@ There are three predefined activities in the tool at present. **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. +**Library** = All persons seated, breathing only (no talking!), all the time. + **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. **Lab** = Based on a typical lab or technical working area, all persons are doing light activity and talking 50% of the time. Everyone (occupants and infected occupants) is treated the same in this model. diff --git a/cara/apps/calculator/model_generator.py b/cara/apps/calculator/model_generator.py index 57f1301a..bdb1cf80 100644 --- a/cara/apps/calculator/model_generator.py +++ b/cara/apps/calculator/model_generator.py @@ -185,6 +185,7 @@ class FormData: {'Talking': 1, 'Breathing': self.total_people - 1} ), 'callcentre': ('Seated', 'Talking'), + 'library': ('Seated', 'Breathing'), 'training': ('Standing', 'Talking'), 'lab': ( 'Light activity', @@ -218,6 +219,7 @@ class FormData: 'office': 'Seated', 'meeting': 'Seated', 'callcentre': 'Seated', + 'library': 'Seated', 'training': 'Seated', 'workshop': 'Moderate activity', 'lab':'Light activity', @@ -398,7 +400,7 @@ def baseline_raw_form_data(): } -ACTIVITY_TYPES = {'office', 'meeting', 'training', 'callcentre', 'workshop', 'lab', 'gym'} +ACTIVITY_TYPES = {'office', 'meeting', 'training', 'callcentre', 'library', 'workshop', 'lab', 'gym'} 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 700de25f..aa4bd74c 100644 --- a/cara/apps/calculator/templates/calculator.form.html.j2 +++ b/cara/apps/calculator/templates/calculator.form.html.j2 @@ -22,7 +22,7 @@ {{ MODEL_VERSION }} Please send feedback to CARA-dev@cern.ch
- +

CARA - COVID Airborne Risk Assessment calculator

@@ -45,12 +45,12 @@ ?
-    +   
-    +   
-          +         

@@ -69,10 +69,10 @@ @@ -128,6 +128,7 @@ + @@ -224,6 +225,7 @@
  • Office = Typical office scenario with all persons seated, in conversation (talking 33% of the time, otherwise breathing normally).
  • Meeting = Typical meeting scenario with all persons seated, in conversation (talking time is shared equally between all persons).
  • Call Centre = A conservative assumption for office spaces, assumes all occupants are seated and talking continuously.
  • +
  • Library = assumes all occupants are seated, breathing and not talking.
  • Laboratory = Typical lab scenario with all persons doing light physical activity and talking 50% of the time.
  • Workshop = Typical mechanical assembly workshop or equipment installation scenario with all persons doing moderate activity and talking 50% of the time.
  • Training = Training course scenario. One person (Trainer) standing, talking, all others seated, talking quietly (whispering). It is assumed the Trainer is the infected person, for the worst case scenario.
  • diff --git a/cara/apps/calculator/templates/report.html.j2 b/cara/apps/calculator/templates/report.html.j2 index 02b2b4b3..451e60f2 100644 --- a/cara/apps/calculator/templates/report.html.j2 +++ b/cara/apps/calculator/templates/report.html.j2 @@ -13,7 +13,7 @@
    - +

    Report

    @@ -77,8 +77,10 @@ {% 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" %} + Call Centre = typical office-like scenario with all persons seated, all talking continuously. + {% elif form.activity_type == "library" %} + Library = Library scenario with all persons seated, breathing and not talking. + {% elif form.activity_type == "workshop" %} Workshop = assembly workshop environment, all persons doing moderate physical activity, 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.