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

Merge branch 'release/v15.53'

Browse Source
This commit is contained in:
Sander Roosendaal
2021-03-02 19:16:09 +01:00
parent fca0d091c2 6d66bf2055
commit c9e6040fe8
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rowers/c2stuff.py
View File

@@ -196,6 +196,12 @@ def get_c2_workouts(rower,do_async=True):
knownc2ids = uniqify(knownc2ids+tombstones+parkedids)
newids = [c2id for c2id in c2ids if not c2id in knownc2ids]
with open("c2_auto_import.log","a") as errorlog:
timestr = time.strftime("%Y%m%d-%H%M%S")
newidjson = json.dumps(newids)
errorlog.write(timestr+'New IDs found \r\n')
errorlog.write(newidjson)
errorlog.write('\r\n')
newparkedids = uniqify(newids+parkedids)

6
rowers/tasks.py
View File

@@ -2955,7 +2955,7 @@ def handle_c2_async_workout(alldata,userid,c2token,c2id,delaysec,defaulttimezone
time.sleep(delaysec)
with open("c2_auto_import.log","a") as errorlog:
timestr = time.strftime("%Y%m%d-%H%M%S")
errorlog.write(timestr+' '+str(c2id)+'for userid '+str(userid)+'\r\n')
errorlog.write(timestr+' '+str(c2id)+' for userid '+str(userid)+'\r\n')
data = alldata[c2id]
splitdata = None
@@ -2991,6 +2991,10 @@ def handle_c2_async_workout(alldata,userid,c2token,c2id,delaysec,defaulttimezone
except:
timezone_str = defaulttimezone
startdatetime = startdatetime.replace(tzinfo=None)
tz = pytz.timezone(timezone_str)
startdatetime = tz.localize(startdatetime)
workoutdate = startdatetime.astimezone(
pytz.timezone(timezone_str)
).strftime('%Y-%m-%d')