Merge branch 'release/v10.54'

2019-11-17 17:52:22 +01:00
parent 9ba5a6a145 9d4a629a42
commit fa841a9f98
1 changed files with 6 additions and 1 deletions
@@ -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: