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

Merge branch 'develop' into feature/fastestchallenges

Browse Source
This commit is contained in:
Sander Roosendaal
2020-11-10 21:45:12 +01:00
parent 06bbce45b8 636d6d24e1
commit 0f0999bab2
3 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
rowers/datautils.py
View File

@@ -377,13 +377,19 @@ def getfastest(df,thevalue,mode='distance'):
if tt.max() < thevalue: if tt.max() < thevalue:
return 0 return 0
if tmax > 500000:
newlen=int(tmax/2000.) # if tmax > 500000:
newt = np.arange(newlen)*tmax/float(newlen) # newlen=int(tmax/2000.)
deltat = newt[1]-newt[0] # newt = np.arange(newlen)*tmax/float(newlen)
else: # deltat = newt[1]-newt[0]
newt = np.arange(0,tmax,10.) # else:
deltat = 10. # 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 = griddata(tt.values,
dd.values,newt,method='linear',rescale=True) dd.values,newt,method='linear',rescale=True)

2
rowers/interactiveplots.py
View File

@@ -3480,7 +3480,7 @@ def interactive_windchart(id=0,promember=0):
plot.xaxis.axis_label = "Distance (m)" plot.xaxis.axis_label = "Distance (m)"
plot.yaxis.axis_label = "Wind Speed (m/s)" plot.yaxis.axis_label = "Wind Speed (m/s)"
plot.y_range = Range1d(-7,7) 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)} plot.extra_y_ranges = {"winddirection": Range1d(start=0,end=360)}

39
rowers/views/planviews.py
View File

@@ -1987,28 +1987,31 @@ def plannedsession_view(request,id=0,userid=0):
for record in vs: for record in vs:
userid = record.userid userid = record.userid
uu = User.objects.get(id=userid) uu = User.objects.get(id=userid)
w = Workout.objects.get(id=record.workoutid) try:
wdict = { w = Workout.objects.get(id=record.workoutid)
'name': uu.first_name+' '+uu.last_name, wdict = {
'date': w.date, 'name': uu.first_name+' '+uu.last_name,
'distance': record.distance, 'date': w.date,
'type': w.workouttype, 'distance': record.distance,
'coursecompleted':True, 'type': w.workouttype,
} 'coursecompleted':True,
}
coursecompleted = record.coursecompleted coursecompleted = record.coursecompleted
t = record.duration t = record.duration
wdict['time'] = datetime.timedelta( wdict['time'] = datetime.timedelta(
hours=t.hour, hours=t.hour,
seconds=t.second, seconds=t.second,
minutes=t.minute, minutes=t.minute,
microseconds=t.microsecond 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']) ranking = sorted(ranking, key=lambda k: k['time'])
if ps.sessiontype == 'fastest_time': if ps.sessiontype == 'fastest_time':