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

Correct sleep graph duration displays for entries crossing midnight.

This commit is contained in:
Christopher Charbonneau Wells 2017-09-09 11:20:37 -04:00
parent b317c08504
commit fe1b54842d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
reports/graphs.py
View File

@ -59,7 +59,7 @@ def diaperchange_types(child):
def sleep_times(child): def sleep_times(child):
"""Create a graph showing blocked out period of sleep during each day.""" """Create a graph showing blocked out periods of sleep during each day."""
instances = Sleep.objects.filter(child=child).order_by('start') instances = Sleep.objects.filter(child=child).order_by('start')
y_df = pd.DataFrame() y_df = pd.DataFrame()
text_df = pd.DataFrame() text_df = pd.DataFrame()
@ -83,9 +83,9 @@ def sleep_times(child):
text_df, text_df,
df_index, df_index,
adjustment['column'], adjustment['column'],
adjustment['duration'], adjustment['duration'].seconds/60,
'Asleep {} ({} to {})'.format( 'Asleep {} ({} to {})'.format(
duration_string(duration), duration_string(adjustment['duration']),
adjustment['start_time'].strftime('%I:%M %p'), adjustment['start_time'].strftime('%I:%M %p'),
adjustment['end_time'].strftime('%I:%M %p') adjustment['end_time'].strftime('%I:%M %p')
) )
@ -100,7 +100,7 @@ def sleep_times(child):
'column': end_time.date().isoformat(), 'column': end_time.date().isoformat(),
'start_time': adj_start_time, 'start_time': adj_start_time,
'end_time': end_time, 'end_time': end_time,
'duration': (end_time - adj_start_time).seconds/60 'duration': end_time - adj_start_time
} }
# Adjust end_time for the current entry. # Adjust end_time for the current entry.