some fixes and more user friendly form to buy instantplan

rowers/views/planviews.py

@@ -2517,14 +2517,15 @@ def rower_view_instantplan(request,id='',userid=0):
         date__gte=datetime.date.today(),
     ).order_by("-date")
 
-    if request.method == 'POST':
+    if request.method == 'POST' and not request.user.is_anonymous:
         if not can_plan(request.user):
             messages.error(request,'You must be on a <a href="/rowers/paidplans">paid plan</a> to use this functionality')
             url = reverse('rower_view_instantplan',kwargs={
                 'id':id,
                 })
             return HttpResponseRedirect(url)
-        form = TrainingPlanForm(request.POST,user=request.user)
+        form = InstantPlanSelectForm(request.POST)
+
 
         if form.is_valid():
             plansteps = response.json()
@@ -2541,17 +2542,17 @@ def rower_view_instantplan(request,id='',userid=0):
                 except KeyError:
                     target = None
             enddate = form.cleaned_data['enddate']
+            startdate = form.cleaned_data['startdate']
             notes = form.cleaned_data['notes']
-            status = form.cleaned_data['status']
-            if target:
+            datechoice = form.cleaned_data['datechoice']
+            status = True
+            if target and datechoice == 'target':
                 enddate = target.date
+            elif datechoice == 'startdate':
+                enddate = startdate+datetime.timedelta(days=plan.duration)
+            else:
+                startdate = enddate-datetime.timedelta(days=plan.duration)
 
-            startdate = enddate-datetime.timedelta(days=plan.duration+1)
-
-            try:
-                athletes = form.cleaned_data['rowers']
-            except KeyError:
-                athletes = [r]
 
             p = TrainingPlan(
                 name=name,
@@ -2563,10 +2564,7 @@ def rower_view_instantplan(request,id='',userid=0):
             )
 
             p.save()
-
-            for athlete in athletes:
-                if can_plan_user(request.user,athlete):
-                    p.rowers.add(athlete)
+            p.rowers.add(r)
 
             create_sessions_from_json(plansteps,athletes,startdate,r.user)
 
@@ -2577,9 +2575,10 @@ def rower_view_instantplan(request,id='',userid=0):
             return HttpResponseRedirect(url)
 
 
+    elif not request.user.is_anonymous:
+        form = InstantPlanSelectForm(targets=targets)
     else:
-        form = TrainingPlanForm(targets=targets,initial={'status':True,'rowers':[r]},
-                            user=request.user)
+        form = None
 
     breadcrumbs = [
         {