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

line 422 and started with plan_menu

Browse Source
This commit is contained in:
Sander Roosendaal
2018-10-11 22:03:04 +02:00
parent 9d69fa15ea
commit f72335c49d
6 changed files with 175 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
rowers/templates/menu_plan.html
View File

@@ -1,5 +1,20 @@
{% load staticfiles %}
{% load rowerfilters %}
<h1>Plan</h1> <h1>Plan</h1>
<ul class="cd-accordion-menu animated"> <ul class="cd-accordion-menu animated">
<li class="has-children" id="plans">
<input type="checkbox" name="group-plans" id="group-plans">
<label for="group-plans">
<i class="fas fa-bullseye-pointer"></i>&nbsp;Plans
</label>
<ul>
<li id="plans-manage">
<a href="/rowers/createplan/">
<i class="fas fa-bullseye-pointer"></i>&nbsp;Manage Plans
</a>
</li>
</ul>
</li>
<li class="has-children" id="sessions"> <li class="has-children" id="sessions">
<input type="checkbox" name="group-sessions" id="group-sessions"> <input type="checkbox" name="group-sessions" id="group-sessions">
<label for="group-sessions"> <label for="group-sessions">
@@ -47,3 +62,27 @@
</ul> </ul>
</li> </li>
</ul><!-- cd-accordion-menu --> </ul><!-- cd-accordion-menu -->
{% if user.is_authenticated and user|is_manager %}
<p>&nbsp;</p>
<ul class="cd-accordion-menu animated">
<li class="has-children" id="athletes">
<input type="checkbox" name="athlete-selector" id="athlete-selector">
<label for="athlete-selector"><i class="fas fa-users fa-fw"></i>&nbsp;Athletes</label>
<ul>
{% for member in user|team_members %}
<a href={{ request.path|userurl:member }}>
<i class="fas fa-user fa-fw"></i>
{% if member == rower.user %}
&bull;
{% else %}
&nbsp;
{% endif %}
{{ member.first_name }} {{ member.last_name }}
</a>
{% endfor %}
</ul>
</li>
</ul>
{% endif %}

159
rowers/templates/plannedsession_multicreate.html
View File

