From 06633f1a89587c680e9e3a4d75c88f569533e94a Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 11 Mar 2018 11:30:03 +0100 Subject: [PATCH 1/3] linebreaks in workflow workout notes --- rowers/templates/panel_notes.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rowers/templates/panel_notes.html b/rowers/templates/panel_notes.html index fb6cd880..b1d4520f 100644 --- a/rowers/templates/panel_notes.html +++ b/rowers/templates/panel_notes.html @@ -1,6 +1,6 @@

Notes

- {{ workout.notes }} + {{ workout.notes|linebreaks }}

From 26254c87ac466f2ac972b2cffac263259d9be0ce Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 11 Mar 2018 11:43:51 +0100 Subject: [PATCH 2/3] link bug fix --- rowers/templates/rankings.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rowers/templates/rankings.html b/rowers/templates/rankings.html index db4f9d7a..2102954b 100644 --- a/rowers/templates/rankings.html +++ b/rowers/templates/rankings.html @@ -57,7 +57,7 @@ {% else %} From de4ec80f64e9d9927c7723245f62b8508beb84e9 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 11 Mar 2018 19:03:47 +0100 Subject: [PATCH 3/3] bug fixed on clone session was comparing datetime.datetime to datetime.date --- rowers/views.py | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/rowers/views.py b/rowers/views.py index 2c565621..049decfd 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -12065,9 +12065,18 @@ def plannedsession_create_view(request,timeperiod='thisweek',rowerid=0): return HttpResponseRedirect(url) else: if 'fstartdate' in request.session: - fstartdate = arrow.get(request.session['fstartdate']).date() - fenddate = arrow.get(request.session['fenddate']).date() - fprefdate = arrow.get(request.session['fprefdate']).date() + try: + fstartdate = arrow.get(request.session['fstartdate']).date() + except KeyError: + fastartdate = timezone.now().date() + try: + fenddate = arrow.get(request.session['fenddate']).date() + except KeyError: + fenddate = timezone.now().date() + try: + fprefdate = arrow.get(request.session['fprefdate']).date() + except KeyError: + fprefdate = timezone.now().date() forminitial = { 'startdate':fstartdate, @@ -12702,8 +12711,8 @@ def plannedsession_clone_view(request,id=0,rowerid=0, deltadays = ps.enddate-ps.startdate - ps.startdate = timezone.now() - ps.enddate = timezone.now()+deltadays + ps.startdate = timezone.now().date() + ps.enddate = (timezone.now()+deltadays).date() ps.name += ' (copy)' ps.save()