diff --git a/rowers/templates/menu_plan.html b/rowers/templates/menu_plan.html index d70323af..70cd7191 100644 --- a/rowers/templates/menu_plan.html +++ b/rowers/templates/menu_plan.html @@ -1,5 +1,20 @@ +{% load staticfiles %} +{% load rowerfilters %}

Plan

+ +{% if user.is_authenticated and user|is_manager %} +

 

+ + +{% endif %} diff --git a/rowers/templates/plannedsession_multicreate.html b/rowers/templates/plannedsession_multicreate.html index 2bf4c0b4..0a3ede15 100644 --- a/rowers/templates/plannedsession_multicreate.html +++ b/rowers/templates/plannedsession_multicreate.html @@ -1,118 +1,65 @@ -{% extends "base.html" %} +{% extends "newbase.html" %} {% load staticfiles %} {% load rowerfilters %} {% block title %}Plan entire microcycle{% endblock %} -{% block content %} -
- {% include "planningbuttons.html" %} -
+{% block main %} +

Create Sessions for {{ rower.user.first_name }} {{ rower.user.last_name }}

-
-
-

Create Sessions for {{ rower.user.first_name }} {{ rower.user.last_name }}

-
- -{% if user.is_authenticated and user|is_manager %} -
- -
- {% for member in user|team_rowers %} - {{ member.user.first_name }} {{ member.user.last_name }} - {% endfor %} -
-
-{% endif %} -
- -
-

- On this page, you can create and edit sessions for an entire time - period. You see a list of the current sessions planned for the - selected time period. Each row in the table is a session. You can - remove a session by clicking "remove" at the end of a row. - You can edit the date in the forms. If you need to add a new session, - click the "Add More" button to add a new session. Use the "Submit" - button to commit any changes you made. +

-
- -
- -
-{% endblock %} - -{% block scripts %} @@ -200,3 +147,7 @@ {% endblock %} + +{% block sidebar %} +{% include 'menu_plan.html' %} +{% endblock %} diff --git a/rowers/templates/trainingplan_create.html b/rowers/templates/trainingplan_create.html index 350e2119..cbf7ffb6 100644 --- a/rowers/templates/trainingplan_create.html +++ b/rowers/templates/trainingplan_create.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "newbase.html" %} {% load staticfiles %} {% load rowerfilters %} @@ -8,32 +8,11 @@ {% endblock %} -{% block content %} - - -
- {% if user.is_authenticated and user|is_manager %} -
- -
- {% for member in user|team_members %} - {{ member.first_name }} {{ member.last_name }} - {% endfor %} -
-
- {% endif %} -
- - -
-
-

Training Targets

+{% block main %} +

Manage Training Targets and Plan for {{ rower.user.first_name }} {{ rower.user.last_name }}

+
-
- - - -
- -
-

Plans