@@ -1,118 +1,65 @@
{% extends "base.html" %} {% extends "newbase.html" %}
{% load staticfiles %} {% load staticfiles %}
{% load rowerfilters %} {% load rowerfilters %}
{% block title %}Plan entire microcycle{% endblock %} {% block title %}Plan entire microcycle{% endblock %}
{% block content %} {% block main %}
<div class="grid_12 alpha"> <h1>Create Sessions for {{ rower.user.first_name }} {{ rower.user.last_name }}</h1>
{% include "planningbuttons.html" %}
</div>
<div class="grid_12 alpha"> <ul class="main-content">
<div id="left" class="grid_6 alpha"> <li class="grid_4">
<h1>Create Sessions for {{ rower.user.first_name }} {{ rower.user.last_name }}</h1> <p>
</div> On this page, you can create and edit sessions for an entire time
<div id="timeperiod" class="grid_2 dropdown"> period. You see a list of the current sessions planned for the
<button class="grid_2 alpha button gray small dropbtn">Select Time Period ({{ timeperiod|verbosetimeperiod }})</button> selected time period. Each row in the table is a session. You can
<div class="dropdown-content"> remove a session by clicking "remove" at the end of a row.
<a class="button gray small alpha" You can edit the date in the forms. If you need to add a new session,
href="/rowers/sessions/multicreate/today/rower/{{ rower.id }}"> click the "Add More" button to add a new session. Use the "Submit"
Today button to commit any changes you made.
</a>
<a class="button gray small alpha"
href="/rowers/sessions/multicreate/thisweek/rower/{{ rower.id }}">
This Week
</a>
<a class="button gray small alpha"
href="/rowers/sessions/multicreate/thismonth/rower/{{ rower.id }}">
This Month
</a>
<a class="button gray small alpha"
href="/rowers/sessions/multicreate/lastweek/rower/{{ rower.id }}">
Last Week
</a>
<a class="button gray small alpha"
href="/rowers/sessions/multicreate/lastmonth/rower/{{ rower.id }}">
Last Month
</a>
<a class="button gray small alpha"
href="/rowers/sessions/multicreate/nextweek/rower/{{ rower.id }}">
Next Week
</a>
<a class="button gray small alpha"
href="/rowers/sessions/multicreate/nextmonth/rower/{{ rower.id }}">
Next Month
</a>
</div>
</div>
{% if user.is_authenticated and user|is_manager %}
<div class="grid_2 dropdown">
<button class="grid_2 alpha button green small dropbtn">
{{ rower.user.first_name }} {{ rower.user.last_name }}
</button>
<div class="dropdown-content">
{% for member in user|team_rowers %}
<a class="button green small" href="/rowers/sessions/multicreate/{{ timeperiod }}/rower/{{ member.id }}">{{ member.user.first_name }} {{ member.user.last_name }}</a>
{% endfor %}
</div>
</div>
{% endif %}
</div>
<div class="grid_12 alpha">
<p>
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.
</p> </p>
<form id="ps-form-table" method="post"> <form id="ps-form-table" method="post">
{% csrf_token %} {% csrf_token %}
{{ ps_formset.management_form }} {{ ps_formset.management_form }}
<table width="100%"> <table width="100%">
<thead> <thead>
<tr> <tr>
<th>&nbsp;</th> <th>&nbsp;</th>
{% for field in ps_formset.0.visible_fields %} {% for field in ps_formset.0.visible_fields %}
<td>{{ field.label_tag }}</td> <td>{{ field.label_tag }}</td>
{% endfor %}
</tr>
</thead>
<tbody>
{% for form in ps_formset %}
<tr class="session_form_row">
<td> {{ forloop.counter }}
{% if form.instance.pk %}{{ form.DELETE }}{% endif %}
{{ form.id }}
{% for field in form.hidden_fields %}
{{ field }}
{% endfor %} {% endfor %}
{% for field in form.visible_fields %} </tr>
<td> </thead>
{{ field }} <tbody>
</td> {% for form in ps_formset %}
<tr class="session_form_row">
<td> {{ forloop.counter }}
{% if form.instance.pk %}{{ form.DELETE }}{% endif %}
{{ form.id }}
{% for field in form.hidden_fields %}
{{ field }}
{% endfor %}
{% for field in form.visible_fields %}
<td>
{{ field }}
</td>
{% endfor %}
</tr>
{% endfor %} {% endfor %}
</tr> </tbody>
{% endfor %} </table>
</tbody> <a href="/rowers/sessions/multicreate/{{ timeperiod }}/rower/{{ rower.id }}/extra/{{ extrasessions }}">
</table> Add More
<a class="button gray small grid_2 alpha" href="/rowers/sessions/multicreate/{{ timeperiod }}/rower/{{ rower.id }}/extra/{{ extrasessions }}">Add More</a> </a>
<button class="button green small grid_2" type="submit">Submit</button> or
<a class="button blue small grid_2" href="/rowers/sessions/multiclone/{{ timeperiod }}/rower/{{ rower.id }}">Clone multiple sessions</a> <a href="/rowers/sessions/multiclone/{{ timeperiod }}/rower/{{ rower.id }}">
Clone multiple sessions
</a>
<button class="button green small" type="submit">Submit</button>
</form> </form>
</li>
</ul>
<div class="grid_6 prefix_6" id="id_guidance">
</div>
</div>
{% endblock %}
{% block scripts %}
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js"></script>
<script src="/static/js/jquery.formset.js"></script> <script src="/static/js/jquery.formset.js"></script>
@@ -200,3 +147,7 @@
</script> </script>
{% endblock %} {% endblock %}
{% block sidebar %}
{% include 'menu_plan.html' %}
{% endblock %}

104
rowers/templates/trainingplan_create.html
View File

