From cdc6b57c97eee9e3c6cfc1c9ae3793c9429bb25a Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 12 Oct 2020 18:42:43 +0200 Subject: [PATCH] bug fixes --- rowers/dataprep.py | 17 ----------------- rowers/models.py | 2 +- rowers/templates/user_analysis_select.html | 2 +- 3 files changed, 2 insertions(+), 19 deletions(-) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index d3d040c0..a68f05c6 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -1061,23 +1061,6 @@ def fetchcp_new(rower,workouts): df = df.sort_values(['delta']).reset_index() - #dindex = df['id'].shift(1)-df['id'] - #dpowerplus = df['cp'].shift(1)-df['cp'] - #dpowermin = df['cp'].shift(-1)-df['cp'] - #badrows = [] - #badid = 0 - #for index,row in df.iterrows(): - # if dindex[index] != 0 and dpowermin[index] > 0: - # badrows.append(index) - # badid = row['id'] - # elif row['id'] == badid: - # badrows.append(index) - # else: - # badid = 0 - - - #df = df.drop(index = badrows) - return df['delta'],df['cp'],0 diff --git a/rowers/models.py b/rowers/models.py index 2ec434b7..9e5bc625 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -2988,7 +2988,7 @@ def auto_delete_file_on_delete(sender, instance, **kwargs): # remove parquet file try: dirname = 'media/cpdata_{id}.parquet.gz'.format(id=instance.id) - shutil.rmtree(dirname) + os.remove(dirname) except FileNotFoundError: pass diff --git a/rowers/templates/user_analysis_select.html b/rowers/templates/user_analysis_select.html index bfd6f13c..37974888 100644 --- a/rowers/templates/user_analysis_select.html +++ b/rowers/templates/user_analysis_select.html @@ -2,7 +2,7 @@ {% load staticfiles %} {% load rowerfilters %} -{% block title %}Workouts{% endblock %} +{% block title %}Analysis{% endblock %} {% block main %}