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

non functional mockup stage

Browse Source
This commit is contained in:
Sander Roosendaal
2021-10-08 09:17:20 +02:00
parent e0bc7f2b67
commit 3bec1d4289
7 changed files with 126 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
rowers/models.py
View File

@@ -3408,7 +3408,8 @@ class VirtualRaceResult(models.Model):
verbose_name="Adaptive Class")
skillclass = models.CharField(default="Open",max_length=50,
verbose_name="Skill Class")
race = models.ForeignKey(VirtualRace,on_delete=models.CASCADE,related_name='entries')
race = models.ForeignKey(VirtualRace,on_delete=models.CASCADE,related_name='entries',
blank=True,null=True)
duration = models.TimeField(default=datetime.time(1,0))
distance = models.IntegerField(default=0)
points = models.FloatField(default=0)
@@ -3448,6 +3449,10 @@ class VirtualRaceResult(models.Model):
return False
if self.skillclass != other.skillclass:
return False
if self.race is None and other.race is not None:
return False
if self.rae is not None and other.race is None:
return False
if self.race != other.race:
return False
if self.boatclass != other.boatclass:
@@ -3522,7 +3527,7 @@ class IndoorVirtualRaceResult(models.Model):
verbose_name="Adaptive Class")
skillclass = models.CharField(default="Open",max_length=50,
verbose_name="Skill Class")
race = models.ForeignKey(VirtualRace,on_delete=models.CASCADE)
race = models.ForeignKey(VirtualRace,on_delete=models.CASCADE,null=True,blank=True)
duration = models.TimeField(default=datetime.time(1,0))
distance = models.IntegerField(default=0)
referencespeed = models.FloatField(default=5.0)
@@ -3554,6 +3559,10 @@ class IndoorVirtualRaceResult(models.Model):
endsecond = models.FloatField(default=0)
def isduplicate(self,other): # pragma: no cover
if self.race is None and other.race is not None:
return False
if self.race is not None and other.race is None:
return False
if self.userid != other.userid:
return False
if self.weightcategory != other.weightcategory: