Merge branch 'develop' into feature/embeddedvideo

2019-11-19 08:02:21 +01:00
parent 3940b66b50 2b1c16d20e
commit 471b95f885
3 changed files with 23 additions and 7 deletions
--- a/rowers/views/workoutviews.py
+++ b/rowers/views/workoutviews.py
@@ -2906,7 +2906,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: