sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

fixing pro trial issue

Browse Source
This commit is contained in:
Sander Roosendaal
2020-04-09 14:22:51 +02:00
parent 5371141f9b
commit 6106acf22e
3 changed files with 3 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rowers/forms.py
View File

@@ -26,6 +26,7 @@ from django.forms import formset_factory
from rowers.utils import landingpages from rowers.utils import landingpages
from rowers.metrics import axes, metricsgroups,rowingmetrics from rowers.metrics import axes, metricsgroups,rowingmetrics
from rowers.metrics import axlabels from rowers.metrics import axlabels
from rowers.rower_rules import user_is_not_basic
formaxlabels = axlabels.copy() formaxlabels = axlabels.copy()
formaxlabels.pop('None') formaxlabels.pop('None')
@@ -1451,7 +1452,7 @@ class FlexAxesForm(forms.Form):
axchoicesbasicy.insert(0,('None',ax[1]+' (PRO)')) axchoicesbasicy.insert(0,('None',ax[1]+' (PRO)'))
if rower.rowerplan == 'basic': if not user_is_not_basic(rower.user):
self.fields['xaxis'].choices = axchoicesbasicx self.fields['xaxis'].choices = axchoicesbasicx
self.fields['yaxis1'].choices = axchoicesbasicy self.fields['yaxis1'].choices = axchoicesbasicy
self.fields['yaxis2'].choices = axchoicesbasicy self.fields['yaxis2'].choices = axchoicesbasicy

7
rowers/interactiveplots.py
View File

@@ -3708,7 +3708,6 @@ def interactive_flex_chart2(id=0,promember=0,
watermarkh = 35 watermarkh = 35
watermarkanchor = 'bottom_right' watermarkanchor = 'bottom_right'
#rowdata,row = dataprep.getrowdata_db(id=id) #rowdata,row = dataprep.getrowdata_db(id=id)
columns = [xparam,yparam1,yparam2, columns = [xparam,yparam1,yparam2,
'ftime','distance','fpace', 'ftime','distance','fpace',
@@ -3763,11 +3762,7 @@ def interactive_flex_chart2(id=0,promember=0,
row = Workout.objects.get(id=id) row = Workout.objects.get(id=id)
if rowdata.empty: if rowdata.empty:
return "","No valid data",'','',workstrokesonly return "","No valid data",'','',workstrokesonly
#else:
# try:
# rowdata.sort_values(by='time',ascending=True,inplace=True)
# except KeyError:
# pass
workoutstateswork = [1,4,5,8,9,6,7] workoutstateswork = [1,4,5,8,9,6,7]
workoutstatesrest = [3] workoutstatesrest = [3]

13
rowers/views/workoutviews.py
View File

@@ -3618,17 +3618,6 @@ def workout_flexchart3_view(request,*args,**kwargs):
# extrametrics = {m.replace('/','_slsh_'):m for m in additionalmetrics} # extrametrics = {m.replace('/','_slsh_'):m for m in additionalmetrics}
extrametrics = additionalmetrics extrametrics = additionalmetrics
# xparam = xparam.replace('/','_slsh_')
# yparam1 = yparam1.replace('/','_slsh_')
# yparam2 = yparam2.replace('/','_slsh_')
# for metric in nometrics:
# try:
# extrametrics.pop(metric)
# except KeyError:
# pass
initial = { initial = {
'xaxis':xparam, 'xaxis':xparam,
'yaxis1':yparam1, 'yaxis1':yparam1,
@@ -5739,7 +5728,6 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
messages.error(request,'Error updating Work per Stroke') messages.error(request,'Error updating Work per Stroke')
elif powerorpace == 'spm': elif powerorpace == 'spm':
try: try:
print('aap')
rowdata.updateinterval_metric( rowdata.updateinterval_metric(
' Cadence (stokes/min)',spm,mode='larger', ' Cadence (stokes/min)',spm,mode='larger',
debug=False,smoothwindow=2., debug=False,smoothwindow=2.,
@@ -5869,7 +5857,6 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
activewindow=[activesecondsmin,activesecondsmax], activewindow=[activesecondsmin,activesecondsmax],
) )
except: except:
print('mies')
messages.error(request,'Error updating SPM') messages.error(request,'Error updating SPM')