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

multiclone refinements

Browse Source
This commit is contained in:
Sander Roosendaal
2018-02-18 13:10:26 +01:00
parent 7badc03935
commit c898f5518a
5 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rowers/templates/plannedsession_multicreate.html
View File

@@ -100,8 +100,9 @@
{% endfor %}
</tbody>
</table>
<a class="button gray small grid_2" href="/rowers/sessions/multicreate/{{ timeperiod }}/rower/{{ rower.id }}/extra/{{ extrasessions }}">Add More</a>
<a class="button gray small grid_2 alpha" href="/rowers/sessions/multicreate/{{ timeperiod }}/rower/{{ rower.id }}/extra/{{ extrasessions }}">Add More</a>
<button class="button green small grid_2" type="submit">Submit</button>
<a class="button blue small grid_2" href="/rowers/sessions/multiclone/{{ timeperiod }}/rower/{{ rower.id }}">Clone multiple sessions</a>
</form>
<div class="grid_6 prefix_6" id="id_guidance">

4
rowers/templates/plannedsessioncreate.html
View File

@@ -96,10 +96,10 @@
<td> {{ ps.sessionvalue }} </td>
<td> {{ ps.sessionunit }} </td>
<td>
<a class="small" href="/rowers/sessions/{{ ps.id }}/edit">Edit</a>
<a class="small" href="/rowers/sessions/{{ ps.id }}/edit/{{ timeperiod }}/rower/{{ rower.id }}">Edit</a>
</td>
<td>
<a class="small" href="/rowers/sessions/{{ ps.id }}/clone">Clone</a>
<a class="small" href="/rowers/sessions/{{ ps.id }}/clone/{{ timeperoid }}/rower/{{ rower.id }}">Clone</a>
</td>
<td>

10
rowers/templates/plannedsessionedit.html
View File

@@ -90,16 +90,10 @@
<td> {{ ps.sessionvalue }} </td>
<td> {{ ps.sessionunit }} </td>
<td>
{% if timeperiod and rower %}
<a class="small" href="/rowers/sessions/{{ ps.id }}/edit/{{ timeperiod }}/rower/{{ rower.id }}">Edit</a>
{% elif timeperiod %}
<a class="small" href="/rowers/sessions/{{ ps.id }}/edit/{{ timeperiod }}">Edit</a>
{% else %}
<a class="small" href="/rowers/sessions/{{ ps.id }}/edit">Edit</a>
{% endif %}
</td>
<td>
<a class="small" href="/rowers/sessions/{{ ps.id }}/clone">Clone</a>
<a class="small" href="/rowers/sessions/{{ ps.id }}/clone/{{ timeperiod }}/rower/{{ rower.id }}">Clone</a>
</td>
<td>
<a class="small" href="/rowers/sessions/{{ ps.id }}/deleteconfirm">Delete</a>
@@ -130,7 +124,7 @@
<a class="gray button small" href="/rowers/sessions/{{ thesession.id }}/clone">Clone</a>
</div>
<div id="formbutton" class="grid_1 suffix_1 omega">
<input class="button green" type="submit" value="Save">
<input class="button green" action="/rowers/sessions/{{ thesession.id }}/edit/{{ timeperiod }}/rower/{{ rower.id }}" type="submit" value="Save">
</div>
<div class="grid_6" id="id_guidance">

6
rowers/templates/plannedsessions_multiclone_select.html
View File

@@ -95,15 +95,15 @@
Last Week
</a>
<a class="button gray small alpha"
href="/rowers/sessions/multiclone/lastmonth/">
href="/rowers/sessions/multiclone/lastmonth">
Last Month
</a>
<a class="button gray small alpha"
href="/rowers/sessions/multiclone/nextweek/">
href="/rowers/sessions/multiclone/nextweek">
Next Week
</a>
<a class="button gray small alpha"
href="/rowers/sessions/multiclone/nextmonth/">
href="/rowers/sessions/multiclone/nextmonth">
Next Month
</a>
</div>

10
rowers/views.py
View File

@@ -11581,7 +11581,7 @@ 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='nextweek',
request,timeperiod='none',
rowerid=0,
startdate=timezone.now()-datetime.timedelta(days=30),
enddate=timezone.now()+datetime.timedelta(days=1)):
@@ -11603,6 +11603,10 @@ def plannedsession_multiclone_view(
if 'enddate' in request.session:
enddate = iso8601.parse_date(request.session['enddate'])
if timeperiod != 'none':
startdate,enddate = get_dates_timeperiod(timeperiod)
if request.method == 'POST' and 'daterange' in request.POST:
dateform = DateRangeForm(request.POST)
if dateform.is_valid():
@@ -11647,10 +11651,6 @@ def plannedsession_multiclone_view(
return HttpResponseRedirect(url)
startdate = datetime.datetime.combine(startdate,datetime.time())
enddate = datetime.datetime.combine(enddate,datetime.time(23,59,59))
enddate = enddate+datetime.timedelta(days=1)
sps = PlannedSession.objects.filter(
manager=request.user,
rower__in=[r],