Private
Public Access
1
0

bugfix split workout

This commit is contained in:
Sander Roosendaal
2018-03-08 13:16:46 +01:00
parent 5d3e58c1fc
commit 150171200b
3 changed files with 21 additions and 4 deletions

View File

@@ -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:

View File

@@ -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'

View File

@@ -106,7 +106,13 @@
</div>
<div class="grid_6 omega">
{% if invites or requests or myrequests or myinvites %}
<h2>Invitations and Requests</h2>
<h2>Invitations and Requests</h2>
<p>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 <a href="/rowers/legal">privacy policy</a>.
</p>
<table width="90%" class="listtable">
<thead>
<tr>