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

Merge branch 'release/v16.0.8'

Browse Source
This commit is contained in:
Sander Roosendaal
2021-05-02 14:55:05 +02:00
parent 8a757c1941 7078842242
commit 4e0eed0a48
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rowers/sporttracksstuff.py
View File

@@ -139,10 +139,13 @@ def createsporttracksworkoutdata(w):
averagehr = 0 averagehr = 0
maxhr = 0 maxhr = 0
duration = w.duration.hour*3600 try:
duration += w.duration.minute*60 duration = w.duration.hour*3600
duration += w.duration.second duration += w.duration.minute*60
duration += +1.0e-6*w.duration.microsecond duration += w.duration.second
duration += +1.0e-6*w.duration.microsecond
except AttributeError:
return 0
# adding diff, trying to see if this is valid # adding diff, trying to see if this is valid
#t = row.df.loc[:,'TimeStamp (sec)'].values-10*row.df.ix[0,'TimeStamp (sec)'] #t = row.df.loc[:,'TimeStamp (sec)'].values-10*row.df.ix[0,'TimeStamp (sec)']

2
rowers/views/importviews.py
View File

@@ -947,7 +947,7 @@ def workout_nkimport_view(request,userid=0,after=0,before=0):
}, },
{ {
'url':reverse('workout_nkimport_view'), 'url':reverse('workout_nkimport_view'),
'name':'Strava' 'name':'NK Logbook'
}, },
] ]