diff --git a/cara/apps/calculator/model_generator.py b/cara/apps/calculator/model_generator.py index ee76f162..d8a7ce9b 100644 --- a/cara/apps/calculator/model_generator.py +++ b/cara/apps/calculator/model_generator.py @@ -408,11 +408,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'), @@ -449,7 +454,8 @@ class FormData: 'office': 'Seated', 'controlroom-day': 'Seated', 'controlroom-night': 'Seated', - 'meeting': 'Seated', + 'smallmeeting': 'Seated', + 'largemeeting': 'Seated', 'callcentre': 'Seated', 'library': 'Seated', 'training': 'Seated', @@ -731,7 +737,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/calculator/report_generator.py b/cara/apps/calculator/report_generator.py index 7b7d6949..a995900d 100644 --- a/cara/apps/calculator/report_generator.py +++ b/cara/apps/calculator/report_generator.py @@ -347,13 +347,6 @@ class ReportGenerator: context['permalink'] = generate_permalink(base_url, self.calculator_prefix, form) context['calculator_prefix'] = self.calculator_prefix - # For further information about these values visit https://gitlab.cern.ch/cara/cara/-/merge_requests/321. - context['scale_warning'] = { - 'level': 'red-4', # 'red-4' - 'orange-3' - 'yellow-2' - 'green-1' - 'risk': 'strong', # 'strong' - 'medium' - 'reduced' - '' - 'onsite_access': '4’000', # '4’000' - '5’000' - '6’500' - '8’000' - 'threshold': '2%' # '2%' - '' - '' - '' - } return context def _template_environment(self) -> jinja2.Environment: diff --git a/cara/apps/static/css/style.css b/cara/apps/static/css/style.css index 93eb34c7..28d28bb4 100644 --- a/cara/apps/static/css/style.css +++ b/cara/apps/static/css/style.css @@ -299,7 +299,7 @@ footer img { #download-pdf, #pdf_qrcode_aref { display: none; } - #cern_level{ + #scale_warning{ height: 15em; margin-top: 1em; } diff --git a/cara/apps/templates/base/calculator.form.html.j2 b/cara/apps/templates/base/calculator.form.html.j2 index 3a84eb74..04ffb455 100644 --- a/cara/apps/templates/base/calculator.form.html.j2 +++ b/cara/apps/templates/base/calculator.form.html.j2 @@ -317,7 +317,8 @@