Merge branch 'release/v18.6.3'

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()

rowers/tasks.py

@@ -1205,7 +1205,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)
@@ -1697,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)