fixes for coach trial

rowers/views/analysisviews.py

@@ -1763,7 +1763,7 @@ def otwcp_toadmin_view(request, theuser=0,
     return response
 
 
-def agegroupcpview(request, age, normalize=0):
+def agegroupcpview(request, age, normalize=0, userid=0):
     script, div = interactive_agegroupcpchart(age, normalized=normalize)
 
     response = render(request, 'agegroupcp.html',

rowers/views/importviews.py

@@ -763,7 +763,7 @@ def workout_nkimport_view(request, userid=0, after=0, before=0):
             messages.info(
                 request,
                 'Your NK logbook workouts will be imported in the background.'
-                ' It may take a few minutes before it appears.')
+                ' It may take a few minutes before they appear.')
             url = reverse('workouts_view')
             return HttpResponseRedirect(url)
         except KeyError:
@@ -1270,7 +1270,7 @@ def workout_stravaimport_view(request, message="", userid=0):
                 # done, redirect to workouts list
                 messages.info(request,
                               'Your Strava workouts will be imported in the background.'
-                              ' It may take a few minutes before it appears.')
+                              ' It may take a few minutes before they appear.')
                 url = reverse('workouts_view')
                 return HttpResponseRedirect(url)
             except KeyError:  # pragma: no cover
@@ -1815,7 +1815,7 @@ def workout_c2import_view(request, page=1, userid=0, message=""):
             messages.info(
                 request,
                 'Your Concept2 workouts will be imported in the background.'
-                ' It may take a few minutes before it appears.')
+                ' It may take a few minutes before they appear.')
             url = reverse('workouts_view')
             return HttpResponseRedirect(url)
         except KeyError:  # pragma: no cover

rowers/views/paymentviews.py

@@ -811,7 +811,7 @@ def useractivate(request, uidb64, token):  # pragma: no cover
                   ['roosendaalsander@gmail.com'])
 
         messages.info(
-            request, 'Thank you for your email confirmation. YOu are now signed in to your account.')
+            request, 'Thank you for your email confirmation. You are now signed in to your account.')
         login(request, user, backend=settings.AUTHENTICATION_BACKENDS[0])
         url = reverse('workouts_view')
         # if user.rower.rowerplan == 'freecoach':

rowers/views/statements.py

@@ -1235,11 +1235,14 @@ def iscoachmember(user):
             r = Rower(user=user)
             r.save()
 
-        result = user.is_authenticated and ('coach' in r.rowerplan)
-    else:  # pragma: no cover
-        result = False
+        if user.is_authenticated:
+            if 'coach' in r.rowerplan:
+                return True
+            elif r.coachtrialexpires >= timezone.now().date():
+                return True
 
-    return result
+
+    return False
 
 
 # More User/Rower utils

rowers/views/workoutviews.py

@@ -5398,7 +5398,7 @@ def workout_upload_view(request,
 # This is the main view for processing uploaded files
 @user_passes_test(iscoachmember, login_url="/rowers/paidplans", redirect_field_name=None,
                   message="This functionality requires a Coach plan or higher")
-def team_workout_upload_view(request, message="",
+def team_workout_upload_view(request, userid=0, message="",
                              successmessage="",
                              uploadoptions={
                                  'make_plot': False,
@@ -5572,7 +5572,7 @@ def team_workout_upload_view(request, message="",
     else:
         form = DocumentsForm()
         optionsform = TeamUploadOptionsForm(initial=uploadoptions)
-        rowerform = TeamInviteForm()
+        rowerform = TeamInviteForm(userid=userid)
         rowerform.fields.pop('email')
 
         rowers = Rower.objects.filter(