pingu_98/cara
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'feature/activity_typo' into 'master'

Browse source 
Fixed missing activity type

See merge request caimira/caimira!423
This commit is contained in:
Luis Aleixo 2023-01-24 16:19:09 +01:00
commit 60672e8e6c
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
caimira/apps/calculator/model_generator.py
View file

@ -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'}

14
caimira/apps/templates/base/calculator.report.html.j2
View file

@ -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 %}
</p></li>
{% if form.short_range_option == "short_range_yes" %}