diff --git a/rowers/tasks.py b/rowers/tasks.py index 0e93b257..0a0c1354 100644 --- a/rowers/tasks.py +++ b/rowers/tasks.py @@ -2192,7 +2192,7 @@ def handle_sendemail_message(email,fromemail,rowername,message,teamname,managern fullemail = email subject = 'New message from team ' + teamname - from_email = fromemail + from_email = 'Rowsandall ' d = { 'rowername':rowername, diff --git a/rowers/teams.py b/rowers/teams.py index aa1c8903..1e591e3c 100644 --- a/rowers/teams.py +++ b/rowers/teams.py @@ -42,7 +42,7 @@ from rowers.tasks import ( handle_sendemail_message, ) -from rowers.models import ValidationError +from rowers.models import ValidationError, PlannedSession # Low level functions - to be called by higher level methods @@ -133,6 +133,11 @@ def add_member(id,rower): res = handle_add_workouts_team(ws,t) + # code to add plannedsessions + plannedsessions = PlannedSession.objects.filter(team=t,enddate__gte=timezone.now().date()) + for ps in plannedsessions: + res = ps.rower.add(rower) + # set_teamplanexpires(rower) return (id,'Member added')