Private
Public Access
1
0

Merge branch 'release/v2.92'

This commit is contained in:
Sander Roosendaal
2017-05-18 20:42:24 +02:00
3 changed files with 15 additions and 5 deletions
+6 -3
View File
@@ -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
+3
View File
@@ -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:
+6 -2
View File
@@ -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