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

Merge branch 'release/v20.1.23'

Browse Source
This commit is contained in:
Sander Roosendaal
2023-08-28 19:31:25 +02:00
parent 4ca42b8a82 075baa19be
commit 600499b2be
5 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rowers/dataprep.py
View File

@@ -126,8 +126,7 @@ def rscore_approx(row):
else: else:
dd = 3600*row['duration'].hour+60*row['duration'].minute+row['duration'].second dd = 3600*row['duration'].hour+60*row['duration'].minute+row['duration'].second
dd = dd/3600 dd = dd/3600
print(row['rpe'],dd,rpetotss[row['rpe']]) return int(rpetotss[row['rpe']]*dd)
return rpetotss[row['rpe']]*dd
if row['rscore'] < 0: if row['rscore'] < 0:
w = Workout.objects.get(id=row['id']) w = Workout.objects.get(id=row['id'])
trimp, hrtss = workout_trimp(w) trimp, hrtss = workout_trimp(w)
@@ -135,12 +134,11 @@ def rscore_approx(row):
if row['rpe'] and row['rpe'] > 0: if row['rpe'] and row['rpe'] > 0:
dd = 3600*row['duration'].hour+60*row['duration'].minute+row['duration'].second dd = 3600*row['duration'].hour+60*row['duration'].minute+row['duration'].second
dd = dd/3600 dd = dd/3600
return rpetotss[row['rpe']]*dd return int(rpetotss[row['rpe']]*dd)
else: # pragma: no cover else: # pragma: no cover
minutes = row['duration'].hour*60+row['duration'].minute minutes = row['duration'].hour*60+row['duration'].minute
return minutes return minutes
print('boer')
return 0 return 0

2
rowers/nkimportutils.py
View File

@@ -110,7 +110,7 @@ def add_workout_from_data(userid, nkid, data, strokedata, source='nk', splitdata
'seatNumber': seatNumber, 'seatNumber': seatNumber,
} }
# dologging('nklog.log',json.dumps(uploadoptions)) dologging('nklog.log',json.dumps(uploadoptions))
session = requests.session() session = requests.session()
newHeaders = {'Content-type': 'application/json', 'Accept': 'text/plain'} newHeaders = {'Content-type': 'application/json', 'Accept': 'text/plain'}

10
rowers/tasks.py
View File

@@ -359,7 +359,7 @@ def uploadactivity(access_token, filename, description='',
with gzip.GzipFile(fileobj=data_gz, mode="w") as gzf: with gzip.GzipFile(fileobj=data_gz, mode="w") as gzf:
gzf.write(s) gzf.write(s)
except FileNotFoundError: except FileNotFoundError:
return 0 return 0, 0, 0, 0
headers = { headers = {
'Content-Type': 'application/json', 'Content-Type': 'application/json',
@@ -2644,8 +2644,12 @@ def handle_makeplot(f1, f2, t, hrdata, plotnr, imagename,
nr_rows = len(row.df) nr_rows = len(row.df)
if (plotnr in [1, 2, 4, 5, 8, 11, 9, 12]) and (nr_rows > 1200): # pragma: no cover if (plotnr in [1, 2, 4, 5, 8, 11, 9, 12]) and (nr_rows > 1200): # pragma: no cover
bin = int(nr_rows / 1200.) bin = int(nr_rows / 1200.)
df = row.df.groupby(lambda x: x / bin).mean() try:
row.df = df df = df.select_types(['number'])
df = row.df.groupby(lambda x: x / bin).mean()
row.df = df
except TypeError:
pass
nr_rows = len(row.df) nr_rows = len(row.df)
if (plotnr == 1): if (plotnr == 1):
fig1 = row.get_timeplot_erg(t, pacerange=oterange, **kwargs) fig1 = row.get_timeplot_erg(t, pacerange=oterange, **kwargs)

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

Binary file not shown.

15
rowers/views/planviews.py
View File

@@ -1518,12 +1518,15 @@ def plannedsessions_view(request,
for w in ws: for w in ws:
thetrimp, hrtss = dataprep.workout_trimp(w) thetrimp, hrtss = dataprep.workout_trimp(w)
totals['trimp'] += thetrimp totals['trimp'] += thetrimp
tss = dataprep.workout_rscore(w)[0] row = {
if not np.isnan(tss) and tss != 0: 'rscore': w.rscore,
totals['rscore'] += tss 'hrtss': w.hrtss,
elif tss == 0: 'rpe': w.rpe,
totals['rscore'] += hrtss 'duration': w.duration,
tss = hrtss 'id': w.id
}
tss = dataprep.rscore_approx(row)
totals['rscore'] += tss
totals['distance'] += w.distance totals['distance'] += w.distance
totals['time'] += timefield_to_seconds_duration(w.duration) totals['time'] += timefield_to_seconds_duration(w.duration)
if w.plannedsession: # pragma: no cover if w.plannedsession: # pragma: no cover