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

coastal to behave as water

Browse Source
This commit is contained in:
Sander Roosendaal
2017-07-03 16:24:47 +02:00
parent 8e33b78de1
commit 3aa567d10e
1 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
rowers/views.py
View File

@@ -640,7 +640,7 @@ def add_workout_from_runkeeperdata(user,importid,data):
times_location = times_distance times_location = times_distance
latcoord = np.zeros(len(times_distance)) latcoord = np.zeros(len(times_distance))
loncoord = np.zeros(len(times_distance)) loncoord = np.zeros(len(times_distance))
if workouttype == 'water': if workouttype in ('water','coastal'):
workouttype = 'rower' workouttype = 'rower'
try: try:
@@ -809,7 +809,7 @@ def add_workout_from_stdata(user,importid,data):
times_location = times_distance times_location = times_distance
latcoord = np.zeros(len(times_distance)) latcoord = np.zeros(len(times_distance))
loncoord = np.zeros(len(times_distance)) loncoord = np.zeros(len(times_distance))
if workouttype == 'water': if workouttype in ('water','coastal'):
workouttype = 'rower' workouttype = 'rower'
try: try:
@@ -975,7 +975,7 @@ def add_workout_from_underarmourdata(user,importid,data):
times_location = times_distance times_location = times_distance
latcoord = np.zeros(len(times_distance)) latcoord = np.zeros(len(times_distance))
loncoord = np.zeros(len(times_distance)) loncoord = np.zeros(len(times_distance))
if workouttype == 'water': if workouttype in ('water','coastal'):
workouttype = 'rower' workouttype = 'rower'
try: try:
@@ -2103,7 +2103,7 @@ def cum_flex(request,theuser=0,
includereststrokes = options['includereststrokes'] includereststrokes = options['includereststrokes']
workstrokesonly = not includereststrokes workstrokesonly = not includereststrokes
checktypes = ['water','rower','dynamic','slides','skierg', checktypes = ['water','rower','dynamic','slides','skierg',
'paddle','snow','other'] 'paddle','snow','coastal','other']
if deltadays>0: if deltadays>0:
startdate = enddate-datetime.timedelta(days=int(deltadays)) startdate = enddate-datetime.timedelta(days=int(deltadays))
@@ -4488,7 +4488,7 @@ def workout_geeky_view(request,id=0,message="",successmessage=""):
messages.error(request,message) messages.error(request,message)
messages.info(request,successmessage) messages.info(request,successmessage)
if row.workouttype=='water': if row.workouttype in ('water','coastal'):
return render(request, return render(request,
'otwgeeky.html', 'otwgeeky.html',
{'workout':row, {'workout':row,
@@ -4524,7 +4524,7 @@ def cumstats(request,theuser=0,
includereststrokes = options['includereststrokes'] includereststrokes = options['includereststrokes']
workstrokesonly = not includereststrokes workstrokesonly = not includereststrokes
checktypes = ['water','rower','dynamic','slides','skierg', checktypes = ['water','rower','dynamic','slides','skierg',
'paddle','snow','other'] 'paddle','snow','other','coastal']
if deltadays>0: if deltadays>0:
startdate = enddate-datetime.timedelta(days=int(deltadays)) startdate = enddate-datetime.timedelta(days=int(deltadays))
@@ -4828,7 +4828,7 @@ def workout_stats_view(request,id=0,message="",successmessage=""):
normp = (pwr4.mean())**(0.25) normp = (pwr4.mean())**(0.25)
if not np.isnan(normp): if not np.isnan(normp):
ftp = float(r.ftp) ftp = float(r.ftp)
if w.workouttype == 'water': if w.workouttype in ('water','coastal'):
ftp = ftp*(100.-r.otwslack)/100. ftp = ftp*(100.-r.otwslack)/100.
intensityfactor = datadf['power'].mean()/float(ftp) intensityfactor = datadf['power'].mean()/float(ftp)
@@ -4923,7 +4923,7 @@ def workout_advanced_view(request,id=0,message="",successmessage=""):
messages.info(request,successmessage) messages.info(request,successmessage)
if row.workouttype=='water': if row.workouttype in ('water','coastal'):
return render(request, return render(request,
'advancedotw.html', 'advancedotw.html',
{'workout':row, {'workout':row,
@@ -5062,7 +5062,7 @@ def workout_flexchart3_view(request,*args,**kwargs):
workouttype = 'ote' workouttype = 'ote'
if row.workouttype == 'water': if row.workouttype in ('water','coastal'):
workouttype = 'otw' workouttype = 'otw'
try: try:
@@ -5168,7 +5168,7 @@ def workout_flexchart3_view(request,*args,**kwargs):
noylist = ["time","distance"] noylist = ["time","distance"]
axchoicesbasic.pop("cumdist") axchoicesbasic.pop("cumdist")
if row.workouttype == 'water': if row.workouttype in ('water','coastal'):
return render(request, return render(request,
'flexchart3otw.html', 'flexchart3otw.html',
{'the_script':script, {'the_script':script,
@@ -5675,7 +5675,7 @@ def workout_add_otw_powerplot_view(request,id):
ftp = r.ftp ftp = r.ftp
if w.workouttype == 'water': if w.workouttype in ('water','coastal'):
ftp = ftp*(100.-r.otwslack)/100. ftp = ftp*(100.-r.otwslack)/100.
hrpwrdata = { hrpwrdata = {
@@ -5693,7 +5693,7 @@ def workout_add_otw_powerplot_view(request,id):
# make plot - asynchronous task # make plot - asynchronous task
plotnr = 9 plotnr = 9
if (w.workouttype=='water'): if w.workouttype in ('water','coastal'):
plotnr = plotnr+3 plotnr = plotnr+3
if settings.DEBUG: if settings.DEBUG:
@@ -5736,7 +5736,7 @@ def workout_add_piechart_view(request,id):
r.pw_tr,r.pw_an])/r.ftp r.pw_tr,r.pw_an])/r.ftp
ftp = float(r.ftp) ftp = float(r.ftp)
if w.workouttype == 'water': if w.workouttype in ('water','coastal'):
ftp = ftp*(100.-r.otwslack)/100. ftp = ftp*(100.-r.otwslack)/100.
hrpwrdata = { hrpwrdata = {
@@ -5754,7 +5754,7 @@ def workout_add_piechart_view(request,id):
# make plot - asynchronous task # make plot - asynchronous task
plotnr = 3 plotnr = 3
if (w.workouttype=='water'): if w.workouttype in ('water','coastal'):
plotnr = plotnr+3 plotnr = plotnr+3
if settings.DEBUG: if settings.DEBUG:
@@ -5797,7 +5797,7 @@ def workout_add_power_piechart_view(request,id):
r.pw_tr,r.pw_an])/r.ftp r.pw_tr,r.pw_an])/r.ftp
ftp = float(r.ftp) ftp = float(r.ftp)
if w.workouttype == 'water': if w.workouttype in ('water','coastal'):
ftp = ftp*(100.-r.otwslack)/100. ftp = ftp*(100.-r.otwslack)/100.
hrpwrdata = { hrpwrdata = {
@@ -5815,7 +5815,7 @@ def workout_add_power_piechart_view(request,id):
# make plot - asynchronous task # make plot - asynchronous task
plotnr = 13 plotnr = 13
if (w.workouttype=='water'): if w.workouttype in ('water','coastal'):
plotnr = plotnr+3 plotnr = plotnr+3
if settings.DEBUG: if settings.DEBUG:
@@ -5855,7 +5855,7 @@ def workout_add_timeplot_view(request,id):
r.pw_tr,r.pw_an])/r.ftp r.pw_tr,r.pw_an])/r.ftp
ftp = float(r.ftp) ftp = float(r.ftp)
if w.workouttype == 'water': if w.workouttype in ('water','coastal'):
ftp = ftp*(100.-r.otwslack)/100. ftp = ftp*(100.-r.otwslack)/100.
hrpwrdata = { hrpwrdata = {
@@ -5873,7 +5873,7 @@ def workout_add_timeplot_view(request,id):
# make plot - asynchronous task # make plot - asynchronous task
plotnr = 1 plotnr = 1
if (w.workouttype=='water'): if w.workouttype in ('water','coastal'):
plotnr = plotnr+3 plotnr = plotnr+3
if settings.DEBUG: if settings.DEBUG:
@@ -5915,7 +5915,7 @@ def workout_add_distanceplot_view(request,id):
r.pw_tr,r.pw_an])/r.ftp r.pw_tr,r.pw_an])/r.ftp
ftp = float(r.ftp) ftp = float(r.ftp)
if w.workouttype == 'water': if w.workouttype in ('water','coastal'):
ftp = ftp*(100.-r.otwslack)/100. ftp = ftp*(100.-r.otwslack)/100.
hrpwrdata = { hrpwrdata = {
@@ -5933,7 +5933,7 @@ def workout_add_distanceplot_view(request,id):
# make plot - asynchronous task # make plot - asynchronous task
plotnr = 2 plotnr = 2
if (w.workouttype=='water'): if w.workouttype in ('water','coastal'):
plotnr = plotnr+3 plotnr = plotnr+3
if settings.DEBUG: if settings.DEBUG:
@@ -5973,7 +5973,7 @@ def workout_add_distanceplot2_view(request,id):
r.pw_tr,r.pw_an])/r.ftp r.pw_tr,r.pw_an])/r.ftp
ftp = float(r.ftp) ftp = float(r.ftp)
if w.workouttype == 'water': if w.workouttype in ('water','coastal'):
ftp = ftp*(100.-r.otwslack)/100. ftp = ftp*(100.-r.otwslack)/100.
hrpwrdata = { hrpwrdata = {
@@ -5991,7 +5991,7 @@ def workout_add_distanceplot2_view(request,id):
# make plot - asynchronous task # make plot - asynchronous task
plotnr = 7 plotnr = 7
if (w.workouttype=='water'): if w.workouttype in ('water','coastal'):
plotnr = plotnr+3 plotnr = plotnr+3
if settings.DEBUG: if settings.DEBUG:
@@ -6033,7 +6033,7 @@ def workout_add_timeplot2_view(request,id):
r.pw_tr,r.pw_an])/r.ftp r.pw_tr,r.pw_an])/r.ftp
ftp = float(r.ftp) ftp = float(r.ftp)
if w.workouttype == 'water': if w.workouttype in ('water','coastal'):
ftp = ftp*(100.-r.otwslack)/100. ftp = ftp*(100.-r.otwslack)/100.
hrpwrdata = { hrpwrdata = {
@@ -6051,7 +6051,7 @@ def workout_add_timeplot2_view(request,id):
# make plot - asynchronous task # make plot - asynchronous task
plotnr = 8 plotnr = 8
if (w.workouttype=='water'): if w.workouttype in ('water','coastal'):
plotnr = plotnr+3 plotnr = plotnr+3
if settings.DEBUG: if settings.DEBUG:
@@ -6806,7 +6806,7 @@ def workout_upload_view(request,
r.pw_tr,r.pw_an])/r.ftp r.pw_tr,r.pw_an])/r.ftp
ftp = float(r.ftp) ftp = float(r.ftp)
if w.workouttype == 'water': if w.workouttype in ('water','coastal'):
ftp = ftp*(100.-r.otwslack)/100. ftp = ftp*(100.-r.otwslack)/100.
hrpwrdata = { hrpwrdata = {
@@ -6829,7 +6829,7 @@ def workout_upload_view(request,
} }
plotnr = plotnrs[plottype] plotnr = plotnrs[plottype]
if (workouttype=='water'): if workouttype in ('water','coastal'):
plotnr = plotnr+3 plotnr = plotnr+3
@@ -7054,7 +7054,7 @@ def team_workout_upload_view(request,message="",
r.pw_tr,r.pw_an])/r.ftp r.pw_tr,r.pw_an])/r.ftp
ftp = float(r.ftp) ftp = float(r.ftp)
if w.workouttype == 'water': if w.workouttype in ('water','coastal'):
ftp = ftp*(100.-r.otwslack)/100. ftp = ftp*(100.-r.otwslack)/100.
hrpwrdata = { hrpwrdata = {
@@ -7077,7 +7077,7 @@ def team_workout_upload_view(request,message="",
} }
plotnr = plotnrs[plottype] plotnr = plotnrs[plottype]
if (workouttype=='water'): if workouttype in ('water','coastal'):
plotnr = plotnr+3 plotnr = plotnr+3
@@ -7267,7 +7267,7 @@ def workout_summary_restore_view(request,id,message="",successmessage=""):
r.pw_tr,r.pw_an])/r.ftp r.pw_tr,r.pw_an])/r.ftp
ftp = float(r.ftp) ftp = float(r.ftp)
if row.workouttype == 'water': if row.workouttype in ('water','coastal'):
ftp = ftp*(100.-r.otwslack)/100. ftp = ftp*(100.-r.otwslack)/100.
rr = rrower(hrmax=r.max,hrut2=r.ut2, rr = rrower(hrmax=r.max,hrut2=r.ut2,
@@ -7385,7 +7385,7 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
r.pw_tr,r.pw_an])/r.ftp r.pw_tr,r.pw_an])/r.ftp
ftp = float(r.ftp) ftp = float(r.ftp)
if row.workouttype == 'water': if row.workouttype in ('water','coastal'):
ftp = ftp*(100.-r.otwslack)/100. ftp = ftp*(100.-r.otwslack)/100.
rr = rrower(hrmax=r.max,hrut2=r.ut2, rr = rrower(hrmax=r.max,hrut2=r.ut2,
@@ -8088,7 +8088,7 @@ def strokedatajson(request,id):
r.pw_tr,r.pw_an])/r.ftp r.pw_tr,r.pw_an])/r.ftp
ftp = float(r.ftp) ftp = float(r.ftp)
if row.workouttype == 'water': if row.workouttype in ('water','coastal'):
ftp = ftp*(100.-r.otwslack)/100. ftp = ftp*(100.-r.otwslack)/100.
rr = rrower(hrmax=r.max,hrut2=r.ut2, rr = rrower(hrmax=r.max,hrut2=r.ut2,