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

Merge branch 'release/v14.30'

Browse Source
This commit is contained in:
Sander Roosendaal
2020-11-09 15:53:30 +01:00
parent 9c53f984ca 6fcabadf25
commit 1b945789d4
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
rowers/interactiveplots.py
View File

@@ -1206,63 +1206,63 @@ def interactive_forcecurve(theworkouts,workstrokesonly=True,plottype='scatter'):
plot.add_layout(avf) plot.add_layout(avf)
peakflabel = Label(x=410,y=460,x_units='screen',y_units='screen', peakflabel = Label(x=760,y=460,x_units='screen',y_units='screen',
text="Fpeak: {peakforceav:6.2f}".format(peakforceav=peakforceav), text="Fpeak: {peakforceav:6.2f}".format(peakforceav=peakforceav),
background_fill_alpha=.7, background_fill_alpha=.7,
background_fill_color='white', background_fill_color='white',
text_color='blue', text_color='blue',
) )
avflabel = Label(x=420,y=430,x_units='screen',y_units='screen', avflabel = Label(x=770,y=430,x_units='screen',y_units='screen',
text="Favg: {averageforceav:6.2f}".format(averageforceav=averageforceav), text="Favg: {averageforceav:6.2f}".format(averageforceav=averageforceav),
background_fill_alpha=.7, background_fill_alpha=.7,
background_fill_color='white', background_fill_color='white',
text_color='blue', text_color='blue',
) )
catchlabel = Label(x=415,y=400,x_units='screen',y_units='screen', catchlabel = Label(x=765,y=400,x_units='screen',y_units='screen',
text="Catch: {catchav:6.2f}".format(catchav=catchav), text="Catch: {catchav:6.2f}".format(catchav=catchav),
background_fill_alpha=0.7, background_fill_alpha=0.7,
background_fill_color='white', background_fill_color='white',
text_color='red', text_color='red',
) )
peakforceanglelabel = Label(x=375,y=370,x_units='screen',y_units='screen', peakforceanglelabel = Label(x=725,y=370,x_units='screen',y_units='screen',
text="Peak angle: {peakforceangleav:6.2f}".format(peakforceangleav=peakforceangleav), text="Peak angle: {peakforceangleav:6.2f}".format(peakforceangleav=peakforceangleav),
background_fill_alpha=0.7, background_fill_alpha=0.7,
background_fill_color='white', background_fill_color='white',
text_color='red', text_color='red',
) )
finishlabel = Label(x=410,y=340,x_units='screen',y_units='screen', finishlabel = Label(x=760,y=340,x_units='screen',y_units='screen',
text="Finish: {finishav:6.2f}".format(finishav=finishav), text="Finish: {finishav:6.2f}".format(finishav=finishav),
background_fill_alpha=0.7, background_fill_alpha=0.7,
background_fill_color='white', background_fill_color='white',
text_color='red', text_color='red',
) )
sliplabel = Label(x=425,y=310,x_units='screen',y_units='screen', sliplabel = Label(x=775,y=310,x_units='screen',y_units='screen',
text="Slip: {slipav:6.2f}".format(slipav=slipav-catchav), text="Slip: {slipav:6.2f}".format(slipav=slipav-catchav),
background_fill_alpha=0.7, background_fill_alpha=0.7,
background_fill_color='white', background_fill_color='white',
text_color='red', text_color='red',
) )
washlabel = Label(x=415,y=280,x_units='screen',y_units='screen', washlabel = Label(x=765,y=280,x_units='screen',y_units='screen',
text="Wash: {washav:6.2f}".format(washav=finishav-washav), text="Wash: {washav:6.2f}".format(washav=finishav-washav),
background_fill_alpha=0.7, background_fill_alpha=0.7,
background_fill_color='white', background_fill_color='white',
text_color='red', text_color='red',
) )
lengthlabel = Label(x=405,y=250, x_units='screen',y_units='screen', lengthlabel = Label(x=755,y=250, x_units='screen',y_units='screen',
text="Length: {length:6.2f}".format(length=finishav-catchav), text="Length: {length:6.2f}".format(length=finishav-catchav),
background_fill_alpha=0.7, background_fill_alpha=0.7,
background_fill_color='white', background_fill_color='white',
text_color='green' text_color='green'
) )
efflengthlabel = Label(x=340,y=220, x_units='screen',y_units='screen', efflengthlabel = Label(x=690,y=220, x_units='screen',y_units='screen',
text="Effective Length: {length:6.2f}".format(length=washav-slipav), text="Effective Length: {length:6.2f}".format(length=washav-slipav),
background_fill_alpha=0.7, background_fill_alpha=0.7,
background_fill_color='white', background_fill_color='white',

2
rowers/views/racesviews.py
View File

@@ -3498,7 +3498,7 @@ def virtualevent_entry_edit_view(request,id=0,entryid=0):
if boattype != record.boattype: if boattype != record.boattype:
messages.error(request,'You cannot change boat type to a different one ') messages.error(request,'You cannot change boat type to a different one ')
return HttpResponseRedirect(returnurl) return HttpResponseRedirect(returnurl)
if boatclass != record.workouttype: if boatclass != record.boatclass:
messages.error(request,'You cannot change the class to a different one ') messages.error(request,'You cannot change the class to a different one ')
return HttpResponseRedirect(returnurl) return HttpResponseRedirect(returnurl)
if weightcategory != record.weightcategory: if weightcategory != record.weightcategory: