From 3d4a6f845fd69d981aa41215eab33efd12cab131 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 18 Aug 2022 19:44:41 +0200 Subject: [PATCH 1/2] improvement --- rowers/tasks.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rowers/tasks.py b/rowers/tasks.py index e922f653..1159ad9a 100644 --- a/rowers/tasks.py +++ b/rowers/tasks.py @@ -1168,6 +1168,8 @@ def handle_calctrimp(id, normw = response.normw hrtss = response.hrtss + print('normalized power',normp) + if np.isnan(tss): # pragma: no cover tss = 0 @@ -1205,7 +1207,7 @@ def handle_calctrimp(id, hrtss = 0 workout = Workout.objects.get(id=id) - workout.tss = int(tss) + workout.rscore = int(tss) workout.normp = int(normp) workout.trimp = int(trimp) workout.hrtss = int(hrtss) From ec3c3c0b9a54c2c96e16ec703d206c5a48d546b2 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 18 Aug 2022 20:00:04 +0200 Subject: [PATCH 2/2] bug fixes --- rowers/management/commands/processemail.py | 1 - rowers/tasks.py | 5 +++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rowers/management/commands/processemail.py b/rowers/management/commands/processemail.py index 55b4fc32..33f3427a 100644 --- a/rowers/management/commands/processemail.py +++ b/rowers/management/commands/processemail.py @@ -112,7 +112,6 @@ class Command(BaseCommand): for r in rowers: # pragma: no cover 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): - dologging("nklog.log","User is not basic") _ = nkstuff.get_nk_workouts(r) except: # pragma: no cover exc_type, exc_value, exc_traceback = sys.exc_info() diff --git a/rowers/tasks.py b/rowers/tasks.py index 1159ad9a..9312ffed 100644 --- a/rowers/tasks.py +++ b/rowers/tasks.py @@ -1168,8 +1168,6 @@ def handle_calctrimp(id, normw = response.normw hrtss = response.hrtss - print('normalized power',normp) - if np.isnan(tss): # pragma: no cover tss = 0 @@ -1699,6 +1697,9 @@ def handle_sendemail_breakthrough(workoutid, useremail, 'btvalues': tablevalues, } + dologging('tasks.log',siteurl) + dologging('tasks.log',json.dumps(tablevalues)) + _ = send_template_email(from_email, [useremail], subject, 'breakthroughemail.html', d, **kwargs)