diff --git a/rowers/templates/plannedsession_multicreate.html b/rowers/templates/plannedsession_multicreate.html index 0a3ede15..3f8f8ffa 100644 --- a/rowers/templates/plannedsession_multicreate.html +++ b/rowers/templates/plannedsession_multicreate.html @@ -48,11 +48,11 @@ {% endfor %} - + Add More or - + Clone multiple sessions diff --git a/rowers/templates/plannedsessioncreate.html b/rowers/templates/plannedsessioncreate.html index 162646f2..e66d61d0 100644 --- a/rowers/templates/plannedsessioncreate.html +++ b/rowers/templates/plannedsessioncreate.html @@ -43,10 +43,10 @@ {{ ps.sessionvalue }} {{ ps.sessionunit }} - Edit + Edit - Clone + Clone diff --git a/rowers/templates/plannedsessions_multiclone_select.html b/rowers/templates/plannedsessions_multiclone_select.html index d17e200a..bbe7a459 100644 --- a/rowers/templates/plannedsessions_multiclone_select.html +++ b/rowers/templates/plannedsessions_multiclone_select.html @@ -1,10 +1,10 @@ -{% extends "base.html" %} +{% extends "newbase.html" %} {% load staticfiles %} {% load rowerfilters %} {% block title %}Workouts{% endblock %} -{% block content %} +{% block main %} - -
- {% include "planningbuttons.html" %} -
-
-

Clone Multiple Sessions

-
-
- -
- - Today - - - This Week - - - This Month - - - Last Week - - - Last Month - - - Next Week - - - Next Month - -
-
-{% if user.is_authenticated and user|is_manager %} -
- -
- {% for member in user|team_rowers %} - {{ member.user.first_name }} {{ member.user.last_name }} - {% endfor %} -
-
-
-
-
- {% endif %} -
- - {{ dateform.as_table }} -
- {% csrf_token %} -
-
- -
-
-
-
-
-
- -
-
- -
-
-
- -
+

Clone Multiple Sessions

-
+
    +
  • - {% if plannedsessions %} - - Toggle All
    - - - {{ form.as_table }} -
    - -{% else %} -

    No sessions found

    -{% endif %} -
-
-

Select one or more planned sessions on the left, - select the date when the new cycle starts below - and press submit

- {% csrf_token %} - - {{ dateshiftform.as_table }} -
-
-

- + {% if plannedsessions %} + + Toggle All
+ + + {{ form.as_table }} +
+ + {% else %} +

No sessions found

