diff --git a/rowers/forms.py b/rowers/forms.py index c4519a1d..02ded6af 100644 --- a/rowers/forms.py +++ b/rowers/forms.py @@ -1036,6 +1036,7 @@ analysischoices = ( ('flexall','Cumulative Flex Chart'), ('stats','Statistics'), ('compare','Compare'), + ('cp','CP Chart') ) diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py index 69a17863..8e780e81 100644 --- a/rowers/views/analysisviews.py +++ b/rowers/views/analysisviews.py @@ -725,6 +725,8 @@ def analysis_view_data(request,userid=0): script,div = statsdata(workouts,options) elif function == 'compare': script,div = comparisondata(workouts,options) + elif function == 'cp': + script, div = cpdata(workouts,options) else: script = '' div = 'Unknown analysis functions' @@ -4849,7 +4851,7 @@ def history_view_data(request,userid=0): typeselect = 'All' yaxis = request.GET.get('yaxis','duration') - + if yaxis.lower() not in ['duration','rscore','trimp']: yaxis = 'duration'