From 75aa7dbd0fbefcdb324e4358b41cb939baac90c3 Mon Sep 17 00:00:00 2001 From: Luis Aleixo Date: Tue, 24 Jan 2023 16:08:41 +0100 Subject: [PATCH] fixed missing activity type --- caimira/apps/calculator/model_generator.py | 4 ++-- .../apps/templates/base/calculator.report.html.j2 | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/caimira/apps/calculator/model_generator.py b/caimira/apps/calculator/model_generator.py index c2948b49..fa1e0441 100644 --- a/caimira/apps/calculator/model_generator.py +++ b/caimira/apps/calculator/model_generator.py @@ -958,8 +958,8 @@ 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', - 'household-day', 'household-night', 'primary-school', 'secondary-school', 'university', 'restaurant', 'precise', + 'office', 'smallmeeting', 'largemeeting', 'callcentre', 'controlroom-day', 'controlroom-night', 'library', 'lab', 'workshop', 'training', + 'training_attendee', 'gym', 'household-day', 'household-night', 'primary-school', 'secondary-school', 'university', 'restaurant', 'precise', } MECHANICAL_VENTILATION_TYPES = {'mech_type_air_changes', 'mech_type_air_supply', 'not-applicable'} MASK_TYPES = {'Type I', 'FFP2', 'Cloth'} diff --git a/caimira/apps/templates/base/calculator.report.html.j2 b/caimira/apps/templates/base/calculator.report.html.j2 index 2452128a..e1880458 100644 --- a/caimira/apps/templates/base/calculator.report.html.j2 +++ b/caimira/apps/templates/base/calculator.report.html.j2 @@ -478,23 +478,23 @@ {% 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. + Call Centre - typical office-like scenario with all persons seated, all speaking continuously. {% elif form.activity_type == "controlroom-day" %} - Control Room (Day Shift) = specific control room scenario, all persons seated, all speaking 50% of the time. + Control Room (Day Shift) - specific control room scenario, all persons seated, all speaking 50% of the time. {% elif form.activity_type == "controlroom-night" %} - Control Room (Night Shift) = specific control room scenario with all persons seated, all speaking for 10% of the time. + Control Room (Night Shift) - specific control room scenario with all persons seated, all speaking for 10% of the time. {% elif form.activity_type == "library" %} - Library = Library scenario with all persons seated, breathing and not speaking. + Library - Library scenario with all persons seated, breathing and not speaking. {% elif form.activity_type == "workshop" %} - Workshop = assembly workshop environment, all persons doing moderate physical activity, speaking 50% of the time. + Workshop - assembly workshop environment, all persons doing moderate physical activity, speaking 50% of the time. {% elif form.activity_type == "training" %} 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. + Laboratory - Lab or technical environment, all persons doing light physical activity, speaking 50% of the time. {% elif form.activity_type == "gym" %} - Gym = For comparison only, all persons doing heavy physical exercise, breathing and not speaking. + Gym - For comparison only, all persons doing heavy physical exercise, breathing and not speaking. {% endif %}

{% if form.short_range_option == "short_range_yes" %}