From a099aea328051252374babc6edd26b1486b6c589 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 19 Sep 2018 08:27:32 +0200 Subject: [PATCH 1/2] bug fix --- rowers/views.py | 8 +------- static/css/styles2.css | 12 ++++++------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/rowers/views.py b/rowers/views.py index eac57b4b..4d19ddc6 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -12728,13 +12728,7 @@ def plannedsession_teamcreate_view(request,timeperiod='thisweek', startdate,enddate = get_dates_timeperiod(timeperiod) - try: - trainingplan = TrainingPlan.objects.filter( - startdate__lte = startdate, - rower = r, - enddate__gte = enddate)[0] - except IndexError: - trainingplan = None + trainingplan = None sps = [] for team in teams: diff --git a/static/css/styles2.css b/static/css/styles2.css index ccdd6c09..8e304869 100644 --- a/static/css/styles2.css +++ b/static/css/styles2.css @@ -113,13 +113,13 @@ @media (min-width: 768px) { .wrapper { - grid-template-columns: 1fr 5fr 1fr; + grid-template-columns: 1fr 4fr 1fr; grid-template-areas: - "header header header user" - "nav nav nav nav" - "sidebar content content content" - "sidebar content content content" - "ad footer footer footer" + "header header user" + "nav nav nav" + "sidebar content content" + "sidebar content content" + "ad footer footer" } nav ul { From 9b7d385b1c2b1b4f2ec26530b989458d53c4d8c7 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Fri, 21 Sep 2018 10:29:51 +0200 Subject: [PATCH 2/2] removed virtual races from sessions edit/create/view --- rowers/plannedsessions.py | 9 ++++++--- rowers/views.py | 19 ++++++++----------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/rowers/plannedsessions.py b/rowers/plannedsessions.py index 46b7f326..da035b17 100644 --- a/rowers/plannedsessions.py +++ b/rowers/plannedsessions.py @@ -451,7 +451,8 @@ def get_sessions_manager(m,teamid=0,startdate=date.today(), manager=m, startdate__lte=enddate, enddate__gte=startdate, - ).order_by("preferreddate","startdate","enddate") + ).order_by("preferreddate","startdate","enddate").exclude( + sessiontype='race') return sps @@ -462,14 +463,16 @@ def get_sessions(r,startdate=date.today(), rower__in=[r], startdate__lte=enddate, enddate__gte=startdate, - ).order_by("preferreddate","startdate","enddate") + ).order_by("preferreddate","startdate","enddate").exclude( + sessiontype='race') return sps def get_my_session_ids(r): sps = PlannedSession.objects.filter( rower__in=[r] - ).order_by("preferreddate","startdate","enddate") + ).order_by("preferreddate","startdate","enddate").exclude( + sessiontype='race') return [ps.id for ps in sps] diff --git a/rowers/views.py b/rowers/views.py index 4d19ddc6..4a06cb58 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -12387,13 +12387,6 @@ def plannedsession_multiclone_view( r = getrequestrower(request,rowerid=rowerid) -# if 'startdate' in request.session: -# startdate = iso8601.parse_date(request.session['startdate']) - - -# if 'enddate' in request.session: -# enddate = iso8601.parse_date(request.session['enddate']) - if timeperiod != 'none': startdate,enddate = get_dates_timeperiod(timeperiod) @@ -12448,7 +12441,8 @@ def plannedsession_multiclone_view( rower__in=[r], startdate__lte=enddate, enddate__gte=startdate).order_by( - "startdate","preferreddate","enddate") + "startdate","preferreddate","enddate").exclude( + sessiontype='race') query = request.GET.get('q') if query: @@ -12590,7 +12584,8 @@ def plannedsession_create_view(request,timeperiod='thisweek',rowerid=0): sessioncreateform = PlannedSessionForm(initial=forminitial) - sps = get_sessions(r,startdate=startdate,enddate=enddate) + sps = get_sessions(r,startdate=startdate,enddate=enddate).exclude( + sessiontype='race') try: trainingplan = TrainingPlan.objects.filter( startdate__lte = startdate, @@ -12640,7 +12635,8 @@ def plannedsession_multicreate_view(request,timeperiod='thisweek', rower__in=[r], startdate__lte=enddate, enddate__gte=startdate, - ).order_by("startdate","preferreddate","enddate") + ).order_by("startdate","preferreddate","enddate").exclude( + sessiontype='race') else: qset = [] else: @@ -12652,7 +12648,8 @@ def plannedsession_multicreate_view(request,timeperiod='thisweek', manager = request.user, startdate__lte=enddate, enddate__gte=startdate, - ).order_by("startdate","preferreddate","enddate") + ).order_by("startdate","preferreddate","enddate").exclude( + sessiontype='race')