From 760ac8702dfbe3446ed54fb78c9a6265775126c6 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 8 Mar 2021 12:02:11 +0100 Subject: [PATCH] lots of ui changes --- rowers/templates/plannedsessioncreate.html | 137 +--------------- rowers/templates/plannedsessionedit.html | 114 +------------ rowers/templates/plannedsessions.html | 24 ++- .../templates/plannedsessionteamcreate.html | 154 ++---------------- rowers/templates/plannedsessionteamedit.html | 108 +----------- .../plannedsessiontemplatecreate.html | 48 +----- .../templates/plannedsessiontemplateedit.html | 49 +----- rowers/urls.py | 6 +- rowers/views/planviews.py | 109 +++++++++---- 9 files changed, 148 insertions(+), 601 deletions(-) diff --git a/rowers/templates/plannedsessioncreate.html b/rowers/templates/plannedsessioncreate.html index 09b9d893..f18b1ff9 100644 --- a/rowers/templates/plannedsessioncreate.html +++ b/rowers/templates/plannedsessioncreate.html @@ -5,29 +5,10 @@ {% block title %}New Planned Session{% endblock %} {% block main %} -

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

+

New Session

{% endblock %} diff --git a/rowers/templates/plannedsessionedit.html b/rowers/templates/plannedsessionedit.html index 3e6bf769..7f5ccd12 100644 --- a/rowers/templates/plannedsessionedit.html +++ b/rowers/templates/plannedsessionedit.html @@ -10,25 +10,7 @@ {% endblock %} diff --git a/rowers/templates/plannedsessions.html b/rowers/templates/plannedsessions.html index 7a5f6261..a9ed371a 100644 --- a/rowers/templates/plannedsessions.html +++ b/rowers/templates/plannedsessions.html @@ -9,13 +9,14 @@

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

-  Add Session +  Add Session {% if request.user|user_teams %}  Add Group Session {% endif %} + Add Session from Library

-
- {% if form.errors %} -

- Please correct the error{{ form.errors|pluralize }} below. -

- {% endif %} - -
- + {% endblock %} diff --git a/rowers/templates/plannedsessionteamedit.html b/rowers/templates/plannedsessionteamedit.html index db7dabf5..b5623062 100644 --- a/rowers/templates/plannedsessionteamedit.html +++ b/rowers/templates/plannedsessionteamedit.html @@ -5,129 +5,37 @@ {% block title %}New Planned Session{% endblock %} {% block main %} -

Edit Team Session

+

Edit Session {{ plannedsession.name }}

-
- {% if form.errors %} -

- Please correct the error{{ form.errors|pluralize }} below. -

- {% endif %} - {% csrf_token %} - -
{% endblock %} diff --git a/rowers/templates/plannedsessiontemplatecreate.html b/rowers/templates/plannedsessiontemplatecreate.html index 3384a909..ca906446 100644 --- a/rowers/templates/plannedsessiontemplatecreate.html +++ b/rowers/templates/plannedsessiontemplatecreate.html @@ -5,13 +5,12 @@ {% block title %}Create Library Session{% endblock %} {% block main %} -

Edit Session Template

+

Create New Library Session

{% endblock %} diff --git a/rowers/templates/plannedsessiontemplateedit.html b/rowers/templates/plannedsessiontemplateedit.html index 1a7456bf..9fa47d07 100644 --- a/rowers/templates/plannedsessiontemplateedit.html +++ b/rowers/templates/plannedsessiontemplateedit.html @@ -5,13 +5,12 @@ {% block title %}Update Library Session{% endblock %} {% block main %} -

Edit Session Template

+

Edit Library Session: {{ thesession.name }}

