diff --git a/rowers/dataprep.py b/rowers/dataprep.py index 6d9a5cf3..1e36ace9 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -1020,7 +1020,10 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True, drivelength = arclength else: drivelength = driveenergy/(averageforce*4.44822) + slip = rowdatadf.ix[:,'slip'] + totalangle = finish-catch + effectiveangle = finish-wash-catch-slip if windowsize > 3 and windowsize
  • Advantages
  • Disadvantages
    • @@ -86,7 +86,7 @@
  • The API is not stable and not fully tested yet.
  • You need to register your app with us. We can revoke your permissions if you misuse them.
    • -
  • The first time user must grant permissions to your app.
    • +
  • The user user must grant permissions to your app.
  • You need to manage authorization tokens.
    • diff --git a/rowers/templates/flexchart3otw.html b/rowers/templates/flexchart3otw.html index 4697f3a7..923edcbb 100644 --- a/rowers/templates/flexchart3otw.html +++ b/rowers/templates/flexchart3otw.html @@ -51,41 +51,19 @@
    - Time - Distance + {% for key, value in axchoicesbasic.items %} + {% if key != 'None' %} + {{ value }} + {% endif %} + {% endfor %} {% if promember %} - Power - HR - SPM - Peak Force - Average Force - Average/Peak force ratio - Drive Length - Work per Stroke - Drive Speed - - Catch Angle - Finish Angle - Slip - Wash - Peak Force Angle + {% for key, value in axchoicespro.items %} + {{ value }} + {% endfor %} {% else %} - Power (Pro) - HR (Pro) - SPM (Pro) - Peak Force (Pro) - Average Force (Pro) - Average/Peak Force Ratio (Pro) - Drive Length (Pro) - Work per Stroke (Pro) - Drive Speed (Pro) - - Catch Angle (Pro) - Finish Angle (Pro) - Slip (Pro) - Wash (Pro) - Peak Force Angle (Pro) - + {% for key, value in axchoicespro.items %} + {{ value }} + {% endfor %} {% endif %}
    @@ -93,38 +71,23 @@
    - Pace - HR - SPM - Power + {% for key, value in axchoicesbasic.items %} + {% if key not in noylist %} + {{ value }} + {% endif %} + {% endfor %} {% if promember %} - Peak Force - Average Force - Average/Peak Force Ratio - Drive Length - Work per Stroke - Drive Speed - Drive Rhythm - - Catch Angle - Finish Angle - Slip - Wash - Peak Force Angle + {% for key, value in axchoicespro.items %} + {% if key not in noylist %} + {{ value }} + {% endif %} + {% endfor %} {% else %} - Peak Force (Pro) - Average Force (Pro) - Average/Peak Force Ratio (Pro) - Drive Length (Pro) - Work per Stroke (Pro) - Drive Speed (Pro) - Drive Rhythm (Pro) - - Catch Angle (Pro) - Finish Angle(Pro) - Wash (Pro) - Slip (Pro) - Peak Force Angle (Pro) + {% for key, value in axchoicespro.items %} + {% if key not in noylist %} + {{ value }} (Pro) + {% endif %} + {% endfor %} {% endif %}
    @@ -133,40 +96,25 @@
    - HR - SPM - Power + {% for key, value in axchoicesbasic.items %} + {% if key not in noylist %} + {{ value }} + {% endif %} + {% endfor %} {% if promember %} - Peak Force - Average Force - Average/Peak Force Ratio - Drive Length - Work per Stroke - Drive Speed - Drive Rhythm - - Catch Angle - Finish Angle - Slip - Wash - Peak Force Angle + {% for key, value in axchoicespro.items %} + {% if key not in noylist %} + {{ value }} + {% endif %} + {% endfor %} {% else %} - Peak Force (Pro) - Average Force (Pro) - Average/Peak Force Ratio (Pro) - Drive Length (Pro) - Work per Stroke (Pro) - Drive Speed (Pro) - Drive Rhythm (Pro) - Catch Angle (Pro) - Finish Angle (Pro) - Slip (Pro) - Wash (Pro) - Peak Force Angle (Pro) + {% for key, value in axchoicespro.items %} + {% if key not in noylist %} + {{ value }} (Pro) + {% endif %} + {% endfor %} {% endif %} - None -
    diff --git a/rowers/views.py b/rowers/views.py index 67715fb1..f61540cb 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -3154,10 +3154,6 @@ def workout_stats_view(request,id=0,message="",successmessage=""): fieldlist,fielddict = dataprep.getstatsfields() fielddict.pop('workoutstate') - print "aap" - print datadf['catch'].mean() - print "noot" - for field,verbosename in fielddict.iteritems(): thedict = { 'mean':datadf[field].mean(), @@ -3433,6 +3429,12 @@ def workout_flexchart3_view(request,*args,**kwargs): # js_resources = res[2] # css_resources = res[3] + + axchoicesbasic = {ax[0]:ax[1] for ax in axes if ax[4]=='basic'} + axchoicespro = {ax[0]:ax[1] for ax in axes if ax[4]=='pro'} + noylist = ["time","distance"] + axchoicesbasic.pop("cumdist") + if row.workouttype == 'water': return render(request, 'flexchart3otw.html', @@ -3447,13 +3449,25 @@ def workout_flexchart3_view(request,*args,**kwargs): 'plottype':plottype, 'mayedit':mayedit, 'promember':promember, + 'axchoicesbasic':axchoicesbasic, + 'axchoicespro':axchoicespro, + 'noylist':noylist, 'workstrokesonly': not workstrokesonly, 'favoritenr':favoritenr, 'maxfav':maxfav, }) else: + axchoicespro.pop('slip') + axchoicespro.pop('wash') + axchoicespro.pop('catch') + axchoicespro.pop('finish') + axchoicespro.pop('totalangle') + axchoicespro.pop('effectiveangle') + axchoicespro.pop('peakforceangle') + + return render(request, - 'flexchart3.html', + 'flexchart3otw.html', {'the_script':script, 'the_div':div, 'js_res': js_resources, @@ -3463,6 +3477,9 @@ def workout_flexchart3_view(request,*args,**kwargs): 'yparam1':yparam1, 'yparam2':yparam2, 'plottype':plottype, + 'axchoicesbasic':axchoicesbasic, + 'axchoicespro':axchoicespro, + 'noylist':noylist, 'mayedit':mayedit, 'promember':promember, 'workstrokesonly': not workstrokesonly,