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

more around default fav charts

Browse Source
This commit is contained in:
Sander Roosendaal
2017-10-12 12:37:33 +02:00
parent a226a957c8
commit 08b49b32bb
2 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
rowers/metrics.py
View File

@@ -245,7 +245,7 @@ defaultfavoritecharts = (
'plottype':'line', 'plottype':'line',
'workouttype':'both', 'workouttype':'both',
'reststrokes':True, 'reststrokes':True,
'notes':'Some Notes 1', 'notes':"""This chart shows your pace and stroke rate versus time. """,
}, },
{ {
'yparam1':'pace', 'yparam1':'pace',
@@ -254,7 +254,9 @@ defaultfavoritecharts = (
'plottype':'line', 'plottype':'line',
'workouttype':'both', 'workouttype':'both',
'reststrokes':True, 'reststrokes':True,
'notes':'Some Notes 2', 'notes':"""This chart shows your pace and heart rate versus time.
Heart rate values will be shown only when it is in your data, i.e.
in case you recorded your heart rate during your workout""",
}, },
{ {
'yparam1':'distanceperstroke', 'yparam1':'distanceperstroke',
@@ -263,7 +265,8 @@ defaultfavoritecharts = (
'plottype':'line', 'plottype':'line',
'workouttype':'otw', 'workouttype':'otw',
'reststrokes':True, 'reststrokes':True,
'notes':'Some Notes 3', 'notes':"""This chart shows the Distance covered per stroke, and your
heart rate versus time. """,
}, },
{ {
'yparam1':'strokeenergy', 'yparam1':'strokeenergy',
@@ -272,16 +275,20 @@ defaultfavoritecharts = (
'plottype':'line', 'plottype':'line',
'workouttype':'ote', 'workouttype':'ote',
'reststrokes':True, 'reststrokes':True,
'notes':'Some Notes 3', 'notes':"""This chart shows the Work per Stroke and your heart rate
plotted versus time. """,
}, },
{ {
'yparam1':'distanceperstroke', 'yparam1':'distanceperstroke',
'yparam2':'None', 'yparam2':'None',
'xparam':'spm', 'xparam':'spm',
'plottype':'line', 'plottype':'scatter',
'workouttype':'otw', 'workouttype':'otw',
'reststrokes':True, 'reststrokes':True,
'notes':'Some Notes 4', 'notes':"""This chart shows the Distance per Stroke versus stroke
stroke rate. You should see a steady decline of the Distance per Stroke
as you increase stroke rate. Typical values are > 10m for steady state
dropping to 8m for race pace in the single.""",
}, },
{ {
'yparam1':'strokeenergy', 'yparam1':'strokeenergy',
@@ -290,6 +297,7 @@ defaultfavoritecharts = (
'plottype':'line', 'plottype':'line',
'workouttype':'ote', 'workouttype':'ote',
'reststrokes':True, 'reststrokes':True,
'notes':'Some Notes 4', 'notes':"""This chart shows the Work per Stroke versus Stroke Rate.
This value should be fairly constant across all stroke rates.""",
}, },
) )

13
rowers/models.py
View File

@@ -299,6 +299,10 @@ class Rower(models.Model):
choices=timezones, choices=timezones,
verbose_name='Default Time Zone') verbose_name='Default Time Zone')
# Show flex chart notes
showfavoritechartnotes = models.BooleanField(default=True,
verbose_name='Show Notes for Favorite Charts')
def __str__(self): def __str__(self):
return self.user.username return self.user.username
@@ -353,7 +357,11 @@ class FavoriteForm(ModelForm):
class Meta: class Meta:
model = FavoriteChart model = FavoriteChart
fields = ['xparam','yparam1','yparam2', fields = ['xparam','yparam1','yparam2',
'plottype','workouttype','reststrokes'] 'plottype','workouttype','reststrokes','notes']
widgets = {
'notes': forms.Textarea,
}
# To generate favorite chart forms on the fly # To generate favorite chart forms on the fly
class BaseFavoriteFormSet(BaseFormSet): class BaseFavoriteFormSet(BaseFormSet):
@@ -830,7 +838,8 @@ class RowerPowerZonesForm(ModelForm):
class AccountRowerForm(ModelForm): class AccountRowerForm(ModelForm):
class Meta: class Meta:
model = Rower model = Rower
fields = ['weightcategory','getemailnotifications','defaulttimezone'] fields = ['weightcategory','getemailnotifications',
'defaulttimezone','showfavoritechartnotes']
class UserForm(ModelForm): class UserForm(ModelForm):
class Meta: class Meta: