sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

manual import rp3 working

Browse Source
This commit is contained in:
Sander Roosendaal
2021-01-27 13:30:51 +01:00
parent 5e5518e176
commit 844b984fb1
10 changed files with 161 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
rowers/dataprep.py
View File

@@ -1571,11 +1571,11 @@ def save_workout_database(f2, r, dosmooth=True, workouttype='rower',
oarlength=2.89, inboard=0.88,
forceunit='lbs',
consistencychecks=False,
startdatetime='',
impeller=False):
message = None
powerperc = 100 * np.array([r.pw_ut2,
r.pw_ut1,
r.pw_at,
@@ -1587,6 +1587,9 @@ def save_workout_database(f2, r, dosmooth=True, workouttype='rower',
hrtr=r.tr, hran=r.an, ftp=r.ftp,
powerperc=powerperc, powerzones=r.powerzones)
row = rdata(f2, rower=rr)
if startdatetime != '':
row.rowdatetime = arrow.get(startdatetime).datetime
if title is None or title == '':
title = 'Workout'
@@ -1613,7 +1616,7 @@ def save_workout_database(f2, r, dosmooth=True, workouttype='rower',
return new_workout_from_df(r, newdf,
title=title,boattype=boattype,
workouttype=workouttype,
workoutsource=workoutsource)
workoutsource=workoutsource,startdatetime=startdatetime)
try:
checks = row.check_consistency()
allchecks = 1
@@ -1700,12 +1703,20 @@ def save_workout_database(f2, r, dosmooth=True, workouttype='rower',
summary = row.allstats()
if startdatetime != '':
workoutstartdatetime = arrow.get(startdatetime).datetime
else:
workoutstartdatetime = row.rowdatetime
timezone_str = 'UTC'
try:
workoutstartdatetime = timezone.make_aware(row.rowdatetime)
workoutstartdatetime = timezone.make_aware(workoutstartdatetime)
except ValueError:
workoutstartdatetime = row.rowdatetime
pass
try:
latavg = row.df[' latitude'].mean()
@@ -1840,9 +1851,11 @@ parsers = {
'eth': ETHParser,
}
def parsenonpainsled(fileformat,f2,summary):
def parsenonpainsled(fileformat,f2,summary,startdatetime=''):
try:
row = parsers[fileformat](f2)
if startdatetime != '':
row.rowdatetime = arrow.get(startdatetime).datetime
hasrecognized = True
except (KeyError,IndexError,ValueError):
hasrecognized = False
@@ -1874,13 +1887,13 @@ def parsenonpainsled(fileformat,f2,summary):
return row,hasrecognized,summary,fileformat
def handle_nonpainsled(f2, fileformat, summary=''):
def handle_nonpainsled(f2, fileformat, summary='',startdatetime=''):
oarlength = 2.89
inboard = 0.88
hasrecognized = False
impeller = False
row,hasrecognized,summary,fileformat = parsenonpainsled(fileformat,f2,summary)
row,hasrecognized,summary,fileformat = parsenonpainsled(fileformat,f2,summary,startdatetime=startdatetime)
# Handle c2log
if (fileformat == 'c2log' or fileformat == 'rowprolog'):
@@ -1973,6 +1986,7 @@ def new_workout_from_file(r, f2,
boattype='1x',
rpe=-1,
makeprivate=False,
startdatetime='',
notes='',
uploadoptions={'boattype':'1x','workouttype':'rower'}):
message = ""
@@ -2078,6 +2092,7 @@ def new_workout_from_file(r, f2,
f2, summary, oarlength, inboard, fileformat, impeller = handle_nonpainsled(
f2,
fileformat,
startdatetime=startdatetime,
summary=summary
)
if not f2:
@@ -2106,6 +2121,7 @@ def new_workout_from_file(r, f2,
dosummary=dosummary,
workoutsource=workoutsource,
summary=summary,
startdatetime=startdatetime,
rpe=rpe,
inboard=inboard, oarlength=oarlength,
title=title,
@@ -2222,6 +2238,7 @@ def new_workout_from_df(r, df,
boattype='1x',
workouttype='rower',
parent=None,
startdatetime='',
setprivate=False,
forceunit='lbs',
dt=datetime.timedelta()):
@@ -2250,7 +2267,8 @@ def new_workout_from_df(r, df,
notes = ''
summary = ''
makeprivate = False
startdatetime = timezone.now()
if startdatetime == '':
startdatetime = timezone.now()
if setprivate:
makeprivate = True