Merge branch 'release/v6.35'

rowers/.#views.py

@@ -1 +0,0 @@
-E408191@CZ27LT9RCGN72.18468:1521978923

rowers/dataprep.py

@@ -853,6 +853,9 @@ def save_workout_database(f2, r, dosmooth=True, workouttype='rower',
                 powerperc=powerperc, powerzones=r.powerzones)
     row = rdata(f2, rower=rr)
 
+    if row.df.empty:
+        return (0, 'Error: CSV data file was empty')
+    
     dtavg = row.df['TimeStamp (sec)'].diff().mean()
 
     if dtavg < 1:

rowers/plannedsessions.py

@@ -364,8 +364,9 @@ def get_sessions_manager(m,teamid=0,startdate=date.today(),
                          enddate=date.today()+timezone.timedelta(+1000)):
     if teamid:
         t = Team.objects.get(id=teamid)
+        rs = Rower.objects.filter(team__in=[t]).distinct()
         sps = PlannedSession.objects.filter(
-            team__in=[t],
+            rower__in=rs,
             manager=m,
             startdate__lte=enddate,
             enddate__gte=startdate,