diff --git a/rowers/dataprep.py b/rowers/dataprep.py index 85bf4b22..2c5e2aab 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -1402,9 +1402,18 @@ def split_workout(r, parent, splitsecond, splitmode): messages.append(message) ids.append(id) if 'keep second' in splitmode: - data2['cumdist'] = data2['cumdist'] - data2.iloc[0, 'cumdist'] - data2['distance'] = data2['distance'] - data2.iloc[0, 'distance'] - data2['time'] = data2['time'] - data2.iloc[0, 'time'] + data2['cumdist'] = data2['cumdist'] - data2.iloc[ + 0, + data2.columns.get_loc('cumdist') + ] + data2['distance'] = data2['distance'] - data2.iloc[ + 0, + data2.columns.get_loc('distance') + ] + data2['time'] = data2['time'] - data2.iloc[ + 0, + data2.columns.get_loc('time') + ] if 'secondprivate' in splitmode: setprivate = True else: diff --git a/rowers/tasks.py b/rowers/tasks.py index 29619a05..10d72f3a 100644 --- a/rowers/tasks.py +++ b/rowers/tasks.py @@ -942,6 +942,8 @@ def handle_sendemail_invite(email, name, code, teamname, manager, message += " team's workouts on rowsandall.com and your workouts will " message += " be visible to " message += "the members of the team.\n\n" + message += "By accepting the invite, you are agreeing with the sharing " + message += "of personal data according to our privacy policy.\n\n" message += 'If you already have an account on rowsandall.com, you can login to the site and you will find the invitation here on the Teams page:\n' message += ' https://rowsandall.com/rowers/me/teams \n\n' message += 'You can also click the direct link: \n' diff --git a/rowers/templates/teams.html b/rowers/templates/teams.html index 959a4748..9971a001 100644 --- a/rowers/templates/teams.html +++ b/rowers/templates/teams.html @@ -106,7 +106,13 @@
{% if invites or requests or myrequests or myinvites %} -

Invitations and Requests

+

Invitations and Requests

+

This section lists open invites to join a team. By accepting + a team invite, you are agreeing with the sharing + of personal data between team members and coaches according to + our privacy policy. +

+