sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'release/v6.35'

Browse Source
This commit is contained in:
Sander Roosendaal
2018-03-29 17:34:40 -07:00
parent 4ceb7d04d1 0ed6a4c9e1
commit d0c11a5c22
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rowers/.#views.py
View File

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

3
rowers/dataprep.py
View File

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

3
rowers/plannedsessions.py
View File

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