From 4bfc5866c4fb172d2f7e3907750adfbe8d49aa71 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 18 Nov 2019 08:32:15 +0100 Subject: [PATCH 1/4] bug fix --- rowers/c2stuff.py | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/rowers/c2stuff.py b/rowers/c2stuff.py index fc60be23..5d184895 100644 --- a/rowers/c2stuff.py +++ b/rowers/c2stuff.py @@ -347,9 +347,20 @@ def summaryfromsplitdata(splitdata,data,filename,sep='|'): timebased = False for interval in splitdata: - idist = interval['distance'] - itime = interval['time']/10. - ipace = 500.*itime/idist + try: + idist = interval['distance'] + except KeyError: + idist = 0 + + try: + itime = interval['time']/10. + except KeyError: + itime = 0 + try: + ipace = 500.*itime/idist + except (ZeroDivisionError,OverflowError): + ipace = 180. + try: ispm = interval['stroke_rate'] except KeyError: From 2b1c16d20eb460f2522486a1f03080edbfcd623b Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 19 Nov 2019 07:57:37 +0100 Subject: [PATCH 2/4] removing StrokeData field *bye and thanks --- rowers/models.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rowers/models.py b/rowers/models.py index c4d6b7e4..395455b6 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -3072,9 +3072,9 @@ attrs.update(strokedatafields) # when the StrokeData are expanded. # No Django Instances of this model are managed. Strokedata table is # accesssed directly with SQL commands -StrokeData = type(str('StrokeData'), (models.Model,), - attrs - ) +#StrokeData = type(str('StrokeData'), (models.Model,), +# attrs +# ) # Storing data for the OTW CP chart class cpdata(models.Model): From 4c0b19ea963696f921f31a31cb065810c5e2ec6d Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 19 Nov 2019 13:10:46 +0100 Subject: [PATCH 3/4] bug fix --- rowers/dataprep.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index f041b8ab..e6324de8 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -2051,6 +2051,8 @@ def read_df_sql(id): if rowdata and len(rowdata.df): data = dataprep(rowdata.df,id=id,bands=True,otwpower=True,barchart=True) df = pd.read_parquet(f) + else: + df = pd.DataFrame() df = df.fillna(value=0) From e0b8513e63d2528b3506d6d7b60a230bb7d3fff6 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 19 Nov 2019 20:51:58 +0100 Subject: [PATCH 4/4] hot fix --- rowers/dataprepnodjango.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rowers/dataprepnodjango.py b/rowers/dataprepnodjango.py index ab1f8506..be8855d0 100644 --- a/rowers/dataprepnodjango.py +++ b/rowers/dataprepnodjango.py @@ -729,7 +729,7 @@ def getsmallrowdata_db(columns,ids=[],debug=False): try: df = pd.read_parquet(csvfilenames[0],columns=columns,engine='pyarrow') except (OSError,IndexError): - pass + df = pd.DataFrame() return df