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

Merge branch 'release/v5.91'

Browse Source
This commit is contained in:
Sander Roosendaal
2018-02-19 15:44:16 +01:00
parent 5bdf151a8b 451a8fef31
commit f0e88ff0ae
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rowers/plannedsessions.py
View File

@@ -196,11 +196,16 @@ def is_session_complete_ws(ws,ps):
if ratio == 1.0: if ratio == 1.0:
return ratio,'completed',completiondate return ratio,'completed',completiondate
else: else:
if not completiondate:
completiondate = ws.reverse()[0].date
return ratio,'partial',completiondate return ratio,'partial',completiondate
elif ps.criterium == 'minimum': elif ps.criterium == 'minimum':
if ratio >= 1.0: if ratio >= 1.0:
return ratio,'completed',completiondate return ratio,'completed',completiondate
else: else:
if not completiondate:
completiondate = ws.reverse()[0].date
return ratio,'partial',completiondate return ratio,'partial',completiondate
else: else:
if ratio>cratiomin and ratio<cratiomax: if ratio>cratiomin and ratio<cratiomax:
@@ -222,11 +227,17 @@ def is_session_complete_ws(ws,ps):
if ratio > 1.0: if ratio > 1.0:
return ratio,'completed',completiondate return ratio,'completed',completiondate
else: else:
if not completiondate:
completiondate = ws.reverse()[0].date
return ratio,'partial',completiondate return ratio,'partial',completiondate
else: else:
if not completiondate:
completiondate = ws.reverse()[0].date
return ratio,'partial',completiondate return ratio,'partial',completiondate
else: else:
if not completiondate:
completiondate = ws.reverse()[0].date
return ratio,status,completiondate return ratio,status,completiondate

2
rowers/stravastuff.py
View File

@@ -268,6 +268,8 @@ def createstravaworkoutdata(w,dozip=True):
row = rowingdata(filename) row = rowingdata(filename)
except IOError: except IOError:
return '','Error - could not find rowing data' return '','Error - could not find rowing data'
else:
return '','Error - could not find rowing data'
tcxfilename = filename[:-4]+'.tcx' tcxfilename = filename[:-4]+'.tcx'
try: try:

1
rowers/views.py
View File

@@ -12354,7 +12354,6 @@ def plannedsession_clone_view(request,id=0,rowerid=0,
'id':ps.id, 'id':ps.id,
'timeperiod':timeperiod, 'timeperiod':timeperiod,
'rowerid':r.id, 'rowerid':r.id,
'rower':r,
} }
) )