Merge branch 'release/v18.1.5'

rowers/polarstuff.py

@@ -135,14 +135,15 @@ def get_polar_notifications(): # pragma: no cover
             'status_code':400,
             }
 
-    dologging('polar.log',response)
-
     available_data = []
 
     try:
         if response.status_code == 200:
             available_data = response.json()['available-user-data']
             dologging('polar.log',available_data)
+        else:
+            dologging('polar.log',response.status_code)
+            dologging('polar.log',reponse.text)
     except AttributeError:
         dologging('polar.log',response.text)
         pass
@@ -199,7 +200,10 @@ def get_polar_workouts(user):
 
         response = requests.post(url, headers=headers)
         dologging('polar.log',url)
-        dologging('polar.log',response.status_code)
+        dologging('polar.log',authorizationstring)
+        dologging('polar.log',str(response.status_code))
+        dologgin('polar.log',response.reason)
+        dologging('polar.log',response.text)
 
 
         if response.status_code == 201:
@@ -219,6 +223,8 @@ def get_polar_workouts(user):
                 userid = r.polaruserid
                 )
 
+            dologging('polar.log',url)
+
             response = requests.get(url, headers=headers)
             if response.status_code == 200:
                 exerciseurls = response.json()['exercises']

rowers/serializers.py

@@ -195,6 +195,7 @@ class WorkoutSerializer(serializers.ModelSerializer):
             'date',
             'workouttype',
             'starttime',
+            'startdatetime',
             'distance',
             'duration',
             'averagehr',
@@ -207,7 +208,11 @@ class WorkoutSerializer(serializers.ModelSerializer):
             'inboard',
             'oarlength',
             'privacy',
-            'rankingpiece'
+            'rankingpiece',
+            'trimp',
+            'rscore',
+            'normp',
+            'duplicate',
         )
 
     def create(self, validated_data): # pragma: no cover