Private
Public Access
1
0

added course to session edit form

This commit is contained in:
Sander Roosendaal
2018-02-18 14:13:45 +01:00
parent 6ec66da974
commit a2628c1860

View File

@@ -661,7 +661,10 @@ timezones = (
class GeoCourse(models.Model): class GeoCourse(models.Model):
manager = models.ForeignKey(Rower) manager = models.ForeignKey(Rower)
name = models.CharField(max_length=150,blank=True) name = models.CharField(max_length=150,blank=True)
def __unicode__(self):
name = self.name
return u'{name}'.format(name=name)
class GeoPolygon(models.Model): class GeoPolygon(models.Model):
name = models.CharField(max_length=150,blank=True) name = models.CharField(max_length=150,blank=True)
@@ -803,6 +806,7 @@ class PlannedSession(models.Model):
('challenge','Challenge'), ('challenge','Challenge'),
('test','Mandatory Test'), ('test','Mandatory Test'),
('cycletarget','Cycle Target'), ('cycletarget','Cycle Target'),
('coursetest','OTW test over a course'),
) )
sessionmodechoices = ( sessionmodechoices = (
@@ -831,6 +835,8 @@ class PlannedSession(models.Model):
) )
manager = models.ForeignKey(User) manager = models.ForeignKey(User)
course = models.ForeignKey(GeoCourse,blank=True,null=True,
verbose_name='OTW Course')
name = models.CharField(max_length=150,blank=True, name = models.CharField(max_length=150,blank=True,
verbose_name='Name') verbose_name='Name')
@@ -914,6 +920,10 @@ class PlannedSession(models.Model):
self.sessionmode = 'distance' self.sessionmode = 'distance'
self.sessionunit = 'm' self.sessionunit = 'm'
self.criterium = 'exact' self.criterium = 'exact'
if self.sessiontype == 'coursetest':
self.sessionmode = 'distance'
self.sessionunit = 'm'
self.criterium = 'none'
super(PlannedSession,self).save(*args, **kwargs) super(PlannedSession,self).save(*args, **kwargs)
@@ -933,6 +943,7 @@ class PlannedSessionForm(ModelForm):
'criterium', 'criterium',
'sessionvalue', 'sessionvalue',
'sessionunit', 'sessionunit',
'course',
'comment', 'comment',
] ]
@@ -947,6 +958,11 @@ class PlannedSessionForm(ModelForm):
'enddate': AdminDateWidget(), 'enddate': AdminDateWidget(),
} }
def __init__(self,*args,**kwargs):
super(PlannedSessionForm, self).__init__(*args, **kwargs)
if self.instance.sessiontype != 'coursetest':
del self.fields['course']
class PlannedSessionFormSmall(ModelForm): class PlannedSessionFormSmall(ModelForm):
class Meta: class Meta:
@@ -977,7 +993,7 @@ class PlannedSessionFormSmall(ModelForm):
'type':'number'}), 'type':'number'}),
'manager': forms.HiddenInput(), 'manager': forms.HiddenInput(),
} }
# Workout # Workout
class Workout(models.Model): class Workout(models.Model):