Merge branch 'develop' of https://bitbucket.org/sanderroosendaal/rowsandall into develop

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,
         )
     )
 

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',

rowers/templates/help.html

@@ -142,7 +142,7 @@
     <h2>Teams</h2>
 
     <p>
-      The <a href="/rowers/teams/">Teams</a> tab brings you to
+      The <a href="/rowers/me/teams/">Teams</a> tab brings you to
       functionality related to interaction with your team, if you
       are part of one.
     </p>

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']
 	},
 }