Merge branch 'feature/fitnessprogress' into develop

rowers/views.py

@@ -46,6 +46,7 @@ from django.core.mail import send_mail, BadHeaderError
 from rowers.forms import (
     SummaryStringForm,IntervalUpdateForm,StrokeDataForm,
     StatsOptionsForm,PredictedPieceForm,DateRangeForm,DeltaDaysForm,
+    FitnessMetricForm,
     EmailForm, RegistrationForm, RegistrationFormTermsOfService,
     RegistrationFormUniqueEmail,RegistrationFormSex,
     CNsummaryForm,UpdateWindForm,
@@ -3062,6 +3063,46 @@ def cum_flex(request,theuser=0,
 		   })
 
 
+@user_passes_test(hasplannedsessions,login_url="/",redirect_field_name=None)
+def fitnessmetric_view(request,id=0,mode='rower',
+                       startdate=timezone.now()-timezone.timedelta(days=365),
+                       enddate=timezone.now()):
+    if id==0:
+        id = request.user.id
+
+    theuser = User.objects.get(id=id)
+    therower = Rower.objects.get(user=theuser)
+
+
+    if request.method == 'POST':
+        form = FitnessMetricForm(request.POST)
+        if form.is_valid():
+            startdate = form.cleaned_data['startdate']
+            enddate = form.cleaned_data['enddate']
+            mode = form.cleaned_data['mode']
+    else:
+        form = FitnessMetricForm()
+
+    fitnessmetrics = PowerTimeFitnessMetric.objects.filter(
+        user=theuser,
+        date__gte=startdate,
+        date__lte=enddate)
+
+    script,thediv = fitnessmetric_chart(
+        fitnessmetrics,theuser,
+        workoutmode=mode
+    )
+
+    return render(request,'fitnessmetric.html',
+                  {
+                      'therower':therower,
+                      'chartscript':script,
+                      'the_div':thediv,
+                      'mode':mode,
+                      'form':form,
+                      })
+    
+
 # Show the EMpower Oarlock generated Stroke Profile
 @user_passes_test(ispromember,login_url="/",redirect_field_name=None)
 def workout_forcecurve_view(request,id=0,workstrokesonly=False):