From 05ebb2c7beef496438593e6974821cb3356eeacf Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sat, 22 Feb 2020 12:41:40 +0100 Subject: [PATCH 1/2] doing calc trimp at upload --- rowers/dataprep.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index e9b48542..af7df311 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -1589,6 +1589,8 @@ def new_workout_from_file(r, f2, impeller=impeller, ) + job = myqueue(queuehigh,handle_calctrimp,id,f2,r.ftp,r.sex,r.hrftp,r.max,r.rest) + return (id, message, f2) From e7cffb2c85bf742f088b5825e1e353e15346daa9 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sat, 22 Feb 2020 15:38:47 +0100 Subject: [PATCH 2/2] fixed is_team_member rule --- rowers/rower_rules.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rowers/rower_rules.py b/rowers/rower_rules.py index 9a890920..8669cc43 100644 --- a/rowers/rower_rules.py +++ b/rowers/rower_rules.py @@ -259,9 +259,9 @@ def is_rower_team_member(user,rower): for team in teams: if team.private == 'open': - if team in rower.team.all(): + if team in user.rower.team.all(): return True - if team.manager == rower.user: + if team.manager == user: return True return False