diff --git a/rowers/datautils.py b/rowers/datautils.py index 1358e0d6..34c13421 100644 --- a/rowers/datautils.py +++ b/rowers/datautils.py @@ -252,7 +252,7 @@ def getcp(dfgrouped,logarr): dt = pd.Series(dt) cpw = pd.Series(cpw) - if len(dt): + if len(dt)>2: cpvalues = griddata(dt.values, cpw.values, logarr,method='linear', diff --git a/rowers/templates/workout_form.html b/rowers/templates/workout_form.html index e0f87339..9f07dbeb 100644 --- a/rowers/templates/workout_form.html +++ b/rowers/templates/workout_form.html @@ -159,7 +159,7 @@
{% elif forloop.counter == 3 %} diff --git a/rowers/views.py b/rowers/views.py index 0986c9fd..8d362082 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -331,18 +331,25 @@ def get_job_status(jobid): 'result': 1, } - - if 'fail' in summary['status'].lower(): - summary['failed'] = True - else: - summary['failed'] = False + try: + if 'fail' in summary['status'].lower(): + summary['failed'] = True + else: + summary['failed'] = False - if 'success' in summary['status'].lower(): - summary['finished'] = True - elif 'finished' in summary['status'].lower(): - summary['finished'] = True - else: - summary['finished'] = False + if 'success' in summary['status'].lower(): + summary['finished'] = True + elif 'finished' in summary['status'].lower(): + summary['finished'] = True + else: + summary['finished'] = False + except AttributeError: + summary = { + 'status': 'failed', + 'result': 0, + 'finished': True, + 'failed': True + } return summary diff --git a/static/img/rowingtimer.gif b/static/img/rowingtimer.gif new file mode 100644 index 00000000..3c9fe0f7 Binary files /dev/null and b/static/img/rowingtimer.gif differ