From 9d4a629a42ab17144d7e238967e22206a71ed883 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Sun, 17 Nov 2019 17:49:11 +0100
Subject: [PATCH 1/3] bug fix

---
 rowers/views/workoutviews.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py
index 7f06aa68..e164c70e 100644
--- a/rowers/views/workoutviews.py
+++ b/rowers/views/workoutviews.py
@@ -2450,7 +2450,12 @@ def workout_data_view(request, id=0):
     else:
         form = DataFrameColumnsForm(initial = {'cols':tcols})
 
-    datadf = datadf[tcols]
+    try:
+        datadf = datadf[tcols]
+    except KeyError:
+        tcols = list(set(datadf.columns(tolist)+tcols))
+        datadf = datadf[tcols]
+        datadf = datadf.fillna(value=0)
 
     for col in cols:
         try:

From 4bfc5866c4fb172d2f7e3907750adfbe8d49aa71 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Mon, 18 Nov 2019 08:32:15 +0100
Subject: [PATCH 2/3] bug fix

---
 rowers/c2stuff.py | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/rowers/c2stuff.py b/rowers/c2stuff.py
index fc60be23..5d184895 100644
--- a/rowers/c2stuff.py
+++ b/rowers/c2stuff.py
@@ -347,9 +347,20 @@ def summaryfromsplitdata(splitdata,data,filename,sep='|'):
         timebased = False
 
     for interval in splitdata:
-        idist = interval['distance']
-        itime = interval['time']/10.
-        ipace = 500.*itime/idist
+        try:
+            idist = interval['distance']
+        except KeyError:
+            idist = 0
+
+        try:
+            itime = interval['time']/10.
+        except KeyError:
+            itime = 0
+        try:
+            ipace = 500.*itime/idist
+        except (ZeroDivisionError,OverflowError):
+            ipace = 180.
+
         try:
             ispm = interval['stroke_rate']
         except KeyError:

From 2b1c16d20eb460f2522486a1f03080edbfcd623b Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Tue, 19 Nov 2019 07:57:37 +0100
Subject: [PATCH 3/3] removing StrokeData field *bye and thanks

---
 rowers/models.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rowers/models.py b/rowers/models.py
index c4d6b7e4..395455b6 100644
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -3072,9 +3072,9 @@ attrs.update(strokedatafields)
 # when the StrokeData are expanded.
 # No Django Instances of this model are managed. Strokedata table is
 # accesssed directly with SQL commands
-StrokeData = type(str('StrokeData'), (models.Model,),
-                  attrs
-                  )
+#StrokeData = type(str('StrokeData'), (models.Model,),
+#                  attrs
+#                  )
 
 # Storing data for the OTW CP chart
 class cpdata(models.Model):