From adc1c5fbd5bd46fba2e56835af890e0ee058c6a7 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 15 Mar 2020 17:10:45 +0100 Subject: [PATCH 1/3] team messages --- rowers/tasks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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, From 3039abbeafe046248b7c6f61f2492597f2168420 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 15 Mar 2020 20:29:00 +0100 Subject: [PATCH 2/3] new group members automatically get the new sessions --- rowers/teams.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/rowers/teams.py b/rowers/teams.py index aa1c8903..42c57406 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) + for ps in plannedsessions: + res = ps.rower.add(rower) + # set_teamplanexpires(rower) return (id,'Member added') From 3c9cc516c7171847c8077481e5fc05b10487da77 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 15 Mar 2020 20:35:57 +0100 Subject: [PATCH 3/3] adding date filter on sessions --- rowers/teams.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rowers/teams.py b/rowers/teams.py index 42c57406..1e591e3c 100644 --- a/rowers/teams.py +++ b/rowers/teams.py @@ -134,7 +134,7 @@ def add_member(id,rower): res = handle_add_workouts_team(ws,t) # code to add plannedsessions - plannedsessions = PlannedSession.objects.filter(team=t) + plannedsessions = PlannedSession.objects.filter(team=t,enddate__gte=timezone.now().date()) for ps in plannedsessions: res = ps.rower.add(rower)