Merge branch 'bugfix/c2' into develop

data.txt

@@ -1 +0,0 @@
-{"distance": 13878, "user_id": 457764, "ranked": false, "weight_class": "L", "verified": false, "workout_type": false, "comments": "\n from speedcoach2v2.15 via rowsandall.com", "heart_rate": {"max": 158, "average": 156}, "source": "rowingdata", "date_utc": "2018-06-30 05:31:01", "time_formatted": "1:21:16.7", "time": 48767, "date": "2018-06-30 07:31:01", "timezone": "Europe/Prague", "type": "water", "id": 33991243, "stroke_data": true}

rowers/c2stuff.py

@@ -17,6 +17,7 @@ from rowers.mytypes import otwtypes
 from iso8601 import ParseError
 
 import numpy
+import json
 
 from rowsandall_app.settings import (
     C2_CLIENT_ID, C2_REDIRECT_URI, C2_CLIENT_SECRET
@@ -415,9 +416,10 @@ def createc2workoutdata(w):
     p = np.clip(p,0,3600)
     if w.workouttype == 'bike':
         p = 2.0*p
-    #    t = t.astype(int)
-    #    d = d.astype(int)
-    #    p = p.astype(int)
+
+    t = t.astype(int)
+    d = d.astype(int)
+    p = p.astype(int)
     spm = row.df[' Cadence (stokes/min)'].astype(int)
     spm[0] = spm[1]
     try: