Private
Public Access
1
0

fixing seatnumber issue

This commit is contained in:
Sander Roosendaal
2022-09-06 20:52:52 +02:00
parent c5dee693d7
commit b893653781
5 changed files with 24 additions and 9 deletions

View File

@@ -74,7 +74,10 @@ def add_workout_from_data(userid, nkid, data, strokedata, source='nk', splitdata
# boatName = oarlocksession["boatName"]
oarLength = oarlocksession["oarLength"] # cm
oarInboardLength = oarlocksession["oarInboardLength"] # cm
# seatNumber = oarlocksession["seatNumber"]
try:
seatNumber = oarlocksession["seatNumber"]
except KeyError:
seatNumber = 1
try:
oarlockfirmware = oarlocksession["firmwareVersion"]
except KeyError:
@@ -83,7 +86,7 @@ def add_workout_from_data(userid, nkid, data, strokedata, source='nk', splitdata
# boatName = ''
oarLength = 289
oarInboardLength = 88
# seatNumber = 1
seatNumber = 1
oarlockfirmware = ''
workouttype = "water"
@@ -103,7 +106,8 @@ def add_workout_from_data(userid, nkid, data, strokedata, source='nk', splitdata
'oarlockfirmware': oarlockfirmware,
'elapsedTime': elapsedTime/1000., # in seconds
'totalDistance': totalDistance,
'useImpeller': useImpeller
'useImpeller': useImpeller,
'seatNumber': seatNumber,
}
# dologging('nklog.log',json.dumps(uploadoptions))
@@ -271,13 +275,13 @@ def getdict(x, seatIndex=1):
return {}
def strokeDataToDf(strokeData):
def strokeDataToDf(strokeData, seatIndex=1):
df = pd.DataFrame.from_dict(strokeData)
oarlockData = df['oarlockStrokes']
oarlockData = oarlockData.apply(lambda x: getdict(x, seatIndex=1))
oarlockData = oarlockData.apply(lambda x: getdict(x, seatIndex=seatIndex))
df2 = pd.DataFrame.from_records(oarlockData.values)
# df.set_index('timestamp',inplace=True)