{% endblock %} diff --git a/rowers/urls.py b/rowers/urls.py index 42aa1507..2e7bcd48 100644 --- a/rowers/urls.py +++ b/rowers/urls.py @@ -838,8 +838,10 @@ urlpatterns = [ re_path(r'^sessions/multicreate/user/(?P\d+)/$', views.plannedsession_multicreate_view, name='plannedsession_multicreate_view'), - re_path(r'^sessions/(?P\d+)/edit/$',views.plannedsession_edit_view), - re_path(r'^sessions/(?P\d+)/templateedit/',views.plannedsession_templateedit_view), + re_path(r'^sessions/(?P\d+)/edit/$',views.plannedsession_edit_view, + name='plannedsession_edit_view'), + re_path(r'^sessions/(?P\d+)/templateedit/',views.plannedsession_templateedit_view, + name='plannedsession_templateedit_view'), re_path(r'^sessions/(?P\d+)/maketemplate/$',views.plannedsession_totemplate_view), re_path(r'^sessions/(?P\d+)/compare/$', views.plannedsession_compare_view, diff --git a/rowers/views/planviews.py b/rowers/views/planviews.py index 7497d901..a8de7582 100644 --- a/rowers/views/planviews.py +++ b/rowers/views/planviews.py @@ -531,9 +531,18 @@ def plannedsession_create_view(request, request.session['fenddate'] = str(arrow.get(ps.enddate)) request.session['fprefdate'] = str(arrow.get(ps.preferreddate)) + url = reverse(plannedsessions_view,kwargs={ 'userid':userid, }) + + if '_continue' in request.POST: + url = reverse('plannedsession_edit_view',kwargs={ + 'id':ps.id, + }) + elif '_addanother' in request.POST: + url = reverse('plannedsession_create_view',kwargs={'userid':userid}) + return HttpResponseRedirect(url) else: @@ -639,11 +648,23 @@ def plannedsession_create_view(request, 'enddate':enddate, }) + breadcrumbs = [ + { + 'url': reverse(plannedsessions_view), + 'name': 'Planned Sessions' + }, + { + 'url': reverse(plannedsession_create_view), + 'name': 'Add Session' + } + ] + return render(request,'plannedsessioncreate.html', { 'teams':get_my_teams(request.user), 'plan':trainingplan, 'dateform':dateform, + 'breadcrumbs':breadcrumbs, 'form':sessioncreateform, 'active':'nav-plan', 'plannedsessions':sps, @@ -676,7 +697,16 @@ def plannedsession_createtemplate_view(request, sessioncreateform.save_m2m() add_rower_session(r,ps) - url = reverse("template_library_view") + + url = reverse('template_library_view') + + if '_continue' in request.POST: + url = reverse('plannedsession_templateedit_view',kwargs={ + 'id':ps.id, + }) + elif '_addanother' in request.POST: + url = reverse('plannedsession_createtemplate_view') + return HttpResponseRedirect(url) else: sessioncreateform = PlannedSessionTemplateForm() @@ -714,6 +744,10 @@ def plannedsession_createtemplate_view(request, 'url': reverse(plannedsessions_view), 'name': 'Sessions' }, + { + 'url':reverse('template_library_view'), + 'name': 'Session Library' + }, { 'url':reverse(plannedsession_createtemplate_view), 'name': 'Create Library Session' @@ -725,6 +759,7 @@ def plannedsession_createtemplate_view(request, 'teams':get_my_teams(request.user), 'plan':trainingplan, 'form':sessioncreateform, + 'breadcrumbs':breadcrumbs, 'active':'nav-plan', 'rower':r, 'alltags':alltags, @@ -929,8 +964,17 @@ def plannedsession_teamcreate_view(request, url = reverse(plannedsessions_view,kwargs={ 'userid':userid, }) + + if '_continue' in request.POST: + url = reverse('plannedsession_edit_view',kwargs={ + 'id':ps.id, + }) + elif '_addanother' in request.POST: + url = reverse('plannedsession_create_view',kwargs={'userid':userid}) + return HttpResponseRedirect(url) + #url = reverse(plannedsession_teamcreate_view) #startdatestring = startdate.strftime('%Y-%m-%d') #enddatestring = enddate.strftime('%Y-%m-%d') @@ -1117,17 +1161,20 @@ def plannedsession_teamedit_view(request, add_rower_session(r,ps) - url = reverse(plannedsession_teamedit_view, - kwargs = { - 'id':id, - }) + url = reverse('plannedsessions_view') - startdatestring = startdate.strftime('%Y-%m-%d') - enddatestring = enddate.strftime('%Y-%m-%d') - url += '?when='+startdatestring+'/'+enddatestring + if "_continue" in request.POST: + url = reverse(plannedsession_edit_view, + kwargs={ + 'id':int(ps.id), + 'userid':r.user.id, + }) - next = request.GET.get('next', url) - return HttpResponseRedirect(next) + startdatestring = startdate.strftime('%Y-%m-%d') + enddatestring = enddate.strftime('%Y-%m-%d') + url += '?when='+startdatestring+'/'+enddatestring + + return HttpResponseRedirect(url) else: sessioncreateform = PlannedSessionForm(instance=ps) sessionteamselectform = PlannedSessionTeamForm( @@ -1820,29 +1867,32 @@ def plannedsession_templateedit_view(request,id=0): else: messages.error(request,message) - url = reverse(plannedsession_templateedit_view, - kwargs = { - 'id':int(ps.id), - }) + url = reverse('template_library_view') - startdatestring = startdate.strftime('%Y-%m-%d') - enddatestring = enddate.strftime('%Y-%m-%d') - url += '?when='+startdatestring+'/'+enddatestring - next = request.GET.get('next', url) - return HttpResponseRedirect(next) + if '_continue' in request.POST: + url = reverse('plannedsession_templateedit_view',kwargs={ + 'id':ps.id, + }) + + + return HttpResponseRedirect(url) breadcrumbs = [ { 'url': reverse(plannedsessions_view), 'name': 'Sessions' }, + { + 'url': reverse('template_library_view'), + 'name': 'Library', + }, { 'url':reverse(plannedsession_templateedit_view, kwargs={ 'id':id, } ), - 'name': 'Edit' + 'name': 'Edit Session' } ] @@ -1946,15 +1996,18 @@ def plannedsession_edit_view(request,id=0,userid=0): else: messages.error(request,message) - url = reverse(plannedsession_edit_view, - kwargs={ - 'id':int(ps.id), - 'userid':r.user.id, - }) + url = reverse('plannedsessions_view') - startdatestring = startdate.strftime('%Y-%m-%d') - enddatestring = enddate.strftime('%Y-%m-%d') - url += '?when='+startdatestring+'/'+enddatestring + if "_continue" in request.POST: + url = reverse(plannedsession_edit_view, + kwargs={ + 'id':int(ps.id), + 'userid':r.user.id, + }) + + startdatestring = startdate.strftime('%Y-%m-%d') + enddatestring = enddate.strftime('%Y-%m-%d') + url += '?when='+startdatestring+'/'+enddatestring return HttpResponseRedirect(url) else: