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

Merge branch 'feature/rowingclub' into develop

Browse Source
This commit is contained in:
Sander Roosendaal
2020-03-15 20:36:14 +01:00
parent 2bc277beba 3c9cc516c7
commit e4b19bf8f2
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/tasks.py
View File

@@ -2192,7 +2192,7 @@ def handle_sendemail_message(email,fromemail,rowername,message,teamname,managern
fullemail = email fullemail = email
subject = 'New message from team ' + teamname subject = 'New message from team ' + teamname
from_email = fromemail from_email = 'Rowsandall <info@rowsandall.com>'
d = { d = {
'rowername':rowername, 'rowername':rowername,

7
rowers/teams.py
View File

@@ -42,7 +42,7 @@ from rowers.tasks import (
handle_sendemail_message, handle_sendemail_message,
) )
from rowers.models import ValidationError from rowers.models import ValidationError, PlannedSession
# Low level functions - to be called by higher level methods # 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) 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) # set_teamplanexpires(rower)
return (id,'Member added') return (id,'Member added')