steve
/
mybuddy
mirror of https://github.com/snachodog/mybuddy.git
1
0
Fork 0
Code Issues 3 Packages Projects 1 Releases Wiki Activity

Include child when setting defaults from timer

This commit is contained in:
Christopher C. Wells 2020-01-28 22:51:16 -08:00 committed by Christopher Charbonneau Wells
parent eb9e2f3927
commit b31d9194d9
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
core/forms.py
View File

@ -17,19 +17,21 @@ def set_default_child(kwargs):
return kwargs return kwargs
# Uses a timer to set the default start and end date and updates the timer. # Sets default values (start/end date, child) from a timer.
def set_default_duration(kwargs): def set_defaults_from_timer(kwargs):
instance = kwargs.get('instance', None) timer = kwargs.get('instance', None)
timer_id = kwargs.get('timer', None) timer_id = kwargs.get('timer', None)
if not kwargs.get('initial'): if not kwargs.get('initial'):
kwargs.update(initial={}) kwargs.update(initial={})
if not instance and timer_id: if not timer and timer_id:
instance = models.Timer.objects.get(id=timer_id) timer = models.Timer.objects.get(id=timer_id)
kwargs['initial'].update({ kwargs['initial'].update({
'timer': instance, 'timer': timer,
'start': instance.start, 'start': timer.start,
'end': instance.end or timezone.now() 'end': timer.end or timezone.now()
}) })
if timer.child:
kwargs['initial'].update({'child': timer.child})
try: try:
kwargs.pop('timer') kwargs.pop('timer')
except KeyError: except KeyError:
@ -120,9 +122,9 @@ class FeedingForm(forms.ModelForm):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
kwargs = set_default_child(kwargs) kwargs = set_default_child(kwargs)
kwargs = set_default_feeding_type(kwargs)
self.timer_id = kwargs.get('timer', None) self.timer_id = kwargs.get('timer', None)
kwargs = set_default_duration(kwargs) kwargs = set_defaults_from_timer(kwargs)
kwargs = set_default_feeding_type(kwargs)
super(FeedingForm, self).__init__(*args, **kwargs) super(FeedingForm, self).__init__(*args, **kwargs)
def save(self, commit=True): def save(self, commit=True):
@ -162,7 +164,7 @@ class SleepForm(forms.ModelForm):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
kwargs = set_default_child(kwargs) kwargs = set_default_child(kwargs)
self.timer_id = kwargs.get('timer', None) self.timer_id = kwargs.get('timer', None)
kwargs = set_default_duration(kwargs) kwargs = set_defaults_from_timer(kwargs)
super(SleepForm, self).__init__(*args, **kwargs) super(SleepForm, self).__init__(*args, **kwargs)
def save(self, commit=True): def save(self, commit=True):
@ -231,7 +233,7 @@ class TummyTimeForm(forms.ModelForm):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
kwargs = set_default_child(kwargs) kwargs = set_default_child(kwargs)
self.timer_id = kwargs.get('timer', None) self.timer_id = kwargs.get('timer', None)
kwargs = set_default_duration(kwargs) kwargs = set_defaults_from_timer(kwargs)
super(TummyTimeForm, self).__init__(*args, **kwargs) super(TummyTimeForm, self).__init__(*args, **kwargs)
def save(self, commit=True): def save(self, commit=True):