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

Merge branch 'feature/calculator-not-applicable' into 'master'

Browse source 
Make the data from the form optional to avoid some of the common failures we're seeing.

See merge request cara/cara!47
This commit is contained in:
Philip James Elson 2020-11-06 16:00:18 +00:00
commit f9f1ebc7b2
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cara/apps/calculator/model_generator.py
View file

@ -44,6 +44,12 @@ class FormData:
@classmethod
def from_dict(cls, form_data: typing.Dict) -> "FormData":
valid_na_values = ['windows_open', 'ventilation_type', 'mechanical_ventilation_type']
for name in valid_na_values:
if not form_data.get(name, ''):
form_data[name] = 'not-applicable'
validation_tuples = [('activity_type', ACTIVITY_TYPES),
('event_type', EVENT_TYPES),
('mechanical_ventilation_type', MECHANICAL_VENTILATION_TYPES),
@ -295,11 +301,11 @@ def baseline_raw_form_data():
ACTIVITY_TYPES = {'office', 'training', 'workshop'}
EVENT_TYPES = {'single_event', 'recurrent_event'}
MECHANICAL_VENTILATION_TYPES = {'air_changes', 'air_supply', ''}
MECHANICAL_VENTILATION_TYPES = {'air_changes', 'air_supply', 'not-applicable'}
MASK_WEARING = {'continuous', 'removed'}
VENTILATION_TYPES = {'natural', 'mechanical', ''}
VENTILATION_TYPES = {'natural', 'mechanical', 'not-applicable'}
VOLUME_TYPES = {'room_volume', 'room_dimensions'}
WINDOWS_OPEN = {'always', 'interval', 'breaks'}
WINDOWS_OPEN = {'always', 'interval', 'breaks', 'not-applicable'}
def time_string_to_minutes(time: str) -> int: