From cd91a75fa02ec2786fb3ff25274f186b69f946f5 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 10 Nov 2020 19:58:23 +0100 Subject: [PATCH 1/3] fix --- rowers/views/planviews.py | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/rowers/views/planviews.py b/rowers/views/planviews.py index a5cb892c..d2cb7ef0 100644 --- a/rowers/views/planviews.py +++ b/rowers/views/planviews.py @@ -1987,28 +1987,31 @@ def plannedsession_view(request,id=0,userid=0): for record in vs: userid = record.userid uu = User.objects.get(id=userid) - w = Workout.objects.get(id=record.workoutid) - wdict = { - 'name': uu.first_name+' '+uu.last_name, - 'date': w.date, - 'distance': record.distance, - 'type': w.workouttype, - 'coursecompleted':True, - } + try: + w = Workout.objects.get(id=record.workoutid) + wdict = { + 'name': uu.first_name+' '+uu.last_name, + 'date': w.date, + 'distance': record.distance, + 'type': w.workouttype, + 'coursecompleted':True, + } - coursecompleted = record.coursecompleted - t = record.duration - wdict['time'] = datetime.timedelta( - hours=t.hour, - seconds=t.second, - minutes=t.minute, - microseconds=t.microsecond - ) + coursecompleted = record.coursecompleted + t = record.duration + wdict['time'] = datetime.timedelta( + hours=t.hour, + seconds=t.second, + minutes=t.minute, + microseconds=t.microsecond + ) - wdict['coursecompleted'] = coursecompleted + wdict['coursecompleted'] = coursecompleted - ranking.append(wdict) + ranking.append(wdict) + except Workout.DoesNotExist: + pass ranking = sorted(ranking, key=lambda k: k['time']) if ps.sessiontype == 'fastest_time': From 2a325bae8af9b899cacae71a2eae7355ebcecfce Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 10 Nov 2020 21:38:50 +0100 Subject: [PATCH 2/3] reducing nr data --- rowers/datautils.py | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/rowers/datautils.py b/rowers/datautils.py index 2155dd3f..603a3b2f 100644 --- a/rowers/datautils.py +++ b/rowers/datautils.py @@ -377,13 +377,19 @@ def getfastest(df,thevalue,mode='distance'): if tt.max() < thevalue: return 0 - if tmax > 500000: - newlen=int(tmax/2000.) - newt = np.arange(newlen)*tmax/float(newlen) - deltat = newt[1]-newt[0] - else: - newt = np.arange(0,tmax,10.) - deltat = 10. + +# if tmax > 500000: +# newlen=int(tmax/2000.) +# newt = np.arange(newlen)*tmax/float(newlen) +# deltat = newt[1]-newt[0] +# else: +# newt = np.arange(0,tmax,10.) +# deltat = 10. + + newlen = 1000 + newt = np.arange(newlen)*tmax/float(newlen) + deltat = newt[1]-newt[0] + dd = griddata(tt.values, dd.values,newt,method='linear',rescale=True) From 636d6d24e1aecaca14df0a7879824dd2f34da9f2 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 10 Nov 2020 21:44:25 +0100 Subject: [PATCH 3/3] fix wind --- rowers/interactiveplots.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index ed1d54eb..5be7da74 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -3480,7 +3480,7 @@ def interactive_windchart(id=0,promember=0): plot.xaxis.axis_label = "Distance (m)" plot.yaxis.axis_label = "Wind Speed (m/s)" plot.y_range = Range1d(-7,7) - plot.sizing_mode = 'scale_both' + plot.sizing_mode = 'stretch_both' plot.extra_y_ranges = {"winddirection": Range1d(start=0,end=360)}