Merge branch 'release/v6.58'
This commit is contained in:
+1
-1
@@ -1319,7 +1319,7 @@ def new_workout_from_file(r, f2,
|
|||||||
return (0, message, '')
|
return (0, message, '')
|
||||||
|
|
||||||
dosummary = (fileformat != 'fit' and 'speedcoach2' not in fileformat)
|
dosummary = (fileformat != 'fit' and 'speedcoach2' not in fileformat)
|
||||||
|
dosummary = dosummary or summary == ''
|
||||||
|
|
||||||
id, message = save_workout_database(
|
id, message = save_workout_database(
|
||||||
f2, r,
|
f2, r,
|
||||||
|
|||||||
@@ -119,6 +119,7 @@ def make_new_workout_from_email(rower, datafile, name, cntr=0,testing=False):
|
|||||||
|
|
||||||
summary = ''
|
summary = ''
|
||||||
|
|
||||||
|
|
||||||
# handle non-Painsled
|
# handle non-Painsled
|
||||||
if fileformat != 'csv':
|
if fileformat != 'csv':
|
||||||
filename_mediadir, summary, oarlength, inboard,fileformat = dataprep.handle_nonpainsled(
|
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:
|
except KeyError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
row.write_csv(datafilename, gzip=True)
|
row.write_csv(datafilename, gzip=True)
|
||||||
dosummary = (fileformat != 'fit' and 'speedcoach2' not in fileformat)
|
dosummary = (fileformat != 'fit' and 'speedcoach2' not in fileformat)
|
||||||
|
dosummary = dosummary or summary == ''
|
||||||
|
|
||||||
if name == '':
|
if name == '':
|
||||||
name = 'Workout from Background Queue'
|
name = 'Workout from Background Queue'
|
||||||
@@ -157,6 +160,7 @@ def make_new_workout_from_email(rower, datafile, name, cntr=0,testing=False):
|
|||||||
datafilename, rower,
|
datafilename, rower,
|
||||||
workouttype=workouttype,
|
workouttype=workouttype,
|
||||||
dosummary=dosummary,
|
dosummary=dosummary,
|
||||||
|
summary=summary,
|
||||||
inboard=inboard,
|
inboard=inboard,
|
||||||
oarlength=oarlength,
|
oarlength=oarlength,
|
||||||
title=name,
|
title=name,
|
||||||
|
|||||||
Reference in New Issue
Block a user