Private
Public Access
1
0

Merge branch 'release/v6.58'

This commit is contained in:
Sander Roosendaal
2018-05-04 13:01:54 +02:00
2 changed files with 6 additions and 2 deletions
+1 -1
View File
@@ -1319,7 +1319,7 @@ def new_workout_from_file(r, f2,
return (0, message, '')
dosummary = (fileformat != 'fit' and 'speedcoach2' not in fileformat)
dosummary = dosummary or summary == ''
id, message = save_workout_database(
f2, r,
+4
View File
@@ -119,6 +119,7 @@ def make_new_workout_from_email(rower, datafile, name, cntr=0,testing=False):
summary = ''
# handle non-Painsled
if fileformat != 'csv':
filename_mediadir, summary, oarlength, inboard,fileformat = dataprep.handle_nonpainsled(
@@ -147,8 +148,10 @@ def make_new_workout_from_email(rower, datafile, name, cntr=0,testing=False):
except KeyError:
pass
row.write_csv(datafilename, gzip=True)
dosummary = (fileformat != 'fit' and 'speedcoach2' not in fileformat)
dosummary = dosummary or summary == ''
if name == '':
name = 'Workout from Background Queue'
@@ -157,6 +160,7 @@ def make_new_workout_from_email(rower, datafile, name, cntr=0,testing=False):
datafilename, rower,
workouttype=workouttype,
dosummary=dosummary,
summary=summary,
inboard=inboard,
oarlength=oarlength,
title=name,