small improvement activity chart; retiring Bike, only bike with small b

rowers/garmin_stuff.py

@@ -35,11 +35,11 @@ from pytz import timezone as tz, utc
 #http_client.HTTPConnection.debuglevel = 1
 
 # You must initialize logging, otherwise you'll not see debug output.
-logging.basicConfig()
+#logging.basicConfig()
-logging.getLogger().setLevel(logging.DEBUG)
+#logging.getLogger().setLevel(logging.DEBUG)
-requests_log = logging.getLogger("requests.packages.urllib3")
+#requests_log = logging.getLogger("requests.packages.urllib3")
-requests_log.setLevel(logging.DEBUG)
+#requests_log.setLevel(logging.DEBUG)
-requests_log.propagate = True
+#requests_log.propagate = True
 
 
 from rowers.tasks import handle_get_garmin_file
@@ -305,12 +305,6 @@ def ps_to_garmin(ps,r):
     payload['steps'] = lijst
     url = 'https://apis.garmin.com/training-api/workout/'
 
-    print(payload)
-    print(oauth_data['client_id'])
-    print(oauth_data['client_secret'])
-    print(r.garmintoken)
-    print(r.garminrefreshtoken)
-
     garmin = OAuth1Session(oauth_data['client_id'],
                            client_secret=oauth_data['client_secret'],
                            resource_owner_key=r.garmintoken,
@@ -319,7 +313,6 @@ def ps_to_garmin(ps,r):
                            encoding='base64'
                            )
 
-    print(garmin.headers)
 
     response = garmin.post(url,data=payload)
 

rowers/interactiveplots.py

@@ -571,7 +571,6 @@ def interactive_activitychart(workouts,startdate,enddate,stack='type',toolbar_lo
     while d<=enddate:
         dd = d.strftime('%d')
 
-
         if totaldays<30:
             dates.append(d.strftime('%m/%d'))
             dates_sorting.append(d.strftime('%Y/%m/%d'))
@@ -582,7 +581,10 @@ def interactive_activitychart(workouts,startdate,enddate,stack='type',toolbar_lo
         rscores.append(0)
         trimps.append(0)
         links.append('')
-        types.append('rower')
+        try:
+            types.append(types[0])
+        except IndexError:
+            types.append('rower')
 
         try:
             rowers.append(rowers[0])

rowers/mytypes.py

@@ -21,7 +21,7 @@ workouttypes_ordered = collections.OrderedDict({
     'c-boat':'Dutch C boat',
     'churchboat':'Finnish Church boat',
     'Ride':'Ride',
-    'Bike':'Bike',
+    'bike':'Bike',
     'Run':'Run',
     'NordicSki':'NordicSki',
     'Swim':'Swim',
@@ -36,7 +36,7 @@ workouttypes_ordered = collections.OrderedDict({
     'Kayaking':'Kayaking',
     'Workout':'Workout',
     'Yoga':'Yoga',
-    'bike':'Bike',
+#    'bike':'Bike',
     'other':'Other',
     }
 )
@@ -51,7 +51,7 @@ stravacollection = (
     ('water','Rowing'),
     ('rower','Rowing'),
     ('skierg','NordicSki'),
-    ('Bike','Ride'),
+    ('bike','Ride'),
     ('bikeerg','Ride'),
     ('dynamic','Rowing'),
     ('slides','Rowing'),
@@ -84,7 +84,7 @@ garmincollection = (
     ('water','ROWING'),
     ('rower','INDOOR_ROWING'),
     ('skierg','CROSS_COUNTRY_SKIING'),
-    ('Bike','ROAD_BIKING'),
+    ('bike','ROAD_BIKING'),
     ('bikeerg','INDOOR_CYCLING'),
     ('dynamic','INDOOR_ROWING'),
     ('slides','INDOOR_ROWING'),
@@ -117,7 +117,7 @@ fitcollection = (
 ('water','rowing'),
 ('rower','rowing'),
 ('skierg','cross_country_skiing'),
-('Bike','cycling'),
+('bike','cycling'),
 ('bikeerg','cycling'),
 ('dynamic','rowing'),
 ('slides','rowing'),
@@ -153,7 +153,7 @@ stcollection = (
     ('water','Rowing'),
     ('rower','Rowing'),
     ('skierg','Skiing:Nordic'),
-    ('Bike','Cycling'),
+    ('bike','Cycling'),
     ('bikeerg','Cycling'),
     ('dynamic','Rowing'),
     ('slides','Rowing'),
@@ -187,7 +187,7 @@ rkcollection = (
     ('water','Rowing'),
     ('rower','Rowing'),
     ('skierg','Cross-Country Skiing'),
-    ('Bike','Cycling'),
+    ('bike','Cycling'),
     ('bikeerg','Cycling'),
     ('dynamic','Rowing'),
     ('slides','Rowing'),
@@ -220,7 +220,7 @@ polarcollection = (
     ('water','Rowing'),
     ('rower','Rowing'),
     ('skierg','Skiing'),
-    ('Bike','Cycling'),
+    ('bike','Cycling'),
     ('bikeerg','Cycling'),
     ('dynamic','Rowing'),
     ('slides','Rowing'),
@@ -253,7 +253,7 @@ tpcollection = (
     ('water','rowing'),
     ('rower','rowing'),
     ('skierg','xc-ski'),
-    ('Bike','bike'),
+    ('bike','bike'),
     ('Bikeerg','bike'),
     ('dynamic','rowing'),
     ('slides','rowing'),
@@ -286,7 +286,7 @@ c2collection = (
     ('water','water'),
     ('rower','rower'),
     ('skierg','skierg'),
-    ('Bike','bike'),
+    ('bike','bike'),
     ('bikeerg','bike'),
     ('dynamic','dynamic'),
     ('slides','slides'),

rowers/tests/test_emails.py

@@ -427,7 +427,7 @@ workout bike
 
         self.assertEqual(len(ws),1)
         w = ws[0]
-        self.assertEqual(w.workouttype,'Bike')
+        self.assertEqual(w.workouttype,'bike')
 
 
 
@@ -575,7 +575,7 @@ race 1
         self.assertIn('Successfully processed email attachments',out.getvalue())
 
         ws = Workout.objects.filter(name="johnsworkout")
-                
+
         self.assertEqual(len(ws),1)
 
         w = ws[0]

rowers/utils.py

@@ -524,7 +524,6 @@ def get_strava_stream(r,metric,stravaid,series_type='time',fetchresolution='high
     if metric=='power': # pragma: no cover
         with open('data.txt', 'w') as outfile:
             json.dump(s.json(), outfile)
-            print('saved to file')
 
     for data in s.json():
         y = None