Merge branch 'develop' into feature/emailcommands

rowers/dataprep.py

@@ -22,7 +22,7 @@ from rowingdata import (
     TCXParser,RowProParser,ErgDataParser,TCXParserNoHR,
     CoxMateParser,
     BoatCoachParser,RowPerfectParser,BoatCoachAdvancedParser,
-    MysteryParser,
+    MysteryParser,BoatCoachOTWParser,
     painsledDesktopParser,speedcoachParser,ErgStickParser,
     SpeedCoach2Parser,FITParser,fitsummarydata,
     make_cumvalues,
@@ -742,6 +742,10 @@ def handle_nonpainsled(f2,fileformat,summary=''):
     if (fileformat == 'boatcoach'):
 	row = BoatCoachParser(f2)
 
+    # handle BoatCoach OTW
+    if (fileformat == 'boatcoachotw'):
+        row = BoatCoachOTWParser(f2)
+        
     # handle painsled desktop
     if (fileformat == 'painsleddesktop'):
 	row = painsledDesktopParser(f2)

rowers/dataprepnodjango.py

@@ -325,6 +325,10 @@ def handle_nonpainsled(f2,fileformat,summary=''):
     if (fileformat == 'bcmike'):
         row = BoatCoachAdvancedParser(f2)
             
+    # handle BoatCoach OTW
+    if (fileformat == 'boatcoachotw'):
+        row = BoatCoachOTWParser(f2)
+
     # handle BoatCoach
     if (fileformat == 'boatcoach'):
 	row = BoatCoachParser(f2)

rowers/interactiveplots.py

@@ -700,6 +700,8 @@ def leaflet_chart(lat,lon,name=""):
 
     df = df.replace(0,np.nan)
     df = df.loc[(df!=0).any(axis=1)]
+    df.fillna(method='bfill',axis=0,inplace=True)
+    df.fillna(method='ffill',axis=0,inplace=True)
     lat = df['lat']
     lon = df['lon']
     if lat.empty or lon.empty:

rowers/templates/developers.html

@@ -115,8 +115,10 @@
     
     <h6>Registering an app</h6>
 
-    <p>As a registered user, you can register an app.</p>
+
-    <ul><li><a href="/rowers/o/applications/">Self-service app link.</a></li></ul>
+    <p>We have disabled the self service app link for security reasons.
+      We will replace it with a secure self service app link soon. If you
+      need to register an app, please send email to info@rowsandall.com</p>
     
     <h6>Authentication</h6>
 

rowers/types.py

@@ -24,6 +24,7 @@ workoutsources = (
     ('rowperfect3','rowperfect3'),
     ('ergdata','ergdata'),
     ('boatcoach','boatcoach'),
+    ('boatcoachotw','boatcoachotw'),
     ('bcmike','boatcoach (develop)'),
     ('painsleddesktop','painsleddesktop'),
     ('speedcoach','speedcoach'),

rowers/urls.py

@@ -102,10 +102,14 @@ handler404 = 'views.error404_view'
 handler400 = 'views.error400_view'
 handler403 = 'views.error403_view'
 
+from oauth2_provider.views import base
+
 urlpatterns = [
 #    url(r'^password_change/$',auth_views.password_change),
 #    url(r'^password_change_done/$',auth_views.password_change_done),
-    url(r'^o/', include('oauth2_provider.urls', namespace='oauth2_provider')),
+#    url(r'^o/', include('oauth2_provider.urls', namespace='oauth2_provider')),
+    url(r'^o/authorize/$', base.AuthorizationView.as_view(), name="authorize"),
+    url(r'^o/token/$', base.TokenView.as_view(), name="token"),
     url(r'^', include(router.urls)),
     url(r'^api-docs$', views.schema_view),
     url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')),

rowsandall_app/settings.py

@@ -176,13 +176,13 @@ AUTH_PASSWORD_VALIDATORS = [
 # Internationalization
 # https://docs.djangoproject.com/en/1.9/topics/i18n/
 
-TIME_ZONE = 'UTC'
 
 USE_I18N = True
 
 USE_L10N = True
 
 USE_TZ = True
+TIME_ZONE = 'UTC'
 
 TZ_DETECT_COUNTRIES = ('US','DE','GB','CZ','FR','IT')