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

small refactor step 1

Browse Source
This commit is contained in:
Sander Roosendaal
2021-04-07 08:35:03 +02:00
parent f1709284b6
commit c0b4b517ed
10 changed files with 312 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
rowers/tasks.py
View File

@@ -111,7 +111,7 @@ def safetimedelta(x):
siteurl = SITE_URL
from rowers.utils import get_nk_summary, get_nk_allstats, get_nk_intervalstats,getdict
from rowers.nkimportutils import get_nk_summary, get_nk_allstats, get_nk_intervalstats,getdict,strokeDataToDf
# testing task
@@ -2981,22 +2981,8 @@ def handle_nk_async_workout(alldata,userid,nktoken,nkid,delaysec,defaulttimezone
jsonData = response.json()
strokeData = jsonData[str(nkid)]
df = pd.DataFrame.from_dict(strokeData)
oarlockData = df['oarlockStrokes']
oarlockData = oarlockData.apply(lambda x:getdict(x, seatIndex=1))
df2 = pd.DataFrame.from_records(oarlockData.values)
df.set_index('timestamp')
if not df2.empty:
df2.set_index('timestamp')
df = df.merge(df2,left_index=True,right_index=True)
df = df.rename(columns={"timestamp_x":"timestamp"})
df = df.drop('oarlockStrokes',axis=1)
df.sort_values(by='timestamp',ascending=True,inplace=True)
df.fillna(inplace=True,method='ffill')
df = strokeDataToDf(strokeData)
# get workout data
timestampbegin = df['timestamp'].min()
@@ -3009,7 +2995,7 @@ def handle_nk_async_workout(alldata,userid,nktoken,nkid,delaysec,defaulttimezone
df.to_csv(csvfilename, index_label='index', compression='gzip')
#res = add_workout_from_data(userid,nkid,data,df)
title = data["name"]
speedInput = data["speedInput"]
elapsedTime = data["elapsedTime"]