From f6aec5b66c711d0b4c2d113a4877a8bc1c573919 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 26 Jan 2021 19:48:38 +0100 Subject: [PATCH 1/2] adding hr zones --- rowers/models.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/rowers/models.py b/rowers/models.py index 3050fc48..ece4f8e3 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -906,6 +906,13 @@ class Rower(models.Model): 'Pwr TR', 'Pwr AN']) + hrzones = PowerZonesField(default=['Rest', + 'UT2', + 'UT1', + 'AT', + 'TR', + 'AN','max']) + emailalternatives = AlternativeEmails(default=[],null=True,blank=True,verbose_name='Alternative Email addresses (separate with ",")') # Site Settings From 22eebadd91d5a3f16008c52fc1855a16a4461dfe Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 27 Jan 2021 08:00:39 +0100 Subject: [PATCH 2/2] changing workout names if no name --- rowers/c2stuff.py | 4 ++-- rowers/garmin_stuff.py | 2 +- rowers/polarstuff.py | 2 +- rowers/stravastuff.py | 4 ++-- rowers/tasks.py | 4 ++-- rowers/views/statements.py | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/rowers/c2stuff.py b/rowers/c2stuff.py index fe42a915..f857a67e 100644 --- a/rowers/c2stuff.py +++ b/rowers/c2stuff.py @@ -239,7 +239,7 @@ def create_async_workout(alldata,user,c2id): t = data['comments'].split('\n', 1)[0] title += t[:40] except: - title = 'Imported' + title = '' weightcategory = 'hwt' if weightclass == "L": @@ -1152,7 +1152,7 @@ def add_workout_from_data(user,importid,data,strokedata, t = data['comments'].split('\n', 1)[0] title += t[:40] except: - title = 'Imported' + title = '' try: comments = data['comments'] diff --git a/rowers/garmin_stuff.py b/rowers/garmin_stuff.py index 37b48901..0d7064c5 100644 --- a/rowers/garmin_stuff.py +++ b/rowers/garmin_stuff.py @@ -154,7 +154,7 @@ def garmin_getworkout(garminid,r,activity): durationseconds = activity['durationInSeconds'] duration = dataprep.totaltime_sec_to_string(durationseconds) activitytype = activity['activityType'] - name = 'Imported from Garmin' + name = '' date = startdatetime.date() try: distance = activity['distanceInMeters'] diff --git a/rowers/polarstuff.py b/rowers/polarstuff.py index b595bf94..8b63d778 100644 --- a/rowers/polarstuff.py +++ b/rowers/polarstuff.py @@ -228,7 +228,7 @@ def get_polar_workouts(user): msg = Message(mailbox=workoutsbox, from_header=user.email, - subject = 'Import from Polar Flow', + subject = '', body=bodyyaml) msg.save() diff --git a/rowers/stravastuff.py b/rowers/stravastuff.py index e5281d45..83681b0e 100644 --- a/rowers/stravastuff.py +++ b/rowers/stravastuff.py @@ -325,7 +325,7 @@ def create_async_workout(alldata,user,stravaid,debug=False): t = data['comments'].split('\n', 1)[0] title += t[:20] except: - title = 'Imported' + title = '' workoutdate = rowdatetime.astimezone( pytz.timezone(thetimezone) @@ -628,7 +628,7 @@ def add_workout_from_data(user,importid,data,strokedata, t = data['comments'].split('\n', 1)[0] title += t[:20] except: - title = 'Imported' + title = '' starttimeunix = arrow.get(rowdatetime).timestamp diff --git a/rowers/tasks.py b/rowers/tasks.py index 1bc6e09e..c1ae1086 100644 --- a/rowers/tasks.py +++ b/rowers/tasks.py @@ -2732,7 +2732,7 @@ def handle_c2_async_workout(alldata,userid,c2token,c2id,debug=False,**kwargs): t = data['comments'].split('\n', 1)[0] title += t[:40] except: - title = 'Imported' + title = '' weightcategory = 'hwt' if weightclass == "L": @@ -3070,7 +3070,7 @@ def fetch_strava_workout(stravatoken,oauth_data,stravaid,csvfilename,userid,debu t = data['comments'].split('\n', 1)[0] title += t[:20] except: - title = 'Imported' + title = '' starttimeunix = arrow.get(rowdatetime).timestamp diff --git a/rowers/views/statements.py b/rowers/views/statements.py index 409dab68..70e01b91 100644 --- a/rowers/views/statements.py +++ b/rowers/views/statements.py @@ -1314,7 +1314,7 @@ def add_workout_from_strokedata(user,importid,data,strokedata, t = data['comments'].split('\n', 1)[0] title += t[:20] except: - title = 'Imported' + title = '' starttimeunix = arrow.get(rowdatetime).timestamp