@@ -1,4 +1,4 @@
{% extends "base.html" %} {% extends "newbase.html" %}
{% load staticfiles %} {% load staticfiles %}
{% load rowerfilters %} {% load rowerfilters %}
@@ -8,32 +8,11 @@
{% endblock %} {% endblock %}
{% block content %} {% block main %}
<style> <h1>Manage Training Targets and Plan for {{ rower.user.first_name }} {{ rower.user.last_name }}</h1>
#mypointer { <ul class="main-content">
cursor: pointer; <li class="grid_2">
} <h2>Training Targets</h2>
</style>
<div class="grid_12 alpha">
{% if user.is_authenticated and user|is_manager %}
<div class="grid_2 prefix_8 dropdown">
<button class="grid_2 alpha button green small dropbtn">
{{ rower.user.first_name }} {{ rower.user.last_name }}
</button>
<div class="dropdown-content">
{% for member in user|team_members %}
<a class="button green small" href="/rowers/createplan/{{ member.id }}">{{ member.first_name }} {{ member.last_name }}</a>
{% endfor %}
</div>
</div>
{% endif %}
</div>
<div class="grid_12 alpha">
<div id="targets_table" class="grid_8 alpha">
<h1>Training Targets</h1>
{% if targets %} {% if targets %}
<table width="100%" class="listtable shortpadded"> <table width="100%" class="listtable shortpadded">
@@ -59,31 +38,22 @@
{% else %} {% else %}
No training targets found No training targets found
{% endif %} {% endif %}
</div> </li>
<div class="grid_4 omega"> <li class="grid_2">
<div class="grid_4" id="planform"> <h2>Add a target</h2>
<h1>Add a target</h1>
<form id="newplanform" <form id="newplanform"
enctype="multipart/form-data" action="" method="post"> enctype="multipart/form-data" action="" method="post">
<table width=100%> <table width=100%>
{{ targetform.as_table }} {{ targetform.as_table }}
</table> </table>
{% csrf_token %} {% csrf_token %}
<div id="formbutton" class="grid_1 prefix_2 suffix_1 omega">
<input class="button green" type="submit" value="Save"> <input class="button green" type="submit" value="Save">
</div> </form>
</form>
</div> </li>
</div> <li class="grid_2">
</div> <h2>Plans</h2>
<div class="grid_12 alpha">
<div id="courses_table" class="grid_8 alpha">
<h1>Plans</h1>
{% if plans %} {% if plans %}
<table width="100%" class="listtable shortpadded"> <table width="100%" class="listtable shortpadded">
@@ -111,28 +81,24 @@
<p> No plans found </p> <p> No plans found </p>
{% endif %} {% endif %}
</div> </li>
<li class="grid_2">
<h2>Add a plan</h2>
<div class="grid_4 omega"> <form id="newplanform"
<div class="grid_4" id="planform"> enctype="multipart/form-data" action="" method="post">
<h1>Add a plan</h1> <table width=100%>
{{ form.as_table }}
<form id="newplanform" </table>
enctype="multipart/form-data" action="" method="post"> {% csrf_token %}
<table width=100%>
{{ form.as_table }}
</table>
{% csrf_token %}
<div id="formbutton" class="grid_1 prefix_2 suffix_1 omega">
<input class="button green" type="submit" value="Save"> <input class="button green" type="submit" value="Save">
</div>
</form>
</div> </li>
</div> </ul>
</div>
{% endblock %} {% endblock %}
{% block sidebar %}
{% include 'menu_plan.html' %}
{% endblock %}

28
rowers/templates/trainingplan_delete.html
View File

@@ -1,4 +1,4 @@
{% extends "base.html" %} {% extends "newbase.html" %}
{% load staticfiles %} {% load staticfiles %}
{% load rowerfilters %} {% load rowerfilters %}
@@ -8,23 +8,17 @@
{% endblock %} {% endblock %}
{% block content %} {% block main %}
<style>
#mypointer {
cursor: pointer;
}
</style>
<div class="grid_12 alpha"> <form action="" method="post">
{% csrf_token %}
<form action="" method="post"> <p>Are you sure you want to delete <em>{{ object }}</em>?</p>
{% csrf_token %} <input class="button red" type="submit" value="Confirm">
<p>Are you sure you want to delete <i>{{ object }}</i>?</p> </form>
<div id="formbutton" class="grid_1 prefix_2">
<input class="button red" type="submit" value="Confirm">
</div>
</form>
</div>
{% endblock %} {% endblock %}
{% block sidebar %}
{% include 'menu_plan.html' %}
{% endblock %}

