sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'release/v20.5.11'

Browse Source
This commit is contained in:
Sander Roosendaal
2024-02-26 12:07:10 +01:00
parent dbae831f69 06323eadcb
commit bdde949fbe
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/integrations/c2.py
View File

@@ -209,7 +209,7 @@ class C2Integration(SyncIntegration):
spmav = 0 spmav = 0
try: try:
hrav = int(row.df[' HRCur (bpm)'][mask].mean()) hrav = int(row.df[' HRCur (bpm)'][mask].mean())
except ValuError: except ValueError:
hrav = 0 hrav = 0
intervaldict = { intervaldict = {
'type': 'distance', 'type': 'distance',

BIN
rowers/tests/testdata/testdata.tcx.gz vendored
View File

Binary file not shown.

7
rowers/views/userviews.py
View File

@@ -262,13 +262,16 @@ def user_message_delete(request,id=0):
try: try:
msg = UserMessage.objects.get(id=id) msg = UserMessage.objects.get(id=id)
except UserMessage.DoesNotExist: except UserMessage.DoesNotExist:
pass messages.error(request,'Could not find this message')
url = reverse('user_messages')
return HttpResponseRedirect(url)
if msg.receiver == request.user.rower: if msg.receiver == request.user.rower:
msg.delete() msg.delete()
messages.info(request,'Deleted message {id}'.format(id=id)) messages.info(request,'Deleted message {id}'.format(id=id))
else: else:
messages.error('You are not allowed to delete this message') messages.error(request,'You are not allowed to delete this message')
url = reverse('user_messages') url = reverse('user_messages')
return HttpResponseRedirect(url) return HttpResponseRedirect(url)