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

race to challenge rename

Browse Source
This commit is contained in:
Sander Roosendaal
2020-05-19 08:03:30 +02:00
parent 4d260ab8e6
commit c062d8c0da
10 changed files with 99 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
rowers/models.py
View File

@@ -2032,8 +2032,8 @@ class PlannedSession(models.Model):
('test','Mandatory Test'),
('cycletarget','Total for a time period'),
('coursetest','OTW test over a course'),
('race','Virtual Race'),
('indoorrace','Indoor Virtual Race'),
('race','Virtual challenge'),
('indoorrace','Indoor Virtual challenge'),
)
regularsessiontypechoices = (
@@ -2197,8 +2197,8 @@ from django.core.validators import RegexValidator,validate_email
registerchoices = (
('windowstart','Start of Race Window'),
('windowend','End of Race Window'),
('windowstart','Start of challenge Window'),
('windowend','End of challenge Window'),
('deadline','Evaluation Closure Deadline'),
('manual','Manual - select below'),
)
@@ -2239,7 +2239,7 @@ class VirtualRace(PlannedSession):
startdate = self.startdate
enddate = self.enddate
stri = u'Virtual Race {n}'.format(
stri = u'Virtual challenge {n}'.format(
n = name,
)
@@ -2505,11 +2505,11 @@ class IndoorVirtualRaceForm(ModelForm):
if startdatetime > enddatetime:
raise forms.ValidationError("The Start of the Race Window should be before the End of the Race Window")
raise forms.ValidationError("The Start of the challenge Window should be before the End of the challenge Window")
if cd['evaluation_closure'] <= enddatetime:
raise forms.ValidationError("Evaluation closure deadline should be after the Race Window closes")
raise forms.ValidationError("Evaluation closure deadline should be after the challenge Window closes")
if cd['evaluation_closure'] <= timezone.now():
raise forms.ValidationError("Evaluation closure cannot be in the past")
@@ -2626,11 +2626,11 @@ class VirtualRaceForm(ModelForm):
if startdatetime > enddatetime:
raise forms.ValidationError("The Start of the Race Window should be before the End of the Race Window")
raise forms.ValidationError("The Start of the challenge Window should be before the End of the challenge Window")
if cd['evaluation_closure'] <= enddatetime:
raise forms.ValidationError("Evaluation closure deadline should be after the Race Window closes")
raise forms.ValidationError("Evaluation closure deadline should be after the challenge Window closes")
if cd['evaluation_closure'] <= timezone.now():
raise forms.ValidationError("Evaluation closure cannot be in the past")
@@ -2924,7 +2924,7 @@ class VirtualRaceResult(models.Model):
age = models.IntegerField(null=True)
emailnotifications = models.BooleanField(default=True,
verbose_name = 'Receive race notifications by email')
verbose_name = 'Receive challenge notifications by email')
def __str__(self):
rr = Rower.objects.get(id=self.userid)
@@ -2980,7 +2980,7 @@ class IndoorVirtualRaceResult(models.Model):
age = models.IntegerField(null=True)
emailnotifications = models.BooleanField(default=True,
verbose_name = 'Receive race notifications by email')
verbose_name = 'Receive challenge notifications by email')
def __str__(self):
rr = Rower.objects.get(id=self.userid)