sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

passes checks in python3

Browse Source
This commit is contained in:
Sander Roosendaal
2019-02-24 15:57:26 +01:00
parent c7ec31344b
commit 866566172c
51 changed files with 4037 additions and 3999 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cvkbrno/models.py
+69 -69
View File
@@ -1,4 +1,4 @@
# -*- coding: utf-8 -*- # -*- Coding: utf-8 -*-
from __future__ import unicode_literals from __future__ import unicode_literals
from django.db import models from django.db import models
@@ -18,86 +18,86 @@ class BoatCategory(models.Model):
club = models.CharField(_("Club"),max_length=30) club = models.CharField(_("Club"),max_length=30)
class Meta: class Meta:
verbose_name = _("boat category") verbose_name = _("boat category")
verbose_name_plural = _("boat categories") verbose_name_plural = _("boat categories")
ordering = ['name'] ordering = ['name']
def __str__(self): def __str__(self):
str = self.name str = self.name
return str return str
def __unicode__(self): def __unicode__(self):
str = self.name str = self.name
return str return str
class Member(models.Model): class Member(models.Model):
statuses = ( statuses = (
("coach", _("coach")), ("coach", _("coach")),
("member", _("member")), ("member", _("member")),
("administrator", _("administrator")), ("administrator", _("administrator")),
) )
class Meta: class Meta:
verbose_name = _("member") verbose_name = _("member")
verbose_name_plural = _("members") verbose_name_plural = _("members")
ordering = ['user'] ordering = ['user']
user = models.OneToOneField(User) user = models.OneToOneField(User,on_delete=models.CASCADE)
contributions = models.BooleanField(default=True) contributions = models.BooleanField(default=True)
status = models.CharField(default="member", status = models.CharField(default="member",
choices=statuses, choices=statuses,
max_length=30) max_length=30)
categories = models.ManyToManyField(BoatCategory, categories = models.ManyToManyField(BoatCategory,
verbose_name=_("Boat Categories")) verbose_name=_("Boat Categories"))
club = models.CharField(_("Club"),max_length=30) club = models.CharField(_("Club"),max_length=30)
hoursworked = models.FloatField(_("Hours Worked")) hoursworked = models.FloatField(_("Hours Worked"))
def __str__(self): def __str__(self):
str = self.user.first_name+' '+self.user.last_name str = self.user.first_name+' '+self.user.last_name
return str return str
def __unicode__(self): def __unicode__(self):
str = self.user.first_name+' '+self.user.last_name str = self.user.first_name+' '+self.user.last_name
return str return str
class Boat(models.Model): class Boat(models.Model):
class Meta: class Meta:
verbose_name = _("boat") verbose_name = _("boat")
verbose_name_plural = _("boats") verbose_name_plural = _("boats")
ordering = ['boatcode'] ordering = ['boatcode']
boatname = models.CharField(_("Boat Name"),max_length=30) boatname = models.CharField(_("Boat Name"),max_length=30)
boatcode = models.CharField(_("Boat Code"),max_length=10) boatcode = models.CharField(_("Boat Code"),max_length=10)
categories = models.ManyToManyField(BoatCategory) categories = models.ManyToManyField(BoatCategory)
nrseats = models.IntegerField(_("Nr of Seats")) nrseats = models.IntegerField(_("Nr of Seats"))
statuses = ( statuses = (
("water",_("water")), ("water",_("water")),
("hangar",_("hangar")), ("hangar",_("hangar")),
("damaged",_("damaged")), ("damaged",_("damaged")),
("races",_("races")), ("races",_("races")),
) )
status = models.CharField(default="hangar", status = models.CharField(default="hangar",
choices=statuses, choices=statuses,
max_length=30) max_length=30)
comment = models.CharField(_("Comment"),blank=True,max_length=100) comment = models.CharField(_("Comment"),blank=True,max_length=100)
def __str__(self): def __str__(self):
str = self.boatcode+' '+self.boatname str = self.boatcode+' '+self.boatname
return str return str
def __unicode__(self): def __unicode__(self):
str = self.boatcode+' '+self.boatname str = self.boatcode+' '+self.boatname
return str return str
class MemberWork(models.Model): class MemberWork(models.Model):
class Meta: class Meta:
verbose_name = _("member work") verbose_name = _("member work")
verbose_name_plural = _("member work") verbose_name_plural = _("member work")
date = models.DateField(_("Date")) date = models.DateField(_("Date"))
hours = models.FloatField(_("Hours")) hours = models.FloatField(_("Hours"))
@@ -105,16 +105,16 @@ class MemberWork(models.Model):
comment = models.CharField(_("Comment"),blank=True,max_length=100) comment = models.CharField(_("Comment"),blank=True,max_length=100)
worker = models.ManyToManyField(Member,_("Worker")) worker = models.ManyToManyField(Member,_("Worker"))
statuses = ( statuses = (
("planned",_("planned")), ("planned",_("planned")),
("executed",_("executed")) ("executed",_("executed"))
) )
status = models.CharField(default="planned", status = models.CharField(default="planned",
choices=statuses, choices=statuses,
max_length=30) max_length=30)
class Races(models.Model): class Races(models.Model):
class Meta: class Meta:
verbose_name = _("race") verbose_name = _("race")
verbose_name_plural = _("races") verbose_name_plural = _("races")
name = models.CharField(max_length = 30) name = models.CharField(max_length = 30)
@@ -124,20 +124,20 @@ class Races(models.Model):
transportboats = models.ManyToManyField(Boat) transportboats = models.ManyToManyField(Boat)
def __str__(self): def __str__(self):
str = self.name str = self.name
str = str+' '+self.startdatetime.strftime('%Y-%m-%d %H:%M:%S') str = str+' '+self.startdatetime.strftime('%Y-%m-%d %H:%M:%S')
return str return str
def __unicode__(self): def __unicode__(self):
str = self.name str = self.name
str = str+' '+self.startdatetime.strftime('%Y-%m-%d %H:%M:%S') str = str+' '+self.startdatetime.strftime('%Y-%m-%d %H:%M:%S')
return str return str
class Outing(models.Model): class Outing(models.Model):
class Meta: class Meta:
verbose_name = _("outing") verbose_name = _("outing")
verbose_name_plural = _("outings") verbose_name_plural = _("outings")
starttime = models.DateTimeField(verbose_name = _("Start Time"),default=timezone.now) starttime = models.DateTimeField(verbose_name = _("Start Time"),default=timezone.now)
@@ -145,27 +145,27 @@ class Outing(models.Model):
distance = models.FloatField(_("Distance (km)"),default=12) distance = models.FloatField(_("Distance (km)"),default=12)
comment = models.CharField(_("Comment"),blank=True,max_length=100) comment = models.CharField(_("Comment"),blank=True,max_length=100)
statuses = ( statuses = (
("reservation",_("reservation")), ("reservation",_("reservation")),
("active", _("active")), ("active", _("active")),
("completed", _("completed")), ("completed", _("completed")),
("race", _("race")), ("race", _("race")),
) )
boat = models.ForeignKey(Boat) boat = models.ForeignKey(Boat,on_delete=models.CASCADE)
rower = models.ForeignKey(Member) rower = models.ForeignKey(Member,on_delete=models.CASCADE)
race = models.ManyToManyField(Races,blank=True) race = models.ManyToManyField(Races,blank=True)
otherrowers = models.ManyToManyField(Member,related_name="otherrowers") otherrowers = models.ManyToManyField(Member,related_name="otherrowers")
status = models.CharField(_("Status"),default="active", status = models.CharField(_("Status"),default="active",
choices=statuses, choices=statuses,
max_length=30) max_length=30)
def __str__(self): def __str__(self):
str = self.boat.boatcode str = self.boat.boatcode
str = str+' '+self.starttime.strftime('%Y-%m-%d %H:%M:%S') str = str+' '+self.starttime.strftime('%Y-%m-%d %H:%M:%S')
return str return str
def __unicode__(self): def __unicode__(self):
str = self.boat.boatcode str = self.boat.boatcode
str = str+' '+self.starttime.strftime('%Y-%m-%d %H:%M:%S') str = str+' '+self.starttime.strftime('%Y-%m-%d %H:%M:%S')
return str return str
cvkbrno/tasks.py
+1 -1
View File
@@ -1,4 +1,4 @@
from celery import Celery,app from .celery import Celery,app
import os import os
import time import time
import gc import gc
rowers/__init__.py
+3 -3
View File
@@ -1,5 +1,5 @@
from __future__ import absolute_import from __future__ import absolute_import, unicode_literals
from .tasks import app as celery_app
from rowers.celery import app as celery_app
__all__ = ('celery_app',)
rowers/c2stuff.py
+160 -159
View File
@@ -1,3 +1,4 @@
from __future__ import unicode_literals, absolute_import
# The interactions with the Concept2 logbook API # The interactions with the Concept2 logbook API
# All C2 related functions should be defined here # All C2 related functions should be defined here
# (There is still some stuff defined directly in views.py. Need to # (There is still some stuff defined directly in views.py. Need to
@@ -6,7 +7,7 @@
from rowers.imports import * from rowers.imports import *
import datetime import datetime
from requests import Request, Session from requests import Request, Session
import mytypes import rowers.mytypes as mytypes
from rowers.mytypes import otwtypes from rowers.mytypes import otwtypes
from iso8601 import ParseError from iso8601 import ParseError
@@ -19,7 +20,7 @@ import django_rq
queue = django_rq.get_queue('default') queue = django_rq.get_queue('default')
queuelow = django_rq.get_queue('low') queuelow = django_rq.get_queue('low')
queuehigh = django_rq.get_queue('low') queuehigh = django_rq.get_queue('low')
from utils import myqueue from rowers.utils import myqueue
oauth_data = { oauth_data = {
'client_id': C2_CLIENT_ID, 'client_id': C2_CLIENT_ID,
@@ -41,19 +42,19 @@ oauth_data = {
def c2_open(user): def c2_open(user):
r = Rower.objects.get(user=user) r = Rower.objects.get(user=user)
if (r.c2token == '') or (r.c2token is None): if (r.c2token == '') or (r.c2token is None):
s = "Token doesn't exist. Need to authorize" s = "Token doesn't exist. Need to authorize"
raise NoTokenError("User has no token") raise NoTokenError("User has no token")
else: else:
if (timezone.now()>r.tokenexpirydate): if (timezone.now()>r.tokenexpirydate):
res = rower_c2_token_refresh(user) res = rower_c2_token_refresh(user)
if res == None: if res == None:
raise NoTokenError("User has no token") raise NoTokenError("User has no token")
if res[0] != None: if res[0] != None:
thetoken = res[0] thetoken = res[0]
else: else:
raise NoTokenError("User has no token") raise NoTokenError("User has no token")
else: else:
thetoken = r.c2token thetoken = r.c2token
return thetoken return thetoken
@@ -61,11 +62,11 @@ def add_stroke_data(user,c2id,workoutid,startdatetime,csvfilename,
workouttype='rower'): workouttype='rower'):
r = Rower.objects.get(user=user) r = Rower.objects.get(user=user)
if (r.c2token == '') or (r.c2token is None): if (r.c2token == '') or (r.c2token is None):
return custom_exception_handler(401,s) return custom_exception_handler(401,s)
s = "Token doesn't exist. Need to authorize" s = "Token doesn't exist. Need to authorize"
elif (timezone.now()>r.tokenexpirydate): elif (timezone.now()>r.tokenexpirydate):
s = "Token expired. Needs to refresh." s = "Token expired. Needs to refresh."
return custom_exception_handler(401,s) return custom_exception_handler(401,s)
else: else:
starttimeunix = arrow.get(startdatetime).timestamp starttimeunix = arrow.get(startdatetime).timestamp
@@ -179,9 +180,9 @@ def makeseconds(t):
# convert our weight class code to Concept2 weight class code # convert our weight class code to Concept2 weight class code
def c2wc(weightclass): def c2wc(weightclass):
if (weightclass=="lwt"): if (weightclass=="lwt"):
res = "L" res = "L"
else: else:
res = "H" res = "H"
return res return res
@@ -343,17 +344,17 @@ def createc2workoutdata_as_splits(w):
hr = df[' HRCur (bpm)'].astype(int) hr = df[' HRCur (bpm)'].astype(int)
split_data = [] split_data = []
for i in range(len(t)): for i in range(len(t)):
thisrecord = {"time":t[i],"distance":d[i],"stroke_rate":spm[i], thisrecord = {"time":t[i],"distance":d[i],"stroke_rate":spm[i],
"heart_rate":{ "heart_rate":{
"average:":hr[i] "average:":hr[i]
} }
} }
split_data.append(thisrecord) split_data.append(thisrecord)
try: try:
durationstr = datetime.datetime.strptime(str(w.duration),"%H:%M:%S.%f") durationstr = datetime.datetime.strptime(str(w.duration),"%H:%M:%S.%f")
except ValueError: except ValueError:
durationstr = datetime.datetime.strptime(str(w.duration),"%H:%M:%S") durationstr = datetime.datetime.strptime(str(w.duration),"%H:%M:%S")
try: try:
newnotes = w.notes+'\n from '+w.workoutsource+' via rowsandall.com' newnotes = w.notes+'\n from '+w.workoutsource+' via rowsandall.com'
@@ -365,19 +366,19 @@ def createc2workoutdata_as_splits(w):
wtype = 'water' wtype = 'water'
data = { data = {
"type": wtype, "type": wtype,
"date": w.startdatetime.isoformat(), "date": w.startdatetime.isoformat(),
"distance": int(w.distance), "distance": int(w.distance),
"time": int(10*makeseconds(durationstr)), "time": int(10*makeseconds(durationstr)),
"timezone": w.timezone, "timezone": w.timezone,
"weight_class": c2wc(w.weightcategory), "weight_class": c2wc(w.weightcategory),
"comments": newnotes, "comments": newnotes,
"heart_rate": { "heart_rate": {
"average": averagehr, "average": averagehr,
"max": maxhr, "max": maxhr,
}, },
"splits": split_data, "splits": split_data,
} }
return data return data
@@ -418,13 +419,13 @@ def createc2workoutdata(w):
hr = 0*d hr = 0*d
stroke_data = [] stroke_data = []
for i in range(len(t)): for i in range(len(t)):
thisrecord = {"t":t[i],"d":d[i],"p":p[i],"spm":spm[i],"hr":hr[i]} thisrecord = {"t":t[i],"d":d[i],"p":p[i],"spm":spm[i],"hr":hr[i]}
stroke_data.append(thisrecord) stroke_data.append(thisrecord)
try: try:
durationstr = datetime.datetime.strptime(str(w.duration),"%H:%M:%S.%f") durationstr = datetime.datetime.strptime(str(w.duration),"%H:%M:%S.%f")
except ValueError: except ValueError:
durationstr = datetime.datetime.strptime(str(w.duration),"%H:%M:%S") durationstr = datetime.datetime.strptime(str(w.duration),"%H:%M:%S")
workouttype = w.workouttype workouttype = w.workouttype
if workouttype in otwtypes: if workouttype in otwtypes:
@@ -436,19 +437,19 @@ def createc2workoutdata(w):
startdate = datetime.datetime.combine(w.date,datetime.time()) startdate = datetime.datetime.combine(w.date,datetime.time())
data = { data = {
"type": mytypes.c2mapping[workouttype], "type": mytypes.c2mapping[workouttype],
"date": w.startdatetime.isoformat(), "date": w.startdatetime.isoformat(),
"timezone": w.timezone, "timezone": w.timezone,
"distance": int(w.distance), "distance": int(w.distance),
"time": int(10*makeseconds(durationstr)), "time": int(10*makeseconds(durationstr)),
"weight_class": c2wc(w.weightcategory), "weight_class": c2wc(w.weightcategory),
"comments": w.notes, "comments": w.notes,
"heart_rate": { "heart_rate": {
"average": averagehr, "average": averagehr,
"max": maxhr, "max": maxhr,
}, },
"stroke_data": stroke_data, "stroke_data": stroke_data,
} }
return data return data
@@ -458,10 +459,10 @@ def do_refresh_token(refreshtoken):
scope = "results:write,user:read" scope = "results:write,user:read"
client_auth = requests.auth.HTTPBasicAuth(C2_CLIENT_ID, C2_CLIENT_SECRET) client_auth = requests.auth.HTTPBasicAuth(C2_CLIENT_ID, C2_CLIENT_SECRET)
post_data = {"grant_type": "refresh_token", post_data = {"grant_type": "refresh_token",
"client_secret": C2_CLIENT_SECRET, "client_secret": C2_CLIENT_SECRET,
"client_id":C2_CLIENT_ID, "client_id":C2_CLIENT_ID,
"refresh_token": refreshtoken, "refresh_token": refreshtoken,
} }
headers = {'user-agent': 'sanderroosendaal'} headers = {'user-agent': 'sanderroosendaal'}
url = "https://log.concept2.com/oauth/access_token" url = "https://log.concept2.com/oauth/access_token"
s = Session() s = Session()
@@ -498,9 +499,9 @@ def get_token(code):
post_data = {"grant_type": "authorization_code", post_data = {"grant_type": "authorization_code",
"code": code, "code": code,
"redirect_uri": C2_REDIRECT_URI, "redirect_uri": C2_REDIRECT_URI,
"client_secret": C2_CLIENT_SECRET, "client_secret": C2_CLIENT_SECRET,
"client_id":C2_CLIENT_ID, "client_id":C2_CLIENT_ID,
} }
headers = {'user-agent': 'sanderroosendaal'} headers = {'user-agent': 'sanderroosendaal'}
url = "https://log.concept2.com/oauth/access_token" url = "https://log.concept2.com/oauth/access_token"
s = Session() s = Session()
@@ -554,19 +555,19 @@ def make_authorization_url(request):
def get_workout(user,c2id): def get_workout(user,c2id):
r = Rower.objects.get(user=user) r = Rower.objects.get(user=user)
if (r.c2token == '') or (r.c2token is None): if (r.c2token == '') or (r.c2token is None):
s = "Token doesn't exist. Need to authorize" s = "Token doesn't exist. Need to authorize"
return custom_exception_handler(401,s) ,0 return custom_exception_handler(401,s) ,0
elif (timezone.now()>r.tokenexpirydate): elif (timezone.now()>r.tokenexpirydate):
s = "Token expired. Needs to refresh." s = "Token expired. Needs to refresh."
return custom_exception_handler(401,s),0 return custom_exception_handler(401,s),0
else: else:
# ready to fetch. Hurray # ready to fetch. Hurray
authorizationstring = str('Bearer ' + r.c2token) authorizationstring = str('Bearer ' + r.c2token)
headers = {'Authorization': authorizationstring, headers = {'Authorization': authorizationstring,
'user-agent': 'sanderroosendaal', 'user-agent': 'sanderroosendaal',
'Content-Type': 'application/json'} 'Content-Type': 'application/json'}
url = "https://log.concept2.com/api/users/me/results/"+str(c2id) url = "https://log.concept2.com/api/users/me/results/"+str(c2id)
s = requests.get(url,headers=headers) s = requests.get(url,headers=headers)
data = s.json()['data'] data = s.json()['data']
@@ -583,9 +584,9 @@ def get_workout(user,c2id):
# Check if workout has stroke data, and get the stroke data # Check if workout has stroke data, and get the stroke data
if data['stroke_data']: if data['stroke_data']:
res2 = get_c2_workout_strokes(user,c2id) res2 = get_c2_workout_strokes(user,c2id)
if res2.status_code == 200: if res2.status_code == 200:
strokedata = pd.DataFrame.from_dict(res2.json()['data']) strokedata = pd.DataFrame.from_dict(res2.json()['data'])
else: else:
strokedata = pd.DataFrame() strokedata = pd.DataFrame()
else: else:
@@ -597,19 +598,19 @@ def get_workout(user,c2id):
def get_c2_workout_strokes(user,c2id): def get_c2_workout_strokes(user,c2id):
r = Rower.objects.get(user=user) r = Rower.objects.get(user=user)
if (r.c2token == '') or (r.c2token is None): if (r.c2token == '') or (r.c2token is None):
return custom_exception_handler(401,s) return custom_exception_handler(401,s)
s = "Token doesn't exist. Need to authorize" s = "Token doesn't exist. Need to authorize"
elif (timezone.now()>r.tokenexpirydate): elif (timezone.now()>r.tokenexpirydate):
s = "Token expired. Needs to refresh." s = "Token expired. Needs to refresh."
return custom_exception_handler(401,s) return custom_exception_handler(401,s)
else: else:
# ready to fetch. Hurray # ready to fetch. Hurray
authorizationstring = str('Bearer ' + r.c2token) authorizationstring = str('Bearer ' + r.c2token)
headers = {'Authorization': authorizationstring, headers = {'Authorization': authorizationstring,
'user-agent': 'sanderroosendaal', 'user-agent': 'sanderroosendaal',
'Content-Type': 'application/json'} 'Content-Type': 'application/json'}
url = "https://log.concept2.com/api/users/me/results/"+str(c2id)+"/strokes" url = "https://log.concept2.com/api/users/me/results/"+str(c2id)+"/strokes"
s = requests.get(url,headers=headers) s = requests.get(url,headers=headers)
return s return s
@@ -618,21 +619,21 @@ def get_c2_workout_strokes(user,c2id):
def get_c2_workout_list(user,page=1): def get_c2_workout_list(user,page=1):
r = Rower.objects.get(user=user) r = Rower.objects.get(user=user)
if (r.c2token == '') or (r.c2token is None): if (r.c2token == '') or (r.c2token is None):
s = "Token doesn't exist. Need to authorize" s = "Token doesn't exist. Need to authorize"
return custom_exception_handler(401,s) return custom_exception_handler(401,s)
elif (timezone.now()>r.tokenexpirydate): elif (timezone.now()>r.tokenexpirydate):
s = "Token expired. Needs to refresh." s = "Token expired. Needs to refresh."
return custom_exception_handler(401,s) return custom_exception_handler(401,s)
else: else:
# ready to fetch. Hurray # ready to fetch. Hurray
authorizationstring = str('Bearer ' + r.c2token) authorizationstring = str('Bearer ' + r.c2token)
headers = {'Authorization': authorizationstring, headers = {'Authorization': authorizationstring,
'user-agent': 'sanderroosendaal', 'user-agent': 'sanderroosendaal',
'Content-Type': 'application/json'} 'Content-Type': 'application/json'}
url = "https://log.concept2.com/api/users/me/results" url = "https://log.concept2.com/api/users/me/results"
url += "?page={page}".format(page=page) url += "?page={page}".format(page=page)
s = requests.get(url,headers=headers) s = requests.get(url,headers=headers)
return s return s
@@ -642,8 +643,8 @@ def get_c2_workout_list(user,page=1):
def get_username(access_token): def get_username(access_token):
authorizationstring = str('Bearer ' + access_token) authorizationstring = str('Bearer ' + access_token)
headers = {'Authorization': authorizationstring, headers = {'Authorization': authorizationstring,
'user-agent': 'sanderroosendaal', 'user-agent': 'sanderroosendaal',
'Content-Type': 'application/json'} 'Content-Type': 'application/json'}
import urllib import urllib
url = "https://log.concept2.com/api/users/me" url = "https://log.concept2.com/api/users/me"
response = requests.get(url,headers=headers) response = requests.get(url,headers=headers)
@@ -664,8 +665,8 @@ def get_username(access_token):
def get_userid(access_token): def get_userid(access_token):
authorizationstring = str('Bearer ' + access_token) authorizationstring = str('Bearer ' + access_token)
headers = {'Authorization': authorizationstring, headers = {'Authorization': authorizationstring,
'user-agent': 'sanderroosendaal', 'user-agent': 'sanderroosendaal',
'Content-Type': 'application/json'} 'Content-Type': 'application/json'}
import urllib import urllib
url = "https://log.concept2.com/api/users/me" url = "https://log.concept2.com/api/users/me"
response = requests.get(url,headers=headers) response = requests.get(url,headers=headers)
@@ -706,40 +707,40 @@ def workout_c2_upload(user,w):
# ready to upload. Hurray # ready to upload. Hurray
if (checkworkoutuser(user,w)): if (checkworkoutuser(user,w)):
c2userid = get_userid(r.c2token) c2userid = get_userid(r.c2token)
if not c2userid: if not c2userid:
raise NoTokenError raise NoTokenError
data = createc2workoutdata(w) data = createc2workoutdata(w)
if data == 0: if data == 0:
return "Error: No data file. Contact info@rowsandall.com if the problem persists",0 return "Error: No data file. Contact info@rowsandall.com if the problem persists",0
authorizationstring = str('Bearer ' + r.c2token) authorizationstring = str('Bearer ' + r.c2token)
headers = {'Authorization': authorizationstring, headers = {'Authorization': authorizationstring,
'user-agent': 'sanderroosendaal', 'user-agent': 'sanderroosendaal',
'Content-Type': 'application/json'} 'Content-Type': 'application/json'}
import urllib import urllib
url = "https://log.concept2.com/api/users/%s/results" % (c2userid) url = "https://log.concept2.com/api/users/%s/results" % (c2userid)
response = requests.post(url,headers=headers,data=json.dumps(data)) response = requests.post(url,headers=headers,data=json.dumps(data))
if (response.status_code == 409 ): if (response.status_code == 409 ):
message = "Concept2 Duplicate error" message = "Concept2 Duplicate error"
w.uploadedtoc2 = -1 w.uploadedtoc2 = -1
c2id = -1 c2id = -1
w.save() w.save()
elif (response.status_code == 201 or response.status_code == 200): elif (response.status_code == 201 or response.status_code == 200):
try: try:
# s= json.loads(response.text) # s= json.loads(response.text)
s = response.json() s = response.json()
c2id = s['data']['id'] c2id = s['data']['id']
w.uploadedtoc2 = c2id w.uploadedtoc2 = c2id
w.save() w.save()
message = "Upload to Concept2 was successful" message = "Upload to Concept2 was successful"
except: except:
message = "Something went wrong in workout_c2_upload_view. Response code 200/201 but C2 sync failed: "+response.text message = "Something went wrong in workout_c2_upload_view. Response code 200/201 but C2 sync failed: "+response.text
c2id = 0 c2id = 0
else: else:
message = "Something went wrong in workout_c2_upload_view. Response code 200/201 but C2 sync failed: "+response.text message = "Something went wrong in workout_c2_upload_view. Response code 200/201 but C2 sync failed: "+response.text
c2id = 0 c2id = 0
@@ -776,41 +777,41 @@ def add_workout_from_data(user,importid,data,strokedata,
workouttype = 'rower' workouttype = 'rower'
if workouttype not in [x[0] for x in Workout.workouttypes]: if workouttype not in [x[0] for x in Workout.workouttypes]:
workouttype = 'other' workouttype = 'other'
try: try:
comments = data['comments'] comments = data['comments']
except: except:
comments = ' ' comments = ' '
try: try:
thetimezone = tz(data['timezone']) thetimezone = tz(data['timezone'])
except: except:
thetimezone = 'UTC' thetimezone = 'UTC'
r = Rower.objects.get(user=user) r = Rower.objects.get(user=user)
try: try:
rowdatetime = iso8601.parse_date(data['date_utc']) rowdatetime = iso8601.parse_date(data['date_utc'])
except KeyError: except KeyError:
rowdatetime = iso8601.parse_date(data['start_date']) rowdatetime = iso8601.parse_date(data['start_date'])
except ParseError: except ParseError:
rowdatetime = iso8601.parse_date(data['date']) rowdatetime = iso8601.parse_date(data['date'])
try: try:
c2intervaltype = data['workout_type'] c2intervaltype = data['workout_type']
except KeyError: except KeyError:
c2intervaltype = '' c2intervaltype = ''
try: try:
title = data['name'] title = data['name']
except KeyError: except KeyError:
title = "" title = ""
try: try:
t = data['comments'].split('\n', 1)[0] t = data['comments'].split('\n', 1)[0]
title += t[:20] title += t[:20]
except: except:
title = 'Imported' title = 'Imported'
starttimeunix = arrow.get(rowdatetime).timestamp starttimeunix = arrow.get(rowdatetime).timestamp
@@ -825,17 +826,17 @@ def add_workout_from_data(user,importid,data,strokedata,
nr_rows = len(unixtime) nr_rows = len(unixtime)
try: try:
latcoord = strokedata.loc[:,'lat'] latcoord = strokedata.loc[:,'lat']
loncoord = strokedata.loc[:,'lon'] loncoord = strokedata.loc[:,'lon']
except: except:
latcoord = np.zeros(nr_rows) latcoord = np.zeros(nr_rows)
loncoord = np.zeros(nr_rows) loncoord = np.zeros(nr_rows)
try: try:
strokelength = strokedata.loc[:,'strokelength'] strokelength = strokedata.loc[:,'strokelength']
except: except:
strokelength = np.zeros(nr_rows) strokelength = np.zeros(nr_rows)
dist2 = 0.1*strokedata.loc[:,'d'] dist2 = 0.1*strokedata.loc[:,'d']
@@ -862,27 +863,27 @@ def add_workout_from_data(user,importid,data,strokedata,
# save csv # save csv
# Create data frame with all necessary data to write to csv # Create data frame with all necessary data to write to csv
df = pd.DataFrame({'TimeStamp (sec)':unixtime, df = pd.DataFrame({'TimeStamp (sec)':unixtime,
' Horizontal (meters)': dist2, ' Horizontal (meters)': dist2,
' Cadence (stokes/min)':spm, ' Cadence (stokes/min)':spm,
' HRCur (bpm)':hr, ' HRCur (bpm)':hr,
' longitude':loncoord, ' longitude':loncoord,
' latitude':latcoord, ' latitude':latcoord,
' Stroke500mPace (sec/500m)':pace, ' Stroke500mPace (sec/500m)':pace,
' Power (watts)':power, ' Power (watts)':power,
' DragFactor':np.zeros(nr_rows), ' DragFactor':np.zeros(nr_rows),
' DriveLength (meters)':np.zeros(nr_rows), ' DriveLength (meters)':np.zeros(nr_rows),
' StrokeDistance (meters)':strokelength, ' StrokeDistance (meters)':strokelength,
' DriveTime (ms)':np.zeros(nr_rows), ' DriveTime (ms)':np.zeros(nr_rows),
' StrokeRecoveryTime (ms)':np.zeros(nr_rows), ' StrokeRecoveryTime (ms)':np.zeros(nr_rows),
' AverageDriveForce (lbs)':np.zeros(nr_rows), ' AverageDriveForce (lbs)':np.zeros(nr_rows),
' PeakDriveForce (lbs)':np.zeros(nr_rows), ' PeakDriveForce (lbs)':np.zeros(nr_rows),
' lapIdx':lapidx, ' lapIdx':lapidx,
' ElapsedTime (sec)':seconds ' ElapsedTime (sec)':seconds
}) })
df.sort_values(by='TimeStamp (sec)',ascending=True) df.sort_values(by='TimeStamp (sec)',ascending=True)
timestr = strftime("%Y%m%d-%H%M%S") timestr = strftime("%Y%m%d-%H%M%S")
rowers/courses.py
+3 -2
View File
@@ -1,3 +1,4 @@
from __future__ import unicode_literals, absolute_import
# All the Courses related methods # All the Courses related methods
# Python # Python
@@ -28,7 +29,7 @@ import pandas as pd
import numpy as np import numpy as np
from timezonefinder import TimezoneFinder from timezonefinder import TimezoneFinder
import dataprep import rowers.dataprep as dataprep
from rowers.utils import geo_distance from rowers.utils import geo_distance
ns = {'opengis': 'http://www.opengis.net/kml/2.2'} ns = {'opengis': 'http://www.opengis.net/kml/2.2'}
@@ -47,7 +48,7 @@ from rowers.models import (
polygon_to_path,coordinate_in_path polygon_to_path,coordinate_in_path
) )
from utils import geo_distance
from rowers.courseutils import coursetime_paths, coursetime_first,time_in_path from rowers.courseutils import coursetime_paths, coursetime_first,time_in_path
rowers/courseutils.py
+2 -2
View File
@@ -5,10 +5,10 @@ def coordinate_in_path(latitude,longitude, p):
class InvalidTrajectoryError(Exception): class InvalidTrajectoryError(Exception):
def __init__(self,value): def __init__(self,value):
self.value=value self.value=value
def __str__(self): def __str__(self):
return repr(self.value) return repr(self.value)
def time_in_path(df,p,maxmin='max',getall=False): def time_in_path(df,p,maxmin='max',getall=False):
rowers/dataprep.py
+15 -14
View File
@@ -1,5 +1,6 @@
# All the data preparation, data cleaning and data mangling should # All the data preparation, data cleaning and data mangling should
# be defined here # be defined here
from __future__ import unicode_literals, absolute_import
from rowers.models import Workout, StrokeData,Team from rowers.models import Workout, StrokeData,Team
import pytz import pytz
@@ -55,7 +56,7 @@ import pandas as pd
import numpy as np import numpy as np
import itertools import itertools
import math import math
from tasks import ( from rowers.tasks import (
handle_sendemail_unrecognized, handle_sendemail_breakthrough, handle_sendemail_unrecognized, handle_sendemail_breakthrough,
handle_sendemail_hard, handle_updatecp,handle_updateergcp, handle_sendemail_hard, handle_updatecp,handle_updateergcp,
handle_calctrimp, handle_calctrimp,
@@ -65,9 +66,9 @@ from django.conf import settings
from sqlalchemy import create_engine from sqlalchemy import create_engine
import sqlalchemy as sa import sqlalchemy as sa
import sys import sys
import utils import rowers.utils as utils
import datautils import rowers.datautils as datautils
from utils import lbstoN,myqueue,is_ranking_piece,wavg from rowers.utils import lbstoN,myqueue,is_ranking_piece,wavg
from timezonefinder import TimezoneFinder from timezonefinder import TimezoneFinder
@@ -638,7 +639,7 @@ def deletecpdata_sql(rower_id,table='cpdata'):
try: try:
result = conn.execute(query) result = conn.execute(query)
except: except:
print "Database locked" print("Database locked")
conn.close() conn.close()
engine.dispose() engine.dispose()
@@ -855,7 +856,7 @@ def create_row_df(r,distance,duration,startdatetime,workouttype='rower',
return (id, message) return (id, message)
from utils import totaltime_sec_to_string from rowers.utils import totaltime_sec_to_string
# Processes painsled CSV file to database # Processes painsled CSV file to database
def save_workout_database(f2, r, dosmooth=True, workouttype='rower', def save_workout_database(f2, r, dosmooth=True, workouttype='rower',
@@ -1564,7 +1565,7 @@ def compare_data(id):
res = conn.execute(query) res = conn.execute(query)
l2 = res.fetchall()[0][0] l2 = res.fetchall()[0][0]
except: except:
print "Database Locked" print("Database Locked")
conn.close() conn.close()
engine.dispose() engine.dispose()
lfile = l1 lfile = l1
@@ -1583,13 +1584,13 @@ def repair_data(verbose=False):
test, ldb, lfile = compare_data(w.id) test, ldb, lfile = compare_data(w.id)
if not test: if not test:
if verbose: if verbose:
print w.id, lfile, ldb print(w.id, lfile, ldb)
try: try:
rowdata = rdata(w.csvfilename) rowdata = rdata(w.csvfilename)
if rowdata and len(rowdata.df): if rowdata and len(rowdata.df):
update_strokedata(w.id, rowdata.df) update_strokedata(w.id, rowdata.df)
except IOError, AttributeError: except (IOError, AttributeError):
pass pass
if lfile == 0: if lfile == 0:
@@ -1618,10 +1619,10 @@ def repair_data(verbose=False):
def rdata(file, rower=rrower()): def rdata(file, rower=rrower()):
try: try:
res = rrdata(csvfile=file, rower=rower) res = rrdata(csvfile=file, rower=rower)
except IOError, IndexError: except (IOError, IndexError):
try: try:
res = rrdata(csvfile=file + '.gz', rower=rower) res = rrdata(csvfile=file + '.gz', rower=rower)
except IOError, IndexError: except (IOError, IndexError):
res = rrdata() res = rrdata()
except: except:
res = rrdata() res = rrdata()
@@ -1640,7 +1641,7 @@ def delete_strokedata(id):
try: try:
result = conn.execute(query) result = conn.execute(query)
except: except:
print "Database Locked" print("Database Locked")
conn.close() conn.close()
engine.dispose() engine.dispose()
@@ -1792,7 +1793,7 @@ def prepmultipledata(ids, verbose=False):
for id in res: for id in res:
rowdata, row = getrowdata(id=id) rowdata, row = getrowdata(id=id)
if verbose: if verbose:
print id print(id)
if rowdata and len(rowdata.df): if rowdata and len(rowdata.df):
data = dataprep(rowdata.df, id=id, bands=True, data = dataprep(rowdata.df, id=id, bands=True,
barchart=True, otwpower=True) barchart=True, otwpower=True)
@@ -2029,7 +2030,7 @@ def fix_newtons(id=0, limit=3000):
peakforce = rowdata['peakforce'] peakforce = rowdata['peakforce']
if peakforce.mean() > limit: if peakforce.mean() > limit:
w = Workout.objects.get(id=id) w = Workout.objects.get(id=id)
print "fixing ", id print("fixing ", id)
rowdata = rdata(w.csvfilename) rowdata = rdata(w.csvfilename)
if rowdata and len(rowdata.df): if rowdata and len(rowdata.df):
update_strokedata(w.id, rowdata.df) update_strokedata(w.id, rowdata.df)
rowers/dataprepnodjango.py
+146 -146
View File
@@ -18,7 +18,7 @@ import sqlalchemy as sa
from rowsandall_app.settings import DATABASES from rowsandall_app.settings import DATABASES
from rowsandall_app.settings_dev import DATABASES as DEV_DATABASES from rowsandall_app.settings_dev import DATABASES as DEV_DATABASES
from utils import lbstoN from rowers.utils import lbstoN
try: try:
@@ -83,33 +83,33 @@ import datetime
def niceformat(values): def niceformat(values):
out = [] out = []
for v in values: for v in values:
formattedv = strfdelta(v) formattedv = strfdelta(v)
out.append(formattedv) out.append(formattedv)
return out return out
def strfdelta(tdelta): def strfdelta(tdelta):
try: try:
minutes,seconds = divmod(tdelta.seconds,60) minutes,seconds = divmod(tdelta.seconds,60)
tenths = int(tdelta.microseconds/1e5) tenths = int(tdelta.microseconds/1e5)
except AttributeError: except AttributeError:
minutes,seconds = divmod(tdelta.view(np.int64),60e9) minutes,seconds = divmod(tdelta.view(np.int64),60e9)
seconds,rest = divmod(seconds,1e9) seconds,rest = divmod(seconds,1e9)
tenths = int(rest/1e8) tenths = int(rest/1e8)
res = "{minutes:0>2}:{seconds:0>2}.{tenths:0>1}".format( res = "{minutes:0>2}:{seconds:0>2}.{tenths:0>1}".format(
minutes=minutes, minutes=minutes,
seconds=seconds, seconds=seconds,
tenths=tenths, tenths=tenths,
) )
return res return res
def nicepaceformat(values): def nicepaceformat(values):
out = [] out = []
for v in values: for v in values:
formattedv = strfdelta(v) formattedv = strfdelta(v)
out.append(formattedv) out.append(formattedv)
return out return out
@@ -124,16 +124,16 @@ def timedeltaconv(x):
def rdata(file,rower=rrower()): def rdata(file,rower=rrower()):
try: try:
res = rrdata(file,rower=rower) res = rrdata(file,rower=rower)
except IOError: except IOError:
try: try:
res = rrdata(file+'.gz',rower=rower) res = rrdata(file+'.gz',rower=rower)
except IOError: except IOError:
res = 0 res = 0
return res return res
from utils import totaltime_sec_to_string from rowers.utils import totaltime_sec_to_string
# Creates C2 stroke data # Creates C2 stroke data
@@ -175,22 +175,22 @@ def create_c2_stroke_data_db(
df = pd.DataFrame({ df = pd.DataFrame({
'TimeStamp (sec)': unixtime, 'TimeStamp (sec)': unixtime,
' Horizontal (meters)': d, ' Horizontal (meters)': d,
' Cadence (stokes/min)': spm, ' Cadence (stokes/min)': spm,
' Stroke500mPace (sec/500m)':pace, ' Stroke500mPace (sec/500m)':pace,
' ElapsedTime (sec)':elapsed, ' ElapsedTime (sec)':elapsed,
' Power (watts)':power, ' Power (watts)':power,
' HRCur (bpm)':np.zeros(nr_strokes), ' HRCur (bpm)':np.zeros(nr_strokes),
' longitude':np.zeros(nr_strokes), ' longitude':np.zeros(nr_strokes),
' latitude':np.zeros(nr_strokes), ' latitude':np.zeros(nr_strokes),
' DragFactor':np.zeros(nr_strokes), ' DragFactor':np.zeros(nr_strokes),
' DriveLength (meters)':np.zeros(nr_strokes), ' DriveLength (meters)':np.zeros(nr_strokes),
' StrokeDistance (meters)':np.zeros(nr_strokes), ' StrokeDistance (meters)':np.zeros(nr_strokes),
' DriveTime (ms)':np.zeros(nr_strokes), ' DriveTime (ms)':np.zeros(nr_strokes),
' StrokeRecoveryTime (ms)':np.zeros(nr_strokes), ' StrokeRecoveryTime (ms)':np.zeros(nr_strokes),
' AverageDriveForce (lbs)':np.zeros(nr_strokes), ' AverageDriveForce (lbs)':np.zeros(nr_strokes),
' PeakDriveForce (lbs)':np.zeros(nr_strokes), ' PeakDriveForce (lbs)':np.zeros(nr_strokes),
' lapIdx':np.zeros(nr_strokes), ' lapIdx':np.zeros(nr_strokes),
'cum_dist': d 'cum_dist': d
}) })
@@ -220,17 +220,17 @@ def add_c2_stroke_data_db(strokedata,workoutid,starttimeunix,csvfilename,
nr_rows = len(unixtime) nr_rows = len(unixtime)
try: try:
latcoord = strokedata.ix[:,'lat'] latcoord = strokedata.ix[:,'lat']
loncoord = strokedata.ix[:,'lon'] loncoord = strokedata.ix[:,'lon']
except: except:
latcoord = np.zeros(nr_rows) latcoord = np.zeros(nr_rows)
loncoord = np.zeros(nr_rows) loncoord = np.zeros(nr_rows)
try: try:
strokelength = strokedata.ix[:,'strokelength'] strokelength = strokedata.ix[:,'strokelength']
except: except:
strokelength = np.zeros(nr_rows) strokelength = np.zeros(nr_rows)
dist2 = 0.1*strokedata.ix[:,'d'] dist2 = 0.1*strokedata.ix[:,'d']
@@ -258,28 +258,28 @@ def add_c2_stroke_data_db(strokedata,workoutid,starttimeunix,csvfilename,
# save csv # save csv
# Create data frame with all necessary data to write to csv # Create data frame with all necessary data to write to csv
df = pd.DataFrame({'TimeStamp (sec)':unixtime, df = pd.DataFrame({'TimeStamp (sec)':unixtime,
' Horizontal (meters)': dist2, ' Horizontal (meters)': dist2,
' Cadence (stokes/min)':spm, ' Cadence (stokes/min)':spm,
' HRCur (bpm)':hr, ' HRCur (bpm)':hr,
' longitude':loncoord, ' longitude':loncoord,
' latitude':latcoord, ' latitude':latcoord,
' Stroke500mPace (sec/500m)':pace, ' Stroke500mPace (sec/500m)':pace,
' Power (watts)':power, ' Power (watts)':power,
' DragFactor':np.zeros(nr_rows), ' DragFactor':np.zeros(nr_rows),
' DriveLength (meters)':np.zeros(nr_rows), ' DriveLength (meters)':np.zeros(nr_rows),
' StrokeDistance (meters)':strokelength, ' StrokeDistance (meters)':strokelength,
' DriveTime (ms)':np.zeros(nr_rows), ' DriveTime (ms)':np.zeros(nr_rows),
' StrokeRecoveryTime (ms)':np.zeros(nr_rows), ' StrokeRecoveryTime (ms)':np.zeros(nr_rows),
' AverageDriveForce (lbs)':np.zeros(nr_rows), ' AverageDriveForce (lbs)':np.zeros(nr_rows),
' PeakDriveForce (lbs)':np.zeros(nr_rows), ' PeakDriveForce (lbs)':np.zeros(nr_rows),
' lapIdx':lapidx, ' lapIdx':lapidx,
' ElapsedTime (sec)':seconds, ' ElapsedTime (sec)':seconds,
'cum_dist': dist2 'cum_dist': dist2
}) })
df.sort_values(by='TimeStamp (sec)',ascending=True) df.sort_values(by='TimeStamp (sec)',ascending=True)
timestr = strftime("%Y%m%d-%H%M%S") timestr = strftime("%Y%m%d-%H%M%S")
@@ -312,8 +312,8 @@ def save_workout_database(f2,r,dosmooth=True,workouttype='rower',
# make workout and put in database # make workout and put in database
rr = rrower(hrmax=r.max,hrut2=r.ut2, rr = rrower(hrmax=r.max,hrut2=r.ut2,
hrut1=r.ut1,hrat=r.at, hrut1=r.ut1,hrat=r.at,
hrtr=r.tr,hran=r.an,ftp=r.ftp, hrtr=r.tr,hran=r.an,ftp=r.ftp,
powerperc=powerperc,powerzones=r.powerzones) powerperc=powerperc,powerzones=r.powerzones)
row = rdata(f2,rower=rr) row = rdata(f2,rower=rr)
@@ -329,7 +329,7 @@ def save_workout_database(f2,r,dosmooth=True,workouttype='rower',
if row == 0: if row == 0:
return (0,'Error: CSV data file not found') return (0,'Error: CSV data file not found')
if dosmooth: if dosmooth:
# auto smoothing # auto smoothing
@@ -342,12 +342,12 @@ def save_workout_database(f2,r,dosmooth=True,workouttype='rower',
else: else:
windowsize = 1 windowsize = 1
if not 'originalvelo' in row.df: if not 'originalvelo' in row.df:
row.df['originalvelo'] = velo row.df['originalvelo'] = velo
if windowsize > 3 and windowsize<len(velo): if windowsize > 3 and windowsize<len(velo):
velo2 = savgol_filter(velo,windowsize,3) velo2 = savgol_filter(velo,windowsize,3)
else: else:
velo2 = velo velo2 = velo
velo3 = pd.Series(velo2) velo3 = pd.Series(velo2)
velo3 = velo3.replace([-np.inf,np.inf],np.nan) velo3 = velo3.replace([-np.inf,np.inf],np.nan)
@@ -367,11 +367,11 @@ def save_workout_database(f2,r,dosmooth=True,workouttype='rower',
# recalculate power data # recalculate power data
if workouttype == 'rower' or workouttype == 'dynamic' or workouttype == 'slides': if workouttype == 'rower' or workouttype == 'dynamic' or workouttype == 'slides':
try: try:
row.erg_recalculatepower() row.erg_recalculatepower()
row.write_csv(f2,gzip=True) row.write_csv(f2,gzip=True)
except: except:
pass pass
averagehr = row.df[' HRCur (bpm)'].mean() averagehr = row.df[' HRCur (bpm)'].mean()
maxhr = row.df[' HRCur (bpm)'].max() maxhr = row.df[' HRCur (bpm)'].max()
@@ -425,22 +425,22 @@ def save_workout_database(f2,r,dosmooth=True,workouttype='rower',
# check for duplicate start times # check for duplicate start times
ws = Workout.objects.filter(startdatetime=workoutstartdatetime, ws = Workout.objects.filter(startdatetime=workoutstartdatetime,
user=r) user=r)
if (len(ws) != 0): if (len(ws) != 0):
message = "Warning: This workout probably already exists in the database" message = "Warning: This workout probably already exists in the database"
privacy = 'private' privacy = 'private'
w = Workout(user=r,name=title,date=workoutdate, w = Workout(user=r,name=title,date=workoutdate,
workouttype=workouttype, workouttype=workouttype,
workoutsource=workoutsource, workoutsource=workoutsource,
duration=duration,distance=totaldist, duration=duration,distance=totaldist,
weightcategory=r.weightcategory, weightcategory=r.weightcategory,
starttime=workoutstarttime, starttime=workoutstarttime,
csvfilename=f2,notes=notes,summary=summary, csvfilename=f2,notes=notes,summary=summary,
maxhr=maxhr,averagehr=averagehr, maxhr=maxhr,averagehr=averagehr,
startdatetime=workoutstartdatetime, startdatetime=workoutstartdatetime,
inboard=inboard,oarlength=oarlength, inboard=inboard,oarlength=oarlength,
privacy=privacy) privacy=privacy)
@@ -463,14 +463,14 @@ def handle_nonpainsled(f2,fileformat,summary=''):
inboard = 0.88 inboard = 0.88
# handle RowPro: # handle RowPro:
if (fileformat == 'rp'): if (fileformat == 'rp'):
row = RowProParser(f2) row = RowProParser(f2)
# handle TCX # handle TCX
if (fileformat == 'tcx'): if (fileformat == 'tcx'):
row = TCXParser(f2) row = TCXParser(f2)
# handle Mystery # handle Mystery
if (fileformat == 'mystery'): if (fileformat == 'mystery'):
row = MysteryParser(f2) row = MysteryParser(f2)
# handle RowPerfect # handle RowPerfect
if (fileformat == 'rowperfect3'): if (fileformat == 'rowperfect3'):
@@ -478,11 +478,11 @@ def handle_nonpainsled(f2,fileformat,summary=''):
# handle ErgData # handle ErgData
if (fileformat == 'ergdata'): if (fileformat == 'ergdata'):
row = ErgDataParser(f2) row = ErgDataParser(f2)
# handle CoxMate # handle CoxMate
if (fileformat == 'coxmate'): if (fileformat == 'coxmate'):
row = CoxMateParser(f2) row = CoxMateParser(f2)
# handle Mike # handle Mike
if (fileformat == 'bcmike'): if (fileformat == 'bcmike'):
@@ -494,19 +494,19 @@ def handle_nonpainsled(f2,fileformat,summary=''):
# handle BoatCoach # handle BoatCoach
if (fileformat == 'boatcoach'): if (fileformat == 'boatcoach'):
row = BoatCoachParser(f2) row = BoatCoachParser(f2)
# handle painsled desktop # handle painsled desktop
if (fileformat == 'painsleddesktop'): if (fileformat == 'painsleddesktop'):
row = painsledDesktopParser(f2) row = painsledDesktopParser(f2)
# handle speed coach GPS # handle speed coach GPS
if (fileformat == 'speedcoach'): if (fileformat == 'speedcoach'):
row = speedcoachParser(f2) row = speedcoachParser(f2)
# handle speed coach GPS 2 # handle speed coach GPS 2
if (fileformat == 'speedcoach2'): if (fileformat == 'speedcoach2'):
row = SpeedCoach2Parser(f2) row = SpeedCoach2Parser(f2)
try: try:
oarlength,inboard = get_empower_rigging(f2) oarlength,inboard = get_empower_rigging(f2)
summary = row.allstats() summary = row.allstats()
@@ -516,14 +516,14 @@ def handle_nonpainsled(f2,fileformat,summary=''):
# handle ErgStick # handle ErgStick
if (fileformat == 'ergstick'): if (fileformat == 'ergstick'):
row = ErgStickParser(f2) row = ErgStickParser(f2)
# handle FIT # handle FIT
if (fileformat == 'fit'): if (fileformat == 'fit'):
row = FITParser(f2) row = FITParser(f2)
s = fitsummarydata(f2) s = fitsummarydata(f2)
s.setsummary() s.setsummary()
summary = s.summarytext summary = s.summarytext
f_to_be_deleted = f2 f_to_be_deleted = f2
@@ -533,7 +533,7 @@ def handle_nonpainsled(f2,fileformat,summary=''):
#os.remove(f2) #os.remove(f2)
try: try:
os.remove(f_to_be_deleted) os.remove(f_to_be_deleted)
except: except:
os.remove(f_to_be_deleted+'.gz') os.remove(f_to_be_deleted+'.gz')
@@ -588,14 +588,14 @@ def new_workout_from_file(r,f2,
# for me to check if it is a bug, or a new file type # for me to check if it is a bug, or a new file type
# worth supporting # worth supporting
if fileformat == 'unknown': if fileformat == 'unknown':
message = "We couldn't recognize the file type" message = "We couldn't recognize the file type"
if settings.DEBUG: if settings.DEBUG:
res = handle_sendemail_unrecognized.delay(f2, res = handle_sendemail_unrecognized.delay(f2,
r.user.email) r.user.email)
else: else:
res = queuehigh.enqueue(handle_sendemail_unrecognized, res = queuehigh.enqueue(handle_sendemail_unrecognized,
f2,r.user.email) f2,r.user.email)
return (0,message,f2) return (0,message,f2)
# handle non-Painsled by converting it to painsled compatible CSV # handle non-Painsled by converting it to painsled compatible CSV
@@ -635,14 +635,14 @@ def delete_strokedata(id,debug=False):
try: try:
result = conn.execute(query) result = conn.execute(query)
except: except:
print "Database Locked" print("Database Locked")
conn.close() conn.close()
engine.dispose() engine.dispose()
def update_strokedata(id,df,debug=False): def update_strokedata(id,df,debug=False):
delete_strokedata(id,debug=debug) delete_strokedata(id,debug=debug)
if debug: if debug:
print "updating ",id print("updating ",id)
rowdata = dataprep(df,id=id,bands=True,barchart=True,otwpower=True, rowdata = dataprep(df,id=id,bands=True,barchart=True,otwpower=True,
debug=debug) debug=debug)
@@ -676,11 +676,11 @@ def update_empower(id, inboard, oarlength, boattype, df, f1, debug=False):
if success: if success:
delete_strokedata(id,debug=debug) delete_strokedata(id,debug=debug)
if debug: if debug:
print "updated ",id print("updated ",id)
print "correction ",corr_factor print("correction ",corr_factor)
else: else:
if debug: if debug:
print "not updated ",id print("not updated ",id)
rowdata = dataprep(df,id=id,bands=True,barchart=True,otwpower=True, rowdata = dataprep(df,id=id,bands=True,barchart=True,otwpower=True,
@@ -784,8 +784,8 @@ def read_cols_df_sql(ids,columns,debug=False):
def read_df_sql(id,debug=False): def read_df_sql(id,debug=False):
if debug: if debug:
engine = create_engine(database_url_debug, echo=False) engine = create_engine(database_url_debug, echo=False)
print "read_df",id print("read_df",id)
print database_url_debug print(database_url_debug)
else: else:
engine = create_engine(database_url, echo=False) engine = create_engine(database_url, echo=False)
@@ -826,7 +826,7 @@ def deletecpdata_sql(rower_id,table='cpdata',debug=False):
try: try:
result = conn.execute(query) result = conn.execute(query)
except: except:
print "Database locked" print("Database locked")
conn.close() conn.close()
engine.dispose() engine.dispose()
@@ -846,7 +846,7 @@ def delete_agegroup_db(age,sex,weightcategory,debug=False):
try: try:
result = conn.execute(query) result = conn.execute(query)
except: except:
print "Database locked" print("Database locked")
conn.close() conn.close()
engine.dispose() engine.dispose()
@@ -956,11 +956,11 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
if rowdatadf.empty: if rowdatadf.empty:
if debug: if debug:
print "empty" print("empty")
return 0 return 0
if debug: if debug:
print "dataprep",id print("dataprep",id)
rowdatadf.set_index([range(len(rowdatadf))],inplace=True) rowdatadf.set_index([range(len(rowdatadf))],inplace=True)
t = rowdatadf.ix[:,'TimeStamp (sec)'] t = rowdatadf.ix[:,'TimeStamp (sec)']
@@ -1006,12 +1006,12 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
else: else:
windowsize = 1 windowsize = 1
if windowsize <= 3: if windowsize <= 3:
windowsize = 5 windowsize = 5
if windowsize > 3 and windowsize<len(hr): if windowsize > 3 and windowsize<len(hr):
spm = savgol_filter(spm,windowsize,3) spm = savgol_filter(spm,windowsize,3)
hr = savgol_filter(hr,windowsize,3) hr = savgol_filter(hr,windowsize,3)
drivelength = savgol_filter(drivelength,windowsize,3) drivelength = savgol_filter(drivelength,windowsize,3)
forceratio = savgol_filter(forceratio,windowsize,3) forceratio = savgol_filter(forceratio,windowsize,3)
try: try:
@@ -1072,14 +1072,14 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
) )
if bands: if bands:
# HR bands # HR bands
data['hr_ut2'] = rowdatadf.ix[:,'hr_ut2'] data['hr_ut2'] = rowdatadf.ix[:,'hr_ut2']
data['hr_ut1'] = rowdatadf.ix[:,'hr_ut1'] data['hr_ut1'] = rowdatadf.ix[:,'hr_ut1']
data['hr_at'] = rowdatadf.ix[:,'hr_at'] data['hr_at'] = rowdatadf.ix[:,'hr_at']
data['hr_tr'] = rowdatadf.ix[:,'hr_tr'] data['hr_tr'] = rowdatadf.ix[:,'hr_tr']
data['hr_an'] = rowdatadf.ix[:,'hr_an'] data['hr_an'] = rowdatadf.ix[:,'hr_an']
data['hr_max'] = rowdatadf.ix[:,'hr_max'] data['hr_max'] = rowdatadf.ix[:,'hr_max']
data['hr_bottom'] = 0.0*data['hr'] data['hr_bottom'] = 0.0*data['hr']
try: try:
@@ -1088,13 +1088,13 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
rowdatadf[' ElapsedTime (sec)'] = rowdatadf['TimeStamp (sec)'] rowdatadf[' ElapsedTime (sec)'] = rowdatadf['TimeStamp (sec)']
if barchart: if barchart:
# time increments for bar chart # time increments for bar chart
time_increments = rowdatadf.ix[:,' ElapsedTime (sec)'].diff() time_increments = rowdatadf.ix[:,' ElapsedTime (sec)'].diff()
time_increments[0] = time_increments[1] time_increments[0] = time_increments[1]
time_increments = 0.5*time_increments+0.5*np.abs(time_increments) time_increments = 0.5*time_increments+0.5*np.abs(time_increments)
x_right = (t2+time_increments.apply(lambda x:timedeltaconv(x))) x_right = (t2+time_increments.apply(lambda x:timedeltaconv(x)))
data['x_right'] = x_right data['x_right'] = x_right
if empower: if empower:
try: try:
@@ -1207,29 +1207,29 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
pass pass
if otwpower: if otwpower:
try: try:
nowindpace = rowdatadf.ix[:,'nowindpace'] nowindpace = rowdatadf.ix[:,'nowindpace']
except KeyError: except KeyError:
nowindpace = p nowindpace = p
try: try:
equivergpower = rowdatadf.ix[:,'equivergpower'] equivergpower = rowdatadf.ix[:,'equivergpower']
except KeyError: except KeyError:
equivergpower = 0*p+50. equivergpower = 0*p+50.
nowindpace2 = nowindpace.apply(lambda x: timedeltaconv(x)) nowindpace2 = nowindpace.apply(lambda x: timedeltaconv(x))
ergvelo = (equivergpower/2.8)**(1./3.) ergvelo = (equivergpower/2.8)**(1./3.)
ergpace = 500./ergvelo ergpace = 500./ergvelo
ergpace[ergpace == np.inf] = 240. ergpace[ergpace == np.inf] = 240.
ergpace2 = ergpace.apply(lambda x: timedeltaconv(x)) ergpace2 = ergpace.apply(lambda x: timedeltaconv(x))
data['ergpace'] = ergpace*1e3 data['ergpace'] = ergpace*1e3
data['nowindpace'] = nowindpace*1e3 data['nowindpace'] = nowindpace*1e3
data['equivergpower'] = equivergpower data['equivergpower'] = equivergpower
data['fergpace'] = nicepaceformat(ergpace2) data['fergpace'] = nicepaceformat(ergpace2)
data['fnowindpace'] = nicepaceformat(nowindpace2) data['fnowindpace'] = nicepaceformat(nowindpace2)
data['efficiency'] = efficiency data['efficiency'] = efficiency
data = data.replace([-np.inf,np.inf],np.nan) data = data.replace([-np.inf,np.inf],np.nan)
rowers/datautils.py
+5 -5
View File
@@ -49,14 +49,14 @@ def cpfit(powerdf):
if len(thesecs)>=4: if len(thesecs)>=4:
try: try:
p1, success = optimize.leastsq(errfunc, p0[:], args = (thesecs,theavpower)) p1, success = optimize.leastsq(errfunc, p0[:], args = (thesecs,theavpower))
except: except:
factor = fitfunc(p0,thesecs.mean())/theavpower.mean() factor = fitfunc(p0,thesecs.mean())/theavpower.mean()
p1 = [p0[0]/factor,p0[1]/factor,p0[2],p0[3]] p1 = [p0[0]/factor,p0[1]/factor,p0[2],p0[3]]
else: else:
factor = fitfunc(p0,thesecs.mean())/theavpower.mean() factor = fitfunc(p0,thesecs.mean())/theavpower.mean()
p1 = [p0[0]/factor,p0[1]/factor,p0[2],p0[3]] p1 = [p0[0]/factor,p0[1]/factor,p0[2],p0[3]]
p1 = [abs(p) for p in p1] p1 = [abs(p) for p in p1]
rowers/forms.py
+90 -88
View File
@@ -1,3 +1,4 @@
from __future__ import unicode_literals, absolute_import
from django import forms from django import forms
from django.contrib.admin.widgets import FilteredSelectMultiple from django.contrib.admin.widgets import FilteredSelectMultiple
from rowers.models import ( from rowers.models import (
@@ -9,15 +10,16 @@ from rowers.rows import validate_file_extension,must_be_csv,validate_image_exten
from django.contrib.auth.forms import UserCreationForm from django.contrib.auth.forms import UserCreationForm
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.contrib.admin.widgets import AdminDateWidget from django.contrib.admin.widgets import AdminDateWidget
from django.forms.extras.widgets import SelectDateWidget from django.forms.widgets import SelectDateWidget
#from django.forms.extras.widgets import SelectDateWidget
from django.utils import timezone,translation from django.utils import timezone,translation
from django.forms import ModelForm, Select from django.forms import ModelForm, Select
import dataprep import rowers.dataprep as dataprep
import mytypes import rowers.mytypes as mytypes
import datetime import datetime
from django.forms import formset_factory from django.forms import formset_factory
from utils import landingpages from rowers.utils import landingpages
from metrics import axes from rowers.metrics import axes
class FlexibleDecimalField(forms.DecimalField): class FlexibleDecimalField(forms.DecimalField):
@@ -84,7 +86,7 @@ for key, value in disqualificationreasons:
class DisqualificationForm(forms.Form): class DisqualificationForm(forms.Form):
reason = forms.ChoiceField(required=True, reason = forms.ChoiceField(required=True,
choices=disqualificationreasons, choices=disqualificationreasons,
widget = forms.RadioSelect,) widget = forms.RadioSelect,)
message = forms.CharField(required=True,widget=forms.Textarea) message = forms.CharField(required=True,widget=forms.Textarea)
@@ -139,10 +141,10 @@ class CourseForm(forms.Form):
class DocumentsForm(forms.Form): class DocumentsForm(forms.Form):
title = forms.CharField(required=False) title = forms.CharField(required=False)
file = forms.FileField(required=False, file = forms.FileField(required=False,
validators=[validate_file_extension]) validators=[validate_file_extension])
workouttype = forms.ChoiceField(required=True, workouttype = forms.ChoiceField(required=True,
choices=Workout.workouttypes) choices=Workout.workouttypes)
boattype = forms.ChoiceField(required=True, boattype = forms.ChoiceField(required=True,
choices=mytypes.boattypes, choices=mytypes.boattypes,
@@ -150,19 +152,19 @@ class DocumentsForm(forms.Form):
notes = forms.CharField(required=False, notes = forms.CharField(required=False,
widget=forms.Textarea) widget=forms.Textarea)
offline = forms.BooleanField(initial=False,required=False, offline = forms.BooleanField(initial=False,required=False,
label='Process in Background') label='Process in Background')
class Meta: class Meta:
fields = ['title','file','workouttype','boattype','fileformat','offline'] fields = ['title','file','workouttype','boattype','fileformat','offline']
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
from django.forms.widgets import HiddenInput from django.forms.widgets import HiddenInput
super(DocumentsForm, self).__init__(*args, **kwargs) super(DocumentsForm, self).__init__(*args, **kwargs)
# self.fields['offline'].widget = HiddenInput() # self.fields['offline'].widget = HiddenInput()
from utils import ( from rowers.utils import (
workflowleftpanel,workflowmiddlepanel, workflowleftpanel,workflowmiddlepanel,
defaultleft,defaultmiddle defaultleft,defaultmiddle
) )
@@ -267,14 +269,14 @@ class LandingPageForm(forms.Form):
class UploadOptionsForm(forms.Form): class UploadOptionsForm(forms.Form):
plotchoices = ( plotchoices = (
('timeplot','Time Plot'), ('timeplot','Time Plot'),
('distanceplot','Distance Plot'), ('distanceplot','Distance Plot'),
('pieplot','Heart Rate Pie Chart'), ('pieplot','Heart Rate Pie Chart'),
) )
make_plot = forms.BooleanField(initial=False,required=False) make_plot = forms.BooleanField(initial=False,required=False)
plottype = forms.ChoiceField(required=False, plottype = forms.ChoiceField(required=False,
choices=plotchoices, choices=plotchoices,
initial='timeplot', initial='timeplot',
label='Plot Type') label='Plot Type')
upload_to_C2 = forms.BooleanField(initial=False,required=False, upload_to_C2 = forms.BooleanField(initial=False,required=False,
label='Export to Concept2 logbook') label='Export to Concept2 logbook')
@@ -303,7 +305,7 @@ class UploadOptionsForm(forms.Form):
label='After Upload, go to') label='After Upload, go to')
class Meta: class Meta:
fields = ['make_plot','plottype','upload_toc2','makeprivate'] fields = ['make_plot','plottype','upload_toc2','makeprivate']
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
self.request = kwargs.pop('request',None) self.request = kwargs.pop('request',None)
@@ -332,18 +334,18 @@ class UploadOptionsForm(forms.Form):
# a team member # a team member
class TeamUploadOptionsForm(forms.Form): class TeamUploadOptionsForm(forms.Form):
plotchoices = ( plotchoices = (
('timeplot','Time Plot'), ('timeplot','Time Plot'),
('distanceplot','Distance Plot'), ('distanceplot','Distance Plot'),
('pieplot','Pie Chart'), ('pieplot','Pie Chart'),
) )
make_plot = forms.BooleanField(initial=False,required=False) make_plot = forms.BooleanField(initial=False,required=False)
plottype = forms.ChoiceField(required=False, plottype = forms.ChoiceField(required=False,
choices=plotchoices, choices=plotchoices,
initial='timeplot', initial='timeplot',
label='Plot Type') label='Plot Type')
class Meta: class Meta:
fields = ['make_plot','plottype'] fields = ['make_plot','plottype']
# This form is used on the Workout Split page # This form is used on the Workout Split page
class WorkoutSplitForm(forms.Form): class WorkoutSplitForm(forms.Form):
@@ -392,9 +394,9 @@ class OteWorkoutTypeForm(forms.Form):
class PredictedPieceForm(forms.Form): class PredictedPieceForm(forms.Form):
unitchoices = ( unitchoices = (
('t','minutes'), ('t','minutes'),
('d','meters'), ('d','meters'),
) )
rankingdistancechoices = [] rankingdistancechoices = []
rankingdurationchoices = [] rankingdurationchoices = []
@@ -422,10 +424,10 @@ class PredictedPieceForm(forms.Form):
value = forms.FloatField(initial=10,label='Free ranking piece (minutes)') value = forms.FloatField(initial=10,label='Free ranking piece (minutes)')
pieceunit = forms.ChoiceField(required=True,choices=unitchoices, pieceunit = forms.ChoiceField(required=True,choices=unitchoices,
initial='t',label='Unit') initial='t',label='Unit')
class Meta: class Meta:
fields = ['value','pieceunit'] fields = ['value','pieceunit']
class PredictedPieceFormNoDistance(forms.Form): class PredictedPieceFormNoDistance(forms.Form):
@@ -450,76 +452,76 @@ class PredictedPieceFormNoDistance(forms.Form):
# On the Geeky side, to update stream information for river dwellers # On the Geeky side, to update stream information for river dwellers
class UpdateStreamForm(forms.Form): class UpdateStreamForm(forms.Form):
unitchoices = ( unitchoices = (
('m','m/s'), ('m','m/s'),
('f','foot/s'), ('f','foot/s'),
('k','knots'), ('k','knots'),
('p','pace difference (sec/500m)'), ('p','pace difference (sec/500m)'),
) )
dist1 = forms.FloatField(initial=0,label = 'Distance 1') dist1 = forms.FloatField(initial=0,label = 'Distance 1')
dist2 = forms.FloatField(initial=1000,label = 'Distance 2') dist2 = forms.FloatField(initial=1000,label = 'Distance 2')
stream1 = forms.FloatField(initial=0,label = 'Stream velocity 1') stream1 = forms.FloatField(initial=0,label = 'Stream velocity 1')
stream2 = forms.FloatField(initial=0,label = 'Stream velocity 2') stream2 = forms.FloatField(initial=0,label = 'Stream velocity 2')
streamunit = forms.ChoiceField(required=True, streamunit = forms.ChoiceField(required=True,
choices=unitchoices, choices=unitchoices,
initial='m', initial='m',
label='Unit') label='Unit')
class Meta: class Meta:
fields = ['dist1','dist2','stream1', 'stream2','streamunit'] fields = ['dist1','dist2','stream1', 'stream2','streamunit']
# add wind information to your workout # add wind information to your workout
class UpdateWindForm(forms.Form): class UpdateWindForm(forms.Form):
unitchoices = ( unitchoices = (
('m','m/s'), ('m','m/s'),
('k','knots'), ('k','knots'),
('b','beaufort'), ('b','beaufort'),
('kmh','km/h'), ('kmh','km/h'),
('mph','miles/hour'), ('mph','miles/hour'),
) )
dist1 = forms.FloatField(initial=0,label = 'Distance 1') dist1 = forms.FloatField(initial=0,label = 'Distance 1')
dist2 = forms.FloatField(initial=1000,label = 'Distance 2') dist2 = forms.FloatField(initial=1000,label = 'Distance 2')
vwind1 = forms.FloatField(initial=0,required=False,label = 'Wind Speed 1') vwind1 = forms.FloatField(initial=0,required=False,label = 'Wind Speed 1')
vwind2 = forms.FloatField(initial=0,required=False,label = 'Wind Speed 2') vwind2 = forms.FloatField(initial=0,required=False,label = 'Wind Speed 2')
windunit = forms.ChoiceField(required=True, windunit = forms.ChoiceField(required=True,
choices=unitchoices, choices=unitchoices,
initial='m', initial='m',
label='Unit') label='Unit')
winddirection1 = forms.IntegerField(initial=0,required=False, winddirection1 = forms.IntegerField(initial=0,required=False,
label = 'Wind Direction 1') label = 'Wind Direction 1')
winddirection2 = forms.IntegerField(initial=0,required=False, winddirection2 = forms.IntegerField(initial=0,required=False,
label = 'Wind Direction 2') label = 'Wind Direction 2')
class Meta: class Meta:
fields = ['dist1','dist2', fields = ['dist1','dist2',
'vwind1','vwind2', 'vwind1','vwind2',
'windunit', 'windunit',
'winddirection1','winddirection2'] 'winddirection1','winddirection2']
# Form to select a data range to show workouts from a certain time period # Form to select a data range to show workouts from a certain time period
class DateRangeForm(forms.Form): class DateRangeForm(forms.Form):
startdate = forms.DateField( startdate = forms.DateField(
initial=timezone.now()-datetime.timedelta(days=365), initial=timezone.now()-datetime.timedelta(days=365),
# widget=SelectDateWidget(years=range(1990,2050)), # widget=SelectDateWidget(years=range(1990,2050)),
widget=AdminDateWidget(), widget=AdminDateWidget(),
label='Start Date') label='Start Date')
enddate = forms.DateField( enddate = forms.DateField(
initial=timezone.now(), initial=timezone.now(),
widget=AdminDateWidget(), widget=AdminDateWidget(),
label='End Date') label='End Date')
class Meta: class Meta:
fields = ['startdate','enddate'] fields = ['startdate','enddate']
class FitnessMetricForm(forms.Form): class FitnessMetricForm(forms.Form):
startdate = forms.DateField( startdate = forms.DateField(
initial=timezone.now()-datetime.timedelta(days=365), initial=timezone.now()-datetime.timedelta(days=365),
# widget=SelectDateWidget(years=range(1990,2050)), # widget=SelectDateWidget(years=range(1990,2050)),
widget=AdminDateWidget(), widget=AdminDateWidget(),
label='Start Date') label='Start Date')
enddate = forms.DateField( enddate = forms.DateField(
initial=timezone.now(), initial=timezone.now(),
widget=AdminDateWidget(), widget=AdminDateWidget(),
label='End Date') label='End Date')
modechoices = ( modechoices = (
('rower','indoor rower'), ('rower','indoor rower'),
@@ -533,7 +535,7 @@ class FitnessMetricForm(forms.Form):
) )
class Meta: class Meta:
fields = ['startdate','enddate','mode'] fields = ['startdate','enddate','mode']
class SessionDateShiftForm(forms.Form): class SessionDateShiftForm(forms.Form):
shiftstartdate = forms.DateField( shiftstartdate = forms.DateField(
@@ -599,7 +601,7 @@ class RegistrationFormSex(RegistrationFormUniqueEmail):
weightcategories = ( weightcategories = (
('hwt','heavy-weight'), ('hwt','heavy-weight'),
('lwt','light-weight'), ('lwt','light-weight'),
) )
adaptivecategories = mytypes.adaptivetypes adaptivecategories = mytypes.adaptivetypes
@@ -637,8 +639,8 @@ class RegistrationFormSex(RegistrationFormUniqueEmail):
class MyTimeField(forms.TimeField): class MyTimeField(forms.TimeField):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super(MyTimeField, self).__init__(*args, **kwargs) super(MyTimeField, self).__init__(*args, **kwargs)
supports_microseconds = True supports_microseconds = True
# Form used to automatically define intervals by pace or power # Form used to automatically define intervals by pace or power
class PowerIntervalUpdateForm(forms.Form): class PowerIntervalUpdateForm(forms.Form):
@@ -660,28 +662,28 @@ class PowerIntervalUpdateForm(forms.Form):
class IntervalUpdateForm(forms.Form): class IntervalUpdateForm(forms.Form):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
typechoices = ( typechoices = (
(1,'single time'), (1,'single time'),
(2,'single distance'), (2,'single distance'),
(3,'rest (time based)'), (3,'rest (time based)'),
(3,'rest (distance based)'), (3,'rest (distance based)'),
(4,'work (time based)'), (4,'work (time based)'),
(5,'work (distance based)'), (5,'work (distance based)'),
) )
aantal = int(kwargs.pop('aantal')) aantal = int(kwargs.pop('aantal'))
super(IntervalUpdateForm, self).__init__(*args, **kwargs) super(IntervalUpdateForm, self).__init__(*args, **kwargs)
for i in range(aantal): for i in range(aantal):
self.fields['intervalt_%s' % i] = forms.DurationField(label='Time '+str(i+1)) self.fields['intervalt_%s' % i] = forms.DurationField(label='Time '+str(i+1))
self.fields['intervald_%s' % i] = forms.IntegerField(label='Distance '+str(i+1)) self.fields['intervald_%s' % i] = forms.IntegerField(label='Distance '+str(i+1))
self.fields['type_%s' % i] = forms.ChoiceField(choices=typechoices, self.fields['type_%s' % i] = forms.ChoiceField(choices=typechoices,
required=True, required=True,
initial=4, initial=4,
label = 'Type '+str(i+1)) label = 'Type '+str(i+1))
self.fields['intervalt_%s' % i].widget.attrs['style'] = 'width:76px; height: 16px;' self.fields['intervalt_%s' % i].widget.attrs['style'] = 'width:76px; height: 16px;'
self.fields['intervald_%s' % i].widget.attrs['style'] = 'width:76px; height: 16px;' self.fields['intervald_%s' % i].widget.attrs['style'] = 'width:76px; height: 16px;'
self.fields['type_%s' % i].widget.attrs['style'] = 'width:156px; height: 22px;' self.fields['type_%s' % i].widget.attrs['style'] = 'width:156px; height: 22px;'
self.fields['intervald_%s' % i].widget = forms.TimeInput(format='%H:%M:%S.%f') self.fields['intervald_%s' % i].widget = forms.TimeInput(format='%H:%M:%S.%f')
boattypes = mytypes.boattypes boattypes = mytypes.boattypes
workouttypes = mytypes.workouttypes workouttypes = mytypes.workouttypes
@@ -824,7 +826,7 @@ formaxlabelsmultiflex.pop('distance')
formaxlabelsmultiflex['workoutid'] = 'Workout' formaxlabelsmultiflex['workoutid'] = 'Workout'
parchoicesmultiflex = list(sorted(formaxlabelsmultiflex.items(), key = lambda x:x[1])) parchoicesmultiflex = list(sorted(formaxlabelsmultiflex.items(), key = lambda x:x[1]))
from utils import palettes from rowers.utils import palettes
palettechoices = tuple((p,p) for p in palettes.keys()) palettechoices = tuple((p,p) for p in palettes.keys())
@@ -950,7 +952,7 @@ class RaceResultFilterForm(forms.Form):
weightcategories = ( weightcategories = (
('hwt','heavy-weight'), ('hwt','heavy-weight'),
('lwt','light-weight'), ('lwt','light-weight'),
) )
adaptivecategories = mytypes.adaptivetypes adaptivecategories = mytypes.adaptivetypes
rowers/imports.py
+27 -27
View File
@@ -1,3 +1,4 @@
from __future__ import unicode_literals, absolute_import
# All the functionality to connect to SportTracks # All the functionality to connect to SportTracks
# Python # Python
@@ -16,7 +17,7 @@ from dateutil import parser
import time import time
from time import strftime from time import strftime
import dataprep import rowers.dataprep as dataprep
import math import math
from math import sin,cos,atan2,sqrt from math import sin,cos,atan2,sqrt
import os,sys import os,sys
@@ -38,7 +39,7 @@ from django.contrib.auth.decorators import login_required
from rowingdata import rowingdata, make_cumvalues from rowingdata import rowingdata, make_cumvalues
import pandas as pd import pandas as pd
from rowers.models import Rower,Workout,checkworkoutuser from rowers.models import Rower,Workout,checkworkoutuser
from rowers import mytypes import rowers.mytypes as mytypes
from rowsandall_app.settings import ( from rowsandall_app.settings import (
C2_CLIENT_ID, C2_REDIRECT_URI, C2_CLIENT_SECRET, C2_CLIENT_ID, C2_REDIRECT_URI, C2_CLIENT_SECRET,
STRAVA_CLIENT_ID, STRAVA_REDIRECT_URI, STRAVA_CLIENT_ID, STRAVA_REDIRECT_URI,
@@ -46,7 +47,7 @@ from rowsandall_app.settings import (
SPORTTRACKS_CLIENT_ID, SPORTTRACKS_REDIRECT_URI SPORTTRACKS_CLIENT_ID, SPORTTRACKS_REDIRECT_URI
) )
from utils import ( from rowers.utils import (
NoTokenError, custom_exception_handler, ewmovingaverage, NoTokenError, custom_exception_handler, ewmovingaverage,
geo_distance,isprorower,uniqify geo_distance,isprorower,uniqify
) )
@@ -59,9 +60,9 @@ def splitstdata(lijst):
t = [] t = []
latlong = [] latlong = []
while len(lijst)>=2: while len(lijst)>=2:
t.append(lijst[0]) t.append(lijst[0])
latlong.append(lijst[1]) latlong.append(lijst[1])
lijst = lijst[2:] lijst = lijst[2:]
return [np.array(t),np.array(latlong)] return [np.array(t),np.array(latlong)]
@@ -103,7 +104,6 @@ def imports_open(user,oauth_data):
oauth_data, oauth_data,
) )
elif tokenexpirydate is None and expirydatename is not None and 'strava' in expirydatename: elif tokenexpirydate is None and expirydatename is not None and 'strava' in expirydatename:
print 'noot'
token = imports_token_refresh( token = imports_token_refresh(
user, user,
tokenname, tokenname,
@@ -124,13 +124,13 @@ def imports_do_refresh_token(refreshtoken,oauth_data,access_token=''):
) )
post_data = {"grant_type": "refresh_token", post_data = {"grant_type": "refresh_token",
"client_secret": oauth_data['client_secret'], "client_secret": oauth_data['client_secret'],
"client_id": oauth_data['client_id'], "client_id": oauth_data['client_id'],
"refresh_token": refreshtoken, "refresh_token": refreshtoken,
} }
headers = {'user-agent': 'sanderroosendaal', headers = {'user-agent': 'sanderroosendaal',
'Accept': 'application/json', 'Accept': 'application/json',
'Content-Type': oauth_data['content_type']} 'Content-Type': oauth_data['content_type']}
# for Strava # for Strava
if 'grant_type' in oauth_data: if 'grant_type' in oauth_data:
@@ -147,11 +147,11 @@ def imports_do_refresh_token(refreshtoken,oauth_data,access_token=''):
if 'json' in oauth_data['content_type']: if 'json' in oauth_data['content_type']:
response = requests.post(baseurl, response = requests.post(baseurl,
data=json.dumps(post_data), data=json.dumps(post_data),
headers=headers) headers=headers)
else: else:
response = requests.post(baseurl, response = requests.post(baseurl,
data=post_data, data=post_data,
headers=headers) headers=headers)
@@ -174,9 +174,9 @@ def imports_do_refresh_token(refreshtoken,oauth_data,access_token=''):
except KeyError: except KeyError:
expires_in = 0 expires_in = 0
try: try:
refresh_token = token_json['refresh_token'] refresh_token = token_json['refresh_token']
except KeyError: except KeyError:
refresh_token = refreshtoken refresh_token = refreshtoken
try: try:
expires_in = int(expires_in) expires_in = int(expires_in)
except (TypeError,ValueError): except (TypeError,ValueError):
@@ -204,16 +204,16 @@ def imports_get_token(
post_data = {"grant_type": "authorization_code", post_data = {"grant_type": "authorization_code",
"code": code, "code": code,
"redirect_uri": redirect_uri, "redirect_uri": redirect_uri,
"client_secret": client_secret, "client_secret": client_secret,
"client_id": client_id, "client_id": client_id,
} }
try: try:
headers = oauth_data['headers'] headers = oauth_data['headers']
except KeyError: except KeyError:
headers = {'Accept': 'application/json', headers = {'Accept': 'application/json',
'Api-Key': client_id, 'Api-Key': client_id,
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'user-agent': 'sanderroosendaal'} 'user-agent': 'sanderroosendaal'}
if 'grant_type' in oauth_data: if 'grant_type' in oauth_data:
@@ -229,12 +229,12 @@ def imports_get_token(
response = requests.post( response = requests.post(
base_uri, base_uri,
data=json.dumps(post_data), data=json.dumps(post_data),
headers=headers) headers=headers)
else: else:
response = requests.post( response = requests.post(
base_uri, base_uri,
data=post_data, data=post_data,
headers=headers) headers=headers)
if response.status_code == 200 or response.status_code == 201: if response.status_code == 200 or response.status_code == 201:
token_json = response.json() token_json = response.json()
@@ -243,9 +243,9 @@ def imports_get_token(
except KeyError: except KeyError:
return [0,0,0] return [0,0,0]
try: try:
refresh_token = token_json['refresh_token'] refresh_token = token_json['refresh_token']
except KeyError: except KeyError:
refresh_token = '' refresh_token = ''
try: try:
expires_in = token_json['expires_in'] expires_in = token_json['expires_in']
except KeyError: except KeyError:
@@ -270,8 +270,8 @@ def imports_make_authorization_url(oauth_data):
params = {"client_id": oauth_data['client_id'], params = {"client_id": oauth_data['client_id'],
"response_type": "code", "response_type": "code",
"redirect_uri": oauth_data['redirect_uri'], "redirect_uri": oauth_data['redirect_uri'],
"scope":oauth_data['scope'], "scope":oauth_data['scope'],
"state":state} "state":state}
import urllib import urllib
rowers/interactiveplots.py
+649 -649
View File
File diff suppressed because it is too large Load Diff
rowers/longtask.py
+3 -3
View File
@@ -72,7 +72,7 @@ def longtask2(aantal,jobid=None,debug=False,secret=''):
counter = 0 counter = 0
progress = int(100.*i/aantal) progress = int(100.*i/aantal)
if debug: if debug:
print progress print(progress)
if jobid != None: if jobid != None:
if debug: if debug:
url = SITE_URL_DEV url = SITE_URL_DEV
@@ -83,8 +83,8 @@ def longtask2(aantal,jobid=None,debug=False,secret=''):
post_data = {"secret":secret} post_data = {"secret":secret}
s = requests.post(url, data=post_data) s = requests.post(url, data=post_data)
if debug: if debug:
print url print(url)
print s print(s)
return 1 return 1
rowers/mailprocessing.py
+1 -1
View File
@@ -92,7 +92,7 @@ def make_new_workout_from_email(rower, datafile, name, cntr=0,testing=False):
fileformat = fileformat[2] fileformat = fileformat[2]
if testing: if testing:
print 'Fileformat = ',fileformat print('Fileformat = ',fileformat)
if fileformat == 'unknown': if fileformat == 'unknown':
# extension = datafilename[-4:].lower() # extension = datafilename[-4:].lower()
rowers/metrics.py
+3 -2
View File
@@ -1,6 +1,7 @@
from utils import lbstoN from __future__ import absolute_import
from rowers.utils import lbstoN
import numpy as np import numpy as np
from models import C2WorldClassAgePerformance from rowers.models import C2WorldClassAgePerformance
import pandas as pd import pandas as pd
from scipy import optimize from scipy import optimize
from django.utils import timezone from django.utils import timezone
rowers/models.py
+236 -236
View File
File diff suppressed because it is too large Load Diff
rowers/mytypes.py
+7 -5
View File
@@ -1,3 +1,5 @@
from six import iteritems
workouttypes = ( workouttypes = (
('water','Standard Racing Shell'), ('water','Standard Racing Shell'),
('rower','Indoor Rower'), ('rower','Indoor Rower'),
@@ -208,15 +210,15 @@ c2mapping = {
} }
c2mappinginv = {value:key for key,value in c2mapping.iteritems() if value is not None} c2mappinginv = {value:key for key,value in iteritems(c2mapping) if value is not None}
stravamappinginv = {value:key for key,value in stravamapping.iteritems() if value is not None} stravamappinginv = {value:key for key,value in iteritems(stravamapping) if value is not None}
stmappinginv = {value:key for key,value in stmapping.iteritems() if value is not None} stmappinginv = {value:key for key,value in iteritems(stmapping) if value is not None}
rkmappinginv = {value:key for key,value in rkmapping.iteritems() if value is not None} rkmappinginv = {value:key for key,value in iteritems(rkmapping) if value is not None}
polarmappinginv = {value:key for key,value in polarmapping.iteritems() if value is not None} polarmappinginv = {value:key for key,value in iteritems(polarmapping) if value is not None}
otwtypes = ( otwtypes = (
'water', 'water',
rowers/ownapistuff.py
+94 -93
View File
@@ -1,3 +1,4 @@
from __future__ import unicode_literals, absolute_import
# Interactions with Rowsandall.com API. Not fully complete. # Interactions with Rowsandall.com API. Not fully complete.
# Python # Python
@@ -15,7 +16,7 @@ import math
from math import sin,cos,atan2,sqrt from math import sin,cos,atan2,sqrt
import urllib import urllib
import c2stuff import rowers.c2stuff as c2stuff
# Django # Django
from django.shortcuts import render_to_response from django.shortcuts import render_to_response
@@ -41,13 +42,13 @@ TEST_REDIRECT_URI = "http://localhost:8000/rowers/test_callback"
def custom_exception_handler(exc,message): def custom_exception_handler(exc,message):
response = { response = {
"errors": [ "errors": [
{ {
"code": str(exc), "code": str(exc),
"detail": message, "detail": message,
} }
] ]
} }
res = HttpResponse(message) res = HttpResponse(message)
res.status_code = 401 res.status_code = 401
@@ -58,27 +59,27 @@ def custom_exception_handler(exc,message):
def do_refresh_token(refreshtoken): def do_refresh_token(refreshtoken):
client_auth = requests.auth.HTTPBasicAuth(TEST_CLIENT_ID, TEST_CLIENT_SECRET) client_auth = requests.auth.HTTPBasicAuth(TEST_CLIENT_ID, TEST_CLIENT_SECRET)
post_data = {"grant_type": "refresh_token", post_data = {"grant_type": "refresh_token",
"client_secret": TEST_CLIENT_SECRET, "client_secret": TEST_CLIENT_SECRET,
"client_id":TEST_CLIENT_ID, "client_id":TEST_CLIENT_ID,
"refresh_token": refreshtoken, "refresh_token": refreshtoken,
} }
headers = {'user-agent': 'sanderroosendaal', headers = {'user-agent': 'sanderroosendaal',
'Accept': 'application/json', 'Accept': 'application/json',
'Content-Type': 'application/json'} 'Content-Type': 'application/json'}
url = "http://localhost:8000/rowers/o/token" url = "http://localhost:8000/rowers/o/token"
response = requests.post(url, response = requests.post(url,
data=json.dumps(post_data), data=json.dumps(post_data),
headers=headers) headers=headers)
token_json = response.json() token_json = response.json()
thetoken = token_json['access_token'] thetoken = token_json['access_token']
expires_in = token_json['expires_in'] expires_in = token_json['expires_in']
try: try:
refresh_token = token_json['refresh_token'] refresh_token = token_json['refresh_token']
except KeyError: except KeyError:
refresh_token = refreshtoken refresh_token = refreshtoken
return [thetoken,expires_in,refresh_token] return [thetoken,expires_in,refresh_token]
@@ -88,18 +89,18 @@ def get_token(code):
post_data = {"grant_type": "authorization_code", post_data = {"grant_type": "authorization_code",
"code": code, "code": code,
"redirect_uri": "http://localhost:8000/rowers/test_callback", "redirect_uri": "http://localhost:8000/rowers/test_callback",
"client_secret": "aapnootmies", "client_secret": "aapnootmies",
"client_id":1, "client_id":1,
} }
headers = {'Accept': 'application/json', headers = {'Accept': 'application/json',
'Content-Type': 'application/json'} 'Content-Type': 'application/json'}
url = "http://localhost:8000/rowers/o/token/" url = "http://localhost:8000/rowers/o/token/"
response = requests.post(url, response = requests.post(url,
data=json.dumps(post_data), data=json.dumps(post_data),
headers=headers) headers=headers)
token_json = response.json() token_json = response.json()
thetoken = token_json['access_token'] thetoken = token_json['access_token']
@@ -118,8 +119,8 @@ def make_authorization_url(request):
params = {"client_id": TEST_CLIENT_ID, params = {"client_id": TEST_CLIENT_ID,
"response_type": "code", "response_type": "code",
"redirect_uri": TEST_REDIRECT_URI, "redirect_uri": TEST_REDIRECT_URI,
"scope":"write", "scope":"write",
"state":state} "state":state}
import urllib import urllib
@@ -147,19 +148,19 @@ def rower_ownapi_token_refresh(user):
def get_ownapi_workout_list(user): def get_ownapi_workout_list(user):
r = Rower.objects.get(user=user) r = Rower.objects.get(user=user)
if (r.ownapitoken == '') or (r.ownapitoken is None): if (r.ownapitoken == '') or (r.ownapitoken is None):
s = "Token doesn't exist. Need to authorize" s = "Token doesn't exist. Need to authorize"
return custom_exception_handler(401,s) return custom_exception_handler(401,s)
elif (timezone.now()>r.ownapitokenexpirydate): elif (timezone.now()>r.ownapitokenexpirydate):
s = "Token expired. Needs to refresh." s = "Token expired. Needs to refresh."
return custom_exception_handler(401,s) return custom_exception_handler(401,s)
else: else:
# ready to fetch. Hurray # ready to fetch. Hurray
authorizationstring = str('Bearer ' + r.ownapitoken) authorizationstring = str('Bearer ' + r.ownapitoken)
headers = {'Authorization': authorizationstring, headers = {'Authorization': authorizationstring,
'user-agent': 'sanderroosendaal', 'user-agent': 'sanderroosendaal',
'Content-Type': 'application/json'} 'Content-Type': 'application/json'}
url = "https://api.ownapi.mobi/api/v2/fitnessActivities" url = "https://api.ownapi.mobi/api/v2/fitnessActivities"
s = requests.get(url,headers=headers) s = requests.get(url,headers=headers)
return s return s
@@ -167,19 +168,19 @@ def get_ownapi_workout_list(user):
def get_ownapi_workout(user,ownapiid): def get_ownapi_workout(user,ownapiid):
r = Rower.objects.get(user=user) r = Rower.objects.get(user=user)
if (r.ownapitoken == '') or (r.ownapitoken is None): if (r.ownapitoken == '') or (r.ownapitoken is None):
return custom_exception_handler(401,s) return custom_exception_handler(401,s)
s = "Token doesn't exist. Need to authorize" s = "Token doesn't exist. Need to authorize"
elif (timezone.now()>r.ownapitokenexpirydate): elif (timezone.now()>r.ownapitokenexpirydate):
s = "Token expired. Needs to refresh." s = "Token expired. Needs to refresh."
return custom_exception_handler(401,s) return custom_exception_handler(401,s)
else: else:
# ready to fetch. Hurray # ready to fetch. Hurray
authorizationstring = str('Bearer ' + r.ownapitoken) authorizationstring = str('Bearer ' + r.ownapitoken)
headers = {'Authorization': authorizationstring, headers = {'Authorization': authorizationstring,
'user-agent': 'sanderroosendaal', 'user-agent': 'sanderroosendaal',
'Content-Type': 'application/json'} 'Content-Type': 'application/json'}
url = "https://api.ownapi.mobi/api/v2/fitnessActivities/"+str(ownapiid) url = "https://api.ownapi.mobi/api/v2/fitnessActivities/"+str(ownapiid)
s = requests.get(url,headers=headers) s = requests.get(url,headers=headers)
return s return s
@@ -203,16 +204,16 @@ def createownapiworkoutdata(w):
haslatlon=1 haslatlon=1
try: try:
lat = row.df[' latitude'].values lat = row.df[' latitude'].values
lon = row.df[' longitude'].values lon = row.df[' longitude'].values
except KeyError: except KeyError:
haslatlon = 0 haslatlon = 0
haspower = 1 haspower = 1
try: try:
power = row.df[' Power (watts)'].values power = row.df[' Power (watts)'].values
except KeyError: except KeyError:
haspower = 0 haspower = 0
locdata = [] locdata = []
hrdata = [] hrdata = []
@@ -221,54 +222,54 @@ def createownapiworkoutdata(w):
powerdata = [] powerdata = []
for i in range(len(t)): for i in range(len(t)):
hrdata.append(t[i]) hrdata.append(t[i])
hrdata.append(hr[i]) hrdata.append(hr[i])
distancedata.append(t[i]) distancedata.append(t[i])
distancedata.append(d[i]) distancedata.append(d[i])
spmdata.append(t[i]) spmdata.append(t[i])
spmdata.append(spm[i]) spmdata.append(spm[i])
if haslatlon: if haslatlon:
locdata.append(t[i]) locdata.append(t[i])
locdata.append([lat[i],lon[i]]) locdata.append([lat[i],lon[i]])
if haspower: if haspower:
powerdata.append(t[i]) powerdata.append(t[i])
powerdata.append(power[i]) powerdata.append(power[i])
if haslatlon: if haslatlon:
data = { data = {
"type": "Rowing", "type": "Rowing",
"name": w.name, "name": w.name,
# "start_time": str(w.date)+"T"+str(w.starttime)+"Z", # "start_time": str(w.date)+"T"+str(w.starttime)+"Z",
"start_time": w.startdatetime.isoformat(), "start_time": w.startdatetime.isoformat(),
"total_distance": int(w.distance), "total_distance": int(w.distance),
"duration": int(max(t)), "duration": int(max(t)),
"notes": w.notes, "notes": w.notes,
"avg_heartrate": averagehr, "avg_heartrate": averagehr,
"max_heartrate": maxhr, "max_heartrate": maxhr,
"location": locdata, "location": locdata,
"distance": distancedata, "distance": distancedata,
"cadence": spmdata, "cadence": spmdata,
"heartrate": hrdata, "heartrate": hrdata,
} }
else: else:
data = { data = {
"type": "Rowing", "type": "Rowing",
"name": w.name, "name": w.name,
# "start_time": str(w.date)+"T"+str(w.starttime)+"Z", # "start_time": str(w.date)+"T"+str(w.starttime)+"Z",
"start_time": w.startdatetime.isoformat(), "start_time": w.startdatetime.isoformat(),
"total_distance": int(w.distance), "total_distance": int(w.distance),
"duration": int(max(t)), "duration": int(max(t)),
"notes": w.notes, "notes": w.notes,
"avg_heartrate": averagehr, "avg_heartrate": averagehr,
"max_heartrate": maxhr, "max_heartrate": maxhr,
"distance": distancedata, "distance": distancedata,
"cadence": spmdata, "cadence": spmdata,
"heartrate": hrdata, "heartrate": hrdata,
} }
if haspower: if haspower:
data['power'] = powerdata data['power'] = powerdata
return data return data
rowers/plannedsessions.py
+5 -4
View File
@@ -1,3 +1,4 @@
from __future__ import unicode_literals, absolute_import
# Python # Python
from django.utils import timezone from django.utils import timezone
from datetime import datetime from datetime import datetime
@@ -10,7 +11,7 @@ import uuid
from django.conf import settings from django.conf import settings
import pytz import pytz
from dateutil import parser from dateutil import parser
from utils import myqueue,calculate_age,totaltime_sec_to_string from rowers.utils import myqueue,calculate_age,totaltime_sec_to_string
import re import re
import django_rq import django_rq
queue = django_rq.get_queue('default') queue = django_rq.get_queue('default')
@@ -30,10 +31,10 @@ from rowers.emails import htmlstrip,htmlstripnobr
import rowers.mytypes as mytypes import rowers.mytypes as mytypes
import metrics import rowers.metrics as metrics
import numpy as np import numpy as np
import dataprep import rowers.dataprep as dataprep
import courses import rowers.courses as courses
import iso8601 import iso8601
from iso8601 import ParseError from iso8601 import ParseError
from rowers.tasks import handle_check_race_course from rowers.tasks import handle_check_race_course
rowers/plots.py
+20 -20
View File
@@ -2,14 +2,14 @@ from matplotlib.ticker import MultipleLocator,FuncFormatter,NullFormatter
import matplotlib.pyplot as plt import matplotlib.pyplot as plt
import numpy as np import numpy as np
from rows import format_pace_tick, format_pace, format_time, format_time_tick from rowers.rows import format_pace_tick, format_pace, format_time, format_time_tick
# Formatting the distance tick marks # Formatting the distance tick marks
#def format_dist_tick(x,pos=None): #def format_dist_tick(x,pos=None):
# km = x/1000. # km = x/1000.
# template='%6.3f' # template='%6.3f'
# return template % (km) # return template % (km)
# Utility to select reasonable y axis range # Utility to select reasonable y axis range
@@ -32,23 +32,23 @@ def y_axis_range(ydata,miny=0,padding=.1,ultimate=[-1e9,1e9]):
if (yrange == 0): if (yrange == 0):
if ymin == 0: if ymin == 0:
yrangemin = -padding yrangemin = -padding
else: else:
yrangemin = ymin-ymin*padding yrangemin = ymin-ymin*padding
if ymax == 0: if ymax == 0:
yrangemax = padding yrangemax = padding
else: else:
yrangemax = ymax+ymax*padding yrangemax = ymax+ymax*padding
else: else:
yrangemin = ymin-padding*yrange yrangemin = ymin-padding*yrange
yrangemax = ymax+padding*yrange yrangemax = ymax+padding*yrange
if (yrangemin < ultimate[0]): if (yrangemin < ultimate[0]):
yrangemin = ultimate[0] yrangemin = ultimate[0]
if (yrangemax > ultimate[1]): if (yrangemax > ultimate[1]):
yrangemax = ultimate[1] yrangemax = ultimate[1]
@@ -70,7 +70,7 @@ def mkplot(row,title):
ax1.set_ylabel('(sec/500)') ax1.set_ylabel('(sec/500)')
yrange = y_axis_range(df.loc[:,' Stroke500mPace (sec/500m)'], yrange = y_axis_range(df.loc[:,' Stroke500mPace (sec/500m)'],
ultimate = [85,190]) ultimate = [85,190])
plt.axis([0,end_time,yrange[1],yrange[0]]) plt.axis([0,end_time,yrange[1],yrange[0]])
ax1.set_xticks(range(1000,end_time,1000)) ax1.set_xticks(range(1000,end_time,1000))
@@ -80,11 +80,11 @@ def mkplot(row,title):
majorFormatter = FuncFormatter(format_pace_tick) majorFormatter = FuncFormatter(format_pace_tick)
majorLocator = (5) majorLocator = (5)
timeTickFormatter = NullFormatter() timeTickFormatter = NullFormatter()
ax1.yaxis.set_major_formatter(majorFormatter) ax1.yaxis.set_major_formatter(majorFormatter)
for tl in ax1.get_yticklabels(): for tl in ax1.get_yticklabels():
tl.set_color('b') tl.set_color('b')
ax2 = ax1.twinx() ax2 = ax1.twinx()
ax2.plot(t,hr,'r-') ax2.plot(t,hr,'r-')
@@ -94,7 +94,7 @@ def mkplot(row,title):
ax2.xaxis.set_major_formatter(majorTimeFormatter) ax2.xaxis.set_major_formatter(majorTimeFormatter)
ax2.patch.set_alpha(0.0) ax2.patch.set_alpha(0.0)
for tl in ax2.get_yticklabels(): for tl in ax2.get_yticklabels():
tl.set_color('r') tl.set_color('r')
plt.subplots_adjust(hspace=0) plt.subplots_adjust(hspace=0)
rowers/polarstuff.py
+7 -8
View File
@@ -1,3 +1,4 @@
from __future__ import unicode_literals, absolute_import
# All the functionality needed to connect to Strava # All the functionality needed to connect to Strava
# Python # Python
@@ -33,8 +34,8 @@ from rowingdata import rowingdata
import pandas as pd import pandas as pd
from rowers.models import Rower,Workout from rowers.models import Rower,Workout
from rowers.models import checkworkoutuser from rowers.models import checkworkoutuser
import dataprep import rowers.dataprep as dataprep
from dataprep import columndict from rowers.dataprep import columndict
from io import StringIO from io import StringIO
@@ -51,8 +52,8 @@ from rowsandall_app.settings import (
baseurl = 'https://polaraccesslink.com/v3' baseurl = 'https://polaraccesslink.com/v3'
from utils import NoTokenError, custom_exception_handler from rowers.utils import NoTokenError, custom_exception_handler
import mytypes import rowers.mytypes as mytypes
# Exchange access code for long-lived access token # Exchange access code for long-lived access token
def get_token(code): def get_token(code):
@@ -126,7 +127,7 @@ from rowers.utils import isprorower
def get_all_new_workouts(available_data,testing=False): def get_all_new_workouts(available_data,testing=False):
for record in available_data: for record in available_data:
if testing: if testing:
print record print(record)
if record['data-type'] == 'EXERCISE': if record['data-type'] == 'EXERCISE':
try: try:
r = Rower.objects.get(polaruserid=record['user-id']) r = Rower.objects.get(polaruserid=record['user-id'])
@@ -134,7 +135,7 @@ def get_all_new_workouts(available_data,testing=False):
if r.polar_auto_import and isprorower(r): if r.polar_auto_import and isprorower(r):
exercise_list = get_polar_workouts(u) exercise_list = get_polar_workouts(u)
if testing: if testing:
print exercise_list print(exercise_list)
except Rower.DoesNotExist: except Rower.DoesNotExist:
pass pass
@@ -313,8 +314,6 @@ def get_polar_workout(user,id,transactionid):
response = requests.get(url,headers = headers2) response = requests.get(url,headers = headers2)
if response.status_code == 200: if response.status_code == 200:
print response.text
result = response.text result = response.text
# commit transaction # commit transaction
response = requests.put(url,headers=headers) response = requests.put(url,headers=headers)
rowers/rows.py
+22 -22
View File
@@ -6,29 +6,29 @@ from django.core.exceptions import ValidationError
def format_pace_tick(x,pos=None): def format_pace_tick(x,pos=None):
minu=int(x/60) minu=int(x/60)
sec=int(x-minu*60.) sec=int(x-minu*60.)
sec_str=str(sec).zfill(2) sec_str=str(sec).zfill(2)
template='%d:%s' template='%d:%s'
return template % (minu,sec_str) return template % (minu,sec_str)
def format_time_tick(x,pos=None): def format_time_tick(x,pos=None):
hour=int(x/3600) hour=int(x/3600)
min=int((x-hour*3600.)/60) min=int((x-hour*3600.)/60)
min_str=str(min).zfill(2) min_str=str(min).zfill(2)
template='%d:%s' template='%d:%s'
return template % (hour,min_str) return template % (hour,min_str)
def format_pace(x,pos=None): def format_pace(x,pos=None):
if isinf(x) or isnan(x): if isinf(x) or isnan(x):
x=0 x=0
min=int(x/60) min=int(x/60)
sec=(x-min*60.) sec=(x-min*60.)
str1 = "{min:0>2}:{sec:0>4.1f}".format( str1 = "{min:0>2}:{sec:0>4.1f}".format(
min = min, min = min,
sec = sec sec = sec
) )
return str1 return str1
@@ -39,9 +39,9 @@ def format_time(x,pos=None):
sec = int(x-min*60) sec = int(x-min*60)
str1 = "{min:0>2}:{sec:0>4.1f}".format( str1 = "{min:0>2}:{sec:0>4.1f}".format(
min=min, min=min,
sec=sec, sec=sec,
) )
return str1 return str1
@@ -67,14 +67,14 @@ def must_be_csv(value):
ext = os.path.splitext(value.name)[1] ext = os.path.splitext(value.name)[1]
valid_extensions = ['.csv','.CSV'] valid_extensions = ['.csv','.CSV']
if not ext in valid_extensions: if not ext in valid_extensions:
raise ValidationError(u'File not supported!') raise ValidationError(u'File not supported!')
def validate_kml(value): def validate_kml(value):
import os import os
ext = os.path.splitext(value.name)[1] ext = os.path.splitext(value.name)[1]
valid_extensions = ['.kml','.KML'] valid_extensions = ['.kml','.KML']
if not ext in valid_extensions: if not ext in valid_extensions:
raise ValidationError(u'File not supported!') raise ValidationError(u'File not supported!')
def handle_uploaded_image(i): def handle_uploaded_image(i):
@@ -83,7 +83,7 @@ def handle_uploaded_image(i):
import os import os
from django.core.files import File from django.core.files import File
image_str = "" image_str = ""
for chunk in i.chunks(): for chunk in i.chunks():
image_str += chunk image_str += chunk
imagefile = StringIO.StringIO(image_str) imagefile = StringIO.StringIO(image_str)
@@ -133,8 +133,8 @@ def handle_uploaded_file(f):
fname = timestr+'-'+fname fname = timestr+'-'+fname
fname2 = 'media/'+fname fname2 = 'media/'+fname
with open(fname2,'wb+') as destination: with open(fname2,'wb+') as destination:
for chunk in f.chunks(): for chunk in f.chunks():
destination.write(chunk) destination.write(chunk)
return fname,fname2 return fname,fname2
rowers/runkeeperstuff.py
+113 -112
View File
@@ -1,3 +1,4 @@
from __future__ import unicode_literals, absolute_import
# All the functionality needed to connect to Runkeeper # All the functionality needed to connect to Runkeeper
from rowers.imports import * from rowers.imports import *
import re import re
@@ -61,16 +62,16 @@ def make_authorization_url(request):
def get_runkeeper_workout_list(user): def get_runkeeper_workout_list(user):
r = Rower.objects.get(user=user) r = Rower.objects.get(user=user)
if (r.runkeepertoken == '') or (r.runkeepertoken is None): if (r.runkeepertoken == '') or (r.runkeepertoken is None):
s = "Token doesn't exist. Need to authorize" s = "Token doesn't exist. Need to authorize"
return custom_exception_handler(401,s) return custom_exception_handler(401,s)
else: else:
# ready to fetch. Hurray # ready to fetch. Hurray
authorizationstring = str('Bearer ' + r.runkeepertoken) authorizationstring = str('Bearer ' + r.runkeepertoken)
headers = {'Authorization': authorizationstring, headers = {'Authorization': authorizationstring,
'user-agent': 'sanderroosendaal', 'user-agent': 'sanderroosendaal',
'Content-Type': 'application/json'} 'Content-Type': 'application/json'}
url = "https://api.runkeeper.com/fitnessActivities" url = "https://api.runkeeper.com/fitnessActivities"
s = requests.get(url,headers=headers) s = requests.get(url,headers=headers)
return s return s
@@ -78,16 +79,16 @@ def get_runkeeper_workout_list(user):
def get_workout(user,runkeeperid): def get_workout(user,runkeeperid):
r = Rower.objects.get(user=user) r = Rower.objects.get(user=user)
if (r.runkeepertoken == '') or (r.runkeepertoken is None): if (r.runkeepertoken == '') or (r.runkeepertoken is None):
return custom_exception_handler(401,s) return custom_exception_handler(401,s)
s = "Token doesn't exist. Need to authorize" s = "Token doesn't exist. Need to authorize"
else: else:
# ready to fetch. Hurray # ready to fetch. Hurray
authorizationstring = str('Bearer ' + r.runkeepertoken) authorizationstring = str('Bearer ' + r.runkeepertoken)
headers = {'Authorization': authorizationstring, headers = {'Authorization': authorizationstring,
'user-agent': 'sanderroosendaal', 'user-agent': 'sanderroosendaal',
'Content-Type': 'application/json'} 'Content-Type': 'application/json'}
url = "https://api.runkeeper.com/fitnessActivities/"+str(runkeeperid) url = "https://api.runkeeper.com/fitnessActivities/"+str(runkeeperid)
s = requests.get(url,headers=headers) s = requests.get(url,headers=headers)
try: try:
data = s.json() data = s.json()
@@ -131,12 +132,12 @@ def createrunkeeperworkoutdata(w):
haslatlon=1 haslatlon=1
try: try:
lat = row.df[' latitude'].values lat = row.df[' latitude'].values
lon = row.df[' longitude'].values lon = row.df[' longitude'].values
if not lat.std() and not lon.std(): if not lat.std() and not lon.std():
haslatlon = 0 haslatlon = 0
except KeyError: except KeyError:
haslatlon = 0 haslatlon = 0
# path data # path data
if haslatlon: if haslatlon:
@@ -172,32 +173,32 @@ def createrunkeeperworkoutdata(w):
newnotes = 'from '+w.workoutsource+' via rowsandall.com' newnotes = 'from '+w.workoutsource+' via rowsandall.com'
if haslatlon: if haslatlon:
data = { data = {
"type": "Rowing", "type": "Rowing",
"start_time": start_time, "start_time": start_time,
"total_distance": int(w.distance), "total_distance": int(w.distance),
"duration": duration, "duration": duration,
"notes": newnotes, "notes": newnotes,
"average_heart_rate": averagehr, "average_heart_rate": averagehr,
"path": locdata, "path": locdata,
"distance": distancedata, "distance": distancedata,
"heart_rate": hrdata, "heart_rate": hrdata,
"post_to_twitter":"false", "post_to_twitter":"false",
"post_to_facebook":"false", "post_to_facebook":"false",
} }
else: else:
data = { data = {
"type": "Rowing", "type": "Rowing",
"start_time": start_time, "start_time": start_time,
"total_distance": int(w.distance), "total_distance": int(w.distance),
"duration": duration, "duration": duration,
"notes": newnotes, "notes": newnotes,
"avg_heartrate": averagehr, "avg_heartrate": averagehr,
"distance": distancedata, "distance": distancedata,
"heart_rate": hrdata, "heart_rate": hrdata,
"post_to_twitter":"false", "post_to_twitter":"false",
"post_to_facebook":"false", "post_to_facebook":"false",
} }
return data return data
@@ -215,8 +216,8 @@ def getidfromresponse(response):
def geturifromid(access_token,id): def geturifromid(access_token,id):
authorizationstring = str('Bearer ' + access_token) authorizationstring = str('Bearer ' + access_token)
headers = {'Authorization': authorizationstring, headers = {'Authorization': authorizationstring,
'user-agent': 'sanderroosendaal', 'user-agent': 'sanderroosendaal',
'Content-Type': 'application/json'} 'Content-Type': 'application/json'}
import urllib import urllib
url = "https://api.runkeeper.com/fitnessActivities/"+str(id) url = "https://api.runkeeper.com/fitnessActivities/"+str(id)
response = requests.get(url,headers=headers) response = requests.get(url,headers=headers)
@@ -238,8 +239,8 @@ def geturifromid(access_token,id):
def get_userid(access_token): def get_userid(access_token):
authorizationstring = str('Bearer ' + access_token) authorizationstring = str('Bearer ' + access_token)
headers = {'Authorization': authorizationstring, headers = {'Authorization': authorizationstring,
'user-agent': 'sanderroosendaal', 'user-agent': 'sanderroosendaal',
'Content-Type': 'application/json'} 'Content-Type': 'application/json'}
import urllib import urllib
url = "https://api.runkeeper.com/user" url = "https://api.runkeeper.com/user"
response = requests.get(url,headers=headers) response = requests.get(url,headers=headers)
@@ -269,42 +270,42 @@ def workout_runkeeper_upload(user,w):
# ready to upload. Hurray # ready to upload. Hurray
if (checkworkoutuser(user,w)): if (checkworkoutuser(user,w)):
data = createrunkeeperworkoutdata(w) data = createrunkeeperworkoutdata(w)
if not data: if not data:
message = "Data error in Runkeeper Upload" message = "Data error in Runkeeper Upload"
rkid = 0 rkid = 0
return message, rkid return message, rkid
authorizationstring = str('Bearer ' + thetoken) authorizationstring = str('Bearer ' + thetoken)
headers = {'Authorization': authorizationstring, headers = {'Authorization': authorizationstring,
'user-agent': 'sanderroosendaal', 'user-agent': 'sanderroosendaal',
'Content-Type': 'application/vnd.com.runkeeper.NewFitnessActivity+json', 'Content-Type': 'application/vnd.com.runkeeper.NewFitnessActivity+json',
'Content-Length':'nnn'} 'Content-Length':'nnn'}
url = "https://api.runkeeper.com/fitnessActivities" url = "https://api.runkeeper.com/fitnessActivities"
response = requests.post(url,headers=headers,data=json.dumps(data)) response = requests.post(url,headers=headers,data=json.dumps(data))
# check for duplicate error first # check for duplicate error first
if (response.status_code == 409 ): if (response.status_code == 409 ):
message = "Duplicate error" message = "Duplicate error"
w.uploadedtorunkeeper = -1 w.uploadedtorunkeeper = -1
rkid = -1 rkid = -1
w.save() w.save()
return message, rkid return message, rkid
elif (response.status_code == 201 or response.status_code==200): elif (response.status_code == 201 or response.status_code==200):
rkid = getidfromresponse(response) rkid = getidfromresponse(response)
rkuri = geturifromid(thetoken,rkid) rkuri = geturifromid(thetoken,rkid)
w.uploadedtorunkeeper = rkid w.uploadedtorunkeeper = rkid
w.save() w.save()
return 'Successfully synchronized to Runkeeper',rkid return 'Successfully synchronized to Runkeeper',rkid
else: else:
s = response s = response
message = "Something went wrong in workout_runkeeper_upload_view: %s - %s" % (s.reason,s.text) message = "Something went wrong in workout_runkeeper_upload_view: %s - %s" % (s.reason,s.text)
rkid = 0 rkid = 0
return message, rkid return message, rkid
else: else:
message = "You are not authorized to upload this workout" message = "You are not authorized to upload this workout"
rkid = 0 rkid = 0
return message, rkid return message, rkid
@@ -316,41 +317,41 @@ def add_workout_from_data(user,importid,data,strokedata,source='runkeeper',
# To Do - add utcoffset to time # To Do - add utcoffset to time
workouttype = data['type'] workouttype = data['type']
if workouttype not in [x[0] for x in Workout.workouttypes]: if workouttype not in [x[0] for x in Workout.workouttypes]:
workouttype = 'other' workouttype = 'other'
try: try:
comments = data['notes'] comments = data['notes']
except: except:
comments = '' comments = ''
try: try:
utcoffset = tz(data['utcoffset']) utcoffset = tz(data['utcoffset'])
except: except:
utcoffset = 0 utcoffset = 0
r = Rower.objects.get(user=user) r = Rower.objects.get(user=user)
try: try:
rowdatetime = iso8601.parse_date(data['start_time']) rowdatetime = iso8601.parse_date(data['start_time'])
except iso8601.ParseError: except iso8601.ParseError:
try: try:
rowdatetime = datetime.strptime(data['start_time'],"%Y-%m-%d %H:%M:%S") rowdatetime = datetime.strptime(data['start_time'],"%Y-%m-%d %H:%M:%S")
rowdatetime = thetimezone.localize(rowdatetime).astimezone(utc) rowdatetime = thetimezone.localize(rowdatetime).astimezone(utc)
except ValueError: except ValueError:
try: try:
rowdatetime = parser.parse(data['start_time']) rowdatetime = parser.parse(data['start_time'])
#rowdatetime = thetimezone.localize(rowdatetime).astimezone(utc) #rowdatetime = thetimezone.localize(rowdatetime).astimezone(utc)
except: except:
rowdatetime = datetime.strptime(data['date'],"%Y-%m-%d %H:%M:%S") rowdatetime = datetime.strptime(data['date'],"%Y-%m-%d %H:%M:%S")
rowdatetime = thetimezone.localize(rowdatetime).astimezone(utc) rowdatetime = thetimezone.localize(rowdatetime).astimezone(utc)
starttimeunix = arrow.get(rowdatetime).timestamp starttimeunix = arrow.get(rowdatetime).timestamp
#starttimeunix = mktime(rowdatetime.utctimetuple()) #starttimeunix = mktime(rowdatetime.utctimetuple())
starttimeunix += utcoffset*3600 starttimeunix += utcoffset*3600
try: try:
title = data['name'] title = data['name']
except: except:
title = "Imported data" title = "Imported data"
@@ -360,35 +361,35 @@ def add_workout_from_data(user,importid,data,strokedata,source='runkeeper',
times_distance = res[0] times_distance = res[0]
try: try:
l = data['path'] l = data['path']
res = splitrunkeeperlatlongdata(l,'timestamp','latitude','longitude') res = splitrunkeeperlatlongdata(l,'timestamp','latitude','longitude')
times_location = res[0] times_location = res[0]
latcoord = res[1] latcoord = res[1]
loncoord = res[2] loncoord = res[2]
except: except:
times_location = times_distance times_location = times_distance
latcoord = np.zeros(len(times_distance)) latcoord = np.zeros(len(times_distance))
loncoord = np.zeros(len(times_distance)) loncoord = np.zeros(len(times_distance))
if workouttype in types.otwtypes: if workouttype in types.otwtypes:
workouttype = 'rower' workouttype = 'rower'
try: try:
res = splitrunkeeperdata(data['cadence'],'timestamp','cadence') res = splitrunkeeperdata(data['cadence'],'timestamp','cadence')
times_spm = res[0] times_spm = res[0]
spm = res[1] spm = res[1]
except KeyError: except KeyError:
times_spm = times_distance times_spm = times_distance
spm = 0*times_distance spm = 0*times_distance
try: try:
res = splitrunkeeperdata(data['heart_rate'],'timestamp','heart_rate') res = splitrunkeeperdata(data['heart_rate'],'timestamp','heart_rate')
hr = res[1] hr = res[1]
times_hr = res[0] times_hr = res[0]
except KeyError: except KeyError:
times_hr = times_distance times_hr = times_distance
hr = 0*times_distance hr = 0*times_distance
# create data series and remove duplicates # create data series and remove duplicates
@@ -417,12 +418,12 @@ def add_workout_from_data(user,importid,data,strokedata,source='runkeeper',
# Create dicts and big dataframe # Create dicts and big dataframe
d = { d = {
' Horizontal (meters)': distseries, ' Horizontal (meters)': distseries,
' latitude': latseries, ' latitude': latseries,
' longitude': lonseries, ' longitude': lonseries,
' Cadence (stokes/min)': spmseries, ' Cadence (stokes/min)': spmseries,
' HRCur (bpm)' : hrseries, ' HRCur (bpm)' : hrseries,
} }
@@ -469,7 +470,7 @@ def add_workout_from_data(user,importid,data,strokedata,source='runkeeper',
df = df.fillna(0) df = df.fillna(0)
df.sort_values(by='TimeStamp (sec)',ascending=True) df.sort_values(by='TimeStamp (sec)',ascending=True)
timestr = strftime("%Y%m%d-%H%M%S") timestr = strftime("%Y%m%d-%H%M%S")
# csvfilename ='media/Import_'+str(importid)+'.csv' # csvfilename ='media/Import_'+str(importid)+'.csv'
rowers/serializers.py
+14 -15
View File
@@ -74,20 +74,20 @@ class WorkoutSerializer(serializers.ModelSerializer):
t.second) t.second)
w = Workout(user=r, w = Workout(user=r,
name=validated_data['name'], name=validated_data['name'],
date=validated_data['date'], date=validated_data['date'],
workouttype=validated_data['workouttype'], workouttype=validated_data['workouttype'],
duration=validated_data['duration'], duration=validated_data['duration'],
distance=validated_data['distance'], distance=validated_data['distance'],
weightcategory=r.weightcategory, weightcategory=r.weightcategory,
adaptiveclass=r.adaptiveclass, adaptiveclass=r.adaptiveclass,
starttime=validated_data['starttime'], starttime=validated_data['starttime'],
csvfilename='', csvfilename='',
notes=validated_data['notes'], notes=validated_data['notes'],
uploadedtoc2=0, uploadedtoc2=0,
summary=validated_data['summary'], summary=validated_data['summary'],
averagehr=validated_data['averagehr'], averagehr=validated_data['averagehr'],
maxhr=validated_data['maxhr'], maxhr=validated_data['maxhr'],
startdatetime=rowdatetime, startdatetime=rowdatetime,
timezone=validated_data['timezone'], timezone=validated_data['timezone'],
forceunit=validated_data['forceunit'], forceunit=validated_data['forceunit'],
inboard=validated_data['inboard'], inboard=validated_data['inboard'],
@@ -109,16 +109,16 @@ class WorkoutSerializer(serializers.ModelSerializer):
instance.name=validated_data['name'] instance.name=validated_data['name']
instance.date=validated_data['date'] instance.date=validated_data['date']
instance.workouttype=validated_data['workouttype'] instance.workouttype=validated_data['workouttype']
instance.duration=validated_data['duration'] instance.duration=validated_data['duration']
instance.distance=validated_data['distance'] instance.distance=validated_data['distance']
instance.starttime=validated_data['starttime'] instance.starttime=validated_data['starttime']
instance.notes=validated_data['notes'] instance.notes=validated_data['notes']
instance.summary=validated_data['summary'] instance.summary=validated_data['summary']
instance.averagehr=validated_data['averagehr'] instance.averagehr=validated_data['averagehr']
instance.maxhr=validated_data['maxhr'] instance.maxhr=validated_data['maxhr']
instance.startdatetime=rowdatetime instance.startdatetime=rowdatetime
instance.timezone=validated_data['timezone'] instance.timezone=validated_data['timezone']
instance.forceunit=validated_data['forceunit'] instance.forceunit=validated_data['forceunit']
instance.inboard=validated_data['inboard'] instance.inboard=validated_data['inboard']
@@ -140,7 +140,6 @@ class StrokeDataSerializer(serializers.Serializer):
""" """
# do something # do something
print "fake serializer"
return 1 return 1
rowers/sporttracksstuff.py
+139 -138
View File
@@ -1,3 +1,4 @@
from __future__ import unicode_literals, absolute_import
# All the functionality to connect to SportTracks # All the functionality to connect to SportTracks
from rowers.imports import * from rowers.imports import *
@@ -9,7 +10,7 @@ from rowsandall_app.settings import (
SPORTTRACKS_REDIRECT_URI SPORTTRACKS_REDIRECT_URI
) )
import mytypes import rowers.mytypes as mytypes
oauth_data = { oauth_data = {
'client_id': SPORTTRACKS_CLIENT_ID, 'client_id': SPORTTRACKS_CLIENT_ID,
@@ -64,19 +65,19 @@ def rower_sporttracks_token_refresh(user):
def get_sporttracks_workout_list(user): def get_sporttracks_workout_list(user):
r = Rower.objects.get(user=user) r = Rower.objects.get(user=user)
if (r.sporttrackstoken == '') or (r.sporttrackstoken is None): if (r.sporttrackstoken == '') or (r.sporttrackstoken is None):
s = "Token doesn't exist. Need to authorize" s = "Token doesn't exist. Need to authorize"
return custom_exception_handler(401,s) return custom_exception_handler(401,s)
elif (timezone.now()>r.sporttrackstokenexpirydate): elif (timezone.now()>r.sporttrackstokenexpirydate):
s = "Token expired. Needs to refresh." s = "Token expired. Needs to refresh."
return custom_exception_handler(401,s) return custom_exception_handler(401,s)
else: else:
# ready to fetch. Hurray # ready to fetch. Hurray
authorizationstring = str('Bearer ' + r.sporttrackstoken) authorizationstring = str('Bearer ' + r.sporttrackstoken)
headers = {'Authorization': authorizationstring, headers = {'Authorization': authorizationstring,
'user-agent': 'sanderroosendaal', 'user-agent': 'sanderroosendaal',
'Content-Type': 'application/json'} 'Content-Type': 'application/json'}
url = "https://api.sporttracks.mobi/api/v2/fitnessActivities" url = "https://api.sporttracks.mobi/api/v2/fitnessActivities"
s = requests.get(url,headers=headers) s = requests.get(url,headers=headers)
return s return s
@@ -84,19 +85,19 @@ def get_sporttracks_workout_list(user):
def get_workout(user,sporttracksid): def get_workout(user,sporttracksid):
r = Rower.objects.get(user=user) r = Rower.objects.get(user=user)
if (r.sporttrackstoken == '') or (r.sporttrackstoken is None): if (r.sporttrackstoken == '') or (r.sporttrackstoken is None):
return custom_exception_handler(401,s) return custom_exception_handler(401,s)
s = "Token doesn't exist. Need to authorize" s = "Token doesn't exist. Need to authorize"
elif (timezone.now()>r.sporttrackstokenexpirydate): elif (timezone.now()>r.sporttrackstokenexpirydate):
s = "Token expired. Needs to refresh." s = "Token expired. Needs to refresh."
return custom_exception_handler(401,s) return custom_exception_handler(401,s)
else: else:
# ready to fetch. Hurray # ready to fetch. Hurray
authorizationstring = str('Bearer ' + r.sporttrackstoken) authorizationstring = str('Bearer ' + r.sporttrackstoken)
headers = {'Authorization': authorizationstring, headers = {'Authorization': authorizationstring,
'user-agent': 'sanderroosendaal', 'user-agent': 'sanderroosendaal',
'Content-Type': 'application/json'} 'Content-Type': 'application/json'}
url = "https://api.sporttracks.mobi/api/v2/fitnessActivities/"+str(sporttracksid) url = "https://api.sporttracks.mobi/api/v2/fitnessActivities/"+str(sporttracksid)
s = requests.get(url,headers=headers) s = requests.get(url,headers=headers)
data = s.json() data = s.json()
@@ -139,19 +140,19 @@ def createsporttracksworkoutdata(w):
haslatlon=1 haslatlon=1
try: try:
lat = row.df[' latitude'].values lat = row.df[' latitude'].values
lon = row.df[' longitude'].values lon = row.df[' longitude'].values
if not lat.std() and not lon.std(): if not lat.std() and not lon.std():
haslatlon = 0 haslatlon = 0
except KeyError: except KeyError:
haslatlon = 0 haslatlon = 0
haspower = 1 haspower = 1
try: try:
power = row.df[' Power (watts)'].astype(int).values power = row.df[' Power (watts)'].astype(int).values
except KeyError: except KeyError:
haspower = 0 haspower = 0
locdata = [] locdata = []
hrdata = [] hrdata = []
@@ -160,18 +161,18 @@ def createsporttracksworkoutdata(w):
powerdata = [] powerdata = []
for i in range(len(t)): for i in range(len(t)):
hrdata.append(t[i]) hrdata.append(t[i])
hrdata.append(hr[i]) hrdata.append(hr[i])
distancedata.append(t[i]) distancedata.append(t[i])
distancedata.append(d[i]) distancedata.append(d[i])
spmdata.append(t[i]) spmdata.append(t[i])
spmdata.append(spm[i]) spmdata.append(spm[i])
if haslatlon: if haslatlon:
locdata.append(t[i]) locdata.append(t[i])
locdata.append([lat[i],lon[i]]) locdata.append([lat[i],lon[i]])
if haspower: if haspower:
powerdata.append(t[i]) powerdata.append(t[i])
powerdata.append(power[i]) powerdata.append(power[i])
try: try:
@@ -183,37 +184,37 @@ def createsporttracksworkoutdata(w):
st = st.replace(microsecond=0) st = st.replace(microsecond=0)
if haslatlon: if haslatlon:
data = { data = {
"type": "Rowing", "type": "Rowing",
"name": w.name, "name": w.name,
"start_time": st.isoformat(), "start_time": st.isoformat(),
"total_distance": int(w.distance), "total_distance": int(w.distance),
"duration": duration, "duration": duration,
"notes": w.notes, "notes": w.notes,
"avg_heartrate": averagehr, "avg_heartrate": averagehr,
"max_heartrate": maxhr, "max_heartrate": maxhr,
"location": locdata, "location": locdata,
"distance": distancedata, "distance": distancedata,
"cadence": spmdata, "cadence": spmdata,
"heartrate": hrdata, "heartrate": hrdata,
} }
else: else:
data = { data = {
"type": "Rowing", "type": "Rowing",
"name": w.name, "name": w.name,
"start_time": st.isoformat(), "start_time": st.isoformat(),
"total_distance": int(w.distance), "total_distance": int(w.distance),
"duration": duration, "duration": duration,
"notes": w.notes, "notes": w.notes,
"avg_heartrate": averagehr, "avg_heartrate": averagehr,
"max_heartrate": maxhr, "max_heartrate": maxhr,
"distance": distancedata, "distance": distancedata,
"cadence": spmdata, "cadence": spmdata,
"heartrate": hrdata, "heartrate": hrdata,
} }
if haspower: if haspower:
data['power'] = powerdata data['power'] = powerdata
return data return data
@@ -239,41 +240,41 @@ def workout_sporttracks_upload(user,w):
thetoken = sporttracks_open(user) thetoken = sporttracks_open(user)
if (checkworkoutuser(user,w)): if (checkworkoutuser(user,w)):
data = createsporttracksworkoutdata(w) data = createsporttracksworkoutdata(w)
if not data: if not data:
message = "Data error" message = "Data error"
stid = 0 stid = 0
return message,stid return message,stid
authorizationstring = str('Bearer ' + thetoken) authorizationstring = str('Bearer ' + thetoken)
headers = {'Authorization': authorizationstring, headers = {'Authorization': authorizationstring,
'user-agent': 'sanderroosendaal', 'user-agent': 'sanderroosendaal',
'Content-Type': 'application/json'} 'Content-Type': 'application/json'}
url = "https://api.sporttracks.mobi/api/v2/fitnessActivities.json" url = "https://api.sporttracks.mobi/api/v2/fitnessActivities.json"
response = requests.post(url,headers=headers,data=json.dumps(data)) response = requests.post(url,headers=headers,data=json.dumps(data))
# check for duplicate error first # check for duplicate error first
if (response.status_code == 409 ): if (response.status_code == 409 ):
message = "Duplicate error" message = "Duplicate error"
w.uploadedtosporttracks = -1 w.uploadedtosporttracks = -1
stid = -1 stid = -1
w.save() w.save()
return message, stid return message, stid
elif (response.status_code == 201 or response.status_code==200): elif (response.status_code == 201 or response.status_code==200):
s= response.json() s= response.json()
stid = getidfromresponse(response) stid = getidfromresponse(response)
w.uploadedtosporttracks = stid w.uploadedtosporttracks = stid
w.save() w.save()
return 'Successfully synced to SportTracks',stid return 'Successfully synced to SportTracks',stid
else: else:
s = response s = response
message = "Something went wrong in workout_sporttracks_upload_view: %s" % s.reason message = "Something went wrong in workout_sporttracks_upload_view: %s" % s.reason
stid = 0 stid = 0
return message,stid return message,stid
else: else:
message = "You are not authorized to upload this workout" message = "You are not authorized to upload this workout"
stid = 0 stid = 0
return message,stid return message,stid
@@ -289,33 +290,33 @@ def add_workout_from_data(user,importid,data,strokedata,source='sporttracks',
workouttype = 'other' workouttype = 'other'
if workouttype not in [x[0] for x in Workout.workouttypes]: if workouttype not in [x[0] for x in Workout.workouttypes]:
workouttype = 'other' workouttype = 'other'
try: try:
comments = data['comments'] comments = data['comments']
except: except:
comments = '' comments = ''
r = Rower.objects.get(user=user) r = Rower.objects.get(user=user)
try: try:
rowdatetime = iso8601.parse_date(data['start_time']) rowdatetime = iso8601.parse_date(data['start_time'])
except iso8601.ParseError: except iso8601.ParseError:
try: try:
rowdatetime = datetime.datetime.strptime(data['start_time'],"%Y-%m-%d %H:%M:%S") rowdatetime = datetime.datetime.strptime(data['start_time'],"%Y-%m-%d %H:%M:%S")
rowdatetime = thetimezone.localize(rowdatetime).astimezone(utc) rowdatetime = thetimezone.localize(rowdatetime).astimezone(utc)
except: except:
try: try:
rowdatetime = dateutil.parser.parse(data['start_time']) rowdatetime = dateutil.parser.parse(data['start_time'])
rowdatetime = thetimezone.localize(rowdatetime).astimezone(utc) rowdatetime = thetimezone.localize(rowdatetime).astimezone(utc)
except: except:
rowdatetime = datetime.datetime.strptime(data['date'],"%Y-%m-%d %H:%M:%S") rowdatetime = datetime.datetime.strptime(data['date'],"%Y-%m-%d %H:%M:%S")
rowdatetime = thetimezone.localize(rowdatetime).astimezone(utc) rowdatetime = thetimezone.localize(rowdatetime).astimezone(utc)
starttimeunix = arrow.get(rowdatetime).timestamp starttimeunix = arrow.get(rowdatetime).timestamp
try: try:
title = data['name'] title = data['name']
except: except:
title = "Imported data" title = "Imported data"
try: try:
res = splitstdata(data['distance']) res = splitstdata(data['distance'])
@@ -331,41 +332,41 @@ def add_workout_from_data(user,importid,data,strokedata,source='sporttracks',
try: try:
l = data['location'] l = data['location']
res = splitstdata(l) res = splitstdata(l)
times_location = res[0] times_location = res[0]
latlong = res[1] latlong = res[1]
latcoord = [] latcoord = []
loncoord = [] loncoord = []
for coord in latlong: for coord in latlong:
lat = coord[0] lat = coord[0]
lon = coord[1] lon = coord[1]
latcoord.append(lat) latcoord.append(lat)
loncoord.append(lon) loncoord.append(lon)
except: except:
times_location = times_distance times_location = times_distance
latcoord = np.zeros(len(times_distance)) latcoord = np.zeros(len(times_distance))
loncoord = np.zeros(len(times_distance)) loncoord = np.zeros(len(times_distance))
if workouttype in mytypes.otwtypes: if workouttype in mytypes.otwtypes:
workouttype = 'rower' workouttype = 'rower'
try: try:
res = splitstdata(data['cadence']) res = splitstdata(data['cadence'])
times_spm = res[0] times_spm = res[0]
spm = res[1] spm = res[1]
except KeyError: except KeyError:
times_spm = times_distance times_spm = times_distance
spm = 0*times_distance spm = 0*times_distance
try: try:
res = splitstdata(data['heartrate']) res = splitstdata(data['heartrate'])
hr = res[1] hr = res[1]
times_hr = res[0] times_hr = res[0]
except KeyError: except KeyError:
times_hr = times_distance times_hr = times_distance
hr = 0*times_distance hr = 0*times_distance
# create data series and remove duplicates # create data series and remove duplicates
@@ -383,12 +384,12 @@ def add_workout_from_data(user,importid,data,strokedata,source='sporttracks',
# Create dicts and big dataframe # Create dicts and big dataframe
d = { d = {
' Horizontal (meters)': distseries, ' Horizontal (meters)': distseries,
' latitude': latseries, ' latitude': latseries,
' longitude': lonseries, ' longitude': lonseries,
' Cadence (stokes/min)': spmseries, ' Cadence (stokes/min)': spmseries,
' HRCur (bpm)' : hrseries, ' HRCur (bpm)' : hrseries,
} }
@@ -432,7 +433,7 @@ def add_workout_from_data(user,importid,data,strokedata,source='sporttracks',
df = df.fillna(0) df = df.fillna(0)
df.sort_values(by='TimeStamp (sec)',ascending=True) df.sort_values(by='TimeStamp (sec)',ascending=True)
timestr = strftime("%Y%m%d-%H%M%S") timestr = strftime("%Y%m%d-%H%M%S")
# csvfilename ='media/Import_'+str(importid)+'.csv' # csvfilename ='media/Import_'+str(importid)+'.csv'
rowers/stravastuff.py
+182 -180
View File
@@ -1,3 +1,5 @@
from __future__ import unicode_literals, absolute_import
# All the functionality needed to connect to Strava # All the functionality needed to connect to Strava
from scipy import optimize from scipy import optimize
from scipy.signal import savgol_filter from scipy.signal import savgol_filter
@@ -10,15 +12,15 @@ queue = django_rq.get_queue('default')
queuelow = django_rq.get_queue('low') queuelow = django_rq.get_queue('low')
queuehigh = django_rq.get_queue('low') queuehigh = django_rq.get_queue('low')
from dataprep import columndict from rowers.dataprep import columndict
import stravalib import stravalib
from stravalib.exc import ActivityUploadFailed,TimeoutExceeded from stravalib.exc import ActivityUploadFailed,TimeoutExceeded
from iso8601 import ParseError from iso8601 import ParseError
from utils import myqueue from rowers.utils import myqueue
import mytypes import rowers.mytypes as mytypes
import gzip import gzip
from rowsandall_app.settings import ( from rowsandall_app.settings import (
@@ -35,7 +37,7 @@ from rowers.imports import *
headers = {'Accept': 'application/json', headers = {'Accept': 'application/json',
'Api-Key': STRAVA_CLIENT_ID, 'Api-Key': STRAVA_CLIENT_ID,
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'user-agent': 'sanderroosendaal'} 'user-agent': 'sanderroosendaal'}
@@ -89,26 +91,26 @@ def make_authorization_url(request):
def get_strava_workout_list(user,limit_n=0): def get_strava_workout_list(user,limit_n=0):
r = Rower.objects.get(user=user) r = Rower.objects.get(user=user)
if (r.stravatoken == '') or (r.stravatoken is None): if (r.stravatoken == '') or (r.stravatoken is None):
s = "Token doesn't exist. Need to authorize" s = "Token doesn't exist. Need to authorize"
return custom_exception_handler(401,s) return custom_exception_handler(401,s)
elif (r.stravatokenexpirydate is None or timezone.now()+timedelta(seconds=3599)>r.stravatokenexpirydate): elif (r.stravatokenexpirydate is None or timezone.now()+timedelta(seconds=3599)>r.stravatokenexpirydate):
s = "Token expired. Needs to refresh." s = "Token expired. Needs to refresh."
return custom_exception_handler(401,s) return custom_exception_handler(401,s)
else: else:
# ready to fetch. Hurray # ready to fetch. Hurray
authorizationstring = str('Bearer ' + r.stravatoken) authorizationstring = str('Bearer ' + r.stravatoken)
headers = {'Authorization': authorizationstring, headers = {'Authorization': authorizationstring,
'user-agent': 'sanderroosendaal', 'user-agent': 'sanderroosendaal',
'Content-Type': 'application/json'} 'Content-Type': 'application/json'}
url = "https://www.strava.com/api/v3/athlete/activities" url = "https://www.strava.com/api/v3/athlete/activities"
if limit_n==0: if limit_n==0:
params = {} params = {}
else: else:
params = {'per_page':limit_n} params = {'per_page':limit_n}
s = requests.get(url,headers=headers,params=params) s = requests.get(url,headers=headers,params=params)
return s return s
@@ -200,27 +202,27 @@ def create_async_workout(alldata,user,stravaid,debug=False):
thetimezone = 'UTC' thetimezone = 'UTC'
try: try:
rowdatetime = iso8601.parse_date(data['date_utc']) rowdatetime = iso8601.parse_date(data['date_utc'])
except KeyError: except KeyError:
rowdatetime = iso8601.parse_date(data['start_date']) rowdatetime = iso8601.parse_date(data['start_date'])
except ParseError: except ParseError:
rowdatetime = iso8601.parse_date(data['date']) rowdatetime = iso8601.parse_date(data['date'])
try: try:
c2intervaltype = data['workout_type'] c2intervaltype = data['workout_type']
except KeyError: except KeyError:
c2intervaltype = '' c2intervaltype = ''
try: try:
title = data['name'] title = data['name']
except KeyError: except KeyError:
title = "" title = ""
try: try:
t = data['comments'].split('\n', 1)[0] t = data['comments'].split('\n', 1)[0]
title += t[:20] title += t[:20]
except: except:
title = 'Imported' title = 'Imported'
workoutdate = rowdatetime.astimezone( workoutdate = rowdatetime.astimezone(
pytz.timezone(thetimezone) pytz.timezone(thetimezone)
@@ -259,7 +261,7 @@ def create_async_workout(alldata,user,stravaid,debug=False):
return 1 return 1
from utils import get_strava_stream from rowers.utils import get_strava_stream
@@ -273,26 +275,26 @@ def get_workout(user,stravaid):
r = Rower.objects.get(user=user) r = Rower.objects.get(user=user)
if (r.stravatoken == '') or (r.stravatoken is None): if (r.stravatoken == '') or (r.stravatoken is None):
s = "Token doesn't exist. Need to authorize" s = "Token doesn't exist. Need to authorize"
return custom_exception_handler(401,s) return custom_exception_handler(401,s)
elif (r.stravatokenexpirydate is not None and timezone.now()>r.stravatokenexpirydate): elif (r.stravatokenexpirydate is not None and timezone.now()>r.stravatokenexpirydate):
s = "Token expired. Needs to refresh." s = "Token expired. Needs to refresh."
return custom_exception_handler(401,s) return custom_exception_handler(401,s)
else: else:
# ready to fetch. Hurray # ready to fetch. Hurray
fetchresolution = 'high' fetchresolution = 'high'
series_type = 'time' series_type = 'time'
authorizationstring = str('Bearer ' + r.stravatoken) authorizationstring = str('Bearer ' + r.stravatoken)
headers = {'Authorization': authorizationstring, headers = {'Authorization': authorizationstring,
'user-agent': 'sanderroosendaal', 'user-agent': 'sanderroosendaal',
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'resolution': 'medium',} 'resolution': 'medium',}
url = "https://www.strava.com/api/v3/activities/"+str(stravaid) url = "https://www.strava.com/api/v3/activities/"+str(stravaid)
workoutsummary = requests.get(url,headers=headers).json() workoutsummary = requests.get(url,headers=headers).json()
workoutsummary['timezone'] = "Etc/UTC" workoutsummary['timezone'] = "Etc/UTC"
try: try:
startdatetime = workoutsummary['start_date'] startdatetime = workoutsummary['start_date']
except KeyError: except KeyError:
startdatetime = timezone.now() startdatetime = timezone.now()
@@ -306,9 +308,9 @@ def get_workout(user,stravaid):
try: try:
t = np.array(timejson.json()[0]['data']) t = np.array(timejson.json()[0]['data'])
nr_rows = len(t) nr_rows = len(t)
d = np.array(distancejson.json()[1]['data']) d = np.array(distancejson.json()[1]['data'])
if nr_rows == 0: if nr_rows == 0:
return (0,"Error: Time data had zero length") return (0,"Error: Time data had zero length")
@@ -318,70 +320,70 @@ def get_workout(user,stravaid):
except KeyError: except KeyError:
return (0,"something went wrong with the Strava import") return (0,"something went wrong with the Strava import")
try: try:
spm = np.array(spmjson.json()[1]['data']) spm = np.array(spmjson.json()[1]['data'])
except: except:
spm = np.zeros(nr_rows) spm = np.zeros(nr_rows)
try: try:
power = np.array(powerjson.json()[1]['data']) power = np.array(powerjson.json()[1]['data'])
except IndexError: except IndexError:
power = np.zeros(nr_rows) power = np.zeros(nr_rows)
try: try:
hr = np.array(hrjson.json()[1]['data']) hr = np.array(hrjson.json()[1]['data'])
except IndexError: except IndexError:
hr = np.zeros(nr_rows) hr = np.zeros(nr_rows)
except KeyError: except KeyError:
hr = np.zeros(nr_rows) hr = np.zeros(nr_rows)
try: try:
velo = np.array(velojson.json()[1]['data']) velo = np.array(velojson.json()[1]['data'])
except IndexError: except IndexError:
velo = np.zeros(nr_rows) velo = np.zeros(nr_rows)
except KeyError: except KeyError:
velo = np.zeros(nr_rows) velo = np.zeros(nr_rows)
dt = np.diff(t).mean() dt = np.diff(t).mean()
wsize = round(5./dt) wsize = round(5./dt)
velo2 = ewmovingaverage(velo,wsize) velo2 = ewmovingaverage(velo,wsize)
coords = np.array(latlongjson.json()[0]['data']) coords = np.array(latlongjson.json()[0]['data'])
try: try:
lat = coords[:,0] lat = coords[:,0]
lon = coords[:,1] lon = coords[:,1]
except IndexError: except IndexError:
lat = np.zeros(len(t)) lat = np.zeros(len(t))
lon = np.zeros(len(t)) lon = np.zeros(len(t))
except KeyError: except KeyError:
lat = np.zeros(len(t)) lat = np.zeros(len(t))
lon = np.zeros(len(t)) lon = np.zeros(len(t))
strokelength = velo*60./(spm) strokelength = velo*60./(spm)
strokelength[np.isinf(strokelength)] = 0.0 strokelength[np.isinf(strokelength)] = 0.0
pace = 500./(1.0*velo2) pace = 500./(1.0*velo2)
pace[np.isinf(pace)] = 0.0 pace[np.isinf(pace)] = 0.0
df = pd.DataFrame({'t':10*t, df = pd.DataFrame({'t':10*t,
'd':10*d, 'd':10*d,
'p':10*pace, 'p':10*pace,
'spm':spm, 'spm':spm,
'hr':hr, 'hr':hr,
'lat':lat, 'lat':lat,
'lon':lon, 'lon':lon,
'power':power, 'power':power,
'strokelength':strokelength, 'strokelength':strokelength,
}) })
# startdatetime = datetime.datetime.strptime(startdatetime,"%Y-%m-%d-%H:%M:%S") # startdatetime = datetime.datetime.strptime(startdatetime,"%Y-%m-%d-%H:%M:%S")
return [workoutsummary,df] return [workoutsummary,df]
# Generate Workout data for Strava (a TCX file) # Generate Workout data for Strava (a TCX file)
def createstravaworkoutdata(w,dozip=True): def createstravaworkoutdata(w,dozip=True):
@@ -478,41 +480,41 @@ def add_workout_from_data(user,importid,data,strokedata,
workouttype = 'water' workouttype = 'water'
if workouttype not in [x[0] for x in Workout.workouttypes]: if workouttype not in [x[0] for x in Workout.workouttypes]:
workouttype = 'other' workouttype = 'other'
try: try:
comments = data['comments'] comments = data['comments']
except: except:
comments = ' ' comments = ' '
try: try:
thetimezone = tz(data['timezone']) thetimezone = tz(data['timezone'])
except: except:
thetimezone = 'UTC' thetimezone = 'UTC'
r = Rower.objects.get(user=user) r = Rower.objects.get(user=user)
try: try:
rowdatetime = iso8601.parse_date(data['date_utc']) rowdatetime = iso8601.parse_date(data['date_utc'])
except KeyError: except KeyError:
rowdatetime = iso8601.parse_date(data['start_date']) rowdatetime = iso8601.parse_date(data['start_date'])
except ParseError: except ParseError:
rowdatetime = iso8601.parse_date(data['date']) rowdatetime = iso8601.parse_date(data['date'])
try: try:
intervaltype = data['workout_type'] intervaltype = data['workout_type']
except KeyError: except KeyError:
intervaltype = '' intervaltype = ''
try: try:
title = data['name'] title = data['name']
except KeyError: except KeyError:
title = "" title = ""
try: try:
t = data['comments'].split('\n', 1)[0] t = data['comments'].split('\n', 1)[0]
title += t[:20] title += t[:20]
except: except:
title = 'Imported' title = 'Imported'
starttimeunix = arrow.get(rowdatetime).timestamp starttimeunix = arrow.get(rowdatetime).timestamp
@@ -526,17 +528,17 @@ def add_workout_from_data(user,importid,data,strokedata,
nr_rows = len(unixtime) nr_rows = len(unixtime)
try: try:
latcoord = strokedata.loc[:,'lat'] latcoord = strokedata.loc[:,'lat']
loncoord = strokedata.loc[:,'lon'] loncoord = strokedata.loc[:,'lon']
except: except:
latcoord = np.zeros(nr_rows) latcoord = np.zeros(nr_rows)
loncoord = np.zeros(nr_rows) loncoord = np.zeros(nr_rows)
try: try:
strokelength = strokedata.loc[:,'strokelength'] strokelength = strokedata.loc[:,'strokelength']
except: except:
strokelength = np.zeros(nr_rows) strokelength = np.zeros(nr_rows)
dist2 = 0.1*strokedata.loc[:,'d'] dist2 = 0.1*strokedata.loc[:,'d']
@@ -566,28 +568,28 @@ def add_workout_from_data(user,importid,data,strokedata,
# save csv # save csv
# Create data frame with all necessary data to write to csv # Create data frame with all necessary data to write to csv
df = pd.DataFrame({'TimeStamp (sec)':unixtime, df = pd.DataFrame({'TimeStamp (sec)':unixtime,
' Horizontal (meters)': dist2, ' Horizontal (meters)': dist2,
' Cadence (stokes/min)':spm, ' Cadence (stokes/min)':spm,
' HRCur (bpm)':hr, ' HRCur (bpm)':hr,
' longitude':loncoord, ' longitude':loncoord,
' latitude':latcoord, ' latitude':latcoord,
' Stroke500mPace (sec/500m)':pace, ' Stroke500mPace (sec/500m)':pace,
' Power (watts)':power, ' Power (watts)':power,
' DragFactor':np.zeros(nr_rows), ' DragFactor':np.zeros(nr_rows),
' DriveLength (meters)':np.zeros(nr_rows), ' DriveLength (meters)':np.zeros(nr_rows),
' StrokeDistance (meters)':strokelength, ' StrokeDistance (meters)':strokelength,
' DriveTime (ms)':np.zeros(nr_rows), ' DriveTime (ms)':np.zeros(nr_rows),
' StrokeRecoveryTime (ms)':np.zeros(nr_rows), ' StrokeRecoveryTime (ms)':np.zeros(nr_rows),
' AverageDriveForce (lbs)':np.zeros(nr_rows), ' AverageDriveForce (lbs)':np.zeros(nr_rows),
' PeakDriveForce (lbs)':np.zeros(nr_rows), ' PeakDriveForce (lbs)':np.zeros(nr_rows),
' lapIdx':lapidx, ' lapIdx':lapidx,
' ElapsedTime (sec)':seconds ' ElapsedTime (sec)':seconds
}) })
df.sort_values(by='TimeStamp (sec)',ascending=True) df.sort_values(by='TimeStamp (sec)',ascending=True)
timestr = strftime("%Y%m%d-%H%M%S") timestr = strftime("%Y%m%d-%H%M%S")
@@ -623,34 +625,34 @@ def workout_strava_upload(user,w):
r = Rower.objects.get(user=user) r = Rower.objects.get(user=user)
res = -1 res = -1
if (r.stravatoken == '') or (r.stravatoken is None): if (r.stravatoken == '') or (r.stravatoken is None):
s = "Token doesn't exist. Need to authorize" s = "Token doesn't exist. Need to authorize"
raise NoTokenError("Your hovercraft is full of eels") raise NoTokenError("Your hovercraft is full of eels")
else: else:
if (checkworkoutuser(user,w)): if (checkworkoutuser(user,w)):
try: try:
tcxfile,tcxmesg = createstravaworkoutdata(w) tcxfile,tcxmesg = createstravaworkoutdata(w)
if tcxfile: if tcxfile:
with open(tcxfile,'rb') as f: with open(tcxfile,'rb') as f:
res,mes = handle_stravaexport( res,mes = handle_stravaexport(
f,w.name, f,w.name,
r.stravatoken, r.stravatoken,
description=w.notes+'\n from '+w.workoutsource+' via rowsandall.com', description=w.notes+'\n from '+w.workoutsource+' via rowsandall.com',
activity_type=r.stravaexportas) activity_type=r.stravaexportas)
if res==0: if res==0:
message = mes message = mes
w.uploadedtostrava = -1 w.uploadedtostrava = -1
stravaid = -1 stravaid = -1
w.save() w.save()
try: try:
os.remove(tcxfile) os.remove(tcxfile)
except WindowsError: except WindowsError:
pass pass
return message,stravaid return message,stravaid
w.uploadedtostrava = res w.uploadedtostrava = res
w.save() w.save()
try: try:
os.remove(tcxfile) os.remove(tcxfile)
except WindowsError: except WindowsError:
pass pass
message = mes message = mes
@@ -663,14 +665,14 @@ def workout_strava_upload(user,w):
w.save() w.save()
return message, stravaid return message, stravaid
except ActivityUploadFailed as e: except ActivityUploadFailed as e:
message = "Strava Upload error: %s" % e message = "Strava Upload error: %s" % e
w.uploadedtostrava = -1 w.uploadedtostrava = -1
stravaid = -1 stravaid = -1
w.save() w.save()
os.remove(tcxfile) os.remove(tcxfile)
return message,stravaid return message,stravaid
return message,stravaid return message,stravaid
return message,stravaid return message,stravaid
@@ -688,9 +690,9 @@ def handle_strava_import_stroke_data(title,
series_type = 'time' series_type = 'time'
authorizationstring = str('Bearer ' + stravatoken) authorizationstring = str('Bearer ' + stravatoken)
headers = {'Authorization': authorizationstring, headers = {'Authorization': authorizationstring,
'user-agent': 'sanderroosendaal', 'user-agent': 'sanderroosendaal',
'Content-Type': 'application/json', 'Content-Type': 'application/json',
'resolution': 'medium',} 'resolution': 'medium',}
url = "https://www.strava.com/api/v3/activities/"+str(stravaid) url = "https://www.strava.com/api/v3/activities/"+str(stravaid)
workoutsummary = requests.get(url,headers=headers).json() workoutsummary = requests.get(url,headers=headers).json()
@@ -708,9 +710,9 @@ def handle_strava_import_stroke_data(title,
wattsjson = get_strava_stream(r,'watts',stravaid) wattsjson = get_strava_stream(r,'watts',stravaid)
try: try:
t = np.array(timejson.json()[0]['data']) t = np.array(timejson.json()[0]['data'])
nr_rows = len(t) nr_rows = len(t)
d = np.array(distancejson.json()[1]['data']) d = np.array(distancejson.json()[1]['data'])
if nr_rows == 0: if nr_rows == 0:
return 0 return 0
except IndexError: except IndexError:
@@ -720,9 +722,9 @@ def handle_strava_import_stroke_data(title,
return 0 return 0
try: try:
spm = np.array(spmjson.json()[1]['data']) spm = np.array(spmjson.json()[1]['data'])
except: except:
spm = np.zeros(nr_rows) spm = np.zeros(nr_rows)
try: try:
watts = np.array(wattsjson.json()[1]['data']) watts = np.array(wattsjson.json()[1]['data'])
@@ -730,16 +732,16 @@ def handle_strava_import_stroke_data(title,
watts = np.zeros(nr_rows) watts = np.zeros(nr_rows)
try: try:
hr = np.array(hrjson.json()[1]['data']) hr = np.array(hrjson.json()[1]['data'])
except IndexError: except IndexError:
hr = np.zeros(nr_rows) hr = np.zeros(nr_rows)
except KeyError: except KeyError:
hr = np.zeros(nr_rows) hr = np.zeros(nr_rows)
try: try:
velo = np.array(velojson.json()[1]['data']) velo = np.array(velojson.json()[1]['data'])
except IndexError: except IndexError:
velo = np.zeros(nr_rows) velo = np.zeros(nr_rows)
except KeyError: except KeyError:
velo = np.zeros(nr_rows) velo = np.zeros(nr_rows)
@@ -756,14 +758,14 @@ def handle_strava_import_stroke_data(title,
coords = np.array(latlongjson.json()[0]['data']) coords = np.array(latlongjson.json()[0]['data'])
try: try:
lat = coords[:,0] lat = coords[:,0]
lon = coords[:,1] lon = coords[:,1]
except IndexError: except IndexError:
lat = np.zeros(len(t)) lat = np.zeros(len(t))
lon = np.zeros(len(t)) lon = np.zeros(len(t))
except KeyError: except KeyError:
lat = np.zeros(len(t)) lat = np.zeros(len(t))
lon = np.zeros(len(t)) lon = np.zeros(len(t))
strokelength = velo*60./(spm) strokelength = velo*60./(spm)
strokelength[np.isinf(strokelength)] = 0.0 strokelength[np.isinf(strokelength)] = 0.0
@@ -779,22 +781,22 @@ def handle_strava_import_stroke_data(title,
df = pd.DataFrame({'TimeStamp (sec)':unixtime, df = pd.DataFrame({'TimeStamp (sec)':unixtime,
' ElapsedTime (sec)':t, ' ElapsedTime (sec)':t,
' Horizontal (meters)':d, ' Horizontal (meters)':d,
' Stroke500mPace (sec/500m)':pace, ' Stroke500mPace (sec/500m)':pace,
' Cadence (stokes/min)':spm, ' Cadence (stokes/min)':spm,
' HRCur (bpm)':hr, ' HRCur (bpm)':hr,
' latitude':lat, ' latitude':lat,
' longitude':lon, ' longitude':lon,
' StrokeDistance (meters)':strokelength, ' StrokeDistance (meters)':strokelength,
'cum_dist':d, 'cum_dist':d,
' DragFactor':np.zeros(nr_strokes), ' DragFactor':np.zeros(nr_strokes),
' DriveLength (meters)':np.zeros(nr_strokes), ' DriveLength (meters)':np.zeros(nr_strokes),
' StrokeDistance (meters)':strokedistance, ' StrokeDistance (meters)':strokedistance,
' DriveTime (ms)':np.zeros(nr_strokes), ' DriveTime (ms)':np.zeros(nr_strokes),
' StrokeRecoveryTime (ms)':np.zeros(nr_strokes), ' StrokeRecoveryTime (ms)':np.zeros(nr_strokes),
' AverageDriveForce (lbs)':np.zeros(nr_strokes), ' AverageDriveForce (lbs)':np.zeros(nr_strokes),
' PeakDriveForce (lbs)':np.zeros(nr_strokes), ' PeakDriveForce (lbs)':np.zeros(nr_strokes),
' lapIdx':np.zeros(nr_strokes), ' lapIdx':np.zeros(nr_strokes),
' Power (watts)':watts, ' Power (watts)':watts,
}) })
rowers/tasks.py
+20 -16
View File
@@ -1,4 +1,5 @@
""" Background tasks done by Celery (develop) or QR (production) """ """ Background tasks done by Celery (develop) or QR (production) """
from __future__ import absolute_import
import os import os
import time import time
import gc import gc
@@ -16,7 +17,10 @@ from rowingdata import rowingdata as rdata
from datetime import timedelta from datetime import timedelta
from sqlalchemy import create_engine from sqlalchemy import create_engine
from celery import app #from celery import app
from rowers.celery import app
from celery import shared_task
import datetime import datetime
import pytz import pytz
import iso8601 import iso8601
@@ -39,10 +43,11 @@ from django_rq import job
from django.utils import timezone from django.utils import timezone
from django.utils.html import strip_tags from django.utils.html import strip_tags
from utils import deserialize_list,ewmovingaverage,wavg from rowers.utils import deserialize_list,ewmovingaverage,wavg
from emails import htmlstrip from rowers.emails import htmlstrip
from HTMLParser import HTMLParser #from HTMLParser import HTMLParser
from html.parser import HTMLParser
class MLStripper(HTMLParser): class MLStripper(HTMLParser):
def __init__(self): def __init__(self):
self.reset() self.reset()
@@ -80,13 +85,13 @@ from django.db.utils import OperationalError
from jinja2 import Template,Environment,FileSystemLoader from jinja2 import Template,Environment,FileSystemLoader
env = Environment(loader = FileSystemLoader(["rowers/templates"])) env = Environment(loader = FileSystemLoader(["rowers/templates"]))
import datautils import rowers.datautils as datautils
import utils import rowers.utils as utils
import requests import requests
import longtask import rowers.longtask as longtask
import arrow import arrow
from utils import get_strava_stream from rowers.utils import get_strava_stream
siteurl = SITE_URL siteurl = SITE_URL
@@ -128,9 +133,9 @@ def handle_c2_import_stroke_data(c2token,
return 1 return 1
else: else:
url = "https://log.concept2.com/api/users/me/results/"+str(c2id) url = "https://log.concept2.com/api/users/me/results/{id}".format(id=c2id)
s = requests.get(url,headers=headers) s = requests.get(url,headers=headers)
if s.status_code == 200: if s.status_code == 200:
workoutdata = s.json()['data'] workoutdata = s.json()['data']
@@ -1238,21 +1243,21 @@ def handle_zip_file(emailfrom, subject, file,**kwargs):
debug = False debug = False
if debug: if debug:
print message print(message)
email = EmailMessage(subject, message, email = EmailMessage(subject, message,
emailfrom, emailfrom,
['workouts@rowsandall.com']) ['workouts@rowsandall.com'])
email.attach_file(file) email.attach_file(file)
if debug: if debug:
print "attaching" print("attaching")
res = email.send() res = email.send()
if debug: if debug:
print "sent" print("sent")
time.sleep(60) time.sleep(60)
return 1 return 1
@@ -1490,9 +1495,8 @@ def handle_updateergcp(rower_id,workoutfilenames,debug=False,**kwargs):
rowdata = rdata(f1 + '.gz') rowdata = rdata(f1 + '.gz')
except IOError: except IOError:
rowdata = 0 rowdata = 0
if rowdata != 0:
if rowdata != 0: therows.append(rowdata)
therows.append(rowdata)
cpdata = rowingdata.cumcpdata(therows) cpdata = rowingdata.cumcpdata(therows)
cpdata.columns = cpdata.columns.str.lower() cpdata.columns = cpdata.columns.str.lower()
rowers/teams.py
+1 -1
View File
@@ -10,7 +10,7 @@ from django.db import IntegrityError
import uuid import uuid
from django.conf import settings from django.conf import settings
from utils import myqueue from rowers.utils import myqueue
import django_rq import django_rq
queue = django_rq.get_queue('default') queue = django_rq.get_queue('default')
rowers/tpstuff.py
+1 -6
View File
@@ -1,3 +1,4 @@
from __future__ import unicode_literals, absolute_import
# All the functionality needed to connect to Runkeeper # All the functionality needed to connect to Runkeeper
from rowers.imports import * from rowers.imports import *
@@ -149,12 +150,6 @@ def uploadactivity(access_token,filename,description='',
headers=headers) headers=headers)
if resp.status_code != 200: if resp.status_code != 200:
if settings.DEBUG:
print resp.status_code
print resp.reason
print ""
print headers
print ""
return 0,resp.reason,resp.status_code,headers return 0,resp.reason,resp.status_code,headers
else: else:
return resp.json()[0]["Id"],"ok",200,"" return resp.json()[0]["Id"],"ok",200,""
rowers/underarmourstuff.py
+101 -100
View File
@@ -1,6 +1,7 @@
from __future__ import unicode_literals, absolute_import
from rowers.imports import * from rowers.imports import *
import mytypes import rowers.mytypes as mytypes
from rowers.mytypes import otwtypes from rowers.mytypes import otwtypes
from rowsandall_app.settings import ( from rowsandall_app.settings import (
@@ -45,18 +46,18 @@ def make_authorization_url(request):
def get_underarmour_workout_list(user): def get_underarmour_workout_list(user):
r = Rower.objects.get(user=user) r = Rower.objects.get(user=user)
if (r.underarmourtoken == '') or (r.underarmourtoken is None): if (r.underarmourtoken == '') or (r.underarmourtoken is None):
s = "Token doesn't exist. Need to authorize" s = "Token doesn't exist. Need to authorize"
return custom_exception_handler(401,s) return custom_exception_handler(401,s)
else: else:
# ready to fetch. Hurray # ready to fetch. Hurray
authorizationstring = str('Bearer ' + r.underarmourtoken) authorizationstring = str('Bearer ' + r.underarmourtoken)
headers = {'Authorization': authorizationstring, headers = {'Authorization': authorizationstring,
'Api-Key': UNDERARMOUR_CLIENT_KEY, 'Api-Key': UNDERARMOUR_CLIENT_KEY,
'user-agent': 'sanderroosendaal', 'user-agent': 'sanderroosendaal',
'Content-Type': 'application/json'} 'Content-Type': 'application/json'}
url = "https://api.ua.com/v7.1/workout/?user="+str(get_userid(r.underarmourtoken))+"&order_by=-start_datetime" url = "https://api.ua.com/v7.1/workout/?user="+str(get_userid(r.underarmourtoken))+"&order_by=-start_datetime"
s = requests.get(url,headers=headers) s = requests.get(url,headers=headers)
return s return s
@@ -65,17 +66,17 @@ def get_underarmour_workout_list(user):
def get_workout(user,underarmourid): def get_workout(user,underarmourid):
r = Rower.objects.get(user=user) r = Rower.objects.get(user=user)
if (r.underarmourtoken == '') or (r.underarmourtoken is None): if (r.underarmourtoken == '') or (r.underarmourtoken is None):
return custom_exception_handler(401,s) return custom_exception_handler(401,s)
s = "Token doesn't exist. Need to authorize" s = "Token doesn't exist. Need to authorize"
else: else:
# ready to fetch. Hurray # ready to fetch. Hurray
authorizationstring = str('Bearer ' + r.underarmourtoken) authorizationstring = str('Bearer ' + r.underarmourtoken)
headers = {'Authorization': authorizationstring, headers = {'Authorization': authorizationstring,
'Api-Key': UNDERARMOUR_CLIENT_KEY, 'Api-Key': UNDERARMOUR_CLIENT_KEY,
'user-agent': 'sanderroosendaal', 'user-agent': 'sanderroosendaal',
'Content-Type': 'application/json'} 'Content-Type': 'application/json'}
url = "https://api.ua.com/v7.1/workout/"+str(underarmourid)+"/?field_set=time_series" url = "https://api.ua.com/v7.1/workout/"+str(underarmourid)+"/?field_set=time_series"
s = requests.get(url,headers=headers) s = requests.get(url,headers=headers)
data = s.json() data = s.json()
@@ -135,12 +136,12 @@ def createunderarmourworkoutdata(w):
haslatlon=1 haslatlon=1
try: try:
lat = row.df[' latitude'] lat = row.df[' latitude']
lon = row.df[' longitude'] lon = row.df[' longitude']
if not lat.std() and not lon.std(): if not lat.std() and not lon.std():
haslatlon = 0 haslatlon = 0
except KeyError: except KeyError:
haslatlon = 0 haslatlon = 0
@@ -201,7 +202,7 @@ def createunderarmourworkoutdata(w):
timeseries["position"] = locdata timeseries["position"] = locdata
data = { data = {
"start_datetime": start_time, "start_datetime": start_time,
"name": name, "name": name,
"has_time_series": True, "has_time_series": True,
"time_series": timeseries, "time_series": timeseries,
@@ -236,8 +237,8 @@ def refresh_ua_actlist(user):
authorizationstring = str('Bearer ' + r.underarmourtoken) authorizationstring = str('Bearer ' + r.underarmourtoken)
headers = {'Authorization': authorizationstring, headers = {'Authorization': authorizationstring,
'Api-Key': UNDERARMOUR_CLIENT_KEY, 'Api-Key': UNDERARMOUR_CLIENT_KEY,
'user-agent': 'sanderroosendaal', 'user-agent': 'sanderroosendaal',
'Content-Type': 'application/json'} 'Content-Type': 'application/json'}
url = "https://api.ua.com/v7.1/activity_type/" url = "https://api.ua.com/v7.1/activity_type/"
response = requests.get(url,headers=headers) response = requests.get(url,headers=headers)
@@ -263,8 +264,8 @@ def get_typefromid(typeid,user):
authorizationstring = str('Bearer ' + r.underarmourtoken) authorizationstring = str('Bearer ' + r.underarmourtoken)
headers = {'Authorization': authorizationstring, headers = {'Authorization': authorizationstring,
'Api-Key': UNDERARMOUR_CLIENT_KEY, 'Api-Key': UNDERARMOUR_CLIENT_KEY,
'user-agent': 'sanderroosendaal', 'user-agent': 'sanderroosendaal',
'Content-Type': 'application/json'} 'Content-Type': 'application/json'}
url = "https://api.ua.com/v7.1/activity_type/"+str(typeid) url = "https://api.ua.com/v7.1/activity_type/"+str(typeid)
response = requests.get(url,headers=headers) response = requests.get(url,headers=headers)
@@ -285,8 +286,8 @@ def get_userid(access_token):
authorizationstring = str('Bearer ' + access_token) authorizationstring = str('Bearer ' + access_token)
headers = {'Authorization': authorizationstring, headers = {'Authorization': authorizationstring,
'Api-Key': UNDERARMOUR_CLIENT_KEY, 'Api-Key': UNDERARMOUR_CLIENT_KEY,
'user-agent': 'sanderroosendaal', 'user-agent': 'sanderroosendaal',
'Content-Type': 'application/json'} 'Content-Type': 'application/json'}
url = "https://api.ua.com/v7.1/user/self/" url = "https://api.ua.com/v7.1/user/self/"
response = requests.get(url,headers=headers) response = requests.get(url,headers=headers)
@@ -311,42 +312,42 @@ def workout_ua_upload(user,w):
# ready to upload. Hurray # ready to upload. Hurray
if (checkworkoutuser(user,w)): if (checkworkoutuser(user,w)):
data = createunderarmourworkoutdata(w) data = createunderarmourworkoutdata(w)
# return HttpResponse(json.dumps(data)) # return HttpResponse(json.dumps(data))
if not data: if not data:
message = "Data error" message = "Data error"
uaid = 0 uaid = 0
return message, uaid return message, uaid
authorizationstring = str('Bearer ' + thetoken) authorizationstring = str('Bearer ' + thetoken)
headers = {'Authorization': authorizationstring, headers = {'Authorization': authorizationstring,
'Api-Key': UNDERARMOUR_CLIENT_KEY, 'Api-Key': UNDERARMOUR_CLIENT_KEY,
'user-agent': 'sanderroosendaal', 'user-agent': 'sanderroosendaal',
'Content-Type': 'application/json', 'Content-Type': 'application/json',
} }
url = "https://api.ua.com/v7.1/workout/" url = "https://api.ua.com/v7.1/workout/"
response = requests.post(url,headers=headers,data=json.dumps(data)) response = requests.post(url,headers=headers,data=json.dumps(data))
# check for duplicate error first # check for duplicate error first
if (response.status_code == 409 ): if (response.status_code == 409 ):
message = "Duplicate error" message = "Duplicate error"
w.uploadedtounderarmour = -1 w.uploadedtounderarmour = -1
uaid = -1 uaid = -1
w.save() w.save()
elif (response.status_code == 201 or response.status_code==200): elif (response.status_code == 201 or response.status_code==200):
uaid = getidfromresponse(response) uaid = getidfromresponse(response)
w.uploadedtounderarmour = uaid w.uploadedtounderarmour = uaid
w.save() w.save()
return 'Successfully synchronized with MapMyFitness',uaid return 'Successfully synchronized with MapMyFitness',uaid
else: else:
s = response s = response
message = "Something went wrong in workout_underarmour_upload_view: %s - %s" % (s.reason,s.text) message = "Something went wrong in workout_underarmour_upload_view: %s - %s" % (s.reason,s.text)
uaid = 0 uaid = 0
return message, uaid return message, uaid
else: else:
message = "You are not authorized to upload this workout" message = "You are not authorized to upload this workout"
uaid = 0 uaid = 0
return message, uaid return message, uaid
@@ -360,36 +361,36 @@ def add_workout_from_data(user,importid,data,strokedata,
workouttype = 'water' workouttype = 'water'
try: try:
comments = data['notes'] comments = data['notes']
except: except:
comments = '' comments = ''
try: try:
thetimezone = tz(data['start_locale_timezone']) thetimezone = tz(data['start_locale_timezone'])
except: except:
thetimezone = 'UTC' thetimezone = 'UTC'
r = Rower.objects.get(user=user) r = Rower.objects.get(user=user)
try: try:
rowdatetime = iso8601.parse_date(data['start_datetime']) rowdatetime = iso8601.parse_date(data['start_datetime'])
except iso8601.ParseError: except iso8601.ParseError:
try: try:
rowdatetime = datetime.strptime(data['start_datetime'],"%Y-%m-%d %H:%M:%S") rowdatetime = datetime.strptime(data['start_datetime'],"%Y-%m-%d %H:%M:%S")
rowdatetime = thetimezone.localize(rowdatetime).astimezone(utc) rowdatetime = thetimezone.localize(rowdatetime).astimezone(utc)
except: except:
try: try:
rowdatetime = parser.parse(data['start_datetime']) rowdatetime = parser.parse(data['start_datetime'])
rowdatetime = thetimezone.localize(rowdatetime).astimezone(utc) rowdatetime = thetimezone.localize(rowdatetime).astimezone(utc)
except: except:
rowdatetime = datetime.strptime(data['date'],"%Y-%m-%d %H:%M:%S") rowdatetime = datetime.strptime(data['date'],"%Y-%m-%d %H:%M:%S")
rowdatetime = thetimezone.localize(rowdatetime).astimezone(utc) rowdatetime = thetimezone.localize(rowdatetime).astimezone(utc)
starttimeunix = arrow.get(rowdatetime).timestamp starttimeunix = arrow.get(rowdatetime).timestamp
try: try:
title = data['name'] title = data['name']
except: except:
title = "Imported data" title = "Imported data"
timeseries = data['time_series'] timeseries = data['time_series']
@@ -403,41 +404,41 @@ def add_workout_from_data(user,importid,data,strokedata,
try: try:
l = timeseries['position'] l = timeseries['position']
res = splituadata(l) res = splituadata(l)
times_location = res[0] times_location = res[0]
latlong = res[1] latlong = res[1]
latcoord = [] latcoord = []
loncoord = [] loncoord = []
for coord in latlong: for coord in latlong:
lat = coord['lat'] lat = coord['lat']
lon = coord['lng'] lon = coord['lng']
latcoord.append(lat) latcoord.append(lat)
loncoord.append(lon) loncoord.append(lon)
except: except:
times_location = times_distance times_location = times_distance
latcoord = np.zeros(len(times_distance)) latcoord = np.zeros(len(times_distance))
loncoord = np.zeros(len(times_distance)) loncoord = np.zeros(len(times_distance))
if workouttype in otwtypes: if workouttype in otwtypes:
workouttype = 'rower' workouttype = 'rower'
try: try:
res = splituadata(timeseries['cadence']) res = splituadata(timeseries['cadence'])
times_spm = res[0] times_spm = res[0]
spm = res[1] spm = res[1]
except KeyError: except KeyError:
times_spm = times_distance times_spm = times_distance
spm = 0*times_distance spm = 0*times_distance
try: try:
res = splituadata(timeseries['heartrate']) res = splituadata(timeseries['heartrate'])
hr = res[1] hr = res[1]
times_hr = res[0] times_hr = res[0]
except KeyError: except KeyError:
times_hr = times_distance times_hr = times_distance
hr = 0*times_distance hr = 0*times_distance
# create data series and remove duplicates # create data series and remove duplicates
@@ -455,12 +456,12 @@ def add_workout_from_data(user,importid,data,strokedata,
# Create dicts and big dataframe # Create dicts and big dataframe
d = { d = {
' Horizontal (meters)': distseries, ' Horizontal (meters)': distseries,
' latitude': latseries, ' latitude': latseries,
' longitude': lonseries, ' longitude': lonseries,
' Cadence (stokes/min)': spmseries, ' Cadence (stokes/min)': spmseries,
' HRCur (bpm)' : hrseries, ' HRCur (bpm)' : hrseries,
} }
@@ -499,7 +500,7 @@ def add_workout_from_data(user,importid,data,strokedata,
df = df.fillna(0) df = df.fillna(0)
df.sort_values(by='TimeStamp (sec)',ascending=True) df.sort_values(by='TimeStamp (sec)',ascending=True)
timestr = strftime("%Y%m%d-%H%M%S") timestr = strftime("%Y%m%d-%H%M%S")
csvfilename ='media/{code}_{importid}.csv'.format( csvfilename ='media/{code}_{importid}.csv'.format(
rowers/uploads.py
+22 -17
View File
@@ -26,12 +26,13 @@ queue = django_rq.get_queue('default')
queuelow = django_rq.get_queue('low') queuelow = django_rq.get_queue('low')
queuehigh = django_rq.get_queue('low') queuehigh = django_rq.get_queue('low')
from mytypes import workouttypes,boattypes,otwtypes,workoutsources from rowers.mytypes import workouttypes,boattypes,otwtypes,workoutsources
try: try:
from cStringIO import StringIO from cStringIO import StringIO
except: except:
from StringIO import StringIO from io import StringIO
from rowers.utils import ( from rowers.utils import (
geo_distance,serialize_list,deserialize_list,uniqify, geo_distance,serialize_list,deserialize_list,uniqify,
@@ -403,34 +404,34 @@ def make_plot(r,w,f1,f2,plottype,title,imagename='',plotnr=0):
ftp = ftp*(100.-r.otwslack)/100. ftp = ftp*(100.-r.otwslack)/100.
hrpwrdata = { hrpwrdata = {
'hrmax':r.max, 'hrmax':r.max,
'hrut2':r.ut2, 'hrut2':r.ut2,
'hrut1':r.ut1, 'hrut1':r.ut1,
'hrat':r.at, 'hrat':r.at,
'hrtr':r.tr, 'hrtr':r.tr,
'hran':r.an, 'hran':r.an,
'ftp':ftp, 'ftp':ftp,
'powerperc':serialize_list(powerperc), 'powerperc':serialize_list(powerperc),
'powerzones':serialize_list(r.powerzones), 'powerzones':serialize_list(r.powerzones),
} }
# make plot - asynchronous task # make plot - asynchronous task
plotnrs = { plotnrs = {
'timeplot':1, 'timeplot':1,
'distanceplot':2, 'distanceplot':2,
'pieplot':3, 'pieplot':3,
} }
if plotnr == 0: if plotnr == 0:
plotnr = plotnrs[plottype] plotnr = plotnrs[plottype]
if w.workouttype in otwtypes: if w.workouttype in otwtypes:
plotnr = plotnr+3 plotnr = plotnr+3
job = myqueue(queue,handle_makeplot,f1,f2, job = myqueue(queue,handle_makeplot,f1,f2,
title,hrpwrdata, title,hrpwrdata,
plotnr,imagename) plotnr,imagename)
try: try:
width,height = Image.open(fullpathimagename).size width,height = Image.open(fullpathimagename).size
@@ -451,8 +452,12 @@ def make_plot(r,w,f1,f2,plottype,title,imagename='',plotnr=0):
return i.id,job.id return i.id,job.id
import c2stuff,stravastuff,sporttracksstuff,runkeeperstuff import rowers.c2stuff as c2stuff
import underarmourstuff,tpstuff import rowers.stravastuff as stravastuff
import rowers.sporttracksstuff as sporttracksstuff
import rowers.runkeeperstuff as runkeeperstuff
import rowers.underarmourstuff as underarmourstuff
import rowers.tpstuff as tpstuff
def set_workouttype(w,options): def set_workouttype(w,options):
try: try:
rowers/urls.py
+1 -1
View File
@@ -2,7 +2,7 @@ from django.conf import settings
from django.conf.urls import url, include from django.conf.urls import url, include
from django.contrib.auth.models import User from django.contrib.auth.models import User
from django.contrib.auth.decorators import login_required, permission_required from django.contrib.auth.decorators import login_required, permission_required
from models import Workout,Rower,StrokeData,FavoriteChart from rowers.models import Workout,Rower,StrokeData,FavoriteChart
from rest_framework import routers, serializers, viewsets,permissions from rest_framework import routers, serializers, viewsets,permissions
from rest_framework.urlpatterns import format_suffix_patterns from rest_framework.urlpatterns import format_suffix_patterns
rowers/utils.py
+2 -2
View File
@@ -439,10 +439,10 @@ def ewmovingaverage(interval,window_size):
# Custom error class - to raise a NoTokenError # Custom error class - to raise a NoTokenError
class NoTokenError(Exception): class NoTokenError(Exception):
def __init__(self,value): def __init__(self,value):
self.value=value self.value=value
def __str__(self): def __str__(self):
return repr(self.value) return repr(self.value)
class ProcessorCustomerError(Exception): class ProcessorCustomerError(Exception):
def __init__(self, value): def __init__(self, value):
rowers/views/analysisviews.py
+718 -717
View File
File diff suppressed because it is too large Load Diff
rowers/views/apiviews.py
+24 -24
View File
@@ -1,4 +1,4 @@
from statements import * from rowers.views.statements import *
# Stroke data form to test API upload # Stroke data form to test API upload
@@ -18,22 +18,22 @@ def strokedataform(request,id=0):
if request.method == 'GET': if request.method == 'GET':
form = StrokeDataForm() form = StrokeDataForm()
return render(request, 'strokedata_form.html', return render(request, 'strokedata_form.html',
{ {
'form':form, 'form':form,
'teams':get_my_teams(request.user), 'teams':get_my_teams(request.user),
'id':id, 'id':id,
'workout':w, 'workout':w,
}) })
elif request.method == 'POST': elif request.method == 'POST':
form = StrokeDataForm() form = StrokeDataForm()
return render(request, 'strokedata_form.html', return render(request, 'strokedata_form.html',
{ {
'form':form, 'form':form,
'teams':get_my_teams(request.user), 'teams':get_my_teams(request.user),
'id':id, 'id':id,
'workout':w, 'workout':w,
}) })
# Process the POSTed stroke data according to the API definition # Process the POSTed stroke data according to the API definition
# Return the GET stroke data according to the API definition # Return the GET stroke data according to the API definition
@@ -124,30 +124,30 @@ def strokedatajson(request,id):
logfile.write(request.user.username+"(POST) \r\n") logfile.write(request.user.username+"(POST) \r\n")
data = pd.DataFrame({'TimeStamp (sec)':unixtime, data = pd.DataFrame({'TimeStamp (sec)':unixtime,
' Horizontal (meters)': distance, ' Horizontal (meters)': distance,
' Cadence (stokes/min)':spm, ' Cadence (stokes/min)':spm,
' HRCur (bpm)':hr, ' HRCur (bpm)':hr,
' DragFactor':dragfactor, ' DragFactor':dragfactor,
' Stroke500mPace (sec/500m)':pace, ' Stroke500mPace (sec/500m)':pace,
' Power (watts)':power, ' Power (watts)':power,
' DriveLength (meters)':drivelength, ' DriveLength (meters)':drivelength,
' DriveTime (ms)':drivetime, ' DriveTime (ms)':drivetime,
' StrokeRecoveryTime (ms)':strokerecoverytime, ' StrokeRecoveryTime (ms)':strokerecoverytime,
' AverageDriveForce (lbs)':averagedriveforce, ' AverageDriveForce (lbs)':averagedriveforce,
' PeakDriveForce (lbs)':peakdriveforce, ' PeakDriveForce (lbs)':peakdriveforce,
' lapIdx':lapidx, ' lapIdx':lapidx,
' ElapsedTime (sec)':time, ' ElapsedTime (sec)':time,
'catch':catch, 'catch':catch,
'slip':slip, 'slip':slip,
'finish':finish, 'finish':finish,
'wash':wash, 'wash':wash,
'driveenergy':driveenergy, 'driveenergy':driveenergy,
'peakforceangle':peakforceangle, 'peakforceangle':peakforceangle,
}) })
# Following part should be replaced with dataprep.new_workout_from_df # Following part should be replaced with dataprep.new_workout_from_df
r = getrower(request.user) r = getrower(request.user)
timestr = row.startdatetime.strftime("%Y%m%d-%H%M%S") timestr = row.startdatetime.strftime("%Y%m%d-%H%M%S")
csvfilename ='media/Import_'+timestr+'.csv' csvfilename ='media/Import_'+timestr+'.csv'
@@ -167,8 +167,8 @@ def strokedatajson(request,id):
ftp = ftp*(100.-r.otwslack)/100. ftp = ftp*(100.-r.otwslack)/100.
rr = rrower(hrmax=r.max,hrut2=r.ut2, rr = rrower(hrmax=r.max,hrut2=r.ut2,
hrut1=r.ut1,hrat=r.at, hrut1=r.ut1,hrat=r.at,
hrtr=r.tr,hran=r.an,ftp=ftp, hrtr=r.tr,hran=r.an,ftp=ftp,
powerperc=powerperc,powerzones=r.powerzones) powerperc=powerperc,powerzones=r.powerzones)
rowdata = rdata(row.csvfilename,rower=rr).df rowdata = rdata(row.csvfilename,rower=rr).df
rowers/views/errorviews.py
+1 -1
View File
@@ -1,4 +1,4 @@
from statements import * from rowers.views.statements import *
# Custom error pages with Rowsandall headers # Custom error pages with Rowsandall headers
def error500_view(request): def error500_view(request):
rowers/views/exportviews.py
+1 -1
View File
@@ -1,4 +1,4 @@
from statements import * from rowers.views.statements import *
rowers/views/importviews.py
+262 -262
View File
@@ -1,4 +1,4 @@
from statements import * from rowers.views.statements import *
# Send workout to TP # Send workout to TP
@@ -71,17 +71,17 @@ def workout_strava_upload_view(request,id=0):
return HttpResponseRedirect("/rowers/me/stravaauthorize/") return HttpResponseRedirect("/rowers/me/stravaauthorize/")
if (r.stravatoken == '') or (r.stravatoken is None): if (r.stravatoken == '') or (r.stravatoken is None):
s = "Token doesn't exist. Need to authorize" s = "Token doesn't exist. Need to authorize"
return HttpResponseRedirect("/rowers/me/stravaauthorize/") return HttpResponseRedirect("/rowers/me/stravaauthorize/")
else: else:
# ready to upload. Hurray # ready to upload. Hurray
w = get_workout_permitted(request.user,id) w = get_workout_permitted(request.user,id)
r = w.user r = w.user
if (checkworkoutuser(request.user,w)): if (checkworkoutuser(request.user,w)):
try: try:
tcxfile,tcxmessg = stravastuff.createstravaworkoutdata(w) tcxfile,tcxmessg = stravastuff.createstravaworkoutdata(w)
if tcxfile: if tcxfile:
with open(tcxfile,'rb') as f: with open(tcxfile,'rb') as f:
try: try:
newnotes = w.notes+'\n from '+w.workoutsource+' via rowsandall.com' newnotes = w.notes+'\n from '+w.workoutsource+' via rowsandall.com'
except TypeError: except TypeError:
@@ -91,38 +91,38 @@ def workout_strava_upload_view(request,id=0):
else: else:
activity_type = mytypes.stravamapping[w.workouttype] activity_type = mytypes.stravamapping[w.workouttype]
res,mes = stravastuff.handle_stravaexport( res,mes = stravastuff.handle_stravaexport(
f,w.name, f,w.name,
r.stravatoken, r.stravatoken,
description=newnotes, description=newnotes,
activity_type=activity_type) activity_type=activity_type)
if res==0: if res==0:
messages.error(request,mes) messages.error(request,mes)
w.uploadedtostrava = -1 w.uploadedtostrava = -1
w.save() w.save()
try: try:
os.remove(tcxfile) os.remove(tcxfile)
except WindowsError: except WindowsError:
pass pass
url = reverse(r.defaultlandingpage, url = reverse(r.defaultlandingpage,
kwargs = { kwargs = {
'id':encoder.encode_hex(w.id), 'id':encoder.encode_hex(w.id),
}) })
response = HttpResponseRedirect(url) response = HttpResponseRedirect(url)
return response return response
try: try:
w.uploadedtostrava = res w.uploadedtostrava = res
w.save() w.save()
try: try:
os.remove(tcxfile) os.remove(tcxfile)
except WindowsError: except WindowsError:
pass pass
url = reverse('workout_edit_view',kwargs={'id':w.id}) url = reverse('workout_edit_view',kwargs={'id':w.id})
messages.info(request,mes) messages.info(request,mes)
except: except:
with open("media/stravaerrors.log","a") as errorlog: with open("media/stravaerrors.log","a") as errorlog:
errorstring = str(sys.exc_info()[0]) errorstring = str(sys.exc_info()[0])
timestr = strftime("%Y%m%d-%H%M%S") timestr = strftime("%Y%m%d-%H%M%S")
@@ -135,33 +135,33 @@ def workout_strava_upload_view(request,id=0):
messages.error(request,message) messages.error(request,message)
w.uploadedtostrava = -1 w.uploadedtostrava = -1
w.save() w.save()
url = reverse(r.defaultlandingpage, url = reverse(r.defaultlandingpage,
kwargs = { kwargs = {
'id':encoder.encode_hex(w.id), 'id':encoder.encode_hex(w.id),
}) })
response = HttpResponseRedirect(url) response = HttpResponseRedirect(url)
url = reverse(r.defaultlandingpage, url = reverse(r.defaultlandingpage,
kwargs = { kwargs = {
'id':encoder.encode_hex(w.id), 'id':encoder.encode_hex(w.id),
} }
) )
response = HttpResponseRedirect(url) response = HttpResponseRedirect(url)
except ActivityUploadFailed as e: except ActivityUploadFailed as e:
message = "Strava Upload error: %s" % e message = "Strava Upload error: %s" % e
messages.error(request,message) messages.error(request,message)
w.uploadedtostrava = -1 w.uploadedtostrava = -1
w.save() w.save()
os.remove(tcxfile) os.remove(tcxfile)
url = reverse(r.defaultlandingpage, url = reverse(r.defaultlandingpage,
kwargs = { kwargs = {
'id':encoder.encode_hex(w.id), 'id':encoder.encode_hex(w.id),
}) })
response = HttpResponseRedirect(url) response = HttpResponseRedirect(url)
return response return response
# Upload workout to Concept2 logbook # Upload workout to Concept2 logbook
@login_required() @login_required()
def workout_c2_upload_view(request,id=0): def workout_c2_upload_view(request,id=0):
@@ -199,59 +199,59 @@ def workout_runkeeper_upload_view(request,id=0):
r = w.user r = w.user
try: try:
thetoken = runkeeper_open(r.user) thetoken = runkeeper_open(r.user)
except NoTokenError: except NoTokenError:
return HttpResponseRedirect("/rowers/me/runkeeperauthorize/") return HttpResponseRedirect("/rowers/me/runkeeperauthorize/")
# ready to upload. Hurray # ready to upload. Hurray
if (checkworkoutuser(request.user,w)): if (checkworkoutuser(request.user,w)):
data = runkeeperstuff.createrunkeeperworkoutdata(w) data = runkeeperstuff.createrunkeeperworkoutdata(w)
if not data: if not data:
message = "Data error" message = "Data error"
messages.error(request,message) messages.error(request,message)
url = reverse(r.defaultlandingpage, url = reverse(r.defaultlandingpage,
kwargs = { kwargs = {
'id':id, 'id':id,
}) })
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
authorizationstring = str('Bearer ' + thetoken) authorizationstring = str('Bearer ' + thetoken)
headers = {'Authorization': authorizationstring, headers = {'Authorization': authorizationstring,
'user-agent': 'sanderroosendaal', 'user-agent': 'sanderroosendaal',
'Content-Type': 'application/vnd.com.runkeeper.NewFitnessActivity+json', 'Content-Type': 'application/vnd.com.runkeeper.NewFitnessActivity+json',
'Content-Length':'nnn'} 'Content-Length':'nnn'}
url = "https://api.runkeeper.com/fitnessActivities" url = "https://api.runkeeper.com/fitnessActivities"
response = requests.post(url,headers=headers,data=json.dumps(data)) response = requests.post(url,headers=headers,data=json.dumps(data))
# check for duplicate error first # check for duplicate error first
if (response.status_code == 409 ): if (response.status_code == 409 ):
message = "Duplicate error" message = "Duplicate error"
messages.error(request,message) messages.error(request,message)
w.uploadedtorunkeeper = -1 w.uploadedtorunkeeper = -1
w.save() w.save()
elif (response.status_code == 201 or response.status_code==200): elif (response.status_code == 201 or response.status_code==200):
runkeeperid = runkeeperstuff.getidfromresponse(response) runkeeperid = runkeeperstuff.getidfromresponse(response)
w.uploadedtorunkeeper = runkeeperid w.uploadedtorunkeeper = runkeeperid
w.save() w.save()
url = reverse('workout_edit_view', url = reverse('workout_edit_view',
kwargs={'id':encoder.encode_hex(w.id)}) kwargs={'id':encoder.encode_hex(w.id)})
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
else: else:
s = response s = response
message = "Something went wrong in workout_runkeeper_upload_view: %s - %s" % (s.reason,s.text) message = "Something went wrong in workout_runkeeper_upload_view: %s - %s" % (s.reason,s.text)
messages.error(request,message) messages.error(request,message)
else: else:
message = "You are not authorized to upload this workout" message = "You are not authorized to upload this workout"
messages.error(request,message) messages.error(request,message)
url = reverse(r.defaultlandingpage, url = reverse(r.defaultlandingpage,
kwargs = { kwargs = {
'id':encoder.encode_hex(w.id), 'id':encoder.encode_hex(w.id),
}) })
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
@@ -263,59 +263,59 @@ def workout_underarmour_upload_view(request,id=0):
r = w.user r = w.user
try: try:
thetoken = underarmour_open(r.user) thetoken = underarmour_open(r.user)
except NoTokenError: except NoTokenError:
return HttpResponseRedirect("/rowers/me/underarmourauthorize/") return HttpResponseRedirect("/rowers/me/underarmourauthorize/")
# ready to upload. Hurray # ready to upload. Hurray
if (checkworkoutuser(request.user,w)): if (checkworkoutuser(request.user,w)):
data = underarmourstuff.createunderarmourworkoutdata(w) data = underarmourstuff.createunderarmourworkoutdata(w)
if not data: if not data:
message = "Data error" message = "Data error"
messages.error(request,message) messages.error(request,message)
url = reverse(r.defaultlandingpage, url = reverse(r.defaultlandingpage,
kwargs = { kwargs = {
'id':encoder.encode_hex(w.id), 'id':encoder.encode_hex(w.id),
}) })
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
authorizationstring = str('Bearer ' + thetoken) authorizationstring = str('Bearer ' + thetoken)
headers = {'Authorization': authorizationstring, headers = {'Authorization': authorizationstring,
'Api-Key': UNDERARMOUR_CLIENT_KEY, 'Api-Key': UNDERARMOUR_CLIENT_KEY,
'user-agent': 'sanderroosendaal', 'user-agent': 'sanderroosendaal',
'Content-Type': 'application/json', 'Content-Type': 'application/json',
} }
url = "https://api.ua.com/v7.1/workout/" url = "https://api.ua.com/v7.1/workout/"
response = requests.post(url,headers=headers,data=json.dumps(data)) response = requests.post(url,headers=headers,data=json.dumps(data))
# check for duplicate error first # check for duplicate error first
if (response.status_code == 409 ): if (response.status_code == 409 ):
message = "Duplicate error" message = "Duplicate error"
messages.error(request,message) messages.error(request,message)
w.uploadedtounderarmour = -1 w.uploadedtounderarmour = -1
w.save() w.save()
elif (response.status_code == 201 or response.status_code==200): elif (response.status_code == 201 or response.status_code==200):
underarmourid = underarmourstuff.getidfromresponse(response) underarmourid = underarmourstuff.getidfromresponse(response)
w.uploadedtounderarmour = underarmourid w.uploadedtounderarmour = underarmourid
w.save() w.save()
url = reverse('workout_edit_view',kwargs={'id':encoder.encode_hex(w.id)}) url = reverse('workout_edit_view',kwargs={'id':encoder.encode_hex(w.id)})
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
else: else:
s = response s = response
message = "Something went wrong in workout_underarmour_upload_view: %s " % s.reason message = "Something went wrong in workout_underarmour_upload_view: %s " % s.reason
messages.error(request,message) messages.error(request,message)
else: else:
message = "You are not authorized to upload this workout" message = "You are not authorized to upload this workout"
messages.error(request,message) messages.error(request,message)
url = reverse(r.defaultlandingpage, url = reverse(r.defaultlandingpage,
kwargs = { kwargs = {
'id':encoder.encode_hex(w.id), 'id':encoder.encode_hex(w.id),
}) })
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
@@ -328,64 +328,64 @@ def workout_sporttracks_upload_view(request,id=0):
r = w.user r = w.user
try: try:
thetoken = sporttracks_open(r.user) thetoken = sporttracks_open(r.user)
except NoTokenError: except NoTokenError:
return HttpResponseRedirect("/rowers/me/sporttracksauthorize/") return HttpResponseRedirect("/rowers/me/sporttracksauthorize/")
if (checkworkoutuser(request.user,w)): if (checkworkoutuser(request.user,w)):
data = sporttracksstuff.createsporttracksworkoutdata(w) data = sporttracksstuff.createsporttracksworkoutdata(w)
if not data: if not data:
message = "Data error" message = "Data error"
messages.error(request,message) messages.error(request,message)
url = reverse(r.defaultlandingpage, url = reverse(r.defaultlandingpage,
kwargs = { kwargs = {
'id':encoder.encode_hex(w.id), 'id':encoder.encode_hex(w.id),
}) })
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
authorizationstring = str('Bearer ' + thetoken) authorizationstring = str('Bearer ' + thetoken)
headers = {'Authorization': authorizationstring, headers = {'Authorization': authorizationstring,
'user-agent': 'sanderroosendaal', 'user-agent': 'sanderroosendaal',
'Content-Type': 'application/json'} 'Content-Type': 'application/json'}
url = "https://api.sporttracks.mobi/api/v2/fitnessActivities.json" url = "https://api.sporttracks.mobi/api/v2/fitnessActivities.json"
response = requests.post(url,headers=headers,data=json.dumps(data)) response = requests.post(url,headers=headers,data=json.dumps(data))
# check for duplicate error first # check for duplicate error first
if (response.status_code == 409 ): if (response.status_code == 409 ):
message = "Duplicate error" message = "Duplicate error"
messages.error(request,message) messages.error(request,message)
w.uploadedtosporttracks = -1 w.uploadedtosporttracks = -1
w.save() w.save()
elif (response.status_code == 201 or response.status_code==200): elif (response.status_code == 201 or response.status_code==200):
s= response.json() s= response.json()
sporttracksid = sporttracksstuff.getidfromresponse(response) sporttracksid = sporttracksstuff.getidfromresponse(response)
w.uploadedtosporttracks = sporttracksid w.uploadedtosporttracks = sporttracksid
w.save() w.save()
message = "Upload to SportTracks was successful" message = "Upload to SportTracks was successful"
messages.info(request,message) messages.info(request,message)
url = reverse('workout_edit_view',kwargs={'id':encoder.encode_hex(w.id)}) url = reverse('workout_edit_view',kwargs={'id':encoder.encode_hex(w.id)})
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
else: else:
s = response s = response
message = "Something went wrong in workout_sporttracks_upload_view: %s" % s.reason message = "Something went wrong in workout_sporttracks_upload_view: %s" % s.reason
messages.error(request,message) messages.error(request,message)
else: else:
message = "You are not authorized to upload this workout" message = "You are not authorized to upload this workout"
messages.error(request,message) messages.error(request,message)
url = reverse(r.defaultlandingpage, url = reverse(r.defaultlandingpage,
kwargs = { kwargs = {
'id':encoder.encode_hex(w.id), 'id':encoder.encode_hex(w.id),
}) })
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
# Concept2 authorization # Concept2 authorization
@login_required() @login_required()
def rower_c2_authorize(request): def rower_c2_authorize(request):
# Generate a random string for the state parameter # Generate a random string for the state parameter
@@ -411,7 +411,7 @@ def rower_strava_authorize(request):
params = {"client_id": STRAVA_CLIENT_ID, params = {"client_id": STRAVA_CLIENT_ID,
"response_type": "code", "response_type": "code",
"redirect_uri": STRAVA_REDIRECT_URI, "redirect_uri": STRAVA_REDIRECT_URI,
"scope": "activity:write,activity:read_all"} "scope": "activity:write,activity:read_all"}
url = "https://www.strava.com/oauth/authorize?"+ urllib.urlencode(params) url = "https://www.strava.com/oauth/authorize?"+ urllib.urlencode(params)
@@ -427,7 +427,7 @@ def rower_polar_authorize(request):
"response_type": "code", "response_type": "code",
"redirect_uri": POLAR_REDIRECT_URI, "redirect_uri": POLAR_REDIRECT_URI,
"state": state, "state": state,
# "scope":"accesslink.read_all" # "scope":"accesslink.read_all"
} }
url = "https://flow.polar.com/oauth2/authorization?" +urllib.urlencode(params) url = "https://flow.polar.com/oauth2/authorization?" +urllib.urlencode(params)
@@ -445,7 +445,7 @@ def rower_runkeeper_authorize(request):
params = {"client_id": RUNKEEPER_CLIENT_ID, params = {"client_id": RUNKEEPER_CLIENT_ID,
"response_type": "code", "response_type": "code",
"state": state, "state": state,
"redirect_uri": RUNKEEPER_REDIRECT_URI} "redirect_uri": RUNKEEPER_REDIRECT_URI}
url = "https://runkeeper.com/apps/authorize?"+ urllib.urlencode(params) url = "https://runkeeper.com/apps/authorize?"+ urllib.urlencode(params)
@@ -463,7 +463,7 @@ def rower_sporttracks_authorize(request):
params = {"client_id": SPORTTRACKS_CLIENT_ID, params = {"client_id": SPORTTRACKS_CLIENT_ID,
"response_type": "code", "response_type": "code",
"state": state, "state": state,
"redirect_uri": SPORTTRACKS_REDIRECT_URI} "redirect_uri": SPORTTRACKS_REDIRECT_URI}
url = "https://api.sporttracks.mobi/oauth2/authorize?"+ urllib.urlencode(params) url = "https://api.sporttracks.mobi/oauth2/authorize?"+ urllib.urlencode(params)
@@ -499,7 +499,7 @@ def rower_tp_authorize(request):
"response_type": "code", "response_type": "code",
"redirect_uri": TP_REDIRECT_URI, "redirect_uri": TP_REDIRECT_URI,
"scope": "file:write", "scope": "file:write",
} }
url = "https://oauth.trainingpeaks.com/oauth/authorize/?" +urllib.urlencode(params) url = "https://oauth.trainingpeaks.com/oauth/authorize/?" +urllib.urlencode(params)
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
@@ -624,16 +624,16 @@ def rower_sporttracks_token_refresh(request):
@login_required() @login_required()
def rower_process_callback(request): def rower_process_callback(request):
try: try:
code = request.GET['code'] code = request.GET['code']
res = c2stuff.get_token(code) res = c2stuff.get_token(code)
except MultiValueDictKeyError: except MultiValueDictKeyError:
message = "The resource owner or authorization server denied the request" message = "The resource owner or authorization server denied the request"
messages.error(request,message) messages.error(request,message)
url = reverse('workouts_view') url = reverse('workouts_view')
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
access_token = res[0] access_token = res[0]
if access_token == 0: if access_token == 0:
message = res[1] message = res[1]
@@ -643,7 +643,7 @@ def rower_process_callback(request):
url = reverse('workouts_view') url = reverse('workouts_view')
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
expires_in = res[1] expires_in = res[1]
refresh_token = res[2] refresh_token = res[2]
@@ -893,24 +893,24 @@ def workout_stravaimport_view(request,message="",userid=0):
messages.info(request,"You cannot import other people's workouts from Strava") messages.info(request,"You cannot import other people's workouts from Strava")
try: try:
thetoken = strava_open(request.user) thetoken = strava_open(request.user)
except NoTokenError: except NoTokenError:
return HttpResponseRedirect("/rowers/me/stravaauthorize/") return HttpResponseRedirect("/rowers/me/stravaauthorize/")
res = stravastuff.get_strava_workout_list(request.user) res = stravastuff.get_strava_workout_list(request.user)
if (res.status_code != 200): if (res.status_code != 200):
if (res.status_code == 401): if (res.status_code == 401):
r = getrower(request.user) r = getrower(request.user)
if (r.stravatoken == '') or (r.stravatoken is None): if (r.stravatoken == '') or (r.stravatoken is None):
s = "Token doesn't exist. Need to authorize" s = "Token doesn't exist. Need to authorize"
return HttpResponseRedirect("/rowers/me/stravaauthorize/") return HttpResponseRedirect("/rowers/me/stravaauthorize/")
message = "Something went wrong in workout_stravaimport_view" message = "Something went wrong in workout_stravaimport_view"
messages.error(request,message) messages.error(request,message)
url = reverse('workouts_view') url = reverse('workouts_view')
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
else: else:
workouts = [] workouts = []
r = getrower(request.user) r = getrower(request.user)
@@ -944,7 +944,7 @@ def workout_stravaimport_view(request,message="",userid=0):
]) ])
newids = [stravaid for stravaid in stravaids if not stravaid in knownstravaids] newids = [stravaid for stravaid in stravaids if not stravaid in knownstravaids]
for item in res.json(): for item in res.json():
d = int(float(item['distance'])) d = int(float(item['distance']))
i = item['id'] i = item['id']
if i in knownstravaids: if i in knownstravaids:
@@ -956,9 +956,9 @@ def workout_stravaimport_view(request,message="",userid=0):
s = item['start_date'] s = item['start_date']
r = item['type'] r = item['type']
keys = ['id','distance','duration','starttime','type','name','new'] keys = ['id','distance','duration','starttime','type','name','new']
values = [i,d,ttot,s,r,n,nnn] values = [i,d,ttot,s,r,n,nnn]
res = dict(zip(keys,values)) res = dict(zip(keys,values))
workouts.append(res) workouts.append(res)
breadcrumbs = [ breadcrumbs = [
{ {
@@ -974,13 +974,13 @@ def workout_stravaimport_view(request,message="",userid=0):
r = getrower(request.user) r = getrower(request.user)
return render(request,'strava_list_import.html', return render(request,'strava_list_import.html',
{'workouts':workouts, {'workouts':workouts,
'rower':r, 'rower':r,
'active':'nav-workouts', 'active':'nav-workouts',
'breadcrumbs':breadcrumbs, 'breadcrumbs':breadcrumbs,
'teams':get_my_teams(request.user), 'teams':get_my_teams(request.user),
}) })
return HttpResponse(res) return HttpResponse(res)
@@ -989,32 +989,32 @@ def workout_stravaimport_view(request,message="",userid=0):
def workout_runkeeperimport_view(request,message="",userid=0): def workout_runkeeperimport_view(request,message="",userid=0):
res = runkeeperstuff.get_runkeeper_workout_list(request.user) res = runkeeperstuff.get_runkeeper_workout_list(request.user)
if (res.status_code != 200): if (res.status_code != 200):
if (res.status_code == 401): if (res.status_code == 401):
r = getrower(request.user) r = getrower(request.user)
if (r.runkeepertoken == '') or (r.runkeepertoken is None): if (r.runkeepertoken == '') or (r.runkeepertoken is None):
s = "Token doesn't exist. Need to authorize" s = "Token doesn't exist. Need to authorize"
return HttpResponseRedirect("/rowers/me/runkeeperauthorize/") return HttpResponseRedirect("/rowers/me/runkeeperauthorize/")
message = "Something went wrong in workout_runkeeperimport_view" message = "Something went wrong in workout_runkeeperimport_view"
messages.error(request,message) messages.error(request,message)
if settings.DEBUG: if settings.DEBUG:
return HttpResponse(res) return HttpResponse(res)
else: else:
url = reverse('workouts_view') url = reverse('workouts_view')
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
workouts = [] workouts = []
for item in res.json()['items']: for item in res.json()['items']:
d = int(float(item['total_distance'])) d = int(float(item['total_distance']))
i = getidfromuri(item['uri']) i = getidfromuri(item['uri'])
ttot = str(datetime.timedelta(seconds=int(float(item['duration'])))) ttot = str(datetime.timedelta(seconds=int(float(item['duration']))))
s = item['start_time'] s = item['start_time']
r = item['type'] r = item['type']
keys = ['id','distance','duration','starttime','type'] keys = ['id','distance','duration','starttime','type']
values = [i,d,ttot,s,r] values = [i,d,ttot,s,r]
res = dict(zip(keys,values)) res = dict(zip(keys,values))
workouts.append(res) workouts.append(res)
breadcrumbs = [ breadcrumbs = [
{ {
@@ -1030,12 +1030,12 @@ def workout_runkeeperimport_view(request,message="",userid=0):
r = getrower(request.user) r = getrower(request.user)
return render(request,'runkeeper_list_import.html', return render(request,'runkeeper_list_import.html',
{'workouts':workouts, {'workouts':workouts,
'rower':r, 'rower':r,
'active':'nav-workouts', 'active':'nav-workouts',
'breadcrumbs':breadcrumbs, 'breadcrumbs':breadcrumbs,
'teams':get_my_teams(request.user), 'teams':get_my_teams(request.user),
}) })
return HttpResponse(res) return HttpResponse(res)
@@ -1044,14 +1044,14 @@ def workout_runkeeperimport_view(request,message="",userid=0):
def workout_underarmourimport_view(request,message="",userid=0): def workout_underarmourimport_view(request,message="",userid=0):
res = underarmourstuff.get_underarmour_workout_list(request.user) res = underarmourstuff.get_underarmour_workout_list(request.user)
if (res.status_code != 200): if (res.status_code != 200):
return HttpResponseRedirect("/rowers/me/underarmourauthorize/") return HttpResponseRedirect("/rowers/me/underarmourauthorize/")
workouts = [] workouts = []
items = res.json()['_embedded']['workouts'] items = res.json()['_embedded']['workouts']
for item in items: for item in items:
s = item['start_datetime'] s = item['start_datetime']
i,r = underarmourstuff.get_idfromuri(request.user,item['_links']) i,r = underarmourstuff.get_idfromuri(request.user,item['_links'])
n = item['name'] n = item['name']
try: try:
d = item['aggregates']['distance_total'] d = item['aggregates']['distance_total']
except KeyError: except KeyError:
@@ -1061,11 +1061,11 @@ def workout_underarmourimport_view(request,message="",userid=0):
except KeyError: except KeyError:
ttot = 0 ttot = 0
keys = ['id','distance','duration','starttime','type'] keys = ['id','distance','duration','starttime','type']
values = [i,d,ttot,s,r] values = [i,d,ttot,s,r]
thedict = dict(zip(keys,values)) thedict = dict(zip(keys,values))
workouts.append(thedict) workouts.append(thedict)
rower = getrower(request.user) rower = getrower(request.user)
breadcrumbs = [ breadcrumbs = [
@@ -1080,12 +1080,12 @@ def workout_underarmourimport_view(request,message="",userid=0):
] ]
return render(request,'underarmour_list_import.html', return render(request,'underarmour_list_import.html',
{'workouts':workouts, {'workouts':workouts,
'breadcrumbs':breadcrumbs, 'breadcrumbs':breadcrumbs,
'rower':rower, 'rower':rower,
'active':'nav-workouts', 'active':'nav-workouts',
'teams':get_my_teams(request.user), 'teams':get_my_teams(request.user),
}) })
return HttpResponse(res) return HttpResponse(res)
@@ -1153,20 +1153,20 @@ def workout_sporttracksimport_view(request,message="",userid=0):
res = sporttracksstuff.get_sporttracks_workout_list(request.user) res = sporttracksstuff.get_sporttracks_workout_list(request.user)
if (res.status_code != 200): if (res.status_code != 200):
if (res.status_code == 401): if (res.status_code == 401):
r = getrower(request.user) r = getrower(request.user)
if (r.sporttrackstoken == '') or (r.sporttrackstoken is None): if (r.sporttrackstoken == '') or (r.sporttrackstoken is None):
s = "Token doesn't exist. Need to authorize" s = "Token doesn't exist. Need to authorize"
return HttpResponseRedirect("/rowers/me/sporttracksauthorize/") return HttpResponseRedirect("/rowers/me/sporttracksauthorize/")
else: else:
return HttpResponseRedirect("/rowers/me/sporttracksrefresh/") return HttpResponseRedirect("/rowers/me/sporttracksrefresh/")
message = "Something went wrong in workout_sporttracksimport_view" message = "Something went wrong in workout_sporttracksimport_view"
messages.error(request,message) messages.error(request,message)
if settings.DEBUG: if settings.DEBUG:
return HttpResponse(res) return HttpResponse(res)
else: else:
url = reverse('workouts_view') url = reverse('workouts_view')
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
workouts = [] workouts = []
r = getrower(request.user) r = getrower(request.user)
@@ -1177,19 +1177,19 @@ def workout_sporttracksimport_view(request,message="",userid=0):
newids = [stid for stid in stids if not stid in knownstids] newids = [stid for stid in stids if not stid in knownstids]
for item in res.json()['items']: for item in res.json()['items']:
d = int(float(item['total_distance'])) d = int(float(item['total_distance']))
i = int(getidfromuri(item['uri'])) i = int(getidfromuri(item['uri']))
if i in knownstids: if i in knownstids:
nnn = '' nnn = ''
else: else:
nnn = 'NEW' nnn = 'NEW'
n = item['name'] n = item['name']
ttot = str(datetime.timedelta(seconds=int(float(item['duration'])))) ttot = str(datetime.timedelta(seconds=int(float(item['duration']))))
s = item['start_time'] s = item['start_time']
r = item['type'] r = item['type']
keys = ['id','distance','duration','starttime','type','name','new'] keys = ['id','distance','duration','starttime','type','name','new']
values = [i,d,ttot,s,r,n,nnn] values = [i,d,ttot,s,r,n,nnn]
res = dict(zip(keys,values)) res = dict(zip(keys,values))
workouts.append(res) workouts.append(res)
r = getrower(request.user) r = getrower(request.user)
@@ -1205,55 +1205,55 @@ def workout_sporttracksimport_view(request,message="",userid=0):
] ]
return render(request,'sporttracks_list_import.html', return render(request,'sporttracks_list_import.html',
{'workouts':workouts, {'workouts':workouts,
'breadcrumbs':breadcrumbs, 'breadcrumbs':breadcrumbs,
'active':'nav-workouts', 'active':'nav-workouts',
'rower':r, 'rower':r,
'teams':get_my_teams(request.user), 'teams':get_my_teams(request.user),
}) })
return HttpResponse(res) return HttpResponse(res)
# List of workouts on Concept2 logbook. This view only used for debugging # List of workouts on Concept2 logbook. This view only used for debugging
@login_required() @login_required()
def c2listdebug_view(request,page=1,message=""): def c2listdebug_view(request,page=1,message=""):
try: try:
thetoken = c2_open(request.user) thetoken = c2_open(request.user)
except NoTokenError: except NoTokenError:
return HttpResponseRedirect("/rowers/me/c2authorize/") return HttpResponseRedirect("/rowers/me/c2authorize/")
r = getrower(request.user) r = getrower(request.user)
res = c2stuff.get_c2_workout_list(request.user,page=page) res = c2stuff.get_c2_workout_list(request.user,page=page)
if (res.status_code != 200): if (res.status_code != 200):
message = "Something went wrong in workout_c2import_view (C2 token renewal)" message = "Something went wrong in workout_c2import_view (C2 token renewal)"
messages.error(request,message) messages.error(request,message)
if settings.DEBUG: if settings.DEBUG:
return HttpResponse(res) return HttpResponse(res)
else: else:
url = reverse('workouts_view') url = reverse('workouts_view')
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
else: else:
workouts = [] workouts = []
for item in res.json()['data']: for item in res.json()['data']:
d = item['distance'] d = item['distance']
i = item['id'] i = item['id']
ttot = item['time_formatted'] ttot = item['time_formatted']
s = item['date'] s = item['date']
r = item['type'] r = item['type']
s2 = item['source'] s2 = item['source']
c = item['comments'] c = item['comments']
keys = ['id','distance','duration','starttime','rowtype','source','comment'] keys = ['id','distance','duration','starttime','rowtype','source','comment']
values = [i,d,ttot,s,r,s2,c] values = [i,d,ttot,s,r,s2,c]
res = dict(zip(keys,values)) res = dict(zip(keys,values))
workouts.append(res) workouts.append(res)
return render(request, return render(request,
'c2_list_import2.html', 'c2_list_import2.html',
{'workouts':workouts, {'workouts':workouts,
'teams':get_my_teams(request.user), 'teams':get_my_teams(request.user),
}) })
@@ -1261,14 +1261,14 @@ def c2listdebug_view(request,page=1,message=""):
@login_required() @login_required()
def workout_getc2workout_all(request,page=1,message=""): def workout_getc2workout_all(request,page=1,message=""):
try: try:
thetoken = c2_open(request.user) thetoken = c2_open(request.user)
except NoTokenError: except NoTokenError:
return HttpResponseRedirect("/rowers/me/c2authorize/") return HttpResponseRedirect("/rowers/me/c2authorize/")
res = c2stuff.get_c2_workout_list(request.user,page=page) res = c2stuff.get_c2_workout_list(request.user,page=page)
if (res.status_code != 200): if (res.status_code != 200):
message = "Something went wrong in workout_c2import_view (C2 token refresh)" message = "Something went wrong in workout_c2import_view (C2 token refresh)"
messages.error(request,message) messages.error(request,message)
else: else:
r = getrower(request.user) r = getrower(request.user)
@@ -1302,17 +1302,17 @@ def workout_c2import_view(request,page=1,userid=0,message=""):
r = getrower(request.user) r = getrower(request.user)
try: try:
thetoken = c2_open(request.user) thetoken = c2_open(request.user)
except NoTokenError: except NoTokenError:
return HttpResponseRedirect("/rowers/me/c2authorize/") return HttpResponseRedirect("/rowers/me/c2authorize/")
res = c2stuff.get_c2_workout_list(request.user,page=page) res = c2stuff.get_c2_workout_list(request.user,page=page)
if (res.status_code != 200): if (res.status_code != 200):
message = "Something went wrong in workout_c2import_view (C2 token refresh)" message = "Something went wrong in workout_c2import_view (C2 token refresh)"
messages.error(request,message) messages.error(request,message)
url = reverse('workouts_view') url = reverse('workouts_view')
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
workouts = [] workouts = []
c2ids = [item['id'] for item in res.json()['data']] c2ids = [item['id'] for item in res.json()['data']]
@@ -1321,21 +1321,21 @@ def workout_c2import_view(request,page=1,userid=0,message=""):
]) ])
newids = [c2id for c2id in c2ids if not c2id in knownc2ids] newids = [c2id for c2id in c2ids if not c2id in knownc2ids]
for item in res.json()['data']: for item in res.json()['data']:
d = item['distance'] d = item['distance']
i = item['id'] i = item['id']
ttot = item['time_formatted'] ttot = item['time_formatted']
s = item['date'] s = item['date']
r = item['type'] r = item['type']
s2 = item['source'] s2 = item['source']
c = item['comments'] c = item['comments']
if i in knownc2ids: if i in knownc2ids:
nnn = '' nnn = ''
else: else:
nnn = 'NEW' nnn = 'NEW'
keys = ['id','distance','duration','starttime','rowtype','source','comment','new'] keys = ['id','distance','duration','starttime','rowtype','source','comment','new']
values = [i,d,ttot,s,r,s2,c,nnn] values = [i,d,ttot,s,r,s2,c,nnn]
res = dict(zip(keys,values)) res = dict(zip(keys,values))
workouts.append(res) workouts.append(res)
breadcrumbs = [ breadcrumbs = [
@@ -1356,8 +1356,8 @@ def workout_c2import_view(request,page=1,userid=0,message=""):
r = getrower(request.user) r = getrower(request.user)
return render(request, return render(request,
'c2_list_import2.html', 'c2_list_import2.html',
{'workouts':workouts, {'workouts':workouts,
'rower':r, 'rower':r,
'active':'nav-workouts', 'active':'nav-workouts',
'breadcrumbs':breadcrumbs, 'breadcrumbs':breadcrumbs,
@@ -1449,7 +1449,7 @@ def workout_getimportview(request,externalid,source = 'c2'):
'id':encoder.encode_hex(w.id), 'id':encoder.encode_hex(w.id),
}) })
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
# strokedata not empty - continue # strokedata not empty - continue
id,message = importsources[source].add_workout_from_data( id,message = importsources[source].add_workout_from_data(
rowers/views/otherviews.py
+1 -1
View File
@@ -1,4 +1,4 @@
from statements import * from rowers.views.statements import *
@login_required() @login_required()
rowers/views/paymentviews.py
+34 -34
View File
@@ -1,5 +1,5 @@
from statements import * from rowers.views.statements import *
def paidplans_view(request): def paidplans_view(request):
if not request.user.is_anonymous(): if not request.user.is_anonymous():
@@ -478,32 +478,32 @@ def rower_register_view(request):
nextpage = '/rowers/list-workouts/' nextpage = '/rowers/list-workouts/'
if request.method == 'POST': if request.method == 'POST':
#form = RegistrationFormUniqueEmail(request.POST) #form = RegistrationFormUniqueEmail(request.POST)
form = RegistrationFormSex(request.POST) form = RegistrationFormSex(request.POST)
if form.is_valid(): if form.is_valid():
first_name = form.cleaned_data['first_name'] first_name = form.cleaned_data['first_name']
last_name = form.cleaned_data['last_name'] last_name = form.cleaned_data['last_name']
email = form.cleaned_data['email'] email = form.cleaned_data['email']
password = form.cleaned_data['password1'] password = form.cleaned_data['password1']
username = form.cleaned_data['username'] username = form.cleaned_data['username']
sex = form.cleaned_data['sex'] sex = form.cleaned_data['sex']
birthdate = form.cleaned_data['birthdate'] birthdate = form.cleaned_data['birthdate']
weightcategory = form.cleaned_data['weightcategory'] weightcategory = form.cleaned_data['weightcategory']
adaptiveclass = form.cleaned_data['adaptiveclass'] adaptiveclass = form.cleaned_data['adaptiveclass']
nextpage = request.POST['next'] nextpage = request.POST['next']
theuser = User.objects.create_user(username,password=password) theuser = User.objects.create_user(username,password=password)
theuser.first_name = first_name theuser.first_name = first_name
theuser.last_name = last_name theuser.last_name = last_name
theuser.email = email theuser.email = email
theuser.save() theuser.save()
birthdate = birthdate.replace(tzinfo=None) birthdate = birthdate.replace(tzinfo=None)
therower = Rower(user=theuser,sex=sex,birthdate=birthdate, therower = Rower(user=theuser,sex=sex,birthdate=birthdate,
weightcategory=weightcategory, weightcategory=weightcategory,
adaptiveclass=adaptiveclass) adaptiveclass=adaptiveclass)
therower.save() therower.save()
# create default favorite charts # create default favorite charts
add_defaultfavorites(therower) add_defaultfavorites(therower)
@@ -523,8 +523,8 @@ def rower_register_view(request):
w.save() w.save()
# Create and send email # Create and send email
fullemail = first_name + " " + last_name + " " + "<" + email + ">" fullemail = first_name + " " + last_name + " " + "<" + email + ">"
subject = "Thank you for registering on rowsandall.com" subject = "Thank you for registering on rowsandall.com"
from_address = 'Sander Roosendaal <info@rowsandall.com>' from_address = 'Sander Roosendaal <info@rowsandall.com>'
d = {'first_name':theuser.first_name} d = {'first_name':theuser.first_name}
@@ -533,31 +533,31 @@ def rower_register_view(request):
subject,'registeremail.html',d) subject,'registeremail.html',d)
subject2 = "New User" subject2 = "New User"
message2 = "New user registered.\n" message2 = "New user registered.\n"
message2 += fullemail + "\n" message2 += fullemail + "\n"
message2 += "User name: "+username message2 += "User name: "+username
send_mail(subject2, message2, send_mail(subject2, message2,
'Rowsandall Server <info@rowsandall.com>', 'Rowsandall Server <info@rowsandall.com>',
['roosendaalsander@gmail.com']) ['roosendaalsander@gmail.com'])
theuser = authenticate(username=username,password=password) theuser = authenticate(username=username,password=password)
login(request,theuser) login(request,theuser)
return HttpResponseRedirect(nextpage) return HttpResponseRedirect(nextpage)
# '/rowers/register/thankyou/') # '/rowers/register/thankyou/')
else: else:
return render(request, return render(request,
"registration_form.html", "registration_form.html",
{'form':form, {'form':form,
'next':nextpage,}) 'next':nextpage,})
else: else:
form = RegistrationFormSex() form = RegistrationFormSex()
return render(request, return render(request,
"registration_form.html", "registration_form.html",
{'form':form, {'form':form,
'next':nextpage,}) 'next':nextpage,})
@login_required() @login_required()
rowers/views/planviews.py
+1 -3
View File
@@ -1,4 +1,4 @@
from statements import * from rowers.views.statements import *
@login_required() @login_required()
def plannedsession_comment_view(request,id=0,userid=0): def plannedsession_comment_view(request,id=0,userid=0):
@@ -496,8 +496,6 @@ def plannedsession_multicreate_view(request,
for obj in ps_formset.deleted_objects: for obj in ps_formset.deleted_objects:
messages.info(request,"Deleted Planned Session "+str(obj)) messages.info(request,"Deleted Planned Session "+str(obj))
obj.delete() obj.delete()
else:
print ps_formset.errors
url = reverse(plannedsession_multicreate_view, url = reverse(plannedsession_multicreate_view,
kwargs = { kwargs = {
rowers/views/racesviews.py
+2 -2
View File
@@ -1,4 +1,4 @@
from statements import * from rowers.views.statements import *
# List Courses # List Courses
@@ -653,7 +653,7 @@ def virtualevent_disqualify_view(request,raceid=0,recordid=0):
latitude = rowdata.df[' latitude'] latitude = rowdata.df[' latitude']
if not latitude.std(): if not latitude.std():
hascoordinates = 0 hascoordinates = 0
except KeyError, AttributeError: except (KeyError, AttributeError):
hascoordinates = 0 hascoordinates = 0
else: else:
hascoordinates = 0 hascoordinates = 0
rowers/views/statements.py
+95 -88
View File
@@ -1,7 +1,7 @@
import time import time
import colorsys import colorsys
import timestring
import zipfile import zipfile
import bleach import bleach
import arrow import arrow
@@ -56,7 +56,11 @@ from rowers.forms import (
MetricsForm,DisqualificationForm,disqualificationreasons, MetricsForm,DisqualificationForm,disqualificationreasons,
disqualifiers,SearchForm,BillingForm,PlanSelectForm disqualifiers,SearchForm,BillingForm,PlanSelectForm
) )
from django.core.urlresolvers import reverse, reverse_lazy
try:
from django.core.urlresolvers import reverse, reverse_lazy
except ModuleNotFoundError:
from django.urls import reverse, reverse_lazy
from django.core.exceptions import PermissionDenied from django.core.exceptions import PermissionDenied
from django.template import RequestContext from django.template import RequestContext
@@ -181,7 +185,10 @@ from rowers.tasks import (
from scipy.signal import savgol_filter from scipy.signal import savgol_filter
from django.shortcuts import render_to_response from django.shortcuts import render_to_response
from Cookie import SimpleCookie try:
from Cookie import SimpleCookie
except ModuleNotFoundError:
from http.cookies import SimpleCookie
from shutil import copyfile,move from shutil import copyfile,move
import rowers.mytypes as mytypes import rowers.mytypes as mytypes
from rowingdata import rower as rrower from rowingdata import rower as rrower
@@ -287,7 +294,7 @@ def getrequestrower(request,rowerid=0,userid=0,notpermanent=False):
u = User.objects.get(id=userid) u = User.objects.get(id=userid)
r = getrower(u) r = getrower(u)
else: else:
r = getrower(request.user) r = getrower(request.user)
except Rower.DoesNotExist: except Rower.DoesNotExist:
raise Http404("Rower doesn't exist") raise Http404("Rower doesn't exist")
@@ -320,7 +327,7 @@ def getrequestplanrower(request,rowerid=0,userid=0,notpermanent=False):
u = User.objects.get(id=userid) u = User.objects.get(id=userid)
r = getrower(u) r = getrower(u)
else: else:
r = getrower(request.user) r = getrower(request.user)
except Rower.DoesNotExist: except Rower.DoesNotExist:
raise Http404("Rower doesn't exist") raise Http404("Rower doesn't exist")
@@ -415,7 +422,7 @@ class SessionTaskListener(threading.Thread):
for item in self.pubsub.listen(): for item in self.pubsub.listen():
if item['data'] == "KILL": if item['data'] == "KILL":
self.pubsub.unsubscribe() self.pubsub.unsubscribe()
print self, "unsubscribed and finished" print(self, "unsubscribed and finished")
break break
else: else:
self.work(item) self.work(item)
@@ -465,7 +472,7 @@ from rowers.interactiveplots import *
from rowers.celery import result as celery_result from rowers.celery import result as celery_result
# Define the API documentation # Define the API documentation
schema_view = get_swagger_view(title='Rowsandall API') #schema_view = get_swagger_view(title='Rowsandall API')
def remove_asynctask(request,id): def remove_asynctask(request,id):
try: try:
@@ -740,9 +747,9 @@ def get_thumbnails(request,id):
r = getrower(request.user) r = getrower(request.user)
result = request.user.is_authenticated() and ispromember(request.user) result = request.user.is_authenticated() and ispromember(request.user)
if result: if result:
promember=1 promember=1
if request.user == row.user.user: if request.user == row.user.user:
mayedit=1 mayedit=1
comments = WorkoutComment.objects.filter(workout=row) comments = WorkoutComment.objects.filter(workout=row)
@@ -872,7 +879,7 @@ def rowhascoordinates(row):
if not latitude.std(): if not latitude.std():
hascoordinates = 0 hascoordinates = 0
except KeyError,AttributeError: except (KeyError,AttributeError):
hascoordinates = 0 hascoordinates = 0
else: else:
@@ -885,11 +892,11 @@ def rowhascoordinates(row):
# Checks for CSV file, then for gzipped CSV file, and if all fails, returns 0 # Checks for CSV file, then for gzipped CSV file, and if all fails, returns 0
def rdata(file,rower=rrower()): def rdata(file,rower=rrower()):
try: try:
res = rrdata(csvfile=file,rower=rower) res = rrdata(csvfile=file,rower=rower)
except IOError, IndexError: except (IOError, IndexError):
try: try:
res = rrdata(csvfile=file+'.gz',rower=rower) res = rrdata(csvfile=file+'.gz',rower=rower)
except IOError, IndexError: except (IOError, IndexError):
res = 0 res = 0
return res return res
@@ -913,24 +920,24 @@ def get_my_teams(user):
# Used for the interval editor - translates seconds to a time object # Used for the interval editor - translates seconds to a time object
def get_time(second): def get_time(second):
if (second<=0) or (second>1e9): if (second<=0) or (second>1e9):
hours = 0 hours = 0
minutes=0 minutes=0
sec=0 sec=0
microsecond = 0 microsecond = 0
elif math.isnan(second): elif math.isnan(second):
hours = 0 hours = 0
minutes=0 minutes=0
sec=0 sec=0
microsecond = 0 microsecond = 0
else: else:
days = int(second/(24.*3600.)) % (24*3600) days = int(second/(24.*3600.)) % (24*3600)
hours = int((second-24.*3600.*days)/3600.) % 24 hours = int((second-24.*3600.*days)/3600.) % 24
minutes = int((second-3600.*(hours+24.*days))/60.) % 60 minutes = int((second-3600.*(hours+24.*days))/60.) % 60
sec = int(second-3600.*(hours+24.*days)-60.*minutes) % 60 sec = int(second-3600.*(hours+24.*days)-60.*minutes) % 60
microsecond = int(1.0e6*(second-3600.*(hours+24.*days)-60.*minutes-sec)) microsecond = int(1.0e6*(second-3600.*(hours+24.*days)-60.*minutes-sec))
return datetime.time(hours,minutes,sec,microsecond) return datetime.time(hours,minutes,sec,microsecond)
# get the workout ID from the SportTracks URI # get the workout ID from the SportTracks URI
def getidfromsturi(uri,length=8): def getidfromsturi(uri,length=8):
return uri[len(uri)-length:] return uri[len(uri)-length:]
@@ -942,7 +949,7 @@ def getidfromuri(uri):
return m.group(2) return m.group(2)
from rowers.utils import ( from rowers.utils import (
geo_distance,serialize_list,deserialize_list,uniqify, geo_distance,serialize_list,deserialize_list,uniqify,
str2bool,range_to_color_hex,absolute,myqueue,get_call, str2bool,range_to_color_hex,absolute,myqueue,get_call,
@@ -1041,24 +1048,24 @@ def sendmail(request):
if request.method == 'POST': if request.method == 'POST':
form = EmailForm(request.POST) form = EmailForm(request.POST)
if form.is_valid(): if form.is_valid():
firstname = form.cleaned_data['firstname'] firstname = form.cleaned_data['firstname']
lastname = form.cleaned_data['lastname'] lastname = form.cleaned_data['lastname']
email = form.cleaned_data['email'] email = form.cleaned_data['email']
subject = form.cleaned_data['subject'] subject = form.cleaned_data['subject']
botcheck = form.cleaned_data['botcheck'].lower() botcheck = form.cleaned_data['botcheck'].lower()
message = form.cleaned_data['message'] message = form.cleaned_data['message']
if botcheck == 'yes': if botcheck == 'yes':
try: try:
fullemail = firstname + " " + lastname + " " + "<" + email + ">" fullemail = firstname + " " + lastname + " " + "<" + email + ">"
send_mail(subject, message, fullemail, ['info@rowsandall.com']) send_mail(subject, message, fullemail, ['info@rowsandall.com'])
return HttpResponseRedirect('/rowers/email/thankyou/') return HttpResponseRedirect('/rowers/email/thankyou/')
except: except:
return HttpResponseRedirect('/rowers/email/') return HttpResponseRedirect('/rowers/email/')
else: else:
messages.error(request,'You have to answer YES to the question') messages.error(request,'You have to answer YES to the question')
return HttpResponseRedirect('/rowers/email/') return HttpResponseRedirect('/rowers/email/')
else: else:
return HttpResponseRedirect('/rowers/email/') return HttpResponseRedirect('/rowers/email/')
else: else:
return HttpResponseRedirect('/rowers/email/') return HttpResponseRedirect('/rowers/email/')
@@ -1074,43 +1081,43 @@ def add_workout_from_strokedata(user,importid,data,strokedata,
workouttype = 'rower' workouttype = 'rower'
if workouttype not in [x[0] for x in Workout.workouttypes]: if workouttype not in [x[0] for x in Workout.workouttypes]:
workouttype = 'other' workouttype = 'other'
try: try:
comments = data['comments'] comments = data['comments']
except: except:
comments = ' ' comments = ' '
# comments = "Imported data \n %s" % comments # comments = "Imported data \n %s" % comments
# comments = "Imported data \n"+comments # str(comments) # comments = "Imported data \n"+comments # str(comments)
try: try:
thetimezone = tz(data['timezone']) thetimezone = tz(data['timezone'])
except: except:
thetimezone = 'UTC' thetimezone = 'UTC'
r = getrower(user) r = getrower(user)
try: try:
rowdatetime = iso8601.parse_date(data['date_utc']) rowdatetime = iso8601.parse_date(data['date_utc'])
except KeyError: except KeyError:
rowdatetime = iso8601.parse_date(data['start_date']) rowdatetime = iso8601.parse_date(data['start_date'])
except ParseError: except ParseError:
rowdatetime = iso8601.parse_date(data['date']) rowdatetime = iso8601.parse_date(data['date'])
try: try:
c2intervaltype = data['workout_type'] c2intervaltype = data['workout_type']
except KeyError: except KeyError:
c2intervaltype = '' c2intervaltype = ''
try: try:
title = data['name'] title = data['name']
except KeyError: except KeyError:
title = "" title = ""
try: try:
t = data['comments'].split('\n', 1)[0] t = data['comments'].split('\n', 1)[0]
title += t[:20] title += t[:20]
except: except:
title = 'Imported' title = 'Imported'
starttimeunix = arrow.get(rowdatetime).timestamp starttimeunix = arrow.get(rowdatetime).timestamp
@@ -1125,17 +1132,17 @@ def add_workout_from_strokedata(user,importid,data,strokedata,
nr_rows = len(unixtime) nr_rows = len(unixtime)
try: try:
latcoord = strokedata.loc[:,'lat'] latcoord = strokedata.loc[:,'lat']
loncoord = strokedata.loc[:,'lon'] loncoord = strokedata.loc[:,'lon']
except: except:
latcoord = np.zeros(nr_rows) latcoord = np.zeros(nr_rows)
loncoord = np.zeros(nr_rows) loncoord = np.zeros(nr_rows)
try: try:
strokelength = strokedata.loc[:,'strokelength'] strokelength = strokedata.loc[:,'strokelength']
except: except:
strokelength = np.zeros(nr_rows) strokelength = np.zeros(nr_rows)
dist2 = 0.1*strokedata.loc[:,'d'] dist2 = 0.1*strokedata.loc[:,'d']
@@ -1159,27 +1166,27 @@ def add_workout_from_strokedata(user,importid,data,strokedata,
# save csv # save csv
# Create data frame with all necessary data to write to csv # Create data frame with all necessary data to write to csv
df = pd.DataFrame({'TimeStamp (sec)':unixtime, df = pd.DataFrame({'TimeStamp (sec)':unixtime,
' Horizontal (meters)': dist2, ' Horizontal (meters)': dist2,
' Cadence (stokes/min)':spm, ' Cadence (stokes/min)':spm,
' HRCur (bpm)':hr, ' HRCur (bpm)':hr,
' longitude':loncoord, ' longitude':loncoord,
' latitude':latcoord, ' latitude':latcoord,
' Stroke500mPace (sec/500m)':pace, ' Stroke500mPace (sec/500m)':pace,
' Power (watts)':power, ' Power (watts)':power,
' DragFactor':np.zeros(nr_rows), ' DragFactor':np.zeros(nr_rows),
' DriveLength (meters)':np.zeros(nr_rows), ' DriveLength (meters)':np.zeros(nr_rows),
' StrokeDistance (meters)':strokelength, ' StrokeDistance (meters)':strokelength,
' DriveTime (ms)':np.zeros(nr_rows), ' DriveTime (ms)':np.zeros(nr_rows),
' StrokeRecoveryTime (ms)':np.zeros(nr_rows), ' StrokeRecoveryTime (ms)':np.zeros(nr_rows),
' AverageDriveForce (lbs)':np.zeros(nr_rows), ' AverageDriveForce (lbs)':np.zeros(nr_rows),
' PeakDriveForce (lbs)':np.zeros(nr_rows), ' PeakDriveForce (lbs)':np.zeros(nr_rows),
' lapIdx':lapidx, ' lapIdx':lapidx,
' ElapsedTime (sec)':seconds ' ElapsedTime (sec)':seconds
}) })
df.sort_values(by='TimeStamp (sec)',ascending=True) df.sort_values(by='TimeStamp (sec)',ascending=True)
timestr = strftime("%Y%m%d-%H%M%S") timestr = strftime("%Y%m%d-%H%M%S")
rowers/views/teamviews.py
+1 -1
View File
@@ -1,4 +1,4 @@
from statements import * from rowers.views.statements import *
@login_required() @login_required()
rowers/views/userviews.py
+41 -41
View File
@@ -1,4 +1,4 @@
from statements import * from rowers.views.statements import *
@login_required() @login_required()
def start_trial_view(request): def start_trial_view(request):
@@ -22,8 +22,8 @@ def start_trial_view(request):
message2 += "User name: "+request.user.username message2 += "User name: "+request.user.username
send_mail(subject2, message2, send_mail(subject2, message2,
'Rowsandall Server <info@rowsandall.com>', 'Rowsandall Server <info@rowsandall.com>',
['roosendaalsander@gmail.com']) ['roosendaalsander@gmail.com'])
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
@@ -50,8 +50,8 @@ def start_plantrial_view(request):
message2 += "User name: "+request.user.username message2 += "User name: "+request.user.username
send_mail(subject2, message2, send_mail(subject2, message2,
'Rowsandall Server <info@rowsandall.com>', 'Rowsandall Server <info@rowsandall.com>',
['roosendaalsander@gmail.com']) ['roosendaalsander@gmail.com'])
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
@@ -151,7 +151,7 @@ def rower_exportsettings_view(request,userid=0):
] ]
return render(request, 'rower_exportsettings.html', return render(request, 'rower_exportsettings.html',
{'form':form, {'form':form,
'rower':r, 'rower':r,
'breadcrumbs': breadcrumbs, 'breadcrumbs': breadcrumbs,
}) })
@@ -242,14 +242,14 @@ def rower_edit_view(request,rowerid=0,userid=0,message=""):
grants = AccessToken.objects.filter(user=request.user) grants = AccessToken.objects.filter(user=request.user)
return render(request, 'rower_form.html', return render(request, 'rower_form.html',
{ {
'teams':get_my_teams(request.user), 'teams':get_my_teams(request.user),
'breadcrumbs':breadcrumbs, 'breadcrumbs':breadcrumbs,
'grants':grants, 'grants':grants,
'userform':userform, 'userform':userform,
'accountform':accountform, 'accountform':accountform,
'rower':r, 'rower':r,
}) })
# Page where user can set his details # Page where user can set his details
@@ -276,43 +276,43 @@ def rower_prefs_view(request,userid=0,message=""):
powerzonesform = RowerPowerZonesForm(instance=r) powerzonesform = RowerPowerZonesForm(instance=r)
if request.method == 'POST' and "ut2" in request.POST: if request.method == 'POST' and "ut2" in request.POST:
form = RowerForm(request.POST) form = RowerForm(request.POST)
if form.is_valid(): if form.is_valid():
# something # something
cd = form.cleaned_data cd = form.cleaned_data
hrmax = cd['max'] hrmax = cd['max']
ut2 = cd['ut2'] ut2 = cd['ut2']
ut1 = cd['ut1'] ut1 = cd['ut1']
at = cd['at'] at = cd['at']
tr = cd['tr'] tr = cd['tr']
an = cd['an'] an = cd['an']
rest = cd['rest'] rest = cd['rest']
r.max = max(min(hrmax,250),10) r.max = max(min(hrmax,250),10)
r.ut2 = max(min(ut2,250),10) r.ut2 = max(min(ut2,250),10)
r.ut1 = max(min(ut1,250),10) r.ut1 = max(min(ut1,250),10)
r.at = max(min(at,250),10) r.at = max(min(at,250),10)
r.tr = max(min(tr,250),10) r.tr = max(min(tr,250),10)
r.an = max(min(an,250),10) r.an = max(min(an,250),10)
r.rest = max(min(rest,250),10) r.rest = max(min(rest,250),10)
r.save() r.save()
successmessage = "Your Heart Rate data were changed" successmessage = "Your Heart Rate data were changed"
messages.info(request,successmessage) messages.info(request,successmessage)
elif request.method == 'POST' and "ftp" in request.POST: elif request.method == 'POST' and "ftp" in request.POST:
powerform = RowerPowerForm(request.POST) powerform = RowerPowerForm(request.POST)
if powerform.is_valid(): if powerform.is_valid():
cd = powerform.cleaned_data cd = powerform.cleaned_data
hrftp = cd['hrftp'] hrftp = cd['hrftp']
if hrftp == 0: if hrftp == 0:
hrftp = int((r.an+r.tr)/2.) hrftp = int((r.an+r.tr)/2.)
ftp = cd['ftp'] ftp = cd['ftp']
otwslack = cd['otwslack'] otwslack = cd['otwslack']
powerfrac = 100*np.array([r.pw_ut2, powerfrac = 100*np.array([r.pw_ut2,
r.pw_ut1, r.pw_ut1,
r.pw_at, r.pw_at,
r.pw_tr,r.pw_an])/r.ftp r.pw_tr,r.pw_an])/r.ftp
r.ftp = max(min(ftp,650),50) r.ftp = max(min(ftp,650),50)
r.otwslack = max(min(otwslack,50),0) r.otwslack = max(min(otwslack,50),0)
ut2,ut1,at,tr,an = (r.ftp*powerfrac/100.).astype(int) ut2,ut1,at,tr,an = (r.ftp*powerfrac/100.).astype(int)
r.pw_ut2 = ut2 r.pw_ut2 = ut2
@@ -321,14 +321,14 @@ def rower_prefs_view(request,userid=0,message=""):
r.pw_tr = tr r.pw_tr = tr
r.pw_an = an r.pw_an = an
r.hrftp = hrftp r.hrftp = hrftp
r.save() r.save()
message = "FTP and/or OTW slack values changed." message = "FTP and/or OTW slack values changed."
messages.info(request,message) messages.info(request,message)
elif request.method == 'POST' and "ut3name" in request.POST: elif request.method == 'POST' and "ut3name" in request.POST:
powerzonesform = RowerPowerZonesForm(request.POST) powerzonesform = RowerPowerZonesForm(request.POST)
if powerzonesform.is_valid(): if powerzonesform.is_valid():
cd = powerzonesform.cleaned_data cd = powerzonesform.cleaned_data
pw_ut2 = cd['pw_ut2'] pw_ut2 = cd['pw_ut2']
pw_ut1 = cd['pw_ut1'] pw_ut1 = cd['pw_ut1']
pw_at = cd['pw_at'] pw_at = cd['pw_at']
@@ -353,14 +353,14 @@ def rower_prefs_view(request,userid=0,message=""):
messages.info(request,successmessage) messages.info(request,successmessage)
return render(request, 'rower_preferences.html', return render(request, 'rower_preferences.html',
{ {
'form':form, 'form':form,
'teams':get_my_teams(request.user), 'teams':get_my_teams(request.user),
'powerform':powerform, 'powerform':powerform,
'powerzonesform':powerzonesform, 'powerzonesform':powerzonesform,
'breadcrumbs':breadcrumbs, 'breadcrumbs':breadcrumbs,
'rower':r, 'rower':r,
}) })
# Revoke an app that you granted access through the API. # Revoke an app that you granted access through the API.
rowers/views/workoutviews.py
+633 -633
View File
File diff suppressed because it is too large Load Diff
rowers/weather.py
+30 -29
View File
@@ -1,3 +1,4 @@
from __future__ import unicode_literals, absolute_import
import requests import requests
import json import json
from lxml import objectify,etree from lxml import objectify,etree
@@ -30,9 +31,9 @@ def get_weather_data(long,lat,unixtime):
s = requests.get(url) s = requests.get(url)
if s.ok: if s.ok:
return s.json() return s.json()
else: else:
return 0 return 0
# Get Metar data # Get Metar data
def get_metar_data(airportcode,unixtime): def get_metar_data(airportcode,unixtime):
@@ -78,7 +79,7 @@ def get_metar_data(airportcode,unixtime):
message = 'Summary for your location at '+timestamp+': ' message = 'Summary for your location at '+timestamp+': '
message += 'Temperature '+temp_c+'C/'+temp_f+'F' message += 'Temperature '+temp_c+'C/'+temp_f+'F'
message += '. Wind: '+str(wind_ms)+' m/s ('+str(wind_knots)+' kt)' message += '. Wind: '+str(wind_ms)+' m/s ('+str(wind_knots)+' kt)'
message +='. Wind Bearing: '+str(windbearing)+' degrees' message +='. Wind Bearing: '+str(windbearing)+' degrees'
# message +='\n'+rawtext # message +='\n'+rawtext
@@ -93,36 +94,36 @@ def get_metar_data(airportcode,unixtime):
def get_wind_data(lat,long,unixtime): def get_wind_data(lat,long,unixtime):
data = get_weather_data(lat,long,unixtime) data = get_weather_data(lat,long,unixtime)
if data: if data:
try: try:
# we are getting wind in mph # we are getting wind in mph
windspeed = data['currently']['windSpeed']*0.44704 windspeed = data['currently']['windSpeed']*0.44704
windbearing = data['currently']['windBearing'] windbearing = data['currently']['windBearing']
except KeyError: except KeyError:
windspeed = 0 windspeed = 0
windbearing = 0 windbearing = 0
try: try:
airports = data['flags']['madis-stations'] airports = data['flags']['madis-stations']
except KeyError: except KeyError:
airports = ['unknown'] airports = ['unknown']
try: try:
temperature = data['currently']['temperature'] temperature = data['currently']['temperature']
# Temp is given in Fahrenheit, so convert to Celsius for Europeans # Temp is given in Fahrenheit, so convert to Celsius for Europeans
temperaturec = (temperature-32.)*(5./9.) temperaturec = (temperature-32.)*(5./9.)
temperaturec = int(10*temperaturec)/10. temperaturec = int(10*temperaturec)/10.
except KeyError: except KeyError:
temperature = 'unknown' temperature = 'unknown'
temperaturec = 'unknown' temperaturec = 'unknown'
try: try:
summary = data['currently']['summary'] summary = data['currently']['summary']
except KeyError: except KeyError:
summary = 'unknown' summary = 'unknown'
else: else:
windspeed = 0 windspeed = 0
windbearing = 0 windbearing = 0
message = 'Not able to get weather data' message = 'Not able to get weather data'
# apply Hellman's coefficient for neutral air above human # apply Hellman's coefficient for neutral air above human
# inhabitated areas # inhabitated areas
@@ -135,7 +136,7 @@ def get_wind_data(lat,long,unixtime):
message += '. Temperature '+str(temperature)+'F/'+str(temperaturec)+'C' message += '. Temperature '+str(temperature)+'F/'+str(temperaturec)+'C'
if data: if data:
message += '. Wind: '+str(windspeed)+' m/s. Wind Bearing: '+str(windbearing)+' degrees' message += '. Wind: '+str(windspeed)+' m/s. Wind Bearing: '+str(windbearing)+' degrees'
return [windspeed,windbearing,message,airports,timestamp] return [windspeed,windbearing,message,airports,timestamp]
rowsandall_app/settings.py
+3 -1
View File
@@ -378,9 +378,11 @@ REST_FRAMEWORK = {
'DEFAULT_AUTHENTICATION_CLASSES': ( 'DEFAULT_AUTHENTICATION_CLASSES': (
'rest_framework.authentication.BasicAuthentication', 'rest_framework.authentication.BasicAuthentication',
'rest_framework.authentication.SessionAuthentication', 'rest_framework.authentication.SessionAuthentication',
'oauth2_provider.ext.rest_framework.OAuth2Authentication', # 'oauth2_provider.ext.rest_framework.OAuth2Authentication',
'oauth2_provider.contrib.rest_framework.OAuth2Authentication',
), ),
'PAGE_SIZE': 20, 'PAGE_SIZE': 20,
'DEFAULT_PAGINATION_CLASS':'rest_framework.pagination.LimitOffsetPagination',
} }
SWAGGER_SETTINGS = { SWAGGER_SETTINGS = {
rowsandall_app/settings_dev.py
+1 -1
View File
@@ -9,7 +9,7 @@ https://docs.djangoproject.com/en/1.9/topics/settings/
For the full list of settings and their values, see For the full list of settings and their values, see
https://docs.djangoproject.com/en/1.9/ref/settings/ https://docs.djangoproject.com/en/1.9/ref/settings/
""" """
from settings import * from .settings import *
DATABASES = { DATABASES = {
'default': { 'default': {
rowsandall_app/settings_thinkpad.py
+1 -1
View File
@@ -12,7 +12,7 @@ https://docs.djangoproject.com/en/1.9/ref/settings/
import os import os
from settings import * from .settings import *
DATABASES = { DATABASES = {
'default': { 'default': {
rowsandall_app/urls.py
+24 -12
View File
@@ -35,19 +35,26 @@ handler500 = 'rowers.views.error500_view'
urlpatterns = [ urlpatterns = [
url('^', include('django.contrib.auth.urls')), url('^', include('django.contrib.auth.urls')),
url(r'^django-rq/',include('django_rq.urls')), url(r'^django-rq/',include('django_rq.urls')),
url(r'^password_change_done/$',auth_views.password_change_done,name='password_change_done'), # url(r'^password_change_done/$',auth_views.password_change_done,name='password_change_done'),
url(r'^password_change/$',auth_views.password_change), url(r'^password_change_done/$',auth_views.PasswordChangeDoneView,name='password_change_done'),
# url(r'^password_change/$',auth_views.password_change),
url(r'^password_change/$',auth_views.PasswordChangeView,name='password_change'),
url(r'^password_reset/$', url(r'^password_reset/$',
auth_views.password_reset, # auth_views.password_reset,
auth_views.PasswordResetView,
{'template_name': 'rowers/templates/registration/password_reset.html'}, {'template_name': 'rowers/templates/registration/password_reset.html'},
name='password_reset'), name='password_reset'),
url(r'^password_reset/done/$', url(r'^password_reset/done/$',
auth_views.password_reset_done, # auth_views.password_reset_done,
auth_views.PasswordResetDoneView,
name='password_reset_done'), name='password_reset_done'),
url(r'^reset/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>.+)/$', url(r'^reset/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>.+)/$',
auth_views.password_reset_confirm, # auth_views.password_reset_confirm,
auth_views.PasswordResetConfirmView,
name='password_reset_confirm'), name='password_reset_confirm'),
url(r'^reset/done/$', auth_views.password_reset_complete, url(r'^reset/done/$',
# auth_views.password_reset_complete,
auth_views.PasswordResetCompleteView,
name='password_reset_complete'), name='password_reset_complete'),
] ]
@@ -55,16 +62,21 @@ urlpatterns += [
url(r'^robots\.txt$', TemplateView.as_view(template_name='robots.txt', url(r'^robots\.txt$', TemplateView.as_view(template_name='robots.txt',
content_type='text/plain')), content_type='text/plain')),
url(r'^admin/', admin.site.urls), url(r'^admin/', admin.site.urls),
url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')), url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework2')),
url(r'^$',rootview), url(r'^$',rootview),
url(r'^getblogs/$',rowersviews.get_blog_posts), url(r'^getblogs/$',rowersviews.get_blog_posts),
url(r'^login/',auth_views.login, name='login'), url(r'^login/',
url(r'^logout/$',auth_views.logout, # auth_views.login,
auth_views.LoginView,
name='login'),
url(r'^logout/$',
# auth_views.logout,
auth_views.LogoutView,
{'next_page': '/'}, {'next_page': '/'},
name='logout',), name='logout',),
url(r'^rowers/',include('rowers.urls')), url(r'^rowers/',include('rowers.urls')),
# url(r'^cvkbrno/',include('cvkbrno.urls')), # url(r'^cvkbrno/',include('cvkbrno.urls')),
url(r'^admin/rq/',include('django_rq_dashboard.urls')), # url(r'^admin/rq/',include('django_rq_dashboard.urls')),
url(r'^call\_back',rowersviews.rower_process_callback), url(r'^call\_back',rowersviews.rower_process_callback),
url(r'^stravacall\_back',rowersviews.rower_process_stravacallback), url(r'^stravacall\_back',rowersviews.rower_process_stravacallback),
url(r'^sporttracks\_callback',rowersviews.rower_process_sporttrackscallback), url(r'^sporttracks\_callback',rowersviews.rower_process_sporttrackscallback),
@@ -75,7 +87,7 @@ urlpatterns += [
url(r'^twitter\_callback',rowersviews.rower_process_twittercallback), url(r'^twitter\_callback',rowersviews.rower_process_twittercallback),
url(r'^i18n/', include('django.conf.urls.i18n')), url(r'^i18n/', include('django.conf.urls.i18n')),
url(r'^tz_detect/', include('tz_detect.urls')), url(r'^tz_detect/', include('tz_detect.urls')),
url(r'^jsi18n/', 'django.views.i18n.javascript_catalog',name='jsi18n'), # url(r'^jsi18n/', 'django.views.i18n.javascript_catalog',name='jsi18n'),
] ]
@@ -83,7 +95,7 @@ if settings.DEBUG:
import debug_toolbar import debug_toolbar
import django import django
urlpatterns += [ urlpatterns += [
url(r'^__debug__/',include(debug_toolbar.urls)), # url(r'^__debug__/','debug_toolbar.urls'),
url(r'^static/(?P<path>.*)$', url(r'^static/(?P<path>.*)$',
django.views.static.serve, django.views.static.serve,
kwargs={'document_root': settings.STATIC_ROOT,} kwargs={'document_root': settings.STATIC_ROOT,}