Merge branch 'release/v22.2.0'

rowers/interactiveplots.py

@@ -1577,7 +1577,7 @@ def interactive_cum_flex_chart2(theworkouts, promember=0,
     ids = [int(w.id) for w in theworkouts]
 
     columns = [name for name, d in metrics.rowingmetrics]
-    columns_basic = [name for name, d in metrics.rowingmetrics if d['group'] == 'basic']
+    columns_basic = [name for name, d in metrics.rowingmetrics if d['type'] == 'basic']
     columns = columns + ['spm', 'driveenergy', 'distance' ,'workoutstate']
     columns_basic = columns_basic + ['spm', 'driveenergy', 'distance', 'workoutstate']
 
@@ -1697,7 +1697,7 @@ def interactive_flexchart_stacked(id, r, xparam='time',
                                   mode='erg'):
 
     columns = [name for name, d in metrics.rowingmetrics]
-    columns_basic = [name for name, d in metrics.rowingmetrics if d['group'] == 'basic']
+    columns_basic = [name for name, d in metrics.rowingmetrics if d['type'] == 'basic']
     columns = columns + ['spm', 'driveenergy', 'distance','workoutid','workoutstate']
     columns_basic = columns_basic + ['spm', 'driveenergy', 'distance','workoutid','workoutstate']
 
@@ -1815,7 +1815,7 @@ def interactive_flex_chart2(id, r, promember=0,
                             mode='rower'):
 
     columns = [name for name, d in metrics.rowingmetrics]
-    columns_basic = [name for name, d in metrics.rowingmetrics if d['group'] == 'basic']
+    columns_basic = [name for name, d in metrics.rowingmetrics if d['type'] == 'basic']
     columns = columns + ['spm', 'driveenergy', 'distance','workoutstate']
     columns_basic = columns_basic + ['spm', 'driveenergy', 'distance','workoutstate']