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

Merge branch 'release/v13.58'

Browse Source
This commit is contained in:
Sander Roosendaal
2020-07-17 16:49:01 +02:00
parent d8c65fe283 a6562ab89e
commit 8c4ed2cf08
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rowers/tasks.py
View File

@@ -412,7 +412,7 @@ def handle_check_race_course(self,
rowdata.fillna(method='backfill',inplace=True) rowdata.fillna(method='backfill',inplace=True)
rowdata['time'] = rowdata['time']-rowdata.ix[0,'time'] rowdata['time'] = rowdata['time']-rowdata.loc[0,'time']
rowdata = rowdata[rowdata['time']>splitsecond] rowdata = rowdata[rowdata['time']>splitsecond]
# we may want to expand the time (interpolate) # we may want to expand the time (interpolate)
rowdata['dt'] = rowdata['time'].apply( rowdata['dt'] = rowdata['time'].apply(
@@ -1972,7 +1972,7 @@ def handle_otwsetpower(self,f1, boattype, weightvalue,
totaltime = rowdata.df['TimeStamp (sec)'].max( totaltime = rowdata.df['TimeStamp (sec)'].max(
) - rowdata.df['TimeStamp (sec)'].min() ) - rowdata.df['TimeStamp (sec)'].min()
try: try:
totaltime = totaltime + rowdata.df.ix[0, ' ElapsedTime (sec)'] totaltime = totaltime + rowdata.df.loc[0, ' ElapsedTime (sec)']
except KeyError: except KeyError:
pass pass
df = getsmallrowdata_db( df = getsmallrowdata_db(
@@ -2733,6 +2733,7 @@ def fetch_strava_workout(stravatoken,oauth_data,stravaid,csvfilename,userid,debu
url = "https://www.strava.com/api/v3/activities/"+str(stravaid) url = "https://www.strava.com/api/v3/activities/"+str(stravaid)
response = requests.get(url,headers=headers) response = requests.get(url,headers=headers)
if response.status_code != 200: if response.status_code != 200:
t = time.localtime()
timestamp = time.strftime('%b-%d-%Y_%H%M', t) timestamp = time.strftime('%b-%d-%Y_%H%M', t)
with open('strava_webhooks.log','a') as f: with open('strava_webhooks.log','a') as f:
f.write('\n') f.write('\n')
@@ -2972,6 +2973,7 @@ def fetch_strava_workout(stravatoken,oauth_data,stravaid,csvfilename,userid,debu
session.headers.update(newHeaders) session.headers.update(newHeaders)
response = session.post(UPLOAD_SERVICE_URL,json=uploadoptions) response = session.post(UPLOAD_SERVICE_URL,json=uploadoptions)
t = time.localtime()
timestamp = time.strftime('%b-%d-%Y_%H%M', t) timestamp = time.strftime('%b-%d-%Y_%H%M', t)
with open('strava_webhooks.log','a') as f: with open('strava_webhooks.log','a') as f:
f.write('\n') f.write('\n')