From 5bc54bd143a4068a95812ab01fa26ea70a4851bc Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Tue, 12 Nov 2019 21:50:32 +0100
Subject: [PATCH] rendering form on create video page

---
 rowers/views/workoutviews.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py
index 1e447ff3..013ad194 100644
--- a/rowers/views/workoutviews.py
+++ b/rowers/views/workoutviews.py
@@ -69,17 +69,19 @@ def workout_video_view(request,id=''):
     if mayedit and request.method == 'POST':
         form = VideoAnalysisCreateForm(request.POST)
         metricsform = VideoAnalysisMetricsForm(request.POST)
-        if form.is_valid():
+        if form.is_valid() and metricsform.is_valid():
             video_id = form.cleaned_data['url']
             try:
                 video_id = get_video_id(form.cleaned_data['url'])
             except (TypeError,ValueError):
                 pass
             delay = form.cleaned_data['delay']
+            metricsgroups = metricsform.cleaned_data['groups']
             if 'save_button' in request.POST:
                 analysis.name = form.cleaned_data['name']
                 analysis.video_id = video_id
                 analysis.delay = delay
+                analysis.metricsgroups = metricsgroups
                 analysis.save()
         else:
             video_id = id
@@ -92,7 +94,7 @@ def workout_video_view(request,id=''):
                 'url': analysis.video_id,
             }
         )
-        metricsform = VideoAnalysisMetricsForm(initial={'groups':['basic']})
+        metricsform = VideoAnalysisMetricsForm(initial={'groups':analysis.metricsgroups})
         video_id = analysis.video_id
     else:
         form = None
@@ -150,9 +152,11 @@ def workout_video_create_view(request,id=0):
     # get video ID and offset
     if request.method == 'POST':
         form = VideoAnalysisCreateForm(request.POST)
-        if form.is_valid():
+        metricsform = VideoAnalysisMetricsForm(request.POST)
+        if form.is_valid() and metricsform.is_valid():
             url = form.cleaned_data['url']
             delay = form.cleaned_data['delay']
+            metricsgroups = metricsform.cleaned_data['groups']
             video_id = get_video_id(url)
             if 'save_button' in request.POST:
                 analysis = VideoAnalysis(
@@ -160,6 +164,7 @@ def workout_video_create_view(request,id=0):
                     name=form.cleaned_data['name'],
                     video_id = video_id,
                     delay=delay,
+                    metricsgroups=metricsgroups
                 )
                 try:
                     analysis.save()
@@ -181,6 +186,7 @@ def workout_video_create_view(request,id=0):
             delay = 0
     else:
         form = VideoAnalysisCreateForm()
+        metricsform = VideoAnalysisMetricsForm(initial={'groups':['basic']})
         video_id = None
         delay = 0
 
@@ -218,6 +224,7 @@ def workout_video_create_view(request,id=0):
                       'mapdiv': mapdiv,
                       'video_id': video_id,
                       'form':form,
+                      'metricsform':metricsform,
                       'analysis':analysis,
                       'breadcrumbs':breadcrumbs,
                       'maxtime':maxtime,