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

better metrics selection

Browse Source
This commit is contained in:
Sander Roosendaal
2019-11-18 10:52:34 +01:00
parent 9650a7cb71
commit 01c02b2b02
5 changed files with 66 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
rowers/views/workoutviews.py
View File

@@ -5,7 +5,7 @@ from __future__ import unicode_literals
from rowers.views.statements import *
import rowers.teams as teams
import rowers.mytypes as mytypes
import numpy
from urllib.parse import urlparse, parse_qs
@@ -58,6 +58,11 @@ def workout_video_view(request,id=''):
w = analysis.workout
delay = analysis.delay
if w.workouttype in mytypes.otwtypes:
mode = 'water'
else:
mode = 'erg'
if request.user.is_authenticated:
mayedit = checkworkoutuser(request.user,w) and isprorower(request.user.rower)
rower = request.user.rower
@@ -68,7 +73,7 @@ def workout_video_view(request,id=''):
# get video ID and offset
if mayedit and request.method == 'POST':
form = VideoAnalysisCreateForm(request.POST)
metricsform = VideoAnalysisMetricsForm(request.POST)
metricsform = VideoAnalysisMetricsForm(request.POST,mode=mode)
if form.is_valid() and metricsform.is_valid():
video_id = form.cleaned_data['url']
try:
@@ -94,7 +99,8 @@ def workout_video_view(request,id=''):
'url': analysis.video_id,
}
)
metricsform = VideoAnalysisMetricsForm(initial={'groups':analysis.metricsgroups})
metricsform = VideoAnalysisMetricsForm(initial={'groups':analysis.metricsgroups},
mode=mode)
metricsgroups = analysis.metricsgroups
video_id = analysis.video_id
else:
@@ -102,10 +108,16 @@ def workout_video_view(request,id=''):
metricsform = None
metricsgroups = analysis.metricsgroups
data, metrics, maxtime = dataprep.get_video_data(w,groups=metricsgroups)
data, metrics, maxtime = dataprep.get_video_data(w,groups=metricsgroups,mode=mode)
hascoordinates = pd.Series(data['latitude']).std() > 0
# create map
mapscript, mapdiv = leaflet_chart_video(data['latitude'],data['longitude'],
if hascoordinates:
mapscript, mapdiv = leaflet_chart_video(data['latitude'],data['longitude'],
w.name)
else:
mapscript, mapdiv = interactive_chart_video(data)
data['longitude'] = data['spm']
data['latitude'] = list(range(len(data['spm'])))
breadcrumbs = [
@@ -150,11 +162,16 @@ def workout_video_view(request,id=''):
def workout_video_create_view(request,id=0):
# get workout
w = get_workout_permitted(request.user,id)
if w.workouttype in mytypes.otwtypes:
mode = 'water'
else:
mode = 'erg'
# get video ID and offset
if request.method == 'POST':
form = VideoAnalysisCreateForm(request.POST)
metricsform = VideoAnalysisMetricsForm(request.POST)
metricsform = VideoAnalysisMetricsForm(request.POST,mode=mode)
print(request.POST)
if form.is_valid() and metricsform.is_valid():
url = form.cleaned_data['url']
delay = form.cleaned_data['delay']
@@ -189,13 +206,13 @@ def workout_video_create_view(request,id=0):
metricsgroups = ['basic']
else:
form = VideoAnalysisCreateForm()
metricsform = VideoAnalysisMetricsForm(initial={'groups':['basic']})
metricsform = VideoAnalysisMetricsForm(initial={'groups':['basic']},mode=mode)
video_id = None
delay = 0
metricsgroups = ['basic']
# get data
data, metrics, maxtime = dataprep.get_video_data(w,groups=metricsgroups)
data, metrics, maxtime = dataprep.get_video_data(w,groups=metricsgroups,mode=mode)
hascoordinates = pd.Series(data['latitude']).std() > 0
# create map
@@ -227,7 +244,6 @@ def workout_video_create_view(request,id=0):
template = 'embedded_video.html'
print(data['latitude'],'aap')
return render(request,
template,