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

added OTW and workouttype to favoritechart model

Browse Source
This commit is contained in:
Sander Roosendaal
2016-12-07 18:12:38 +01:00
parent bfc05a7de6
commit 84c3b7e175
5 changed files with 82 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
rowers/models.py
View File

@@ -136,6 +136,12 @@ class FavoriteChart(models.Model):
('finish','Finish Angle'),
('peakforceangle','Peak Force Angle'),
)
workouttypechoices = (
('ote','Erg/SkiErg'),
('otw','On The Water'),
('both','both')
)
plottypes = (
('line','Line Chart'),
@@ -143,15 +149,20 @@ class FavoriteChart(models.Model):
)
yparam1 = models.CharField(max_length=50,choices=y1params,verbose_name='Y1')
yparam2 = models.CharField(max_length=50,choices=y2params,verbose_name='Y2')
yparam2 = models.CharField(max_length=50,choices=y2params,verbose_name='Y2',default='None',blank=True)
xparam = models.CharField(max_length=50,choices=xparams,verbose_name='X')
plottype = models.CharField(max_length=50,choices=plottypes,default='line')
plottype = models.CharField(max_length=50,choices=plottypes,
default='line',
verbose_name='Chart Type')
workouttype = models.CharField(max_length=50,choices=workouttypechoices,
default='both',
verbose_name='Workout Type')
user = models.ForeignKey(Rower)
class FavoriteForm(ModelForm):
class Meta:
model = FavoriteChart
fields = ['xparam','yparam1','yparam2','plottype']
fields = ['xparam','yparam1','yparam2','plottype','workouttype']
class BaseFavoriteFormSet(BaseFormSet):
def clean(self):
@@ -170,6 +181,15 @@ class BaseFavoriteFormSet(BaseFormSet):
'Must have x parameter.',
code='missing_xparam'
)
if not yparam1:
raise forms.ValidationError(
'Must have Y1 parameter.',
code='missing_yparam1'
)
if not yparam2:
yparam2 = 'None'
class Workout(models.Model):
workouttypes = (