From 866ef7dcba04ebc7d7e07d6359d0e0e40fd9c27c Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 18 Feb 2018 16:16:33 +0100 Subject: [PATCH 1/2] added completion date for partially complete sessions --- rowers/plannedsessions.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/rowers/plannedsessions.py b/rowers/plannedsessions.py index b2b7811a..487226c5 100644 --- a/rowers/plannedsessions.py +++ b/rowers/plannedsessions.py @@ -196,11 +196,16 @@ def is_session_complete_ws(ws,ps): if ratio == 1.0: return ratio,'completed',completiondate else: + if not completiondate: + completiondate = ws.reverse()[0].date return ratio,'partial',completiondate elif ps.criterium == 'minimum': if ratio >= 1.0: return ratio,'completed',completiondate else: + if not completiondate: + completiondate = ws.reverse()[0].date + return ratio,'partial',completiondate else: if ratio>cratiomin and ratio 1.0: return ratio,'completed',completiondate else: + if not completiondate: + completiondate = ws.reverse()[0].date return ratio,'partial',completiondate else: + if not completiondate: + completiondate = ws.reverse()[0].date return ratio,'partial',completiondate else: + if not completiondate: + completiondate = ws.reverse()[0].date return ratio,status,completiondate From 451a8fef31eb946c0d7ec1ef79588f8609a86925 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 19 Feb 2018 15:35:49 +0100 Subject: [PATCH 2/2] bug fixes --- rowers/stravastuff.py | 2 ++ rowers/views.py | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/rowers/stravastuff.py b/rowers/stravastuff.py index 9666ca1d..605f796f 100644 --- a/rowers/stravastuff.py +++ b/rowers/stravastuff.py @@ -268,6 +268,8 @@ def createstravaworkoutdata(w,dozip=True): row = rowingdata(filename) except IOError: return '','Error - could not find rowing data' + else: + return '','Error - could not find rowing data' tcxfilename = filename[:-4]+'.tcx' try: diff --git a/rowers/views.py b/rowers/views.py index 16d1b947..5ed987c4 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -12354,7 +12354,6 @@ def plannedsession_clone_view(request,id=0,rowerid=0, 'id':ps.id, 'timeperiod':timeperiod, 'rowerid':r.id, - 'rower':r, } )