added completion date for partially complete sessions
This commit is contained in:
@@ -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
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user