Skip to content

Commit 63834fb

Browse files
committed
Add home_site field to Club model
1 parent 06a9318 commit 63834fb

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

Diff for: models.py

+9-5
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ def __unicode__(self):
4040
class Club(models.Model):
4141
name = models.CharField(max_length=50)
4242

43+
home_site = models.ForeignKey('Site', blank=True)
4344
district = models.ForeignKey('District', related_name='clubs')
4445
members = models.ManyToManyField('Person', related_name='clubs', blank=True, through='ClubMemberRelation')
4546
managers = models.ManyToManyField('Person', blank=True, related_name='clubs_managed')
@@ -58,7 +59,7 @@ class League(models.Model):
5859
managers = models.ManyToManyField('Person', blank=True, related_name='leagues_managed')
5960

6061
def __unicode__(self):
61-
return self.name
62+
return '{0} {1} {2}'.format(self.name, self.gender, self.age_group)
6263

6364

6465
class LeagueTemplate(models.Model):
@@ -67,7 +68,7 @@ class LeagueTemplate(models.Model):
6768
age_group = models.CharField(max_length=20, choices=(('adults', _('adults')), ('juniors', _('juniors')), ('kids', _('kids'))))
6869

6970
def __unicode__(self):
70-
return self.name
71+
return '{0} {1} {2}'.format(self.name, self.gender, self.age_group)
7172

7273

7374
class Group(models.Model):
@@ -78,6 +79,9 @@ class Group(models.Model):
7879
league = models.ForeignKey('League', related_name='groups', blank=True)
7980
teams = models.ManyToManyField('Team', related_name='groups', blank=True)
8081

82+
def __unicode__(self):
83+
return '{0}, {1}, {2}, {3}'.format(self.name, self.league.name, self.league.gender, self.league.age_group, self.league.district.name)
84+
8185

8286
class District(models.Model):
8387
name = models.CharField(max_length=50)
@@ -129,14 +133,14 @@ def __unicode__(self):
129133

130134

131135
class Site(models.Model):
132-
name = models.CharField(max_length=50)
133-
adress = models.CharField(max_length=50)
136+
# name = models.CharField(max_length=50)
137+
address = models.CharField(max_length=50)
134138
city = models.CharField(max_length=50)
135139
zip_code = models.IntegerField()
136140
number = models.IntegerField(primary_key=True)
137141

138142
def __unicode__(self):
139-
return self.name
143+
return '{0}, {1} {2} (#{3})'.format(self.address, self.zip_code, self.city, self.number)
140144

141145

142146
class GamePlayerRelation(models.Model):

0 commit comments

Comments
 (0)