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

added test to travel all links

Browse Source
This commit is contained in:
Sander Roosendaal
2018-04-10 15:42:38 +02:00
parent 7edc020747
commit c3448ebf2c
7 changed files with 228 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
rowers/views.py
View File

@@ -2712,7 +2712,7 @@ def rower_process_testcallback(request):
@login_required()
def histo_all(request,theuser=0,
startdate=timezone.now()-datetime.timedelta(days=10),
enddate=timezone.now()+datetime.timedelta(days=1),
enddate=timezone.now(),
deltadays=-1,
startdatestring="",
enddatestring="",
@@ -2894,7 +2894,7 @@ def cum_flex(request,theuser=0,
yparam1='power',
yparam2='None',
startdate=timezone.now()-datetime.timedelta(days=10),
enddate=timezone.now()+datetime.timedelta(days=1),
enddate=timezone.now(),
deltadays=-1,
startdatestring="",
enddatestring="",
@@ -3623,7 +3623,7 @@ def rankings_view(request,theuser=0,
# test to fix bug
startdate = datetime.datetime.combine(startdate,datetime.time())
enddate = datetime.datetime.combine(enddate,datetime.time(23,59,59))
enddate = enddate+datetime.timedelta(days=1)
#enddate = enddate+datetime.timedelta(days=1)
thedistances = []
theworkouts = []
@@ -4029,7 +4029,7 @@ def rankings_view2(request,theuser=0,
# test to fix bug
startdate = datetime.datetime.combine(startdate,datetime.time())
enddate = datetime.datetime.combine(enddate,datetime.time(23,59,59))
enddate = enddate+datetime.timedelta(days=1)
#enddate = enddate+datetime.timedelta(days=1)
thedistances = []
@@ -4407,7 +4407,7 @@ def otwrankings_view(request,theuser=0,
# test to fix bug
startdate = datetime.datetime.combine(startdate,datetime.time())
enddate = datetime.datetime.combine(enddate,datetime.time(23,59,59))
enddate = enddate+datetime.timedelta(days=1)
#enddate = enddate+datetime.timedelta(days=1)
@@ -4683,7 +4683,7 @@ def oterankings_view(request,theuser=0,
# test to fix bug
startdate = datetime.datetime.combine(startdate,datetime.time())
enddate = datetime.datetime.combine(enddate,datetime.time(23,59,59))
enddate = enddate+datetime.timedelta(days=1)
#enddate = enddate+datetime.timedelta(days=1)
@@ -5080,7 +5080,7 @@ def workouts_join_select(request,
message='',
successmessage='',
startdate=timezone.now()-datetime.timedelta(days=30),
enddate=timezone.now()+datetime.timedelta(days=1),
enddate=timezone.now(),
teamid=0):
try:
@@ -5152,7 +5152,7 @@ def workouts_join_select(request,
startdate = datetime.datetime.combine(startdate,datetime.time())
enddate = datetime.datetime.combine(enddate,datetime.time(23,59,59))
enddate = enddate+datetime.timedelta(days=1)
#enddate = enddate+datetime.timedelta(days=1)
if startdatestring:
startdate = iso8601.parse_date(startdatestring)
@@ -5239,7 +5239,7 @@ def team_comparison_select(request,
message='',
successmessage='',
startdate=timezone.now()-datetime.timedelta(days=30),
enddate=timezone.now()+datetime.timedelta(days=1),
enddate=timezone.now(),
teamid=0):
try:
@@ -5311,7 +5311,7 @@ def team_comparison_select(request,
startdate = datetime.datetime.combine(startdate,datetime.time())
enddate = datetime.datetime.combine(enddate,datetime.time(23,59,59))
enddate = enddate+datetime.timedelta(days=1)
#enddate = enddate+datetime.timedelta(days=1)
if startdatestring:
startdate = iso8601.parse_date(startdatestring)
@@ -5478,13 +5478,13 @@ def multi_compare_view(request):
# Multi Flex Chart with Grouping
@user_passes_test(ispromember,login_url="/",redirect_field_name=None)
def user_multiflex_select(request,
startdatestring="",
enddatestring="",
message='',
successmessage='',
startdate=timezone.now()-datetime.timedelta(days=30),
enddate=timezone.now()+datetime.timedelta(days=1),
userid=0):
startdatestring="",
enddatestring="",
message='',
successmessage='',
startdate=timezone.now()-datetime.timedelta(days=30),
enddate=timezone.now(),
userid=0):
if userid == 0:
user = request.user
@@ -5575,7 +5575,7 @@ def user_multiflex_select(request,
startdate = datetime.datetime.combine(startdate,datetime.time())
enddate = datetime.datetime.combine(enddate,datetime.time(23,59,59))
enddate = enddate+datetime.timedelta(days=1)
#enddate = enddate+datetime.timedelta(days=1)
if startdatestring:
startdate = iso8601.parse_date(startdatestring)
@@ -6017,7 +6017,7 @@ def user_boxplot_select(request,
message='',
successmessage='',
startdate=timezone.now()-datetime.timedelta(days=30),
enddate=timezone.now()+datetime.timedelta(days=1),
enddate=timezone.now(),
options={
'includereststrokes':False,
'workouttypes':['rower','dynamic','slides'],
@@ -6113,7 +6113,7 @@ def user_boxplot_select(request,
startdate = datetime.datetime.combine(startdate,datetime.time())
enddate = datetime.datetime.combine(enddate,datetime.time(23,59,59))
enddate = enddate+datetime.timedelta(days=1)
#enddate = enddate+datetime.timedelta(days=1)
if startdatestring:
startdate = iso8601.parse_date(startdatestring)
@@ -6413,7 +6413,7 @@ def courses_view(request):
def workouts_view(request,message='',successmessage='',
startdatestring="",enddatestring="",
startdate=timezone.now()-datetime.timedelta(days=365),
enddate=timezone.now()+datetime.timedelta(days=1),
enddate=timezone.now(),
teamid=0,rankingonly=False,rowerid=0,userid=0):
request.session['referer'] = absolute(request)['PATH']
@@ -6448,7 +6448,7 @@ def workouts_view(request,message='',successmessage='',
startdate = datetime.datetime.combine(startdate,datetime.time())
enddate = datetime.datetime.combine(enddate,datetime.time(23,59,59))
enddate = enddate+datetime.timedelta(days=1)
#enddate = enddate+datetime.timedelta(days=1)
if startdatestring:
startdate = iso8601.parse_date(startdatestring)
@@ -6590,7 +6590,7 @@ def workout_comparison_list(request,id=0,message='',successmessage='',
startdate = datetime.datetime.combine(startdate,datetime.time())
enddate = datetime.datetime.combine(enddate,datetime.time(23,59,59))
enddate = enddate+datetime.timedelta(days=1)
#enddate = enddate+datetime.timedelta(days=1)
if enddate < startdate:
s = enddate
@@ -6668,7 +6668,7 @@ def workout_fusion_list(request,id=0,message='',successmessage='',
startdate = datetime.datetime.combine(startdate,datetime.time())
enddate = datetime.datetime.combine(enddate,datetime.time(23,59,59))
enddate = enddate+datetime.timedelta(days=1)
#enddate = enddate+datetime.timedelta(days=1)
if enddate < startdate:
s = enddate
@@ -10988,7 +10988,10 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
if rowdata == 0:
return HttpResponse("Error: CSV Data File Not Found")
intervalstats = rowdata.allstats()
itime,idist,itype = rowdata.intervalstats_values()
try:
itime,idist,itype = rowdata.intervalstats_values()
except TypeError:
return HttpResponse("Error: CSV Data File Not Found")
nrintervals = len(idist)
# create interactive plot
@@ -12209,7 +12212,7 @@ def plannedsession_multiclone_view(
request,timeperiod='none',
rowerid=0,
startdate=timezone.now()-datetime.timedelta(days=30),
enddate=timezone.now()+datetime.timedelta(days=1)):
enddate=timezone.now()):
if rowerid==0:
r = getrower(request.user)