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

Merge branch 'release/v14.40'

Browse Source
This commit is contained in:
Sander Roosendaal
2020-11-12 18:46:20 +01:00
parent 4f8f85b24c 011cfc8cca
commit 291b35ab11
2 changed files with 17 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
rowers/plannedsessions.py
View File

@@ -397,9 +397,9 @@ def add_workouts_plannedsession(ws,ps,r):
if ps.sessiontype == 'fastest_distance': if ps.sessiontype == 'fastest_distance':
records = CourseTestResult.objects.filter(userid=w.user.id,plannedsession=ps) records = CourseTestResult.objects.filter(userid=w.user.id,plannedsession=ps)
for record in records: for record in records:
w1 = Workout.objects.get(id=record.workoutid) #w1 = Workout.objects.get(id=record.workoutid)
w1.plannedsession = None #w1.plannedsession = None
w1.save() #w1.save()
record.delete() record.delete()
df = dataprep.getsmallrowdata_db(['time','cumdist'],ids=[w.id]) df = dataprep.getsmallrowdata_db(['time','cumdist'],ids=[w.id])
@@ -424,21 +424,13 @@ def add_workouts_plannedsession(ws,ps,r):
record.save() record.save()
else: else:
record = CourseTestResult( errors.append('Could not find a matching interval')
userid = w.user.user.id,
workoutid=w.id,
plannedsession = ps,
duration = dt.time(0,0),
coursecompleted = True,
distance = ps.sessionvalue,
)
record.save()
if ps.sessiontype == 'fastest_time': if ps.sessiontype == 'fastest_time':
records = CourseTestResult.objects.filter(userid=w.user.id,plannedsession=ps) records = CourseTestResult.objects.filter(userid=w.user.id,plannedsession=ps)
for record in records: for record in records:
w1 = Workout.objects.get(id=record.workoutid) #w1 = Workout.objects.get(id=record.workoutid)
w1.plannedsession = None #w1.plannedsession = None
w1.save() #w1.save()
record.delete() record.delete()
df = dataprep.getsmallrowdata_db(['time','cumdist'],ids=[w.id]) df = dataprep.getsmallrowdata_db(['time','cumdist'],ids=[w.id])
@@ -461,15 +453,7 @@ def add_workouts_plannedsession(ws,ps,r):
) )
record.save() record.save()
else: else:
record = CourseTestResult( errors.append('Could not find a matching interval')
userid = w.user.user.id,
plannedsession = ps,
workoutid=w.id,
duration = dt.time(0,ps.sessionvalue),
coursecompleted = True,
distance = fastest_meters,
)
record.save()
else: else:
errors.append('Workout %i did not match session dates' % w.id) errors.append('Workout %i did not match session dates' % w.id)

12
rowers/views/workoutviews.py
View File

@@ -2411,9 +2411,15 @@ def workout_view(request,id=0,raceresult=0,sessionresult=0):
if hascoordinates: if hascoordinates:
mapscript,mapdiv = leaflet_chart(rowdata.df[' latitude'], if intervaldata:
rowdata.df[' longitude'], rowdata.df['reltime'] = rowdata.df['TimeStamp (sec)']-rowdata.df.loc[0,'TimeStamp (sec)']
row.name) mask = (rowdata.df['reltime']>startsecond) & (rowdata.df['reltime']<endsecond)
latitudes = rowdata.df.loc[mask,' latitude']
longitudes = rowdata.df.loc[mask,' longitude']
else:
latitudes = rowdata.df[' latitude']
longitudes = rowdata.df[' longitude']
mapscript,mapdiv = leaflet_chart(latitudes,longitudes,row.name,)
else: else: