fixing #424

rowers/c2stuff.py

@@ -415,9 +415,9 @@ def createc2workoutdata(w):
     p = np.clip(p,0,3600)
     if w.workouttype == 'bike':
         p = 2.0*p
-    t = t.astype(int)
+    #    t = t.astype(int)
-    d = d.astype(int)
+    #    d = d.astype(int)
-    p = p.astype(int)
+    #    p = p.astype(int)
     spm = row.df[' Cadence (stokes/min)'].astype(int)
     spm[0] = spm[1]
     try:
@@ -425,12 +425,19 @@ def createc2workoutdata(w):
     except ValueError:
         hr = 0*d
     stroke_data = []
+
+    t = t.tolist()
+    d = d.tolist()
+    p = p.tolist()
+    spm = spm.tolist()
+    hr = hr.tolist()
+    
     for i in range(len(t)):
-        thisrecord = {"t":t[i].astype(int),
+        thisrecord = {"t":t[i],
-                      "d":d[i].astype(int),
+                      "d":d[i],
-                      "p":p[i].astype(int),
+                      "p":p[i],
-                      "spm":spm[i].astype(int),
+                      "spm":spm[i],
-                      "hr":hr[i].astype(int)}
+                      "hr":hr[i]}
         stroke_data.append(thisrecord)
 
     try:

rowers/plannedsessions.py

@@ -463,10 +463,15 @@ def add_team_session(t,ps):
     return 1
 
 def add_rower_session(r,ps):
-    ps.rower.add(r)
+    teams = Team.objects.filter(manager=ps.manager)
-    ps.save()
+    members = Rower.objects.filter(team__in=teams).distinct()
+    if r in members:
+        ps.rower.add(r)
+        ps.save()
 
-    return 1
+        return 1
+
+    return 0
 
 def remove_team_session(t,ps):
     ps.team.remove(t)

rowers/sporttracksstuff.py

@@ -172,6 +172,14 @@ def createsporttracksworkoutdata(w):
     distancedata = []
     powerdata = []
 
+    t = t.tolist()
+    hr = hr.tolist()
+    d = d.tolist()
+    spm = spm.tolist()
+    lat = lat.tolist()
+    lon = lon.tolist()
+    power = power.tolist()
+
     for i in range(len(t)):
         hrdata.append(t[i])
         hrdata.append(hr[i])

rowers/underarmourstuff.py

@@ -127,23 +127,23 @@ def createunderarmourworkoutdata(w):
 
     d = row.df.loc[:,'cum_dist'].values
     d[0] = d[1]
-    t = t.astype(float)
+    t = t.astype(float).tolist()
 
     
 
     
-    d = d.astype(int)
+    d = d.astype(int).tolist()
-    spm = row.df[' Cadence (stokes/min)'].astype(int)
+    spm = row.df[' Cadence (stokes/min)'].astype(int).tolist()
     spm[0] = spm[1]
-    hr = row.df[' HRCur (bpm)'].astype(int)
+    hr = row.df[' HRCur (bpm)'].astype(int).tolist()
     speed = row.df[' AverageBoatSpeed (m/s)']
-    speed = speed.replace(np.inf,0)
+    speed = speed.replace(np.inf,0).tolist()
     
     haslatlon=1
     
     try:
-        lat = row.df[' latitude']
+        lat = row.df[' latitude'].tolist()
-        lon = row.df[' longitude']
+        lon = row.df[' longitude'].tolist()
         if not lat.std() and not lon.std():
             haslatlon = 0
     except KeyError: