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

Change feeding durations to a scatter/line plot with number of feedings included.

This commit is contained in:
Christopher Charbonneau Wells 2017-11-30 11:13:48 -05:00
parent 4272c9b075
commit 0646640ba3
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
reports/graphs/feeding_duration.py
View File

@ -33,35 +33,47 @@ def feeding_duration(instances):
for total in totals: for total in totals:
averages.append(total['sum']/total['count']) averages.append(total['sum']/total['count'])
trace = go.Bar( trace_avg = go.Scatter(
name='Average duration', name='Average duration',
line=dict(shape='spline'),
x=list(totals.values_list('date', flat=True)), x=list(totals.values_list('date', flat=True)),
y=[td.seconds/60 for td in averages], y=[td.seconds/60 for td in averages],
hoverinfo='text', hoverinfo='text',
textposition='outside', textposition='outside',
text=[_duration_string_minutes(td) for td in averages] text=[_duration_string_ms(td) for td in averages]
)
trace_count = go.Scatter(
name='Total feedings',
mode='markers',
x=list(totals.values_list('date', flat=True)),
y=list(totals.values_list('count', flat=True)),
yaxis='y2',
hoverinfo='y'
) )
layout_args = utils.default_graph_layout_options() layout_args = utils.default_graph_layout_options()
layout_args['barmode'] = 'stack'
layout_args['title'] = '<b>Average Feeding Durations</b>' layout_args['title'] = '<b>Average Feeding Durations</b>'
layout_args['xaxis']['title'] = 'Date' layout_args['xaxis']['title'] = 'Date'
layout_args['xaxis']['rangeselector'] = utils.rangeselector_date() layout_args['xaxis']['rangeselector'] = utils.rangeselector_date()
layout_args['yaxis']['title'] = 'Average duration (minutes)' layout_args['yaxis']['title'] = 'Average duration (minutes)'
layout_args['yaxis2'] = dict(layout_args['yaxis'])
layout_args['yaxis2']['title'] = 'Number of feedings'
layout_args['yaxis2']['overlaying'] = 'y'
layout_args['yaxis2']['side'] = 'right'
fig = go.Figure({ fig = go.Figure({
'data': [trace], 'data': [trace_avg, trace_count],
'layout': go.Layout(**layout_args) 'layout': go.Layout(**layout_args)
}) })
output = plotly.plot(fig, output_type='div', include_plotlyjs=False) output = plotly.plot(fig, output_type='div', include_plotlyjs=False)
return utils.split_graph_output(output) return utils.split_graph_output(output)
def _duration_string_minutes(duration): def _duration_string_ms(duration):
""" """
Format a "short" duration string with only minutes precision. This is Format a "short" duration string with only minutes and seconds. This is
intended to fit better in smaller spaces on a graph. intended to fit better in smaller spaces on a graph.
:returns: a string of the form Xm. :returns: a string of the form Xm.
""" """
h, m, s = duration_parts(duration) h, m, s = duration_parts(duration)
return '{}m'.format(m) return '{}m{}s'.format(m, s)