passing tests

rowers/interactiveplots.py

@@ -1588,19 +1588,19 @@ def interactive_cum_flex_chart2(theworkouts, promember=0,
     except (KeyError, ColumnNotFoundError):
         yparam1 = 'None'
 
-    datadf = datadf.fill_nan(None).drop_nulls()
+    datadf = dataprep.remove_nulls_pl(datadf)
 
     # test if we have drive energy
     try:  # pragma: no cover
         _ = datadf['driveenergy'].mean()
-    except KeyError:  # pragma: no cover
-        datadf['driveenergy'] = 500.
+    except (KeyError, ColumnNotFoundError):  # pragma: no cover
+        datadf = datadf.with_columns((pl.lit(500)).alias("driveenergy"))
 
     # test if we have power
     try:  # pragma: no cover
         _ = datadf['power'].mean()
-    except KeyError:  # pragma: no cover
-        datadf['power'] = 50.
+    except (KeyError, ColumnNotFoundError):  # pragma: no cover
+        datadf = datadf.with_columns((pl.lit(50)).alias("power"))
 
     yparamname1 = axlabels[yparam1]
     if yparam2 != 'None':
@@ -1687,8 +1687,8 @@ def interactive_flexchart_stacked(id, r, xparam='time',
 
     columns = [name for name, d in metrics.rowingmetrics]
     columns_basic = [name for name, d in metrics.rowingmetrics if d['group'] == 'basic']
-    columns = columns + ['spm', 'driveenergy', 'distance']
-    columns_basic = columns_basic + ['spm', 'driveenergy', 'distance']
+    columns = columns + ['spm', 'driveenergy', 'distance','workoutid','workoutstate']
+    columns_basic = columns_basic + ['spm', 'driveenergy', 'distance','workoutid','workoutstate']
 
     rowdata = pd.DataFrame()
     row = Workout.objects.get(id=id)
@@ -1763,7 +1763,7 @@ def interactive_flexchart_stacked(id, r, xparam='time',
         rowdata = rowdata.with_columns(y4=pl.col("time"))
         rowdata = rowdata.with_columns((pl.col("y4")).alias(yparam4))
 
-        
+    
     # replace nans
     rowdata = rowdata.fill_nan(0)
 
@@ -1783,7 +1783,7 @@ def interactive_flexchart_stacked(id, r, xparam='time',
         'metrics': metrics_list,
     }
 
-    script, div = get_chart("/stacked", chart_data)
+    script, div = get_chart("/stacked", chart_data, debug=False)
 
     return script, div