From 2e9a10b46980eb07b3843761e9437f399cd27e94 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 31 May 2020 20:44:16 +0200 Subject: [PATCH] adding entrycategory to virtual race result --- rowers/models.py | 60 ++++++++++++++++++++++++------------------------ 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/rowers/models.py b/rowers/models.py index 2ea9d71b..7a1d12a9 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -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,