From 99f3ad968d31c1f8fd0bf058f67cd41fd12f7923 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Mon, 22 May 2017 07:33:46 +0200
Subject: [PATCH 1/2] hotfix flexall

---
 rowers/interactiveplots.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py
index 2993b728..73f81d69 100644
--- a/rowers/interactiveplots.py
+++ b/rowers/interactiveplots.py
@@ -1090,7 +1090,10 @@ def interactive_cum_flex_chart2(theworkouts,promember=0,
     try:
         datadf['y1'] = datadf.ix[:,yparam1]
     except KeyError:
-        datadf['y1'] = datadf['pace']
+        try:
+            datadf['y1'] = datadf['pace']
+        except KeyError:
+            return ['','<p>No non-zero data in selection</p>,'','']
     if yparam2 != 'None':
         try:
 	    datadf['y2'] = datadf.ix[:,yparam2]

From b14526771cce672fe19cec34f4a6cdd953b1b3c0 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Mon, 22 May 2017 08:25:27 +0200
Subject: [PATCH 2/2] fix

---
 rowers/interactiveplots.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py
index 73f81d69..64df2848 100644
--- a/rowers/interactiveplots.py
+++ b/rowers/interactiveplots.py
@@ -1093,7 +1093,7 @@ def interactive_cum_flex_chart2(theworkouts,promember=0,
         try:
             datadf['y1'] = datadf['pace']
         except KeyError:
-            return ['','<p>No non-zero data in selection</p>,'','']
+            return ['','<p>No non-zero data in selection</p>','','']
     if yparam2 != 'None':
         try:
 	    datadf['y2'] = datadf.ix[:,yparam2]