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

Fix permalunch. Closes #57.

Browse source
This commit is contained in:
Phil Elson 2020-11-06 17:25:31 +01:00
parent 227c9c26c4
commit f10bea7765
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -163,8 +163,11 @@ class FormData:
return tuple(coffee_times)
def present_interval(self) -> models.Interval:
leave_times = [self.lunch_start]
enter_times = [self.lunch_finish]
leave_times = []
enter_times = []
if self.lunch_option:
leave_times.append(self.lunch_start)
enter_times.append(self.lunch_finish)
for coffee_start, coffee_end in self.coffee_break_times():
leave_times.append(coffee_start)
@ -212,12 +215,6 @@ class FormData:
def model_from_form(form: FormData, tmp_raw_form_data) -> models.Model:
d = tmp_raw_form_data
# TODO: This fixup is a problem with the form.html.
d['coffee_breaks'] = 1
d['activity_type'] = 'Training'
d['lunch_start'] = '12:00'
d['lunch_finish'] = '13:00'
# Initializes room with volume either given directly or as product of area and height
if form.volume_type == 'room_volume':
volume = form.room_volume