From d2fb2274f4bc0670c3177e22fed600de9643540f Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Mon, 13 Apr 2020 13:39:31 +0200
Subject: [PATCH] fixed some workoutstate errors

---
 rowers/c2stuff.py          |  1 +
 rowers/dataprep.py         | 12 ++++++++++++
 rowers/dataprepnodjango.py |  1 +
 3 files changed, 14 insertions(+)

diff --git a/rowers/c2stuff.py b/rowers/c2stuff.py
index 41393b94..a90c2a2c 100644
--- a/rowers/c2stuff.py
+++ b/rowers/c2stuff.py
@@ -1054,6 +1054,7 @@ def add_workout_from_data(user,importid,data,strokedata,
                        ' AverageDriveForce (lbs)':np.zeros(nr_rows),
                        ' PeakDriveForce (lbs)':np.zeros(nr_rows),
                        ' lapIdx':lapidx,
+                       ' WorkoutState': 4,
                        ' ElapsedTime (sec)':seconds
                        })
 
diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index 3f74db30..de004620 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -512,6 +512,12 @@ def clean_df_stats(datadf, workstrokesonly=True, ignorehr=True,
     except (KeyError,TypeError) as e:
         pass
 
+    # protect 0 workoutstate values from being nulled
+    try:
+        datadf['workoutstate'] = datadf['workoutstate'] + 1
+    except (KeyError,TypeError) as e:
+        pass
+
 
     try:
         datadf = datadf.clip(lower=0)
@@ -545,6 +551,12 @@ def clean_df_stats(datadf, workstrokesonly=True, ignorehr=True,
     except (TypeError,KeyError) as e:
         pass
 
+    # bring workoutstate back to real values
+    try:
+        datadf['workoutstate'] = datadf['workoutstate'] - 1
+    except (TypeError,KeyError) as e:
+        pass
+
 
     # return from positive domain to negative
     try:
diff --git a/rowers/dataprepnodjango.py b/rowers/dataprepnodjango.py
index 493357d8..98c6f7d4 100644
--- a/rowers/dataprepnodjango.py
+++ b/rowers/dataprepnodjango.py
@@ -291,6 +291,7 @@ def add_c2_stroke_data_db(strokedata,workoutid,starttimeunix,csvfilename,
                        ' AverageDriveForce (lbs)':np.zeros(nr_rows),
                        ' PeakDriveForce (lbs)':np.zeros(nr_rows),
                        ' lapIdx':lapidx,
+                       ' WorkoutState': 4,
                        ' ElapsedTime (sec)':seconds,
                        'cum_dist': dist2
                        })