Private
Public Access
1
0

solved losing Empower data

This commit is contained in:
Sander Roosendaal
2017-05-19 13:27:09 +02:00
parent a84ddf73d9
commit 3bf512179c
3 changed files with 70 additions and 43 deletions

View File

@@ -925,8 +925,6 @@ def add_workout_from_underarmourdata(user,importid,data):
times_distance = res[0]
print distance[0:5]
print times_distance[0:5]
try:
l = timeseries['position']
@@ -6941,7 +6939,9 @@ def workout_fusion_view(request,id1=0,id2=1):
posneg = cd['posneg']
if posneg == 'neg':
timeoffset = -timeoffset
df = dataprep.datafusion(id1,id2,columns,timeoffset)
idnew,message = dataprep.new_workout_from_df(r,df,
title='Fused data',
parent=w1)