From 1d9dd56951acc34f17bb46c1668bde92525d5fcf Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 18 May 2017 19:55:35 +0200 Subject: [PATCH 1/2] added str2bool for workstrokesonly --- rowers/utils.py | 3 +++ rowers/views.py | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/rowers/utils.py b/rowers/utils.py index b78310cd..17dfffe6 100644 --- a/rowers/utils.py +++ b/rowers/utils.py @@ -4,6 +4,9 @@ import numpy as np lbstoN = 4.44822 +def str2bool(v): + return v.lower() in ("yes", "true", "t", "1") + def uniqify(seq, idfun=None): # order preserving if idfun is None: diff --git a/rowers/views.py b/rowers/views.py index 2bead2fc..08be46b5 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -267,7 +267,11 @@ def splitstdata(lijst): return [np.array(t),np.array(latlong)] -from utils import geo_distance,serialize_list,deserialize_list,uniqify +from utils import ( + geo_distance,serialize_list,deserialize_list,uniqify, + str2bool + ) + from rowers.models import checkworkoutuser # Check if a user is a Coach member @@ -4401,7 +4405,7 @@ def workout_stats_view(request,id=0,message="",successmessage=""): workstrokesonly = True if request.method == 'POST' and 'workstrokesonly' in request.POST: - workstrokesonly = request.POST['workstrokesonly'] + workstrokesonly = str2bool(request.POST['workstrokesonly']) # prepare data frame From da2066cfd16967b74a43e9b052e9d34d51eff064 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 18 May 2017 20:38:51 +0200 Subject: [PATCH 2/2] FIT from C2 --- rowers/dataprep.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index ba78268e..e18c8c8b 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -590,9 +590,12 @@ def handle_nonpainsled(f2,fileformat,summary=''): # handle FIT if (fileformat == 'fit'): row = FITParser(f2) - s = fitsummarydata(f2) - s.setsummary() - summary = s.summarytext + try: + s = fitsummarydata(f2) + s.setsummary() + summary = s.summarytext + except: + pass f_to_be_deleted = f2