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

Merge branch 'release/v12.68'

Browse Source
This commit is contained in:
Sander Roosendaal
2020-05-31 20:50:40 +02:00
parent 496764b862 2e9a10b469
commit a93cd1a8f5
1 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
rowers/models.py
View File

@@ -2959,8 +2959,8 @@ class VirtualRaceResult(models.Model):
startsecond = models.FloatField(default=0)
endsecond = models.FloatField(default=0)
referencespeed = models.FloatField(default=5.0)
# entrycategory = models.ForeignKey(CourseStandard,null=True,on_delete=models.SET_NULL,
# verbose_name='Group')
entrycategory = models.ForeignKey(CourseStandard,null=True,on_delete=models.SET_NULL,
verbose_name='Group')
def __str__(self):
rr = Rower.objects.get(id=self.userid)
@@ -2969,13 +2969,13 @@ class VirtualRaceResult(models.Model):
u2 = rr.user.last_name,
)
if self.teamname:
# if self.entrycategory:
# return u'Entry for {n} for "{r}" in {g} with {t}'.format(
# n = name,
# r = self.race,
# g = self.entrycategory,
# t = self.teamname,
# )
if self.entrycategory:
return u'Entry for {n} for "{r}" in {g} with {t}'.format(
n = name,
r = self.race,
g = self.entrycategory,
t = self.teamname,
)
return u'Entry for {n} for "{r}" in {c} {d} with {t} ({s})'.format(
n = name,
@@ -2986,12 +2986,12 @@ class VirtualRaceResult(models.Model):
s = self.sex,
)
else:
# if self.entrycategory:
# return u'Entry for {n} for "{r}" in {g}'.format(
# n = name,
# r = self.race,
# g = self.entrycategory,
# )
if self.entrycategory:
return u'Entry for {n} for "{r}" in {g}'.format(
n = name,
r = self.race,
g = self.entrycategory,
)
return u'Entry for {n} for "{r}" in {c} {d} ({s})'.format(
n = name,
r = self.race,
@@ -3035,8 +3035,8 @@ class IndoorVirtualRaceResult(models.Model):
age = models.IntegerField(null=True)
emailnotifications = models.BooleanField(default=True,
verbose_name = 'Receive challenge notifications by email')
# entrycategory = models.ForeignKey(CourseStandard,null=True,on_delete=models.SET_NULL,
# verbose_name='Group')
entrycategory = models.ForeignKey(CourseStandard,null=True,on_delete=models.SET_NULL,
verbose_name='Group')
def __str__(self):
rr = Rower.objects.get(id=self.userid)
@@ -3045,13 +3045,13 @@ class IndoorVirtualRaceResult(models.Model):
u2 = rr.user.last_name,
)
if self.teamname:
# if self.entrycategory:
# return u'Entry for {n} for "{r}" in {g} with {t}'.format(
# n = name,
# r = self.race,
# g = self.entrycategory,
# t = self.teamname,
# )
if self.entrycategory:
return u'Entry for {n} for "{r}" in {g} with {t}'.format(
n = name,
r = self.race,
g = self.entrycategory,
t = self.teamname,
)
return u'Entry for {n} for "{r}" on {c} with {t} ({s})'.format(
n = name,
r = self.race,
@@ -3060,12 +3060,12 @@ class IndoorVirtualRaceResult(models.Model):
s = self.sex,
)
else:
# if self.entrycategory:
# return u'Entry for {n} for "{r}" in {g}'.format(
# n = name,
# r = self.race,
# g = self.entrycategory,
# )
if self.entrycategory:
return u'Entry for {n} for "{r}" in {g}'.format(
n = name,
r = self.race,
g = self.entrycategory,
)
return u'Entry for {n} for "{r}" on {c} ({s})'.format(
n = name,
r = self.race,