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

fastest

Browse Source
This commit is contained in:
Sander Roosendaal
2020-11-11 13:25:20 +01:00
parent abefbbc799
commit d2a87da5b5
5 changed files with 36 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rowers/views/planviews.py
View File

@@ -1931,6 +1931,8 @@ def plannedsession_view(request,id=0,userid=0):
'time': dddelta,
'type': w.workouttype,
'coursecompleted':True,
'sessionresult':0,
'workoutid':w.id,
}
if ps.sessiontype == 'coursetest':
vs = CourseTestResult.objects.filter(plannedsession=ps,
@@ -1950,6 +1952,7 @@ def plannedsession_view(request,id=0,userid=0):
)
wdict['distance'] = int(round(coursemeters))
wdict['coursecompleted'] = coursecompleted
wdict['sessionresult'] = record.id
else:
record = CourseTestResult(
userid=w.user.id,
@@ -1994,7 +1997,9 @@ def plannedsession_view(request,id=0,userid=0):
'date': w.date,
'distance': record.distance,
'type': w.workouttype,
'workoutid':w.id,
'coursecompleted':True,
'sessionresult':record.id
}
coursecompleted = record.coursecompleted
@@ -2027,7 +2032,9 @@ def plannedsession_view(request,id=0,userid=0):
'date': w.date,
'distance': record.distance,
'type': w.workouttype,
'workoutid':w.id,
'coursecompleted':True,
'sessionresult':record.id,
}
coursecompleted = record.coursecompleted

23
rowers/views/workoutviews.py
View File

@@ -2323,7 +2323,7 @@ def workout_fusion_list(request,id=0,
# Basic view of workout
@permission_required('workout.view_workout',fn=get_workout_by_opaqueid,raise_exception=True)
def workout_view(request,id=0,raceresult=0):
def workout_view(request,id=0,raceresult=0,sessionresult=0):
request.session['referer'] = absolute(request)['PATH']
if not request.user.is_anonymous:
@@ -2352,8 +2352,27 @@ def workout_view(request,id=0,raceresult=0):
except:
pass
# get raceresult
# get raceresult or session result
intervaldata = {}
if sessionresult != 0:
try:
result = CourseTestResult.objects.get(id=sessionresult)
startsecond = result.startsecond
endsecond = result.endsecond
duration = row.duration
durationsecs = duration.hour*3600+duration.minute*60+duration.second
itime = [startsecond,endsecond-startsecond]
itype = [3,4]
intervaldata['itime'] = itime
intervaldata['itype'] = itype
rowdata.updateinterval_metric(' AverageBoatSpeed (m/s)',0.1,mode='larger',
debug=False,smoothwindow=15.,
activewindow = [startsecond,endsecond])
summary = rowdata.allstats()
except CourseTestResult.DoesNotExist:
pass
if raceresult != 0:
try:
result = VirtualRaceResult.objects.get(id=raceresult)