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

Merge branch 'release/v18.6.3'

Browse Source
This commit is contained in:
Sander Roosendaal
2022-08-18 20:21:53 +02:00
parent 46cbce7cb6 ec3c3c0b9a
commit 8ebe4a0e3d
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rowers/management/commands/processemail.py
View File

@@ -112,7 +112,6 @@ class Command(BaseCommand):
for r in rowers: # pragma: no cover for r in rowers: # pragma: no cover
dologging("nklog.log","NK Auto import set for rower {id}".format(id=r.user.id)) dologging("nklog.log","NK Auto import set for rower {id}".format(id=r.user.id))
if user_is_not_basic(r.user) or user_is_coachee(r.user): if user_is_not_basic(r.user) or user_is_coachee(r.user):
dologging("nklog.log","User is not basic")
_ = nkstuff.get_nk_workouts(r) _ = nkstuff.get_nk_workouts(r)
except: # pragma: no cover except: # pragma: no cover
exc_type, exc_value, exc_traceback = sys.exc_info() exc_type, exc_value, exc_traceback = sys.exc_info()

5
rowers/tasks.py
View File

@@ -1205,7 +1205,7 @@ def handle_calctrimp(id,
hrtss = 0 hrtss = 0
workout = Workout.objects.get(id=id) workout = Workout.objects.get(id=id)
workout.tss = int(tss) workout.rscore = int(tss)
workout.normp = int(normp) workout.normp = int(normp)
workout.trimp = int(trimp) workout.trimp = int(trimp)
workout.hrtss = int(hrtss) workout.hrtss = int(hrtss)
@@ -1697,6 +1697,9 @@ def handle_sendemail_breakthrough(workoutid, useremail,
'btvalues': tablevalues, 'btvalues': tablevalues,
} }
dologging('tasks.log',siteurl)
dologging('tasks.log',json.dumps(tablevalues))
_ = send_template_email(from_email, [useremail], _ = send_template_email(from_email, [useremail],
subject, 'breakthroughemail.html', subject, 'breakthroughemail.html',
d, **kwargs) d, **kwargs)