diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index 12c0a1ec..60cad3cc 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -2046,7 +2046,6 @@ def interactive_flex_chart2(id=0,promember=0, plottype='line', workstrokesonly=False): - #rowdata,row = dataprep.getrowdata_db(id=id) columns = [xparam,yparam1,yparam2, 'ftime','distance','fpace', diff --git a/rowers/views.py b/rowers/views.py index 8b2c5b75..5ce1156b 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -6197,6 +6197,19 @@ def workout_flexchart3_view(request,*args,**kwargs): else: workstrokesonly = False + if not promember: + for name,d in rowingmetrics: + if d['type'] != 'basic': + if xparam == name: + xparam = 'time' + messages.info(request,'To use '+d['verbose_name']+', you have to be Pro member') + if yparam1 == name: + yparam1 = 'pace' + messages.info(request,'To use '+d['verbose_name']+', you have to be Pro member') + if yparam2 == name: + yparam2 = 'spm' + messages.info(request,'To use '+d['verbose_name']+', you have to be Pro member') + # create interactive plot try: script,div,js_resources,css_resources,workstrokesonly = interactive_flex_chart2(id,xparam=xparam,yparam1=yparam1, @@ -8539,10 +8552,10 @@ def rower_favoritecharts_view(request): if request.method == 'POST': favorites_formset = FavoriteChartFormSet(request.POST) - if favorites_formset.is_valid(): new_instances = [] for favorites_form in favorites_formset: + print 'mies' yparam1 = favorites_form.cleaned_data.get('yparam1') yparam2 = favorites_form.cleaned_data.get('yparam2') xparam = favorites_form.cleaned_data.get('xparam') @@ -8568,7 +8581,6 @@ def rower_favoritecharts_view(request): except IntegrityError: message = "something went wrong" messages.error(request,message) - else: favorites_formset = FavoriteChartFormSet(initial=favorites_data)