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

Merge branch 'develop' into feature/nkseatnumber

Browse Source
This commit is contained in:
Sander Roosendaal
2024-05-20 19:08:01 +02:00
parent 11f9956b4b 513e677f0f
commit 1a2647457a
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rowers/dataprep.py
View File

@@ -1076,7 +1076,7 @@ def checkbreakthrough(w, r):
r.user.email,
r.user.first_name,
r.user.last_name,
btvalues=btvalues.to_json())
btvalues=btvalues.write_json())
for coach in r.get_coaches():
if coach.getemailnotifications and not coach.emailbounced:
_ = myqueue(queuehigh, handle_sendemail_breakthrough,
@@ -1084,7 +1084,7 @@ def checkbreakthrough(w, r):
coach.user.email,
r.user.first_name,
r.user.last_name,
btvalues=btvalues.to_json(),
btvalues=btvalues.write_json(),
surname=True)
# submit email task to send email about breakthrough workout
@@ -1098,7 +1098,7 @@ def checkbreakthrough(w, r):
r.user.email,
r.user.first_name,
r.user.last_name,
btvalues=btvalues.to_json())
btvalues=btvalues.write_json())
for coach in r.get_coaches():
if coach.getemailnotifications and not coach.emailbounced:
_ = myqueue(queuehigh, handle_sendemail_hard,
@@ -1106,7 +1106,7 @@ def checkbreakthrough(w, r):
coach.user.email,
r.user.first_name,
r.user.last_name,
btvalues=btvalues.to_json(),
btvalues=btvalues.write_json(),
surname=True)
return isbreakthrough, ishard

6
rowers/interactiveplots.py
View File

@@ -1815,7 +1815,6 @@ def interactive_flex_chart2(id, r, promember=0,
workstrokesonly=workstrokesonly, for_chart=True)
if r.usersmooth > 1: # pragma: no cover
for column in columns:
try:
@@ -1823,9 +1822,8 @@ def interactive_flex_chart2(id, r, promember=0,
nrsteps = int(log2(r.usersmooth))
for i in range(nrsteps):
rowdata = rowdata.with_columns(
(utils.ewmovingaverage(
rowdata[column], 5)).alias(column)
)
column = utils.ewmovingaverage(
rowdata[column], 5))
except KeyError:
pass