diff --git a/rowers/dataprep.py b/rowers/dataprep.py index 6d9a5cf3..d0db4df7 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 - + + - {{ interactiveplot |safe }} +{{ interactiveplot |safe }} - - + +
-
- Swap Workouts -
-
- Edit Workout -
-
- Advanced Edit -
+
+ Swap Workouts +
+
+ Edit Workout +
+
+ Advanced Edit +

 

+
+
+ +
+ {% for key, value in axchoicesbasic.items %} + {% if key != 'None' %} + {{ value }} + {% endif %} + {% endfor %} + {% if promember %} + {% for key, value in axchoicespro.items %} + {{ value }} + {% endfor %} + {% else %} + {% for key, value in axchoicespro.items %} + {{ value }} + {% endfor %} + {% endif %} +
+
- -
-
- -
- Time - Distance - {% if promember %} - Power - HR - SPM - Peak Force - Average Force - Average/Peak Force Ratio - Drive Length - Work per Stroke - Drive Speed - {% 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) - - {% endif %} -
-
-
- -
- Pace - HR - SPM - Power - {% if promember %} - Peak Force - Average Force - Average/Peak Force Ratio - Drive Length - Work per Stroke - Drive Speed - {% else %} - Peak Force (Pro) - Average Force (Pro) - Average/Peak Force Ratio (Pro) - Drive Length (Pro) - Work per Stroke (Pro) - {% endif %} +
+ +
+ {% for key, value in axchoicesbasic.items %} + {% if key not in noylist and key != 'None' %} + {{ value }} + {% endif %} + {% endfor %} + {% if promember %} + {% for key, value in axchoicespro.items %} + {% if key not in noylist %} + {{ value }} + {% endif %} + {% endfor %} + {% else %} + {% for key, value in axchoicespro.items %} + {% if key not in noylist %} + {{ value }} (Pro) + {% endif %} + {% endfor %} + {% endif %} + -
-
+
+
-
- -
-
- Line Plot -
-
- Scatter Plot -
-
- +
+ +
+
+ Line Plot +
+
+ Scatter Plot +
+
+
- {{ the_div|safe }} + {{ the_div|safe }}
diff --git a/rowers/templates/developers.html b/rowers/templates/developers.html index 268fed20..b81bb596 100644 --- a/rowers/templates/developers.html +++ b/rowers/templates/developers.html @@ -47,13 +47,13 @@ @@ -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..52a8eeaa 100644 --- a/rowers/templates/flexchart3otw.html +++ b/rowers/templates/flexchart3otw.html @@ -51,122 +51,70 @@
    - 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 %}
    -
    + -
    + diff --git a/rowers/views.py b/rowers/views.py index a025f86e..bbc6514e 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(), @@ -3257,6 +3253,10 @@ def workout_comparison_view(request,id1=0,id2=0,xparam='distance',yparam='spm'): script = res[0] div = res[1] + 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") return render(request, 'comparisonchart.html', @@ -3264,6 +3264,9 @@ def workout_comparison_view(request,id1=0,id2=0,xparam='distance',yparam='spm'): 'the_div':div, 'id1':id1, 'id2':id2, + 'axchoicesbasic':axchoicesbasic, + 'axchoicespro':axchoicespro, + 'noylist':noylist, 'xparam':xparam, 'yparam':yparam, }) @@ -3287,12 +3290,33 @@ def workout_comparison_view2(request,id1=0,id2=0,xparam='distance', script = res[0] div = res[1] + 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") + + row1 = Workout.objects.get(id=id1) + row2 = Workout.objects.get(id=id2) + + if row1.workouttype != 'water' or row2.workouttype != 'water': + axchoicespro.pop('slip') + axchoicespro.pop('wash') + axchoicespro.pop('catch') + axchoicespro.pop('finish') + axchoicespro.pop('totalangle') + axchoicespro.pop('effectiveangle') + axchoicespro.pop('peakforceangle') + + return render(request, 'comparisonchart2.html', {'interactiveplot':script, 'the_div':div, 'id1':id1, 'id2':id2, + 'axchoicesbasic':axchoicesbasic, + 'axchoicespro':axchoicespro, + 'noylist':noylist, 'xparam':xparam, 'yparam':yparam, 'plottype':plottype, @@ -3433,6 +3457,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 +3477,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 +3505,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, @@ -3692,13 +3737,27 @@ def workout_comment_view(request,id=0): return HttpResponseRedirect(url) form = WorkoutCommentForm() - - return render(request, - 'workout_comments.html', - {'workout':w, - 'comments':comments, - 'form':form, - }) + + g = GraphImage.objects.filter(workout=row).order_by("-creationdatetime") + + if (len(g)<=3): + return render(request, + 'workout_comments.html', + {'workout':w, + 'graphs1':g[0:3], + 'comments':comments, + 'form':form, + }) + else: + return render(request, + 'workout_comments.html', + {'workout':w, + 'graphs1':g[0:3], + 'graphs1':g[3:6], + 'comments':comments, + 'form':form, + }) + # The basic edit page @login_required()