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

Merge branch 'fix/form-validation' into 'master'

Browse source 
Validate the lunch start and ends in calculator

See merge request cara/cara!48
This commit is contained in:
Philip James Elson 2020-11-06 16:11:46 +00:00
commit 227c9c26c4
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -50,6 +50,10 @@ class FormData:
if not form_data.get(name, ''):
form_data[name] = 'not-applicable'
for name in ['lunch_start', 'lunch_finish']:
if not form_data.get(name, ''):
form_data[name] = '00:00'
validation_tuples = [('activity_type', ACTIVITY_TYPES),
('event_type', EVENT_TYPES),
('mechanical_ventilation_type', MECHANICAL_VENTILATION_TYPES),
@ -148,6 +152,8 @@ class FormData:
return ventilation
def coffee_break_times(self) -> typing.Tuple[typing.Tuple[int, int]]:
if not self.coffee_breaks:
return ()
coffee_period = (self.activity_finish - self.activity_start) // self.coffee_breaks
coffee_times = []
for minute in range(self.activity_start, self.activity_finish, coffee_period):