From 079fc6e699fb352e36547ca7f68335505cb5fe9c Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 19 May 2019 10:42:07 +0200 Subject: [PATCH] improved #480 --- rowers/templates/workout_join_select.html | 64 ++++++++-------------- rowers/tests/testdata/testdata.csv.gz | Bin 12523 -> 12523 bytes rowers/urls.py | 2 +- rowers/views/workoutviews.py | 19 +++---- 4 files changed, 34 insertions(+), 51 deletions(-) diff --git a/rowers/templates/workout_join_select.html b/rowers/templates/workout_join_select.html index 7267ee91..ab1035b1 100644 --- a/rowers/templates/workout_join_select.html +++ b/rowers/templates/workout_join_select.html @@ -66,9 +66,21 @@ -

{{ team.name }} Join Workouts

+

{{ team.name }} Glue Workouts

    +
  • + {% if team %} +
    + {% else %} + + {% endif %} + {{ searchform }} + +
    +
  • {% if workouts %} @@ -96,45 +108,17 @@
  • - {% if team %} -
    - {% else %} - - {% endif %} - - {{ dateform.as_table }} -
    -

    - {% csrf_token %} - -

    -
    -
    • -
  • - {% if team %} -
    - {% else %} - - {% endif %} - - {{ modalityform.as_table }} -
    -

    - {% csrf_token %} - -

    -
    -
    • -
  • - {% if team %} -
    - {% else %} - - {% endif %} - {{ searchform }} - + + + {{ dateform.as_table }} +
    + + {{ modalityform.as_table }} +
    +

    + {% csrf_token %} + +

diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz index 55bf7cd3045a8148defda5782bcddb0aa7462d30..5fb79bb4045c585908b675a247293efcf015a65d 100644 GIT binary patch delta 15 WcmaEz_&SkIzMF&Nn%G9Rrv?BtvIY?V delta 15 WcmaEz_&SkIzMF$%gTO|%rv?Bsum$A+ diff --git a/rowers/urls.py b/rowers/urls.py index eb04742f..ab33f992 100644 --- a/rowers/urls.py +++ b/rowers/urls.py @@ -224,8 +224,8 @@ urlpatterns = [ re_path(r'^user-boxplot-select/user/(?P\d+)/$',views.user_boxplot_select,name='user_boxplot_select'), re_path(r'^user-boxplot-select/$',views.user_boxplot_select,name='user_boxplot_select'), re_path(r'^user-analysis-select/(?P\w.*)/user/(?P\d+)/$',views.analysis_new,name='analysis_new'), - re_path(r'^user-analysis-select/user/(?P\d+)/$',views.analysis_new,name='analysis_new'), re_path(r'^user-analysis-select/(?P\w.*)/team/(?P\d+)/$',views.analysis_new,name='analysis_new'), + re_path(r'^user-analysis-select/user/(?P\d+)/$',views.analysis_new,name='analysis_new'), re_path(r'^user-analysis-select/team/(?P\d+)/$',views.analysis_new,name='analysis_new'), re_path(r'^user-analysis-select/(?P\w.*)/$',views.analysis_new,name='analysis_new'), re_path(r'^user-analysis-select/$',views.analysis_new,name='analysis_new'), diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py index b78c4ec5..83046177 100644 --- a/rowers/views/workoutviews.py +++ b/rowers/views/workoutviews.py @@ -479,8 +479,9 @@ def workouts_join_select(request, modalities = [m[0] for m in mytypes.workouttypes] modality = 'all' - if request.method == 'POST' and 'daterange' in request.POST: + if request.method == 'POST': dateform = DateRangeForm(request.POST) + modalityform = TrendFlexModalForm(request.POST) if dateform.is_valid(): startdate = dateform.cleaned_data['startdate'] enddate = dateform.cleaned_data['enddate'] @@ -488,15 +489,6 @@ def workouts_join_select(request, enddatestring = enddate.strftime('%Y-%m-%d') request.session['startdate'] = startdatestring request.session['enddate'] = enddatestring - else: - dateform = DateRangeForm(initial={ - 'startdate':startdate, - 'enddate':enddate, - }) - - - if request.method == 'POST' and 'modality' in request.POST: - modalityform = TrendFlexModalForm(request.POST) if modalityform.is_valid(): modality = modalityform.cleaned_data['modality'] waterboattype = modalityform.cleaned_data['waterboattype'] @@ -511,6 +503,13 @@ def workouts_join_select(request, request.session['modalities'] = modalities request.session['waterboattype'] = waterboattype + else: + dateform = DateRangeForm(initial={ + 'startdate':startdate, + 'enddate':enddate, + }) + + negtypes = [] for b in mytypes.boattypes: