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

small UI improvements planned session

Browse Source
This commit is contained in:
Sander Roosendaal
2021-03-05 17:58:18 +01:00
parent eb1a827635
commit 232c144efa
2 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rowers/templates/plannedsessions.html
View File

@@ -8,6 +8,16 @@
<h1>Planned Sessions for {{ rower.user.first_name }} {{ rower.user.last_name }}</h1> <h1>Planned Sessions for {{ rower.user.first_name }} {{ rower.user.last_name }}</h1>
<p>
<a href="/rowers/sessions/create/?when={{ timeperiod }}"> <i class="far fa-calendar-plus fa-fw"></i>&nbsp;Add Session
</a>
{% if request.user|user_teams %}
<a href="/rowers/sessions/teamcreate/?when={{ timeperiod }}">
<i class="fas fa-whistle fa-fw"></i>&nbsp;Add Group Session
</a>
{% endif %}
</p>
<ul class="main-content"> <ul class="main-content">
<li class="grid_2"> <li class="grid_2">
<p> <p>

21
rowers/views/planviews.py
View File

@@ -531,6 +531,11 @@ def plannedsession_create_view(request,
request.session['fenddate'] = str(arrow.get(ps.enddate)) request.session['fenddate'] = str(arrow.get(ps.enddate))
request.session['fprefdate'] = str(arrow.get(ps.preferreddate)) request.session['fprefdate'] = str(arrow.get(ps.preferreddate))
url = reverse(plannedsessions_view,kwargs={
'userid':userid,
})
return HttpResponseRedirect(url)
else: else:
if 'fstartdate' in request.session: if 'fstartdate' in request.session:
try: try:
@@ -921,15 +926,19 @@ def plannedsession_teamcreate_view(request,
for r in rs: for r in rs:
add_rower_session(r,ps) add_rower_session(r,ps)
url = reverse(plannedsessions_view,kwargs={
'userid':userid,
})
return HttpResponseRedirect(url)
url = reverse(plannedsession_teamcreate_view) #url = reverse(plannedsession_teamcreate_view)
startdatestring = startdate.strftime('%Y-%m-%d') #startdatestring = startdate.strftime('%Y-%m-%d')
enddatestring = enddate.strftime('%Y-%m-%d') #enddatestring = enddate.strftime('%Y-%m-%d')
url += '?when='+startdatestring+'/'+enddatestring #url += '?when='+startdatestring+'/'+enddatestring
next = request.GET.get('next', url) #next = request.GET.get('next', url)
return HttpResponseRedirect(next) #return HttpResponseRedirect(next)
else: else:
timeperiod = startdate.strftime('%Y-%m-%d')+'/'+enddate.strftime('%Y-%m-%d') timeperiod = startdate.strftime('%Y-%m-%d')+'/'+enddate.strftime('%Y-%m-%d')
breadcrumbs = [ breadcrumbs = [