+ +
  • +

    Plans

    {% if plans %} @@ -111,28 +81,24 @@

    No plans found

    {% endif %} - - - - -
    -
    -

    Add a plan

    - -
    -
    - {{ form.as_table }} -
    - {% csrf_token %} -
    +
    • +
  • +

    Add a plan

    + + + + {{ form.as_table }} +
    + {% csrf_token %} -
    • - -
    - + + - {% endblock %} + +{% block sidebar %} +{% include 'menu_plan.html' %} +{% endblock %} diff --git a/rowers/templates/trainingplan_delete.html b/rowers/templates/trainingplan_delete.html index ffb9362c..d39d971f 100644 --- a/rowers/templates/trainingplan_delete.html +++ b/rowers/templates/trainingplan_delete.html @@ -1,4 +1,4 @@ -{% extends "base.html" %} +{% extends "newbase.html" %} {% load staticfiles %} {% load rowerfilters %} @@ -8,23 +8,17 @@ {% endblock %} -{% block content %} - +{% block main %} -
    - -
    - {% csrf_token %} -

    Are you sure you want to delete {{ object }}?

    -
    - -
    -
    +
    + {% csrf_token %} +

    Are you sure you want to delete {{ object }}?

    + +
    -
    {% endblock %} + +{% block sidebar %} +{% include 'menu_plan.html' %} +{% endblock %} diff --git a/rowers/urls.py b/rowers/urls.py index 9a99a301..34607d96 100644 --- a/rowers/urls.py +++ b/rowers/urls.py @@ -409,11 +409,11 @@ urlpatterns = [ url(r'^workout/(?P\d+)/flexchart/(?P\w+.*)/(?P[\w\ ]+.*)/(?P[\w\ ]+.*)/(?P\w+.*)$',views.workout_flexchart3_view), url(r'^workout/(?P\d+)/flexchart/(?P\w+.*)/(?P[\w\ ]+.*)/(?P[\w\ ]+.*)$',views.workout_flexchart3_view), url(r'^workout/(?P\d+)/flexchart$',views.workout_flexchart3_view), - url(r'^workout/compare/(?P\d+)/(?P\d+)/(?P\w+.*)/(?P[\w\ ]+.*)/(?P[\w\ ]+.*)$',views.workout_comparison_view2), - url(r'^workout/compare/(?P\d+)/(?P\d+)/(?P\w+.*)/(?P[\w\ ]+.*)/$',views.workout_comparison_view2), +# url(r'^workout/compare/(?P\d+)/(?P\d+)/(?P\w+.*)/(?P[\w\ ]+.*)/(?P[\w\ ]+.*)$',views.workout_comparison_view2), +# url(r'^workout/compare/(?P\d+)/(?P\d+)/(?P\w+.*)/(?P[\w\ ]+.*)/$',views.workout_comparison_view2), url(r'^test\_callback',views.rower_process_testcallback), - url(r'^createplan$',views.rower_create_trainingplan), - url(r'^createplan/(?P\d+)$',views.rower_create_trainingplan), + url(r'^createplan/$',views.rower_create_trainingplan), + url(r'^createplan/user/(?P\d+)$',views.rower_create_trainingplan), url(r'^deleteplan/(?P\d+)$',views.TrainingPlanDelete.as_view()), url(r'^deletemicrocycle/(?P\d+)$',views.MicroCycleDelete.as_view()), url(r'^deletemesocycle/(?P\d+)$',views.MesoCycleDelete.as_view()), @@ -440,57 +440,57 @@ urlpatterns = [ url(r'^sessions/teamedit/(?P\d+)/(?P[\w\ ]+.*)$',views.plannedsession_teamedit_view), url(r'^sessions/create$',views.plannedsession_create_view), - url(r'^sessions/create/rower/(?P\d+)$', + url(r'^sessions/create/user/(?P\d+)$', views.plannedsession_create_view), url( - r'^sessions/create/(?P[\w\ ]+.*)/rower/(?P\d+)$', + r'^sessions/create/(?P[\w\ ]+.*)/user/(?P\d+)$', views.plannedsession_create_view), url(r'^sessions/create/(?P[\w\ ]+.*)$', views.plannedsession_create_view), url(r'^sessions/multiclone$',views.plannedsession_multiclone_view), - url(r'^sessions/multiclone/(?P[\w\ ]+.*)/rower/(?P\d+)/extra/(?P\d+)$', + url(r'^sessions/multiclone/(?P[\w\ ]+.*)/user/(?P\d+)/extra/(?P\d+)$', views.plannedsession_multiclone_view), - url(r'^sessions/multiclone/rower/(?P\d+)$', + url(r'^sessions/multiclone/user/(?P\d+)$', views.plannedsession_multiclone_view), url( - r'^sessions/multiclone/(?P[\w\ ]+.*)/rower/(?P\d+)$', + 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\ ]+.*)/rower/(?P\d+)/extra/(?P\d+)$', + url(r'^sessions/multicreate/(?P[\w\ ]+.*)/user/(?P\d+)/extra/(?P\d+)$', views.plannedsession_multicreate_view), - url(r'^sessions/multicreate/rower/(?P\d+)$', + url(r'^sessions/multicreate/user/(?P\d+)$', views.plannedsession_multicreate_view), url( - r'^sessions/multicreate/(?P[\w\ ]+.*)/rower/(?P\d+)$', + 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\ ]+.*)/rower/(?P\d+)$',views.plannedsession_edit_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\ ]+.*)/rower/(?P\d+)$',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+)$',views.plannedsession_view, name='plannedsession_view'), - url(r'^sessions/(?P\d+)/(?P[\w\ ]+.*)/rower/(?P\d+)$',views.plannedsession_view, + url(r'^sessions/(?P\d+)/(?P[\w\ ]+.*)/user/(?P\d+)$',views.plannedsession_view, name='plannedsession_view'), - url(r'^sessions/(?P\d+)/rower/(?P\d+)$',views.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), url(r'^sessions/(?P\d+)/delete$',views.plannedsession_delete_view), url(r'^sessions/manage/session/(?P\d+)$', views.plannedsessions_manage_view), - url(r'^sessions/manage/rower/(?P\d+)/session/(?P\d+)$', + url(r'^sessions/manage/user/(?P\d+)/session/(?P\d+)$', views.plannedsessions_manage_view), - url(r'^sessions/manage/(?P[\w\ ]+.*)/rower/(?P\d+)/session/(?P\d+)$', + 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), @@ -498,9 +498,9 @@ urlpatterns = [ url(r'^sessions/manage/?$', views.plannedsessions_manage_view), - url(r'^sessions/manage/rower/(?P\d+)$', + url(r'^sessions/manage/user/(?P\d+)$', views.plannedsessions_manage_view), - url(r'^sessions/manage/(?P[\w\ ]+.*)/rower/(?P\d+)$', + url(r'^sessions/manage/(?P[\w\ ]+.*)/user/(?P\d+)$', views.plannedsessions_manage_view), url(r'^sessions/manage/(?P[\w\ ]+.*)$', views.plannedsessions_manage_view), @@ -510,12 +510,12 @@ urlpatterns = [ url(r'^sessions/coach/(?P[\w\ ]+.*)$', views.plannedsessions_coach_view), url(r'^sessions/print/?$',views.plannedsessions_print_view), - url(r'^sessions/print/rower/(?P\d+)$',views.plannedsessions_print_view), - url(r'^sessions/print/(?P[\w\ ]+.*)/rower/(?P\d+)$',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/rower/(?P\d+)$',views.plannedsessions_view), - url(r'^sessions/(?P[\w\ ]+.*)/rower/(?P\d+)$',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'), diff --git a/rowers/views.py b/rowers/views.py index b9b544ae..64b0711c 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -13527,7 +13527,7 @@ def agegrouprecordview(request,sex='male',weightcategory='hwt', redirect_field_name=None) def plannedsession_multiclone_view( request,timeperiod='none', - rowerid=0, + rowerid=0,userid=0, startdate=timezone.now()-datetime.timedelta(days=30), enddate=timezone.now()): @@ -13630,7 +13630,7 @@ def plannedsession_multiclone_view( # Individual user creates training for himself @user_passes_test(hasplannedsessions,login_url="/rowers/planmembership/", redirect_field_name=None) -def plannedsession_create_view(request,timeperiod='thisweek',rowerid=0): +def plannedsession_create_view(request,timeperiod='thisweek',rowerid=0,userid=0): r = getrequestrower(request,rowerid=rowerid) startdate,enddate = get_dates_timeperiod(timeperiod) @@ -13754,7 +13754,7 @@ def plannedsession_create_view(request,timeperiod='thisweek',rowerid=0): @user_passes_test(hasplannedsessions,login_url="/rowers/planmembership/", redirect_field_name=None) def plannedsession_multicreate_view(request,timeperiod='thisweek', - teamid=0,rowerid=0,extrasessions=0): + teamid=0,rowerid=0,userid=0,extrasessions=0): extrasessions=int(extrasessions) @@ -13845,6 +13845,7 @@ def plannedsession_multicreate_view(request,timeperiod='thisweek', context = { 'ps_formset':ps_formset, 'rower':r, + 'active':'nav-plan', 'plan':trainingplan, 'timeperiod':timeperiod, 'teams':get_my_teams(request.user), @@ -14145,7 +14146,7 @@ def plannedsessions_coach_view(request,timeperiod='thisweek', ) @login_required() -def plannedsessions_view(request,timeperiod='thisweek',rowerid=0): +def plannedsessions_view(request,timeperiod='thisweek',rowerid=0,userid=0): r = getrequestrower(request,rowerid=rowerid) @@ -14192,7 +14193,7 @@ def plannedsessions_view(request,timeperiod='thisweek',rowerid=0): }) @login_required() -def plannedsessions_print_view(request,timeperiod='thisweek',rowerid=0): +def plannedsessions_print_view(request,timeperiod='thisweek',rowerid=0,userid=0): r = getrequestrower(request,rowerid=rowerid) @@ -14225,7 +14226,7 @@ def plannedsessions_print_view(request,timeperiod='thisweek',rowerid=0): @login_required() -def plannedsessions_manage_view(request,timeperiod='thisweek',rowerid=0, +def plannedsessions_manage_view(request,timeperiod='thisweek',rowerid=0,userid=0, initialsession=0): is_ajax = False @@ -14358,7 +14359,7 @@ def plannedsessions_manage_view(request,timeperiod='thisweek',rowerid=0, # need clarity on cloning behavior time shift @user_passes_test(hasplannedsessions,login_url="/rowers/planmembership/", redirect_field_name=None) -def plannedsession_clone_view(request,id=0,rowerid=0, +def plannedsession_clone_view(request,id=0,rowerid=0,userid=0, timeperiod='thisweek'): r = getrequestrower(request,rowerid=rowerid) @@ -14414,7 +14415,7 @@ def plannedsession_clone_view(request,id=0,rowerid=0, # Edit an existing planned session @user_passes_test(hasplannedsessions,login_url="/rowers/planmembership/", redirect_field_name=None) -def plannedsession_edit_view(request,id=0,timeperiod='thisweek',rowerid=0): +def plannedsession_edit_view(request,id=0,timeperiod='thisweek',rowerid=0,userid=0): r = getrequestrower(request,rowerid=rowerid) @@ -14489,7 +14490,7 @@ def plannedsession_edit_view(request,id=0,timeperiod='thisweek',rowerid=0): @login_required() -def plannedsession_view(request,id=0,rowerid=0, +def plannedsession_view(request,id=0,rowerid=0,userid=0, timeperiod='thisweek'): m = getrower(request.user) @@ -15524,7 +15525,7 @@ def rower_delete_trainingtarget(request,id=0): if checkaccessuser(request.user,target.rower): target.delete() - messages.info(request,"We have deleted the training plan") + messages.info(request,"We have deleted the training target") else: raise PermissionDenied("Access denied")