fixes
This commit is contained in:
@@ -1076,7 +1076,7 @@ def checkbreakthrough(w, r):
|
|||||||
r.user.email,
|
r.user.email,
|
||||||
r.user.first_name,
|
r.user.first_name,
|
||||||
r.user.last_name,
|
r.user.last_name,
|
||||||
btvalues=btvalues.to_json())
|
btvalues=btvalues.write_json())
|
||||||
for coach in r.get_coaches():
|
for coach in r.get_coaches():
|
||||||
if coach.getemailnotifications and not coach.emailbounced:
|
if coach.getemailnotifications and not coach.emailbounced:
|
||||||
_ = myqueue(queuehigh, handle_sendemail_breakthrough,
|
_ = myqueue(queuehigh, handle_sendemail_breakthrough,
|
||||||
@@ -1084,7 +1084,7 @@ def checkbreakthrough(w, r):
|
|||||||
coach.user.email,
|
coach.user.email,
|
||||||
r.user.first_name,
|
r.user.first_name,
|
||||||
r.user.last_name,
|
r.user.last_name,
|
||||||
btvalues=btvalues.to_json(),
|
btvalues=btvalues.write_json(),
|
||||||
surname=True)
|
surname=True)
|
||||||
|
|
||||||
# submit email task to send email about breakthrough workout
|
# submit email task to send email about breakthrough workout
|
||||||
@@ -1098,7 +1098,7 @@ def checkbreakthrough(w, r):
|
|||||||
r.user.email,
|
r.user.email,
|
||||||
r.user.first_name,
|
r.user.first_name,
|
||||||
r.user.last_name,
|
r.user.last_name,
|
||||||
btvalues=btvalues.to_json())
|
btvalues=btvalues.write_json())
|
||||||
for coach in r.get_coaches():
|
for coach in r.get_coaches():
|
||||||
if coach.getemailnotifications and not coach.emailbounced:
|
if coach.getemailnotifications and not coach.emailbounced:
|
||||||
_ = myqueue(queuehigh, handle_sendemail_hard,
|
_ = myqueue(queuehigh, handle_sendemail_hard,
|
||||||
@@ -1106,7 +1106,7 @@ def checkbreakthrough(w, r):
|
|||||||
coach.user.email,
|
coach.user.email,
|
||||||
r.user.first_name,
|
r.user.first_name,
|
||||||
r.user.last_name,
|
r.user.last_name,
|
||||||
btvalues=btvalues.to_json(),
|
btvalues=btvalues.write_json(),
|
||||||
surname=True)
|
surname=True)
|
||||||
|
|
||||||
return isbreakthrough, ishard
|
return isbreakthrough, ishard
|
||||||
|
|||||||
@@ -1815,7 +1815,6 @@ def interactive_flex_chart2(id, r, promember=0,
|
|||||||
workstrokesonly=workstrokesonly, for_chart=True)
|
workstrokesonly=workstrokesonly, for_chart=True)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if r.usersmooth > 1: # pragma: no cover
|
if r.usersmooth > 1: # pragma: no cover
|
||||||
for column in columns:
|
for column in columns:
|
||||||
try:
|
try:
|
||||||
@@ -1823,9 +1822,8 @@ def interactive_flex_chart2(id, r, promember=0,
|
|||||||
nrsteps = int(log2(r.usersmooth))
|
nrsteps = int(log2(r.usersmooth))
|
||||||
for i in range(nrsteps):
|
for i in range(nrsteps):
|
||||||
rowdata = rowdata.with_columns(
|
rowdata = rowdata.with_columns(
|
||||||
(utils.ewmovingaverage(
|
column = utils.ewmovingaverage(
|
||||||
rowdata[column], 5)).alias(column)
|
rowdata[column], 5))
|
||||||
)
|
|
||||||
except KeyError:
|
except KeyError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user