not sure if this works
This commit is contained in:
@@ -386,7 +386,6 @@ class TeamInviteForm(ModelForm):
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
class TeamRequest(models.Model):
|
||||
team = models.ForeignKey(Team)
|
||||
@@ -633,6 +632,8 @@ class PaidPlan(models.Model):
|
||||
paymentprocessor = self.paymentprocessor,
|
||||
)
|
||||
|
||||
class CoachingGroup(models.Model):
|
||||
pass
|
||||
|
||||
# Extension of User with rowing specific data
|
||||
class Rower(models.Model):
|
||||
@@ -832,7 +833,8 @@ class Rower(models.Model):
|
||||
|
||||
# Friends/Team
|
||||
friends = models.ManyToManyField("self",blank=True)
|
||||
coaches = models.ManyToManyField("self",blank=True)
|
||||
mycoachgroup = models.ForeignKey(CoachingGroup,related_name='coachingrole',null=True)
|
||||
coachinggroups = models.ManyToManyField(CoachingGroup,related_name='coaches')
|
||||
privacy = models.CharField(default='visible',max_length=30,
|
||||
choices=privacychoices)
|
||||
|
||||
@@ -870,6 +872,19 @@ class DeleteUserForm(forms.ModelForm):
|
||||
model = User
|
||||
fields = []
|
||||
|
||||
# requestor is user
|
||||
class CoachRequest(models.Model):
|
||||
coach = models.ForeignKey(Rower)
|
||||
user = models.ForeignKey(User,null=True)
|
||||
issuedate = models.DateField(default=current_day)
|
||||
code = models.CharField(max_length=150,unique=True)
|
||||
|
||||
# requestor is coach
|
||||
class CoachOffer(models.Model):
|
||||
coach = models.ForeignKey(Rower)
|
||||
user = models.ForeignKey(User,null=True)
|
||||
issuedate = models.DateField(default=current_day)
|
||||
code = models.CharField(max_length=150,unique=True)
|
||||
|
||||
from django.db.models.signals import m2m_changed
|
||||
|
||||
@@ -988,7 +1003,7 @@ def checkworkoutuser(user,workout):
|
||||
return False
|
||||
try:
|
||||
r = Rower.objects.get(user=user)
|
||||
coaches = user.rower.coaches.filter(rowerplan='coach')
|
||||
coaches = rower_get_coaches(user.rower)
|
||||
if workout.user == r:
|
||||
return True
|
||||
elif coaches:
|
||||
@@ -1007,7 +1022,7 @@ def checkaccessuser(user,rower):
|
||||
r = Rower.objects.get(user=user)
|
||||
if rower == r:
|
||||
return True
|
||||
coaches = rower.coaches.filter(rowerplan='coach')
|
||||
coaches = rower_get_coaches(rower)
|
||||
if coaches:
|
||||
for coach in coaches:
|
||||
if user.rower == coach:
|
||||
@@ -3434,3 +3449,4 @@ class PlannedSessionCommentForm(ModelForm):
|
||||
'comment': forms.Textarea,
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user