From cf3a3e227d7afc735a7ae533777327005df5fe4b Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Thu, 29 Mar 2018 11:22:05 -0700
Subject: [PATCH] debugging oauth

---
 rowers/dataprep.py                    |  9 +++++----
 rowers/serializers.py                 | 23 ++++++++++++++++++++++-
 rowers/templates/strokedata_form.html |  2 +-
 rowers/views.py                       |  9 ++++++---
 4 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index 6885e341..56ce5fc4 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -1586,9 +1586,9 @@ def rdata(file, rower=rrower()):
         try:
             res = rrdata(csvfile=file + '.gz', rower=rower)
         except IOError, IndexError:
-            res = 0
+            res = rrdata()
         except:
-            res = 0
+            res = rrdata()
 
     return res
 
@@ -1637,7 +1637,7 @@ def getrowdata_db(id=0, doclean=False, convertnewtons=True):
 
     if data.empty:
         rowdata, row = getrowdata(id=id)
-        if rowdata:
+        if not rowdata.empty:
             data = dataprep(rowdata.df, id=id, bands=True,
                             barchart=True, otwpower=True)
         else:
@@ -1645,7 +1645,8 @@ def getrowdata_db(id=0, doclean=False, convertnewtons=True):
     else:
         row = Workout.objects.get(id=id)
 
-    if data['efficiency'].mean() == 0 and data['power'].mean() != 0:
+    
+    if not data.empty and data['efficiency'].mean() == 0 and data['power'].mean() != 0:
         data = add_efficiency(id=id)
 
     if doclean:
diff --git a/rowers/serializers.py b/rowers/serializers.py
index c552e2ed..3e94f954 100644
--- a/rowers/serializers.py
+++ b/rowers/serializers.py
@@ -21,6 +21,7 @@ class RowerSerializer(serializers.HyperlinkedModelSerializer):
             'tr',
             'an',
             'ftp',
+            'sex',
             )
 
 class FavoriteChartSerializer(serializers.ModelSerializer):
@@ -52,6 +53,13 @@ class WorkoutSerializer(serializers.ModelSerializer):
             'maxhr',
             'notes',
             'summary',
+            'boattype',            
+            'timezone',
+            'forceunit',
+            'inboard',
+            'oarlength',
+            'privacy',
+            'rankingpiece'
         )
 
     def create(self, validated_data):
@@ -78,7 +86,13 @@ class WorkoutSerializer(serializers.ModelSerializer):
                     summary=validated_data['summary'],
 		    averagehr=validated_data['averagehr'],
                     maxhr=validated_data['maxhr'],
-		    startdatetime=rowdatetime)
+		    startdatetime=rowdatetime,
+                    timezone=validated_data['timezone'],
+                    forceunit=validated_data['forceunit'],
+                    inboard=validated_data['inboard'],
+                    oarlength=validated_data['oarlength'],
+                    privacy=validated_data['privacy'],
+                    rankingpiece=validated_data['rankingpiece'],)
         w.save()
         return w
         
@@ -104,6 +118,13 @@ class WorkoutSerializer(serializers.ModelSerializer):
 	instance.averagehr=validated_data['averagehr']
         instance.maxhr=validated_data['maxhr']
 	instance.startdatetime=rowdatetime
+        instance.timezone=validated_data['timezone']
+        instance.forceunit=validated_data['forceunit']
+        instance.inboard=validated_data['inboard']
+        instance.oarlength=validated_data['oarlength']
+        instance.privacy=validated_data['privacy']
+        instance.rankingpiece=validated_data['rankingpiece']
+
         instance.save()
         return instance
 
diff --git a/rowers/templates/strokedata_form.html b/rowers/templates/strokedata_form.html
index 34cabb57..c7ad8d3a 100644
--- a/rowers/templates/strokedata_form.html
+++ b/rowers/templates/strokedata_form.html
@@ -11,7 +11,7 @@
 	<div class="grid_12 alpha">
 	<h1>Stroke Data for workout {{ id }}</h1>
 
-    <form enctype="multipart/form-data" action="/rowers/api/workouts/{{ id }}/strokedata" method="post">
+    <form enctype="application/json" action="/rowers/api/workouts/{{ id }}/strokedata" method="post">
         <table>
             {{ form.as_table }}
         </table>
diff --git a/rowers/views.py b/rowers/views.py
index 07be1758..e9913488 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -11480,7 +11480,10 @@ def strokedatajson(request,id):
         df.index = df.index.astype(int)
         df.sort_index(inplace=True)
         # time, hr, pace, spm, power, drivelength, distance, drivespeed, dragfactor, strokerecoverytime, averagedriveforce, peakdriveforce, lapidx
-        time = df['time']/1.e3
+        try:
+            time = df['time']/1.e3
+        except KeyError:
+            return HttpResponse("There must be time values",status=400)
         aantal = len(time)
         pace = df['pace']/1.e3
         if len(pace) != aantal:
@@ -11508,11 +11511,11 @@ def strokedatajson(request,id):
         lapidx = trydf(df,aantal,'lapidx')
         hr = trydf(df,aantal,'hr')
 
-        starttime = totimestamp(row.startdatetime)+time
+        starttime = totimestamp(row.startdatetime)+time[0]
         unixtime = starttime+time
 
         with open('media/apilog.log','a') as logfile:
-            logfile.write(starttime+": ")
+            logfile.write(str(starttime)+": ")
             logfile.write(request.user.username+"(POST) \r\n")
             
         data = pd.DataFrame({'TimeStamp (sec)':unixtime,