48
rowers/urls.py
View File

@@ -409,11 +409,11 @@ urlpatterns = [
url(r'^workout/(?P<id>\d+)/flexchart/(?P<xparam>\w+.*)/(?P<yparam1>[\w\ ]+.*)/(?P<yparam2>[\w\ ]+.*)/(?P<plottype>\w+.*)$',views.workout_flexchart3_view), url(r'^workout/(?P<id>\d+)/flexchart/(?P<xparam>\w+.*)/(?P<yparam1>[\w\ ]+.*)/(?P<yparam2>[\w\ ]+.*)/(?P<plottype>\w+.*)$',views.workout_flexchart3_view),
url(r'^workout/(?P<id>\d+)/flexchart/(?P<xparam>\w+.*)/(?P<yparam1>[\w\ ]+.*)/(?P<yparam2>[\w\ ]+.*)$',views.workout_flexchart3_view), url(r'^workout/(?P<id>\d+)/flexchart/(?P<xparam>\w+.*)/(?P<yparam1>[\w\ ]+.*)/(?P<yparam2>[\w\ ]+.*)$',views.workout_flexchart3_view),
url(r'^workout/(?P<id>\d+)/flexchart$',views.workout_flexchart3_view), url(r'^workout/(?P<id>\d+)/flexchart$',views.workout_flexchart3_view),
url(r'^workout/compare/(?P<id1>\d+)/(?P<id2>\d+)/(?P<xparam>\w+.*)/(?P<yparam>[\w\ ]+.*)/(?P<plottype>[\w\ ]+.*)$',views.workout_comparison_view2), # url(r'^workout/compare/(?P<id1>\d+)/(?P<id2>\d+)/(?P<xparam>\w+.*)/(?P<yparam>[\w\ ]+.*)/(?P<plottype>[\w\ ]+.*)$',views.workout_comparison_view2),
url(r'^workout/compare/(?P<id1>\d+)/(?P<id2>\d+)/(?P<xparam>\w+.*)/(?P<yparam>[\w\ ]+.*)/$',views.workout_comparison_view2), # url(r'^workout/compare/(?P<id1>\d+)/(?P<id2>\d+)/(?P<xparam>\w+.*)/(?P<yparam>[\w\ ]+.*)/$',views.workout_comparison_view2),
url(r'^test\_callback',views.rower_process_testcallback), url(r'^test\_callback',views.rower_process_testcallback),
url(r'^createplan$',views.rower_create_trainingplan), url(r'^createplan/$',views.rower_create_trainingplan),
url(r'^createplan/(?P<userid>\d+)$',views.rower_create_trainingplan), url(r'^createplan/user/(?P<userid>\d+)$',views.rower_create_trainingplan),
url(r'^deleteplan/(?P<pk>\d+)$',views.TrainingPlanDelete.as_view()), url(r'^deleteplan/(?P<pk>\d+)$',views.TrainingPlanDelete.as_view()),
url(r'^deletemicrocycle/(?P<pk>\d+)$',views.MicroCycleDelete.as_view()), url(r'^deletemicrocycle/(?P<pk>\d+)$',views.MicroCycleDelete.as_view()),
url(r'^deletemesocycle/(?P<pk>\d+)$',views.MesoCycleDelete.as_view()), url(r'^deletemesocycle/(?P<pk>\d+)$',views.MesoCycleDelete.as_view()),
@@ -440,57 +440,57 @@ urlpatterns = [
url(r'^sessions/teamedit/(?P<sessionid>\d+)/(?P<timeperiod>[\w\ ]+.*)$',views.plannedsession_teamedit_view), url(r'^sessions/teamedit/(?P<sessionid>\d+)/(?P<timeperiod>[\w\ ]+.*)$',views.plannedsession_teamedit_view),
url(r'^sessions/create$',views.plannedsession_create_view), url(r'^sessions/create$',views.plannedsession_create_view),
url(r'^sessions/create/rower/(?P<rowerid>\d+)$', url(r'^sessions/create/user/(?P<userid>\d+)$',
views.plannedsession_create_view), views.plannedsession_create_view),
url( url(
r'^sessions/create/(?P<timeperiod>[\w\ ]+.*)/rower/(?P<rowerid>\d+)$', r'^sessions/create/(?P<timeperiod>[\w\ ]+.*)/user/(?P<userid>\d+)$',
views.plannedsession_create_view), views.plannedsession_create_view),
url(r'^sessions/create/(?P<timeperiod>[\w\ ]+.*)$', url(r'^sessions/create/(?P<timeperiod>[\w\ ]+.*)$',
views.plannedsession_create_view), views.plannedsession_create_view),
url(r'^sessions/multiclone$',views.plannedsession_multiclone_view), url(r'^sessions/multiclone$',views.plannedsession_multiclone_view),
url(r'^sessions/multiclone/(?P<timeperiod>[\w\ ]+.*)/rower/(?P<rowerid>\d+)/extra/(?P<extrasessions>\d+)$', url(r'^sessions/multiclone/(?P<timeperiod>[\w\ ]+.*)/user/(?P<userid>\d+)/extra/(?P<extrasessions>\d+)$',
views.plannedsession_multiclone_view), views.plannedsession_multiclone_view),
url(r'^sessions/multiclone/rower/(?P<rowerid>\d+)$', url(r'^sessions/multiclone/user/(?P<userid>\d+)$',
views.plannedsession_multiclone_view), views.plannedsession_multiclone_view),
url( url(
r'^sessions/multiclone/(?P<timeperiod>[\w\ ]+.*)/rower/(?P<rowerid>\d+)$', r'^sessions/multiclone/(?P<timeperiod>[\w\ ]+.*)/user/(?P<userid>\d+)$',
views.plannedsession_multiclone_view), views.plannedsession_multiclone_view),
url(r'^sessions/multiclone/(?P<timeperiod>[\w\ ]+.*)$', url(r'^sessions/multiclone/(?P<timeperiod>[\w\ ]+.*)$',
views.plannedsession_multiclone_view), views.plannedsession_multiclone_view),
url(r'^sessions/multicreate$',views.plannedsession_multicreate_view), url(r'^sessions/multicreate$',views.plannedsession_multicreate_view),
url(r'^sessions/multicreate/(?P<timeperiod>[\w\ ]+.*)/rower/(?P<rowerid>\d+)/extra/(?P<extrasessions>\d+)$', url(r'^sessions/multicreate/(?P<timeperiod>[\w\ ]+.*)/user/(?P<userid>\d+)/extra/(?P<extrasessions>\d+)$',
views.plannedsession_multicreate_view), views.plannedsession_multicreate_view),
url(r'^sessions/multicreate/rower/(?P<rowerid>\d+)$', url(r'^sessions/multicreate/user/(?P<userid>\d+)$',
views.plannedsession_multicreate_view), views.plannedsession_multicreate_view),
url( url(
r'^sessions/multicreate/(?P<timeperiod>[\w\ ]+.*)/rower/(?P<rowerid>\d+)$', r'^sessions/multicreate/(?P<timeperiod>[\w\ ]+.*)/user/(?P<userid>\d+)$',
views.plannedsession_multicreate_view), views.plannedsession_multicreate_view),
url(r'^sessions/multicreate/(?P<timeperiod>[\w\ ]+.*)$', url(r'^sessions/multicreate/(?P<timeperiod>[\w\ ]+.*)$',
views.plannedsession_multicreate_view), views.plannedsession_multicreate_view),
url(r'^sessions/(?P<id>\d+)/edit/(?P<timeperiod>[\w\ ]+.*)/rower/(?P<rowerid>\d+)$',views.plannedsession_edit_view), url(r'^sessions/(?P<id>\d+)/edit/(?P<timeperiod>[\w\ ]+.*)/user/(?P<userid>\d+)$',views.plannedsession_edit_view),
url(r'^sessions/(?P<id>\d+)/edit/(?P<timeperiod>[\w\ ]+.*)$',views.plannedsession_edit_view), url(r'^sessions/(?P<id>\d+)/edit/(?P<timeperiod>[\w\ ]+.*)$',views.plannedsession_edit_view),
url(r'^sessions/(?P<id>\d+)/edit$',views.plannedsession_edit_view), url(r'^sessions/(?P<id>\d+)/edit$',views.plannedsession_edit_view),
url(r'^sessions/(?P<id>\d+)/clone$',views.plannedsession_clone_view), url(r'^sessions/(?P<id>\d+)/clone$',views.plannedsession_clone_view),
url(r'^sessions/(?P<id>\d+)/clone/(?P<timeperiod>[\w\ ]+.*)/rower/(?P<rowerid>\d+)$',views.plannedsession_clone_view), url(r'^sessions/(?P<id>\d+)/clone/(?P<timeperiod>[\w\ ]+.*)/user/(?P<userid>\d+)$',views.plannedsession_clone_view),
url(r'^sessions/(?P<id>\d+)/clone/(?P<timeperiod>[\w\ ]+.*)$',views.plannedsession_clone_view), url(r'^sessions/(?P<id>\d+)/clone/(?P<timeperiod>[\w\ ]+.*)$',views.plannedsession_clone_view),
url(r'^sessions/(?P<id>\d+)$',views.plannedsession_view, url(r'^sessions/(?P<id>\d+)$',views.plannedsession_view,
name='plannedsession_view'), name='plannedsession_view'),
url(r'^sessions/(?P<id>\d+)/(?P<timeperiod>[\w\ ]+.*)/rower/(?P<rowerid>\d+)$',views.plannedsession_view, url(r'^sessions/(?P<id>\d+)/(?P<timeperiod>[\w\ ]+.*)/user/(?P<userid>\d+)$',views.plannedsession_view,
name='plannedsession_view'), name='plannedsession_view'),
url(r'^sessions/(?P<id>\d+)/rower/(?P<rowerid>\d+)$',views.plannedsession_view, url(r'^sessions/(?P<id>\d+)/user/(?P<userid>\d+)$',views.plannedsession_view,
name='plannedsession_view'), name='plannedsession_view'),
url(r'^sessions/(?P<id>\d+)/deleteconfirm$',views.plannedsession_deleteconfirm_view), url(r'^sessions/(?P<id>\d+)/deleteconfirm$',views.plannedsession_deleteconfirm_view),
url(r'^sessions/(?P<id>\d+)/delete$',views.plannedsession_delete_view), url(r'^sessions/(?P<id>\d+)/delete$',views.plannedsession_delete_view),
url(r'^sessions/manage/session/(?P<initialsession>\d+)$', url(r'^sessions/manage/session/(?P<initialsession>\d+)$',
views.plannedsessions_manage_view), views.plannedsessions_manage_view),
url(r'^sessions/manage/rower/(?P<rowerid>\d+)/session/(?P<initialsession>\d+)$', url(r'^sessions/manage/user/(?P<userid>\d+)/session/(?P<initialsession>\d+)$',
views.plannedsessions_manage_view), views.plannedsessions_manage_view),
url(r'^sessions/manage/(?P<timeperiod>[\w\ ]+.*)/rower/(?P<rowerid>\d+)/session/(?P<initialsession>\d+)$', url(r'^sessions/manage/(?P<timeperiod>[\w\ ]+.*)/user/(?P<userid>\d+)/session/(?P<initialsession>\d+)$',
views.plannedsessions_manage_view), views.plannedsessions_manage_view),
url(r'^sessions/manage/(?P<timeperiod>[\w\ ]+.*)/session/(?P<initialsession>\d+)$', url(r'^sessions/manage/(?P<timeperiod>[\w\ ]+.*)/session/(?P<initialsession>\d+)$',
views.plannedsessions_manage_view), views.plannedsessions_manage_view),
@@ -498,9 +498,9 @@ urlpatterns = [
url(r'^sessions/manage/?$', url(r'^sessions/manage/?$',
views.plannedsessions_manage_view), views.plannedsessions_manage_view),
url(r'^sessions/manage/rower/(?P<rowerid>\d+)$', url(r'^sessions/manage/user/(?P<userid>\d+)$',
views.plannedsessions_manage_view), views.plannedsessions_manage_view),
url(r'^sessions/manage/(?P<timeperiod>[\w\ ]+.*)/rower/(?P<rowerid>\d+)$', url(r'^sessions/manage/(?P<timeperiod>[\w\ ]+.*)/user/(?P<userid>\d+)$',
views.plannedsessions_manage_view), views.plannedsessions_manage_view),
url(r'^sessions/manage/(?P<timeperiod>[\w\ ]+.*)$', url(r'^sessions/manage/(?P<timeperiod>[\w\ ]+.*)$',
views.plannedsessions_manage_view), views.plannedsessions_manage_view),
@@ -510,12 +510,12 @@ urlpatterns = [
url(r'^sessions/coach/(?P<timeperiod>[\w\ ]+.*)$', url(r'^sessions/coach/(?P<timeperiod>[\w\ ]+.*)$',
views.plannedsessions_coach_view), views.plannedsessions_coach_view),
url(r'^sessions/print/?$',views.plannedsessions_print_view), url(r'^sessions/print/?$',views.plannedsessions_print_view),
url(r'^sessions/print/rower/(?P<rowerid>\d+)$',views.plannedsessions_print_view), url(r'^sessions/print/user/(?P<userid>\d+)$',views.plannedsessions_print_view),
url(r'^sessions/print/(?P<timeperiod>[\w\ ]+.*)/rower/(?P<rowerid>\d+)$',views.plannedsessions_print_view), url(r'^sessions/print/(?P<timeperiod>[\w\ ]+.*)/user/(?P<userid>\d+)$',views.plannedsessions_print_view),
url(r'^sessions/print/(?P<timeperiod>[\w\ ]+.*)$',views.plannedsessions_print_view), url(r'^sessions/print/(?P<timeperiod>[\w\ ]+.*)$',views.plannedsessions_print_view),
url(r'^sessions/?$',views.plannedsessions_view), url(r'^sessions/?$',views.plannedsessions_view),
url(r'^sessions/rower/(?P<rowerid>\d+)$',views.plannedsessions_view), url(r'^sessions/user/(?P<userid>\d+)$',views.plannedsessions_view),
url(r'^sessions/(?P<timeperiod>[\w\ ]+.*)/rower/(?P<rowerid>\d+)$',views.plannedsessions_view), url(r'^sessions/(?P<timeperiod>[\w\ ]+.*)/user/(?P<userid>\d+)$',views.plannedsessions_view),
url(r'^sessions/(?P<timeperiod>[\w\ ]+.*)$',views.plannedsessions_view), url(r'^sessions/(?P<timeperiod>[\w\ ]+.*)$',views.plannedsessions_view),
url(r'^courses/(?P<id>\d+)/edit$',views.course_edit_view, url(r'^courses/(?P<id>\d+)/edit$',views.course_edit_view,
name='course_edit_view'), name='course_edit_view'),

21
rowers/views.py
View File

@@ -13527,7 +13527,7 @@ def agegrouprecordview(request,sex='male',weightcategory='hwt',
redirect_field_name=None) redirect_field_name=None)
def plannedsession_multiclone_view( def plannedsession_multiclone_view(
request,timeperiod='none', request,timeperiod='none',
rowerid=0, rowerid=0,userid=0,
startdate=timezone.now()-datetime.timedelta(days=30), startdate=timezone.now()-datetime.timedelta(days=30),
enddate=timezone.now()): enddate=timezone.now()):
@@ -13630,7 +13630,7 @@ def plannedsession_multiclone_view(
# Individual user creates training for himself # Individual user creates training for himself
@user_passes_test(hasplannedsessions,login_url="/rowers/planmembership/", @user_passes_test(hasplannedsessions,login_url="/rowers/planmembership/",
redirect_field_name=None) 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) r = getrequestrower(request,rowerid=rowerid)
startdate,enddate = get_dates_timeperiod(timeperiod) 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/", @user_passes_test(hasplannedsessions,login_url="/rowers/planmembership/",
redirect_field_name=None) redirect_field_name=None)
def plannedsession_multicreate_view(request,timeperiod='thisweek', def plannedsession_multicreate_view(request,timeperiod='thisweek',
teamid=0,rowerid=0,extrasessions=0): teamid=0,rowerid=0,userid=0,extrasessions=0):
extrasessions=int(extrasessions) extrasessions=int(extrasessions)
@@ -13845,6 +13845,7 @@ def plannedsession_multicreate_view(request,timeperiod='thisweek',
context = { context = {
'ps_formset':ps_formset, 'ps_formset':ps_formset,
'rower':r, 'rower':r,
'active':'nav-plan',
'plan':trainingplan, 'plan':trainingplan,
'timeperiod':timeperiod, 'timeperiod':timeperiod,
'teams':get_my_teams(request.user), 'teams':get_my_teams(request.user),
@@ -14145,7 +14146,7 @@ def plannedsessions_coach_view(request,timeperiod='thisweek',
) )
@login_required() @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) r = getrequestrower(request,rowerid=rowerid)
@@ -14192,7 +14193,7 @@ def plannedsessions_view(request,timeperiod='thisweek',rowerid=0):
}) })
@login_required() @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) r = getrequestrower(request,rowerid=rowerid)
@@ -14225,7 +14226,7 @@ def plannedsessions_print_view(request,timeperiod='thisweek',rowerid=0):
@login_required() @login_required()
def plannedsessions_manage_view(request,timeperiod='thisweek',rowerid=0, def plannedsessions_manage_view(request,timeperiod='thisweek',rowerid=0,userid=0,
initialsession=0): initialsession=0):
is_ajax = False is_ajax = False
@@ -14358,7 +14359,7 @@ def plannedsessions_manage_view(request,timeperiod='thisweek',rowerid=0,
# need clarity on cloning behavior time shift # need clarity on cloning behavior time shift
@user_passes_test(hasplannedsessions,login_url="/rowers/planmembership/", @user_passes_test(hasplannedsessions,login_url="/rowers/planmembership/",
redirect_field_name=None) 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'): timeperiod='thisweek'):
r = getrequestrower(request,rowerid=rowerid) r = getrequestrower(request,rowerid=rowerid)
@@ -14414,7 +14415,7 @@ def plannedsession_clone_view(request,id=0,rowerid=0,
# Edit an existing planned session # Edit an existing planned session
@user_passes_test(hasplannedsessions,login_url="/rowers/planmembership/", @user_passes_test(hasplannedsessions,login_url="/rowers/planmembership/",
redirect_field_name=None) 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) r = getrequestrower(request,rowerid=rowerid)
@@ -14489,7 +14490,7 @@ def plannedsession_edit_view(request,id=0,timeperiod='thisweek',rowerid=0):
@login_required() @login_required()
def plannedsession_view(request,id=0,rowerid=0, def plannedsession_view(request,id=0,rowerid=0,userid=0,
timeperiod='thisweek'): timeperiod='thisweek'):
m = getrower(request.user) m = getrower(request.user)
@@ -15524,7 +15525,7 @@ def rower_delete_trainingtarget(request,id=0):
if checkaccessuser(request.user,target.rower): if checkaccessuser(request.user,target.rower):
target.delete() target.delete()
messages.info(request,"We have deleted the training plan") messages.info(request,"We have deleted the training target")
else: else:
raise PermissionDenied("Access denied") raise PermissionDenied("Access denied")