diff --git a/mysql b/mysql new file mode 100644 index 00000000..e69de29b diff --git a/rowers/dataprep.py b/rowers/dataprep.py index 97133433..79fdcdfd 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -2240,7 +2240,7 @@ def dataprep(rowdatadf, id=0, bands=True, barchart=True, otwpower=True, drivespeed=drivespeed, rhythm=rhythm, distanceperstroke=distanceperstroke, - powerhr=powerhr, +# powerhr=powerhr, ) ) diff --git a/rowers/metrics.py b/rowers/metrics.py index 81f28632..0cc0fdc4 100644 --- a/rowers/metrics.py +++ b/rowers/metrics.py @@ -86,14 +86,14 @@ rowingmetrics = ( 'mode':'both', 'type':'pro'}), - ('powerhr',{ - 'numtype':'float', - 'null':True, - 'verbose_name': 'Power Heart Rate Efficiency (J/beat)', - 'ax_min':0, - 'ax_max':300, - 'mode':'both', - 'type':'pro'}), +# ('powerhr',{ +# 'numtype':'float', +# 'null':True, +# 'verbose_name': 'Power Heart Rate Efficiency (J/beat)', +# 'ax_min':0, +# 'ax_max':300, +# 'mode':'both', +# 'type':'pro'}), ('spm',{ 'numtype':'float', diff --git a/rowers/templates/help.html b/rowers/templates/help.html index d7835320..5ce3b582 100644 --- a/rowers/templates/help.html +++ b/rowers/templates/help.html @@ -142,7 +142,7 @@
- The Teams tab brings you to + The Teams tab brings you to functionality related to interaction with your team, if you are part of one.
diff --git a/rowsandall_app/settings.py b/rowsandall_app/settings.py index b7410f24..3a9a537c 100644 --- a/rowsandall_app/settings.py +++ b/rowsandall_app/settings.py @@ -166,9 +166,7 @@ DATABASES = { }, 'TEST': { 'CHARSET': 'utf8', - 'ENGINE': 'django.db.backends.mysql', 'COLLATION': 'utf8_general_ci', - 'NAME': CFG['db_name'] }, }