adding better rscore calc from power zone

rowers/views/planviews.py

@@ -1417,7 +1417,6 @@ def save_plan_yaml(request, userid=0):
                     elif ps.sessionmode == 'time':
                         ps.interval_string = '{d}min'.format(d=ps.sessionvalue)
                     elif ps.sessionmode == 'rScore':
-                        print('aap')
                         ps.approximate_duration = ps.sessionvalue
                         ps.interval_string = '{d}min'.format(d=ps.sessionvalue)
                     elif ps.sessionmode == 'TRIMP':
@@ -2670,6 +2669,14 @@ def rower_view_instantplan(request, id='', userid=0):
                 return HttpResponseRedirect(url)
 
         form = InstantPlanSelectForm(request.POST, targets=targets)
+        byrscoreform = PlanByRscoreForm(request.POST)
+        if byrscoreform.is_valid():
+            try:
+                byrscore = byrscoreform.cleaned_data['byrscore']
+            except KeyError:
+                byrscore = False
+        else:
+            byrscore = False
 
         if form.is_valid():
             if plan.price > 0:  # pragma: no cover
@@ -2718,7 +2725,7 @@ def rower_view_instantplan(request, id='', userid=0):
             p.save()
             p.rowers.add(r)
 
-            create_sessions_from_json(plansteps, r, startdate, r.user)
+            create_sessions_from_json(plansteps, r, startdate, r.user, planbyrscore=byrscore)
 
             messages.info(request, 'Your Sessions have been added')
 
@@ -2739,6 +2746,13 @@ def rower_view_instantplan(request, id='', userid=0):
         }
         form = InstantPlanSelectForm(
             targets=targets, instantplan=plan, initial=initial)
+        if request.user.is_superuser:
+            byrscoreform = PlanByRscoreForm()
+        else:
+            byrscoreform = None
+
+    
+
     else:  # pragma: no cover
         form = None
 
@@ -2771,6 +2785,7 @@ def rower_view_instantplan(request, id='', userid=0):
                       'rower': r,
                       'active': 'nav-plan',
                       'plan': plan,
+                      'byrscoreform': byrscoreform,
                       'trainingdays': trainingdays2,
                       'breadcrumbs': breadcrumbs,
                       'form': form,
@@ -2983,6 +2998,7 @@ def rower_create_trainingplan(request, id=0):
                             initial={'status': False, 'rowers': [therower]},
                             user=request.user)
 
+
     breadcrumbs = [
         {
             'url': reverse(plannedsessions_view,

rowers/views/statements.py

@@ -113,7 +113,7 @@ from rowers.forms import (
     StravaChartForm, FitnessFitForm, PerformanceManagerForm,
     TrainingPlanBillingForm, InstantPlanSelectForm,
     TrainingZonesForm, InstrokeForm, InStrokeMultipleCompareForm,
-    ForceCurveMultipleCompareForm
+    ForceCurveMultipleCompareForm, PlanByRscoreForm
 )
 
 from django.urls import reverse, reverse_lazy