From de6fdd9378f5b2fc5b972388c4ed71b0648f8000 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 21 Jun 2020 10:29:54 +0200 Subject: [PATCH 1/2] more verbose logging --- rowers/courseutils.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/rowers/courseutils.py b/rowers/courseutils.py index 3bdeefd8..d864e372 100644 --- a/rowers/courseutils.py +++ b/rowers/courseutils.py @@ -38,6 +38,25 @@ def time_in_path(df,p,maxmin='max',getall=False,name='unknown',logfile=None): if len(df[b==2]): + if logfile is not None: + t = time.localtime() + timestamp = time.strftime('%b-%d-%Y_%H%M', t) + with open(logfile,'a') as f: + f.write('\n') + f.write(timestamp) + f.write(' ') + f.write(name) + f.write(' ') + f.write(maxmin) + f.write(' ') + f.write(str(getall)) + f.write(' ') + f.write(str(len(df[b==2]))) + f.write(' ') + if len(df[b==2])>1: + f.write(' passes found') + else: + f.write(' pass found') if getall: return df[b==2]['time'],df[b==2]['cum_dist'] else: @@ -57,6 +76,8 @@ def time_in_path(df,p,maxmin='max',getall=False,name='unknown',logfile=None): f.write(str(getall)) f.write(' ') f.write(str(len(df[b==2]))) + f.write(' ') + f.write(' pass not found') raise InvalidTrajectoryError("Trajectory doesn't go through path") From 36f54783f72eb0d7555803a0e0101e340ef05a3d Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 21 Jun 2020 10:41:08 +0200 Subject: [PATCH 2/2] bug fixed --- rowers/views/analysisviews.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py index a8c58849..b02a7cb9 100644 --- a/rowers/views/analysisviews.py +++ b/rowers/views/analysisviews.py @@ -526,6 +526,11 @@ def statsdata(workouts, options): datadf = dataprep.clean_df_stats(datadf,workstrokesonly=workstrokesonly) + try: + datadf['pace'] = datadf['pace']/1000. + except KeyError: + pass + # Create stats stats = {} # fielddict.pop('workoutstate') @@ -4169,6 +4174,10 @@ def cumstats(request,userid=0, datadf,extracols = dataprep.read_cols_df_sql(ids,fieldlist) datadf = dataprep.clean_df_stats(datadf,workstrokesonly=workstrokesonly) + try: + datadf['pace'] = datadf['pace']/1000. + except KeyError: + pass request.session['rowerid'] = r.id