diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index 951c04f8..5e11a871 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -1,4 +1,3 @@ - from rowers.models import Workout, User, Rower, WorkoutForm,RowerForm,GraphImage from rowingdata import rower as rrower from rowingdata import main as rmain @@ -1822,11 +1821,14 @@ def interactive_comparison_chart(id1=0,id2=0,xparam='distance',yparam='spm', else: rowdata2.sort_values(by='time',ascending=True,inplace=True) - x1 = rowdata1.ix[:,xparam] - x2 = rowdata2.ix[:,xparam] + try: + x1 = rowdata1.ix[:,xparam] + x2 = rowdata2.ix[:,xparam] - y1 = rowdata1.ix[:,yparam] - y2 = rowdata2.ix[:,yparam] + y1 = rowdata1.ix[:,yparam] + y2 = rowdata2.ix[:,yparam] + except KeyError: + return "","No valid Data Available" x_axis_type = 'linear' y_axis_type = 'linear' @@ -1949,7 +1951,7 @@ def interactive_comparison_chart(id1=0,id2=0,xparam='distance',yparam='spm', plot.title.text = row1.name+' vs '+row2.name plot.title.text_font_size=value("1.2em") plot.xaxis.axis_label = axlabels[xparam] - + plot.yaxis.axis_label = axlabels[yparam] if xparam == 'time': plot.xaxis[0].formatter = DatetimeTickFormatter( diff --git a/rowers/templates/comparisonchart2.html b/rowers/templates/comparisonchart2.html index c6f664a0..a07b41bd 100644 --- a/rowers/templates/comparisonchart2.html +++ b/rowers/templates/comparisonchart2.html @@ -6,144 +6,134 @@ {% block content %} - - + + - {{ 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/views.py b/rowers/views.py index f61540cb..bbc6514e 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -3253,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', @@ -3260,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, }) @@ -3283,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,