fixing c2 import summaries
This commit is contained in:
@@ -196,7 +196,6 @@ def get_c2_workouts(rower,do_async=True):
|
||||
knownc2ids = uniqify(knownc2ids+tombstones+parkedids)
|
||||
|
||||
newids = [c2id for c2id in c2ids if not c2id in knownc2ids]
|
||||
print(newids,'aap')
|
||||
|
||||
newparkedids = uniqify(newids+parkedids)
|
||||
|
||||
@@ -215,6 +214,7 @@ def get_c2_workouts(rower,do_async=True):
|
||||
c2id,
|
||||
counter
|
||||
)
|
||||
#res = handle_c2_async_workout(alldata,rower.user.id,rower.c2token,c2id,counter)
|
||||
counter = counter+1
|
||||
else:
|
||||
workoutid = create_async_workout(alldata,
|
||||
@@ -405,6 +405,37 @@ def create_async_workout(alldata,user,c2id):
|
||||
c2blocked.seek(0)
|
||||
json.dump(data,c2blocked)
|
||||
|
||||
# summary
|
||||
if 'workout' in data:
|
||||
if 'splits' in data['workout']:
|
||||
splitdata = data['workout']['splits']
|
||||
elif 'intervals' in data['workout']:
|
||||
splitdata = data['workout']['intervals']
|
||||
else:
|
||||
splitdata = False
|
||||
else:
|
||||
splitdata = False
|
||||
|
||||
if splitdata:
|
||||
summary,sa,results = c2stuff.summaryfromsplitdata(splitdata,data,csvfilename,workouttype=workouttype)
|
||||
w = Workout.objects.get(id=workoutid)
|
||||
w.summary = summary
|
||||
w.save()
|
||||
|
||||
from rowingdata.trainingparser import getlist
|
||||
if sa:
|
||||
values = getlist(sa)
|
||||
units = getlist(sa,sel='unit')
|
||||
types = getlist(sa,sel='type')
|
||||
|
||||
rowdata = rdata(w.csvfilename)
|
||||
if rowdata:
|
||||
rowdata.updateintervaldata(values,
|
||||
units,types,results)
|
||||
|
||||
rowdata.write_csv(w.csvfilename,gzip=True)
|
||||
dataprep.update_strokedata(w.id,rowdata.df)
|
||||
|
||||
|
||||
return workoutid
|
||||
|
||||
|
||||
Reference in New Issue
Block a user