Private
Public Access
1
0

show race interval as work interval in details

This commit is contained in:
Sander Roosendaal
2020-05-24 12:33:36 +02:00
parent d5f61d75ae
commit d2fd4fe562
5 changed files with 29 additions and 8 deletions

View File

@@ -2156,7 +2156,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):
def workout_view(request,id=0,raceresult=0):
request.session['referer'] = absolute(request)['PATH']
if not request.user.is_anonymous:
@@ -2164,7 +2164,10 @@ def workout_view(request,id=0):
else:
rower = None
# get row
row = get_workout_by_opaqueid(request,id)
f1 = row.csvfilename
rowdata = rdata(f1)
comments = WorkoutComment.objects.filter(workout=row)
@@ -2181,16 +2184,33 @@ def workout_view(request,id=0):
except:
pass
# get raceresult
intervaldata = {}
if raceresult != 0:
try:
result = VirtualRaceResult.objects.get(id=raceresult)
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 VirtualRaceResult.DoesNotExist:
summary = row.summary
# create interactive plot
res = interactive_chart(encoder.decode_hex(id))
res = interactive_chart(encoder.decode_hex(id),intervaldata=intervaldata)
script = res[0]
div = res[1]
# create map
f1 = row.csvfilename
rowdata = rdata(f1)
hascoordinates = 1
if rowdata != 0:
try:
@@ -2239,6 +2259,7 @@ def workout_view(request,id=0):
'graphs':g,
'last_name':u.last_name,
'records':records,
'summary':summary,
'recordsindoor':recordsindoor,
'first_name':u.first_name,
'interactiveplot':script,