From 13c9759f63b1d8ec83b0e0b322742ea56a958844 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Thu, 10 Oct 2024 18:39:36 +0200
Subject: [PATCH 1/2] fixing group vs type confusion

---
 rowers/interactiveplots.py            |   2 +-
 rowers/tests/testdata/testdata.tcx.gz | Bin 4000 -> 4001 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py
index d56086d3..001db4f1 100644
--- a/rowers/interactiveplots.py
+++ b/rowers/interactiveplots.py
@@ -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']
 
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index 0791151b9d8cb1373f0e7cb6ea0f8d721203f392..d79c050d21a967f2dbc5609f10e700aed318cbff 100644
GIT binary patch
literal 4001
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
H#DD<+;pRJ9

literal 4000
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
GfB^tKGevp;


From b47628865be9c26f929f215544c50c6fea66da7b Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Thu, 10 Oct 2024 18:54:48 +0200
Subject: [PATCH 2/2] one more group replaced by type

---
 rowers/interactiveplots.py            |   4 ++--
 rowers/tests/testdata/testdata.tcx.gz | Bin 4001 -> 3999 bytes
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py
index 001db4f1..3d1c22db 100644
--- a/rowers/interactiveplots.py
+++ b/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']
 
@@ -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']
 
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index d79c050d21a967f2dbc5609f10e700aed318cbff..a2d6207cc3b408b6fce6669b601c1ff7f5407c20 100644
GIT binary patch
literal 3999
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
F0RWC^Kvn<%

literal 4001
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
H#DD<+;pRJ9