Private
Public Access
1
0

rewind to world before StandardTimes

This commit is contained in:
Sander Roosendaal
2020-05-31 12:59:02 +02:00
parent e11407b76d
commit 886ea7576c
11 changed files with 281 additions and 255 deletions

View File

@@ -2183,38 +2183,38 @@ class PlannedSession(models.Model):
from django.core.validators import RegexValidator,validate_email
class StandardCollection(models.Model):
name = models.CharField(max_length=150)
manager = models.ForeignKey(User, null=True,on_delete=models.CASCADE)
notes = models.CharField(blank=True,null=True,max_length=1000)
active = models.BooleanField(default=True)
#class StandardCollection(models.Model):
# name = models.CharField(max_length=150)
# manager = models.ForeignKey(User, null=True,on_delete=models.CASCADE)
# notes = models.CharField(blank=True,null=True,max_length=1000)
# active = models.BooleanField(default=True)
def __str__(self):
return self.name
# def __str__(self):
# return self.name
class CourseStandard(models.Model):
name = models.CharField(max_length=150)
coursedistance = models.IntegerField()
coursetime = models.CharField(max_length=100,default="")
referencespeed = models.FloatField() # average boat speed
agemin = models.IntegerField(default=0)
agemax = models.IntegerField(default=120)
boatclass = models.CharField(max_length=150) # corresponds to workout workouttype
boattype = models.CharField(choices=mytypes.boattypes,max_length=50,default='1x')
sex = models.CharField(max_length=150)
weightclass = models.CharField(max_length=150)
adaptiveclass = models.CharField(choices=mytypes.adaptivetypes,max_length=50,default="None")
skillclass = models.CharField(max_length=150)
standardcollection = models.ForeignKey(StandardCollection,on_delete=models.CASCADE)
#class CourseStandard(models.Model):
# name = models.CharField(max_length=150)
# coursedistance = models.IntegerField()
# coursetime = models.CharField(max_length=100,default="")
# referencespeed = models.FloatField() # average boat speed
# agemin = models.IntegerField(default=0)
# agemax = models.IntegerField(default=120)
# boatclass = models.CharField(max_length=150) # corresponds to workout workouttype
# boattype = models.CharField(choices=mytypes.boattypes,max_length=50,default='1x')
# sex = models.CharField(max_length=150)
# weightclass = models.CharField(max_length=150)
# adaptiveclass = models.CharField(choices=mytypes.adaptivetypes,max_length=50,default="None")
# skillclass = models.CharField(max_length=150)
# standardcollection = models.ForeignKey(StandardCollection,on_delete=models.CASCADE)
class Meta:
unique_together = (
('name','standardcollection')
)
# class Meta:
# unique_together = (
# ('name','standardcollection')
# )
def __str__(self):
return self.name
# def __str__(self):
# return self.name
registerchoices = (
('windowstart','Start of challenge Window'),
@@ -2253,8 +2253,8 @@ class VirtualRace(PlannedSession):
contact_email = models.EmailField(max_length=254,
validators=[validate_email],blank=True)
coursestandards = models.ForeignKey(StandardCollection,null=True,on_delete=models.SET_NULL,
verbose_name='Standard Times',blank=True)
# coursestandards = models.ForeignKey(StandardCollection,null=True,on_delete=models.SET_NULL,
# verbose_name='Standard Times',blank=True)
def __str__(self):
@@ -2424,7 +2424,7 @@ class IndoorVirtualRaceForm(ModelForm):
'registration_closure',
'evaluation_closure',
'comment',
'coursestandards',
# 'coursestandards',
'contact_phone',
'contact_email',
]
@@ -2458,7 +2458,7 @@ class IndoorVirtualRaceForm(ModelForm):
self.fields['sessionunit'].initial = 'm'
if timezone:
self.fields['timezone'].initial = timezone
self.fields['coursestandards'].queryset = StandardCollection.objects.filter(active=True)
# self.fields['coursestandards'].queryset = StandardCollection.objects.filter(active=True)
def clean(self):
cd = self.cleaned_data
@@ -2562,7 +2562,7 @@ class VirtualRaceForm(ModelForm):
'registration_closure',
'evaluation_closure',
'course',
'coursestandards',
# 'coursestandards',
'comment',
'contact_phone',
'contact_email',
@@ -2586,7 +2586,7 @@ class VirtualRaceForm(ModelForm):
def __init__(self,*args,**kwargs):
super(VirtualRaceForm, self).__init__(*args, **kwargs)
self.fields['course'].queryset = GeoCourse.objects.all().order_by("country","name")
self.fields['coursestandards'].queryset = StandardCollection.objects.filter(active=True)
# self.fields['coursestandards'].queryset = StandardCollection.objects.filter(active=True)
def clean(self):
@@ -2932,12 +2932,12 @@ class VirtualRaceResult(models.Model):
adaptiveclass = models.CharField(default="None",max_length=50,
choices=mytypes.adaptivetypes,
verbose_name="Adaptive Class")
skillclass = models.CharField(default="Open",max_length=50,
verbose_name="Skill Class")
# skillclass = models.CharField(default="Open",max_length=50,
# verbose_name="Skill Class")
race = models.ForeignKey(VirtualRace,on_delete=models.CASCADE)
duration = models.TimeField(default=datetime.time(1,0))
distance = models.IntegerField(default=0)
points = models.IntegerField(default=0)
# points = models.IntegerField(default=0)
boatclass = models.CharField(choices=boatclasses,
max_length=40,
default='water',
@@ -2958,9 +2958,9 @@ 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')
# referencespeed = models.FloatField(default=5.0)
# 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,
@@ -3015,13 +3015,13 @@ class IndoorVirtualRaceResult(models.Model):
adaptiveclass = models.CharField(default="None",max_length=50,
choices=mytypes.adaptivetypes,
verbose_name="Adaptive Class")
skillclass = models.CharField(default="Open",max_length=50,
verbose_name="Skill Class")
# skillclass = models.CharField(default="Open",max_length=50,
# verbose_name="Skill Class")
race = models.ForeignKey(VirtualRace,on_delete=models.CASCADE)
duration = models.TimeField(default=datetime.time(1,0))
distance = models.IntegerField(default=0)
referencespeed = models.FloatField(default=5.0)
points = models.IntegerField(default=0)
# points = models.IntegerField(default=0)
boatclass = models.CharField(choices=boatclasses,
max_length=40,
default='rower',
@@ -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,
@@ -3091,13 +3091,13 @@ class IndoorVirtualRaceResultForm(ModelForm):
def __init__(self, *args, **kwargs):
categories = kwargs.pop('categories',None)
# categories = kwargs.pop('categories',None)
super(IndoorVirtualRaceResultForm, self).__init__(*args, **kwargs)
if categories is not None:
self.fields['entrycategory'].queryset = categories
self.fields['entrycategory'].empty_label = None
else:
self.fields.pop('entrycategory')
# if categories is not None:
# self.fields['entrycategory'].queryset = categories
# self.fields['entrycategory'].empty_label = None
# else:
# self.fields.pop('entrycategory')
class VirtualRaceResultForm(ModelForm):
class Meta:
@@ -3110,7 +3110,7 @@ class VirtualRaceResultForm(ModelForm):
def __init__(self, *args, **kwargs):
boattypes = kwargs.pop('boattypes',None)
categories = kwargs.pop('categories',None)
# categories = kwargs.pop('categories',None)
super(VirtualRaceResultForm, self).__init__(*args, **kwargs)
if boattypes:
@@ -3120,11 +3120,11 @@ class VirtualRaceResultForm(ModelForm):
required=False,
label='Mixed Gender')
if categories is not None:
self.fields['entrycategory'].queryset = categories
self.fields['entrycategory'].empty_label = None
else:
self.fields.pop('entrycategory')
# if categories is not None:
# self.fields['entrycategory'].queryset = categories
# self.fields['entrycategory'].empty_label = None
# else:
# self.fields.pop('entrycategory')
from rowers.metrics import rowingmetrics