From 95739145a98b19f8bf8fdc7816378a6bf578d3e3 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal
Date: Sat, 9 May 2020 15:12:32 +0200
Subject: [PATCH] first version workouttype chart
---
rowers/interactiveplots.py | 65 ++++++++++++++++++++++++++++++++++-
rowers/templates/history.html | 7 ++++
rowers/views/analysisviews.py | 9 +++--
3 files changed, 78 insertions(+), 3 deletions(-)
diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py
index e1a1f0eb..9568069c 100644
--- a/rowers/interactiveplots.py
+++ b/rowers/interactiveplots.py
@@ -51,6 +51,7 @@ from rowers.courses import (
polygon_coord_center
)
+from rowers import mytypes
from rowers.models import course_spline
import datetime
@@ -234,7 +235,8 @@ def interactive_hr_piechart(df,rower,title):
tools=TOOLS,
)
- for start, end , legend, color in zip(source_starts, source_ends, source_legends, colors[0:len(source_starts)]):
+ for start, end , legend, color in zip(source_starts, source_ends, source_legends,
+ colors[0:len(source_starts)]):
z.wedge(x=0, y=0, radius=1, start_angle=start, end_angle=end, color=color, legend=legend)
@@ -249,6 +251,67 @@ def interactive_hr_piechart(df,rower,title):
return components(z)
+def interactive_workouttype_piechart(workouts):
+ if len(workouts) == 0:
+ return "","Not enough workouts to make a chart"
+
+ datadict = {}
+ labels = []
+ types = []
+
+ for w in workouts:
+ try:
+ datadict[w.workouttype] += 3600*w.duration.hour+60*w.duration.minute+w.duration.second
+ except KeyError:
+ datadict[w.workouttype] = 3600*w.duration.hour+60*w.duration.minute+w.duration.second
+ types += [w.workouttype]
+ try:
+ labels += [mytypes.workouttypes_ordered[w.workouttype]]
+ except KeyError:
+ labels += [w.workouttype]
+
+ total = 0
+ source_starts = [0]
+ source_ends = []
+ for type in types:
+ total += datadict[type]
+ source_starts.append(total)
+ source_ends.append(total)
+
+ source_ends.append(total)
+
+ source_starts = pd.Series(source_starts)*2*pi/total
+ source_ends = pd.Series(source_ends)*2*pi/total
+
+ size = 350
+ TOOLS = 'save'
+
+ z = figure(title="Workout Types", x_range=(-1,1), y_range=(-1,1), width=size, height=size,
+ tools=TOOLS,
+ )
+
+ colors = palette
+
+ print(source_ends)
+ print(labels)
+
+ for start, end , legend, color in zip(source_starts, source_ends, labels,
+ colors[0:len(source_starts)]):
+ print(start,end,color,legend)
+ z.wedge(x=0, y=0, radius=1, start_angle=start, end_angle=end, color=color, legend=legend)
+
+
+ z.toolbar_location = 'right'
+ z.legend.location = 'top_right'
+ #z.legend.visible = False
+ z.axis.visible = False
+ z.xgrid.grid_line_color = None
+ z.ygrid.grid_line_color = None
+ z.outline_line_color = None
+
+ return components(z)
+
+
def interactive_boxchart(datadf,fieldname,extratitle='',
spmmin=0,spmmax=0,workmin=0,workmax=0):
diff --git a/rowers/templates/history.html b/rowers/templates/history.html
index c7507a58..9f7c87b2 100644
--- a/rowers/templates/history.html
+++ b/rowers/templates/history.html
@@ -21,6 +21,10 @@
+
+ {{ tscript|safe}}
+
+
-
History for {{ rower.user.first_name }} {{ rower.user.last_name }}
@@ -73,6 +77,9 @@
+
+ {{ tdiv|safe }}
+
{{ totaldiv|safe }}
diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py
index bb005175..89cd0075 100644
--- a/rowers/views/analysisviews.py
+++ b/rowers/views/analysisviews.py
@@ -4697,7 +4697,8 @@ def history_view(request,userid=0):
columns = ['hr','power','time']
-
+ tscript,tdiv = interactive_workouttype_piechart(g_workouts)
+
totalmeters,totalhours, totalminutes = get_totals(g_workouts)
totalminutes = "{totalminutes:02d}".format(totalminutes=totalminutes)
@@ -4768,6 +4769,8 @@ def history_view(request,userid=0):
return render(request,'history.html',
{
+ 'tscript':tscript,
+ 'tdiv':tdiv,
'rower':r,
'breadcrumbs':breadcrumbs,
'active':'nav-analysis',
@@ -4836,6 +4839,8 @@ def history_view_data(request,userid=0):
totalmeters,totalhours, totalminutes = get_totals(g_workouts)
totalminutes = "{totalminutes:02d}".format(totalminutes=totalminutes)
+
+
# meters, duration per workout type
wtypes = list(set([w.workouttype for w in g_workouts]))
@@ -4854,7 +4859,7 @@ def history_view_data(request,userid=0):
ddict['wtype'] = mytypes.workouttypes_ordered[wtype]
except KeyError:
ddict['wtype'] = wtype
-
+
ddict['id'] = wtype
ddict['distance'] = wmeters
ddict['duration'] = "{whours}:{wminutes:02d}".format(