+ {% endif %} + +
  • +

    Select one or more planned sessions on the left, + select the date when the new cycle starts below + and press submit

    + {% csrf_token %} + + {{ dateshiftform.as_table }} +
    +

    +

    -
    • -
    -

    You can use the date and search forms above to search through all +

    You can use the date and search forms above to search through all sessions.

    -
    -
    + +
    {% endblock %} + +{% block sidebar %} +{% include 'menu_plan.html' %} +{% endblock %} diff --git a/rowers/urls.py b/rowers/urls.py index e2833eb2..53e87a49 100644 --- a/rowers/urls.py +++ b/rowers/urls.py @@ -446,46 +446,25 @@ urlpatterns = [ url(r'^sessions/teamcreate/team/$', views.plannedsession_teamcreate_view), url(r'^sessions/teamedit/(?P\d+)$',views.plannedsession_teamedit_view), - url(r'^sessions/teamedit/(?P\d+)/(?P[\w\ ]+.*)$',views.plannedsession_teamedit_view), - url(r'^sessions/create/$',views.plannedsession_create_view), url(r'^sessions/create/user/(?P\d+)$', views.plannedsession_create_view), - - url(r'^sessions/multiclone$',views.plannedsession_multiclone_view), - url(r'^sessions/multiclone/(?P[\w\ ]+.*)/user/(?P\d+)/extra/(?P\d+)$', + url(r'^sessions/multiclone/$',views.plannedsession_multiclone_view), + url(r'^sessions/multiclone/user/(?P\d+)/extra/(?P\d+)$/', views.plannedsession_multiclone_view), - url(r'^sessions/multiclone/user/(?P\d+)$', + url(r'^sessions/multiclone/user/(?P\d+)/$', views.plannedsession_multiclone_view), - url( - r'^sessions/multiclone/(?P[\w\ ]+.*)/user/(?P\d+)$', - views.plannedsession_multiclone_view), - url(r'^sessions/multiclone/(?P[\w\ ]+.*)$', - views.plannedsession_multiclone_view), - - url(r'^sessions/multicreate$',views.plannedsession_multicreate_view), - url(r'^sessions/multicreate/(?P[\w\ ]+.*)/user/(?P\d+)/extra/(?P\d+)$', + url(r'^sessions/multicreate/$',views.plannedsession_multicreate_view), + url(r'^sessions/multicreate/user/(?P\d+)/extra/(?P\d+)/$', views.plannedsession_multicreate_view), - url(r'^sessions/multicreate/user/(?P\d+)$', + url(r'^sessions/multicreate/user/(?P\d+)/$', views.plannedsession_multicreate_view), - url( - r'^sessions/multicreate/(?P[\w\ ]+.*)/user/(?P\d+)$', - views.plannedsession_multicreate_view), - url(r'^sessions/multicreate/(?P[\w\ ]+.*)$', - views.plannedsession_multicreate_view), - - url(r'^sessions/(?P\d+)/edit/(?P[\w\ ]+.*)/user/(?P\d+)$',views.plannedsession_edit_view), - url(r'^sessions/(?P\d+)/edit/(?P[\w\ ]+.*)$',views.plannedsession_edit_view), - url(r'^sessions/(?P\d+)/edit$',views.plannedsession_edit_view), - - url(r'^sessions/(?P\d+)/clone$',views.plannedsession_clone_view), - url(r'^sessions/(?P\d+)/clone/(?P[\w\ ]+.*)/user/(?P\d+)$',views.plannedsession_clone_view), - url(r'^sessions/(?P\d+)/clone/(?P[\w\ ]+.*)$',views.plannedsession_clone_view), - + url(r'^sessions/(?P\d+)/edit/$',views.plannedsession_edit_view), + url(r'^sessions/(?P\d+)/edit/user/(?P/$',views.plannedsession_edit_view), + url(r'^sessions/(?P\d+)/clone/user/(?P/$',views.plannedsession_clone_view), + url(r'^sessions/(?P\d+)/clone/$',views.plannedsession_clone_view), url(r'^sessions/(?P\d+)$',views.plannedsession_view, name='plannedsession_view'), - url(r'^sessions/(?P\d+)/(?P[\w\ ]+.*)/user/(?P\d+)$',views.plannedsession_view, - name='plannedsession_view'), url(r'^sessions/(?P\d+)/user/(?P\d+)$',views.plannedsession_view, name='plannedsession_view'), url(r'^sessions/(?P\d+)/deleteconfirm$',views.plannedsession_deleteconfirm_view), @@ -494,33 +473,15 @@ urlpatterns = [ views.plannedsessions_manage_view), url(r'^sessions/manage/user/(?P\d+)/session/(?P\d+)$', views.plannedsessions_manage_view), - url(r'^sessions/manage/(?P[\w\ ]+.*)/user/(?P\d+)/session/(?P\d+)$', - views.plannedsessions_manage_view), - url(r'^sessions/manage/(?P[\w\ ]+.*)/session/(?P\d+)$', - views.plannedsessions_manage_view), - - url(r'^sessions/manage/?$', views.plannedsessions_manage_view), url(r'^sessions/manage/user/(?P\d+)$', views.plannedsessions_manage_view), - url(r'^sessions/manage/(?P[\w\ ]+.*)/user/(?P\d+)$', - views.plannedsessions_manage_view), - url(r'^sessions/manage/(?P[\w\ ]+.*)$', - views.plannedsessions_manage_view), url(r'^sessions/coach$',views.plannedsessions_coach_view), - url(r'^sessions/coach/(?P[\w\ ]+.*)/team/(?P\d+)$', - views.plannedsessions_coach_view), - url(r'^sessions/coach/(?P[\w\ ]+.*)$', - views.plannedsessions_coach_view), url(r'^sessions/print/?$',views.plannedsessions_print_view), url(r'^sessions/print/user/(?P\d+)$',views.plannedsessions_print_view), - url(r'^sessions/print/(?P[\w\ ]+.*)/user/(?P\d+)$',views.plannedsessions_print_view), - url(r'^sessions/print/(?P[\w\ ]+.*)$',views.plannedsessions_print_view), - url(r'^sessions/?$',views.plannedsessions_view), + url(r'^sessions/$',views.plannedsessions_view), url(r'^sessions/user/(?P\d+)$',views.plannedsessions_view), - url(r'^sessions/(?P[\w\ ]+.*)/user/(?P\d+)$',views.plannedsessions_view), - url(r'^sessions/(?P[\w\ ]+.*)$',views.plannedsessions_view), url(r'^courses/(?P\d+)/edit$',views.course_edit_view, name='course_edit_view'), url(r'^courses/(?P\d+)/delete$',views.course_delete_view), diff --git a/rowers/views.py b/rowers/views.py index 0d59dc38..c604b8e6 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -13541,15 +13541,20 @@ def agegrouprecordview(request,sex='male',weightcategory='hwt', @user_passes_test(hasplannedsessions,login_url="/rowers/planmembership/", redirect_field_name=None) def plannedsession_multiclone_view( - request,timeperiod='none', - rowerid=0,userid=0, + request, + userid=0, startdate=timezone.now()-datetime.timedelta(days=30), enddate=timezone.now()): - r = getrequestrower(request,rowerid=rowerid) + r = getrequestrower(request,userid=userid) - if timeperiod != 'none': - startdate,enddate = get_dates_timeperiod(timeperiod) + when = request.GET.get('when') + if when: + timeperiod = when + else: + timeperiod = 'thisweek' + + startdate,enddate = get_dates_timeperiod(timeperiod) if request.method == 'POST' and 'daterange' in request.POST: @@ -13591,10 +13596,11 @@ def plannedsession_multiclone_view( url = reverse(plannedsession_multicreate_view, kwargs = { - 'rowerid':r.id, - 'timeperiod':timeperiod, + 'userid':r.user.id, }) + url += '?when='+when + return HttpResponseRedirect(url) sps = PlannedSession.objects.filter( @@ -13638,6 +13644,7 @@ def plannedsession_multiclone_view( 'form':form, 'dateshiftform':dateshiftform, 'rower':r, + 'active':'nav-plan', 'timeperiod':timeperiod, } ) @@ -13777,12 +13784,18 @@ def plannedsession_create_view(request, @user_passes_test(hasplannedsessions,login_url="/rowers/planmembership/", redirect_field_name=None) -def plannedsession_multicreate_view(request,timeperiod='thisweek', - teamid=0,rowerid=0,userid=0,extrasessions=0): +def plannedsession_multicreate_view(request, + teamid=0,userid=0,extrasessions=0): extrasessions=int(extrasessions) - r = getrequestrower(request,rowerid=rowerid) + r = getrequestrower(request,userid=userid) + + when = request.GET.get('when') + if when: + timeperiod = when + else: + timeperiod = 'thisweek' startdate,enddate = get_dates_timeperiod(timeperiod) try: @@ -13834,6 +13847,7 @@ def plannedsession_multicreate_view(request,timeperiod='thisweek', initials = [initial for i in range(extrasessions)] + PlannedSessionFormSet = modelformset_factory( PlannedSession, form=PlannedSessionFormSmall, @@ -16081,7 +16095,6 @@ def rower_trainingplan_view(request, else: thismeso = None - print thismacro,thismeso,thismicro,'aap' return render(request,'trainingplan.html', {