fixes for coach trial

rowers/models.py

@@ -531,6 +531,13 @@ class TeamInviteForm(ModelForm):
     user = UserFullnameChoiceField(queryset=User.objects.all(), required=False)
     email = forms.EmailField(required=False)
 
+    def __init__(self, *args, **kwargs):
+        userid = kwargs.pop('userid',0)
+        super(TeamInviteForm, self).__init__(*args, **kwargs)
+        if userid:
+            self.fields['user'].initial = userid
+        
+
     class Meta:
         model = TeamInvite
         fields = ['user', 'email']

rowers/rower_rules.py

@@ -138,6 +138,12 @@ def is_staff(user):  # pragma: no cover
 
 @rules.predicate
 def is_coach(user):
+    if user is None:
+        return False
+    if user.is_anonymous:
+        return False
+    if user.rower.coachtrialexpires >= timezone.now().date():
+        return True
     return user.rower.rowerplan in ['coach', 'freecoach']
 
 
@@ -157,6 +163,9 @@ def is_planmember(user):
     except AttributeError:  # pragma: no cover
         return False
 
+    if user.rower.coachtrialexpires >= timezone.now().date():
+        return True
+
     return r.rowerplan in ['coach', 'plan']  # freecoach?
 
 
@@ -198,7 +207,7 @@ def is_coachtrial(user):
     return False  # pragma: no cover
 
 
-ispromember = is_promember | is_protrial
+ispromember = is_promember | is_protrial | is_coach | is_coachtrial
 
 
 can_have_teams = ispromember | is_coach | is_coachtrial
@@ -251,7 +260,7 @@ def is_plantrial(user):
 
 isplanmember = is_planmember | is_plantrial
 
-iscoachmember = is_coach | is_coachtrial
+iscoachmember = is_coachtrial | is_coach
 
 
 @rules.predicate

rowers/tasks.py

@@ -314,6 +314,21 @@ def summaryfromsplitdata(splitdata, data, filename, sep='|', workouttype='rower'
 
     return sums, sa, results
 
+@app.task
+def handle_remove_workouts_team(ws, t, debug=False, **kwargs):
+    for w in ws:
+        w.team.remove(t)
+
+    return 1
+
+@app.task
+def handle_add_workouts_team(ws, t, debug=False, **kwargs):
+
+    for w in ws:
+        w.team.add(t)
+
+    return 1
+
 @app.task
 def check_tp_workout_id(workout, location, attempts=5, debug=False, **kwargs):
     authorizationstring = str('Bearer ' + workout.user.tptoken)

rowers/teams.py

@@ -42,20 +42,7 @@ queuehigh = django_rq.get_queue('low')
 
 inviteduration = 14  # days
 
-
+from rowers.tasks import handle_remove_workouts_team, handle_add_workouts_team
-def handle_remove_workouts_team(ws, t):
-    for w in ws:
-        w.team.remove(t)
-
-    return 1
-
-
-def handle_add_workouts_team(ws, t):
-
-    for w in ws:
-        w.team.add(t)
-
-    return 1
 
 
 def update_team(t, name, manager, private, notes, viewing):
@@ -128,10 +115,17 @@ def add_member(id, rower):
     except ValidationError as e:  # pragma: no cover
         return(0, "Couldn't add member: "+str(e.message))
 
+    # if team manager is coach
+    if is_coach(t.manager):
+        result = add_coach(t.manager.rower, rower)
+
     # code to add all workouts
     ws = Workout.objects.filter(user=rower)
 
-    _ = handle_add_workouts_team(ws, t)
+    _ = myqueue(
+        queuehigh,
+        handle_add_workouts_team,
+        ws, t)
 
     # code to add plannedsessions
     plannedsessions = PlannedSession.objects.filter(
@@ -154,7 +148,8 @@ def remove_member(id, rower):
     # remove the team from rower's workouts:
     ws = Workout.objects.filter(user=rower, team=t)
 
-    _ = handle_remove_workouts_team(ws, t)
+
+    _ = myqueue(queuehigh,handle_remove_workouts_team,ws, t)
 
 #    set_teamplanexpires(rower)
     return (id, 'Member removed')

rowers/templates/document_form.html

@@ -25,7 +25,7 @@
     <div id="id_drop-files" class="drop-files">
       <form id="file_form" enctype="multipart/form-data" action="{{ formloc }}" method="post">
         <h1>Upload Workout File</h1>
-        {% if user.is_authenticated and user|is_manager %}
+        {% if user.is_authenticated and user|coach_rowers %}
         <p>Looking for <a href="/rowers/workout/upload/team/">Team Manager
             Upload?</a></p>
         {% endif %}

rowers/templates/menu_analytics.html

@@ -115,6 +115,7 @@
 
 	{% if user.is_authenticated and user|is_manager and rower %}
 	<p>&nbsp;</p>
+	{% endif %}
 
 	{% if user|coach_rowers %}
 	<ul class="cd-accordion-menu animated">
@@ -137,7 +138,6 @@
 		</li>
 	</ul>
 	{% endif %}
-	{% endif %}
 
 	{% if user|user_teams  %}
 	<p>&nbsp;</p>

rowers/templates/menu_workouts.html

@@ -65,6 +65,7 @@
 
 {% if user.is_authenticated and user|is_manager and rower %}
 <p>&nbsp;</p>
+{% endif %}
 
 {% if user|coach_rowers %}
 <ul class="cd-accordion-menu animated">
@@ -87,7 +88,6 @@
   </li>
 </ul>
 {% endif %}
-{% endif %}
 
 {% if teams  %}
 <p>&nbsp;</p>

rowers/templatetags/rowerfilters.py

@@ -49,7 +49,6 @@ from six import string_types
 
 register = template.Library()
 
-
 @register.filter
 def workoutdate(id):  # pragma: no cover
     try:
@@ -711,6 +710,7 @@ def team_members(user):
     try:
         therower = Rower.objects.get(user=user)
         if therower.rowerplan == 'basic':  # pragma: no cover
+            if therower.coachtrialexpires < timezone.now().date():
                 return []
         teams = Team.objects.filter(manager=user)
         members = Rower.objects.filter(
@@ -757,13 +757,20 @@ def team_rowers(user):  # pragma: no cover
 
     return []
 
+@register.filter
+def length(l):
+    return len(l)
+
 
 @register.filter
 def coach_rowers(user):
+    if user.is_anonymous:
+        return []
     if user.rower.rowerplan != 'freecoach':
         thelist = [user.rower]+[c for c in coach_getcoachees(user.rower)]
     else:  # pragma: no cover
         thelist = [c for c in coach_getcoachees(user.rower)]
+
     return thelist
 
 

rowers/tests/test_api.py

@@ -69,6 +69,7 @@ class OwnApi(TestCase):
         # response must be json
         strokedata = json.loads(response.content)
         df = pd.DataFrame(strokedata)
+        
         self.assertFalse(df.empty)
 
         form_data = {

rowers/urls.py

@@ -261,8 +261,12 @@ urlpatterns = [
             name='rower_update_empower_view'),
     re_path(r'^agegroupcp/(?P<age>\d+)/$',
             views.agegroupcpview, name='agegroupcpview'),
+    re_path(r'^agegroupcp/(?P<age>\d+)/user/(?P<userid>\d+)/$',
+            views.agegroupcpview, name='agegroupcpview'),
     re_path(r'^agegroupcp/(?P<age>\d+)/(?P<normalize>\d+)/$',
             views.agegroupcpview, name='agegroupcpview'),
+    re_path(r'^agegroupcp/(?P<age>\d+)/(?P<normalize>\d+)/user/(?P<userid>\d+)/$',
+            views.agegroupcpview, name='agegroupcpview'),
     re_path(r'^ajax_agegroup/(?P<age>\d+)/(?P<weightcategory>\w+.*)/(?P<sex>\w+.*)/(?P<userid>\d+)/$',
             views.ajax_agegrouprecords, name='ajax_agegrouprecords'),
     re_path(r'^agegrouprecords/(?P<sex>\w+.*)/(?P<weightcategory>\w+.*)/(?P<distance>\d+)m/$',
@@ -429,6 +433,8 @@ urlpatterns = [
             name='workout_toggle_ranking'),
     re_path(r'^workout/upload/team/$', views.team_workout_upload_view,
             name='team_workout_upload_view'),
+    re_path(r'^workout/upload/team/user/(?P<userid>\d+)/$', views.team_workout_upload_view,
+            name='team_workout_upload_view'),
     re_path(r'^workout/upload/(?P<raceid>\d+)/$',
             views.workout_upload_view, name='workout_upload_view'),
     re_path(r'^workout/upload/$', views.workout_upload_view,

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)
+        if user.is_authenticated:
-    else:  # pragma: no cover
+            if 'coach' in r.rowerplan:
-        result = False
+                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(