added freecoach to coach priviliges

rowers/views/paymentviews.py

@@ -638,6 +638,9 @@ def freecoach_register_view(request):
                            'next':nextpage,})
     else:
         form =  RegistrationFormSex()
+        form.fields.pop('sex')
+        form.fields.pop('weightcategory')
+        form.fields.pop('adaptiveclass')
         return render(request,
                       "freecoach_registration_form.html",
                       {'form':form,

rowers/views/statements.py

@@ -1041,7 +1041,7 @@ def hasplannedsessions(user):
             r = Rower(user=user)
             r.save()
 
-        result = user.is_authenticated and (r.rowerplan=='coach' or r.rowerplan=='plan')
+        result = user.is_authenticated and (r.rowerplan=='coach' or r.rowerplan=='freecoach' or r.rowerplan=='plan')
         if not result and r.plantrialexpires:
             result = user.is_authenticated and r.plantrialexpires >= datetime.date.today()
     else:

rowers/views/teamviews.py

@@ -200,10 +200,10 @@ def rower_teams_view(request,message='',successmessage=''):
 
     coaches = teams.rower_get_coaches(r)
 
-    potentialcoaches = [t.manager for t in memberteams if t.manager not in coaches and t.manager.rower.rowerplan == 'coach']
+    potentialcoaches = [t.manager for t in memberteams if t.manager not in coaches and 'coach' in t.manager.rower.rowerplan]
     offercoaches = [
         r.user for r in Rower.objects.filter(
-            offercoaching=True,rowerplan='coach').exclude(user=request.user)
+            offercoaching=True,rowerplan__in='coach').exclude(user=request.user)
     ]
     potentialcoaches = list(set(potentialcoaches+offercoaches))
     potentialcoaches = [c for c in potentialcoaches if c.rower not in invitedcoaches+coaches]
@@ -218,6 +218,16 @@ def rower_teams_view(request,message='',successmessage=''):
                 user__in=invitedathletes).exclude(
                     user=request.user
                 ).exclude(coachinggroups__in=[request.user.rower.mycoachgroup])
+    elif request.user.rower.rowerplan == 'freecoach':
+        potentialathletes = Rower.objects.filter(
+            team__in=myteams).exclude(
+                user__in=invitedathletes).exclude(
+                    user=request.user
+                ).exclude(
+                    coachinggroups__in=[request.user.rower.mycoachgroup]
+                ).exclude(
+                    rowerplan__in=['basic','freecoach']
+                )
     else:
         potentialathletes = []
 
@@ -437,7 +447,7 @@ def request_coaching_view(request,coachid):
 
     coach = User.objects.get(id=coachid).rower
 
-    if coach.rowerplan == 'coach':
+    if 'coach' in coach.rowerplan:
         res,text = teams.create_coaching_request(coach,request.user)
         if res:
             messages.info(request,text)