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

fixed sporttracks and ua exports

Browse Source
This commit is contained in:
Sander Roosendaal
2019-03-07 19:31:19 +01:00
parent e01c03d091
commit 0dd3e9542e
4 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rowers/plannedsessions.py
View File

@@ -470,6 +470,9 @@ def add_rower_session(r,ps):
ps.save() ps.save()
return 1 return 1
elif ps.manager.rower == r:
ps.rower.add(r)
ps.save()
return 0 return 0

1
rowers/sporttracksstuff.py
View File

@@ -176,6 +176,7 @@ def createsporttracksworkoutdata(w):
hr = hr.tolist() hr = hr.tolist()
d = d.tolist() d = d.tolist()
spm = spm.tolist() spm = spm.tolist()
if haslatlon:
lat = lat.tolist() lat = lat.tolist()
lon = lon.tolist() lon = lon.tolist()
power = power.tolist() power = power.tolist()

BIN
rowers/tests/testdata/testdata.csv.gz vendored
View File

Binary file not shown.

25
rowers/underarmourstuff.py
View File

@@ -105,7 +105,11 @@ def createunderarmourworkoutdata(w):
start_time = st.isoformat() start_time = st.isoformat()
averagehr = int(row.df[' HRCur (bpm)'].mean()) averagehr = int(row.df[' HRCur (bpm)'].mean())
minhr = int(row.df[' HRCur (bpm)'].min())
maxhr = int(row.df[' HRCur (bpm)'].max())
averagespm = int(row.df[' Cadence (stokes/min)'].mean()/2.) averagespm = int(row.df[' Cadence (stokes/min)'].mean()/2.)
minspm = int(row.df[' Cadence (stokes/min)'].min()/2.)
maxspm = int(row.df[' Cadence (stokes/min)'].max()/2.)
maxhr = int(row.df[' HRCur (bpm)'].max()) maxhr = int(row.df[' HRCur (bpm)'].max())
duration = w.duration.hour*3600 duration = w.duration.hour*3600
duration += w.duration.minute*60 duration += w.duration.minute*60
@@ -137,8 +141,13 @@ def createunderarmourworkoutdata(w):
spm[0] = spm[1] spm[0] = spm[1]
hr = row.df[' HRCur (bpm)'].astype(int).tolist() hr = row.df[' HRCur (bpm)'].astype(int).tolist()
speed = row.df[' AverageBoatSpeed (m/s)'] speed = row.df[' AverageBoatSpeed (m/s)']
speedmin = float(row.df[' AverageBoatSpeed (m/s)'].min())
speedmax = float(row.df[' AverageBoatSpeed (m/s)'].max())
speedmean = float(row.df[' AverageBoatSpeed (m/s)'].mean())
speed = speed.replace(np.inf,0).tolist() speed = speed.replace(np.inf,0).tolist()
haslatlon=1 haslatlon=1
try: try:
@@ -150,7 +159,6 @@ def createunderarmourworkoutdata(w):
haslatlon = 0 haslatlon = 0
# path data # path data
if haslatlon: if haslatlon:
locdata = [] locdata = []
@@ -188,18 +196,19 @@ def createunderarmourworkoutdata(w):
} }
aggregates = { aggregates = {
"elapsed_time_total": int(duration), "elapsed_time_total": int(duration),
"active_time_total": int(duration), "active_time_total": int(duration),
"distance_total": int(max(d)), "distance_total": int(max(d)),
"heartrate_avg": averagehr, "heartrate_avg": averagehr,
"heart_rate_min": int(min(hr)), "heart_rate_min": minhr,
"heart_rate_max": int(max(hr)), "heart_rate_max": maxhr,
"speed_min": speed.min().astype(float), "speed_min": speedmin,
"speed_max": speed.max().astype(float), "speed_max": speedmax,
"speed_avg": speed.mean(), "speed_avg": speedmean,
"cadence_min": int(min(spm)/2.), "cadence_min": minspm,
"cadence_max": int(max(spm)/2.), "cadence_max": maxspm,
"cadence_avg": averagespm, "cadence_avg": averagespm,
} }