adding trimp or rscore, time constants, test duration to form

rowers/views/analysisviews.py

@@ -1551,17 +1551,22 @@ def fitness_from_cp_view(request,userid=0,mode='rower',
 
     therower = getrequestrower(request,userid=userid)
     theuser = therower.user
-    
 
+    kfitness = 42
+    kfatigue = 7
+    fitnesstest = 20
 
     if request.method == 'POST':
-        form = FitnessMetricForm(request.POST)
+        form = FitnessFitForm(request.POST)
         if form.is_valid():
             startdate = form.cleaned_data['startdate']
             enddate = form.cleaned_data['enddate']
             mode = form.cleaned_data['mode']
+            kfitness = form.cleaned_data['kfitness']
+            kfatigue = form.cleaned_data['kfatigue']
+            fitnesstest = form.cleaned_data['fitnesstest']
     else:
-        form = FitnessMetricForm()
+        form = FitnessFitForm()
 
     workouts = Workout.objects.filter(user=therower,date__gte=startdate,
                                       date__lte=enddate,
@@ -1576,6 +1581,9 @@ def fitness_from_cp_view(request,userid=0,mode='rower',
         workouts,theuser,
         workoutmode=mode,startdate=startdate,
         enddate=enddate,
+        kfitness=kfitness,
+        kfatigue=kfatigue,
+        fitnesstest=fitnesstest,
     )
 
     breadcrumbs = [

rowers/views/statements.py

@@ -76,7 +76,7 @@ from rowers.forms import (
     disqualifiers,SearchForm,BillingForm,PlanSelectForm,
     VideoAnalysisCreateForm,WorkoutSingleSelectForm,
     VideoAnalysisMetricsForm,SurveyForm,HistorySelectForm,
-    StravaChartForm,
+    StravaChartForm,FitnessFitForm
     )
 
 from django.urls import reverse, reverse_lazy