diff --git a/rowers/dataprep.py b/rowers/dataprep.py index 63a40939..acceef39 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -1081,7 +1081,7 @@ def checkbreakthrough(w, r): r.user.email, r.user.first_name, r.user.last_name, - btvalues=btvalues.write_json()) + btvalues=btvalues.write_json(row_oriented=True)) for coach in r.get_coaches(): if coach.getemailnotifications and not coach.emailbounced: _ = myqueue(queuehigh, handle_sendemail_breakthrough, @@ -1089,7 +1089,7 @@ def checkbreakthrough(w, r): coach.user.email, r.user.first_name, r.user.last_name, - btvalues=btvalues.write_json(), + btvalues=btvalues.write_json(row_oriented=True), surname=True) # submit email task to send email about breakthrough workout diff --git a/rowers/emails.py b/rowers/emails.py index f0d4c0d9..424540dc 100644 --- a/rowers/emails.py +++ b/rowers/emails.py @@ -13,7 +13,7 @@ from scipy import optimize import rowingdata from rowingdata import rowingdata as rdata - +from rowers.utils import dologging from celery import app import datetime import pytz @@ -132,7 +132,8 @@ def send_template_email(from_email, to_email, subject, except User.DoesNotExist: pass except Exception as e: - pass + dologging('tasks.log',e) + if not emailbounced: res = msg.send() diff --git a/rowers/tasks.py b/rowers/tasks.py index cf19d8dc..4dc9fc90 100644 --- a/rowers/tasks.py +++ b/rowers/tasks.py @@ -2160,10 +2160,13 @@ def handle_sendemail_breakthrough(workoutid, useremail, surname=False, **kwargs): + dologging('tasks.log',btvalues) btvalues = pd.read_json(btvalues) + try: btvalues.sort_values('delta', axis=0, inplace=True) except KeyError: + dologging('tasks.log','KeyError') return 0 lastname = '' diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz index 9b3705d1..01a7040b 100644 Binary files a/rowers/tests/testdata/testdata.tcx.gz and b/rowers/tests/testdata/testdata.tcx.gz differ