diff --git a/requirements.txt b/requirements.txt index 4ff5f68c..99a70b5b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -157,7 +157,7 @@ ratelim==0.1.6 redis==3.2.1 requests==2.21.0 requests-oauthlib==1.2.0 -rowingdata==2.4.4 +rowingdata==2.4.9 rowingphysics==0.5.0 rq==1.0 rq-dashboard==0.4.0 diff --git a/rowers/mytypes.py b/rowers/mytypes.py index 5c59f8f3..a2594185 100644 --- a/rowers/mytypes.py +++ b/rowers/mytypes.py @@ -46,6 +46,7 @@ stravamapping = collections.OrderedDict({ 'rower':'Rowing', 'skierg':'NordicSki', 'bike':'Ride', + 'bikeerg':'Ride', 'dynamic':'Rowing', 'slides':'Rowing', 'paddle':'StandUpPaddling', @@ -77,6 +78,7 @@ stmapping = collections.OrderedDict({ 'rower':'Rowing', 'skierg':'Skiing:Nordic', 'bike':'Cycling', + 'bikeerg':'Cycling', 'dynamic':'Rowing', 'slides':'Rowing', 'paddle':'Other:Paddling', @@ -109,6 +111,7 @@ rkmapping = collections.OrderedDict({ 'rower':'Rowing', 'skierg':'Cross-Country Skiing', 'bike':'Cycling', + 'bikeerg':'Cycling', 'dynamic':'Rowing', 'slides':'Rowing', 'paddle':'Other:Paddling', @@ -139,6 +142,7 @@ polarmapping = collections.OrderedDict({ 'rower':'Rowing', 'skierg':'Skiing', 'bike':'Cycling', + 'bikeerg':'Cycling', 'dynamic':'Rowing', 'slides':'Rowing', 'paddle':'Other Outdoor', @@ -169,6 +173,7 @@ tpmapping = collections.OrderedDict({ 'rower':'rowing', 'skierg':'xc-ski', 'bike':'bike', + 'bikeerg':'bike', 'dynamic':'rowing', 'slides':'rowing', 'paddle':'other', @@ -199,6 +204,7 @@ c2mapping = collections.OrderedDict({ 'rower':'rower', 'skierg':'skierg', 'bike':'bike', + 'bikeerg':'bike', 'dynamic':'dynamic', 'slides':'slides', 'paddle':'paddle', diff --git a/rowers/templates/monitorjobs.html b/rowers/templates/monitorjobs.html index 6cebfa20..dbf89a1e 100644 --- a/rowers/templates/monitorjobs.html +++ b/rowers/templates/monitorjobs.html @@ -24,7 +24,7 @@ }; previous = current; }); - setTimeout(checkJobs, 15000); + setTimeout(checkJobs, 5000); }()); diff --git a/rowers/templates/plannedsessionview.html b/rowers/templates/plannedsessionview.html index f5aa1c88..92fa1897 100644 --- a/rowers/templates/plannedsessionview.html +++ b/rowers/templates/plannedsessionview.html @@ -80,12 +80,9 @@