Merge branch 'release/v16.0.8'
This commit is contained in:
@@ -139,10 +139,13 @@ def createsporttracksworkoutdata(w):
|
||||
averagehr = 0
|
||||
maxhr = 0
|
||||
|
||||
duration = w.duration.hour*3600
|
||||
duration += w.duration.minute*60
|
||||
duration += w.duration.second
|
||||
duration += +1.0e-6*w.duration.microsecond
|
||||
try:
|
||||
duration = w.duration.hour*3600
|
||||
duration += w.duration.minute*60
|
||||
duration += w.duration.second
|
||||
duration += +1.0e-6*w.duration.microsecond
|
||||
except AttributeError:
|
||||
return 0
|
||||
|
||||
# adding diff, trying to see if this is valid
|
||||
#t = row.df.loc[:,'TimeStamp (sec)'].values-10*row.df.ix[0,'TimeStamp (sec)']
|
||||
|
||||
@@ -947,7 +947,7 @@ def workout_nkimport_view(request,userid=0,after=0,before=0):
|
||||
},
|
||||
{
|
||||
'url':reverse('workout_nkimport_view'),
|
||||
'name':'Strava'
|
||||
'name':'NK Logbook'
|
||||
},
|
||||
]
|
||||
|
||||
|
||||
Reference in New Issue
Block a user