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

some javascript to improve planned session manage

Browse Source
This commit is contained in:
Sander Roosendaal
2018-02-07 22:30:47 +01:00
parent 1e70708ce0
commit 6a56bb98b6
5 changed files with 94 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rowers/plannedsessions.py
View File

@@ -105,19 +105,17 @@ def is_session_complete(r,ps):
elif ps.sessionunit == 'km':
value *= 1000.
print score,value,ps.sessionvalue,ps.sessionunit
ratio = score/float(value)
status = 'partial'
if ps.sessiontype == 'training':
if ps.sessioncriterium == 'exact':
if ps.sessiontype == 'session':
if ps.criterium == 'exact':
if ratio == 1.0:
return ratio,'completed'
else:
return ratio,'partial'
elif ps.sessioncriterium == 'minimum':
elif ps.criterium == 'minimum':
if ratio > 1.0:
return ratio,'completed'
else:
@@ -133,12 +131,12 @@ def is_session_complete(r,ps):
else:
return ratio,'partial'
elif ps.sessiontype == 'challenge':
if ps.sessioncriterium == 'exact':
if ps.criterium == 'exact':
if ratio == 1.0:
return ratio,'completed'
else:
return ratio,'partial'
elif ps.sessioncriterium == 'minimum':
elif ps.criterium == 'minimum':
if ratio > 1.0:
return ratio,'completed'
else: