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

small changes

Browse Source
This commit is contained in:
Sander Roosendaal
2020-01-11 17:56:38 +01:00
parent 48a361a43e
commit 892b6c0e60
3 changed files with 27 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
rowers/teams.py
View File

@@ -81,7 +81,7 @@ def create_team(name,manager,private='open',notes='',viewing='allmembers'):
if manager.rower.rowerplan == 'basic':
if manager.rower.protrialexpires < timezone.now().date() and manager.rower.plantrialexpires < timezone.now().date():
return (0,'You need to upgrade to a paid plan to establish a team')
if manager.rower.rowerplan not in ('coach','freecoach'):
if not is_coach(manager):
ts = Team.objects.filter(manager=manager)
if len(ts)>=1:
return (0,'You need to upgrade to the Coach plan to have more than one team')
@@ -102,19 +102,6 @@ def remove_team(id):
send_team_delete_mail(t,r)
return t.delete()
#def set_teamplanexpires(rower):
# ts = Team.objects.filter(rower=rower)
# texp = datetime.date(timezone.now())
# for t in ts:
# print t.name
# mr = Rower.objects.get(user=t.manager)
# if mr.teamplanexpires > texp:
# rower.teamplanexpires = mr.teamplanexpires
# t.save()
return (1,'Updated rower team expiry')
def add_coach(coach,rower):
@@ -194,7 +181,7 @@ def rower_get_coaches(rower):
def coach_getcoachees(coach):
if coach.mycoachgroup and coach.rowerplan in ('coach','freecoach'):
if coach.mycoachgroup and is_coach(coach.user):
return Rower.objects.filter(
coachinggroups__in=[coach.mycoachgroup]
).distinct().order_by("user__last_name","user__first_name")