Merge branch 'release/tcx_st'
This commit is contained in:
Sander Roosendaal
@@ -125,7 +125,7 @@ def tailwind(bearing,vwind,winddir):
|
||||
from rowers.dataprep import nicepaceformat,niceformat
|
||||
from rowers.dataprep import timedeltaconv
|
||||
|
||||
def interactive_forcecurve(theworkouts):
|
||||
def interactive_forcecurve(theworkouts,workstrokesonly=False):
|
||||
TOOLS = 'save,pan,box_zoom,wheel_zoom,reset,tap,hover,resize,crosshair'
|
||||
|
||||
ids = [int(w.id) for w in theworkouts]
|
||||
@@ -133,10 +133,21 @@ def interactive_forcecurve(theworkouts):
|
||||
boattype = theworkouts[0].boattype
|
||||
|
||||
columns = ['catch','slip','wash','finish','averageforce',
|
||||
'peakforceangle','peakforce','spm','distance']
|
||||
'peakforceangle','peakforce','spm','distance',
|
||||
'workoutstate']
|
||||
|
||||
rowdata = dataprep.getsmallrowdata_db(columns,ids=ids)
|
||||
|
||||
workoutstateswork = [1,4,5,8,9,6,7]
|
||||
workoutstatesrest = [3]
|
||||
workoutstatetransition = [0,2,10,11,12,13]
|
||||
|
||||
if workstrokesonly:
|
||||
try:
|
||||
rowdata = rowdata[~rowdata['workoutstate'].isin(workoutstatesrest)]
|
||||
except KeyError:
|
||||
pass
|
||||
|
||||
catchav = rowdata['catch'].mean()
|
||||
finishav = rowdata['finish'].mean()
|
||||
washav = rowdata['wash'].mean()
|
||||
|
||||
+15
-1
@@ -1,5 +1,5 @@
|
||||
from rest_framework import serializers
|
||||
from rowers.models import Workout,Rower,StrokeData
|
||||
from rowers.models import Workout,Rower,StrokeData,FavoriteChart
|
||||
|
||||
import datetime
|
||||
|
||||
@@ -8,6 +8,7 @@ class RowerSerializer(serializers.HyperlinkedModelSerializer):
|
||||
class Meta:
|
||||
model = Rower
|
||||
fields = (
|
||||
'id',
|
||||
'weightcategory',
|
||||
'max',
|
||||
'rest',
|
||||
@@ -19,6 +20,19 @@ class RowerSerializer(serializers.HyperlinkedModelSerializer):
|
||||
'ftp',
|
||||
)
|
||||
|
||||
class FavoriteChartSerializer(serializers.ModelSerializer):
|
||||
class Meta:
|
||||
model = FavoriteChart
|
||||
fields = (
|
||||
'id',
|
||||
'xparam',
|
||||
'yparam1',
|
||||
'yparam2',
|
||||
'plottype',
|
||||
'workouttype',
|
||||
'reststrokes',
|
||||
'user'
|
||||
)
|
||||
|
||||
class WorkoutSerializer(serializers.ModelSerializer):
|
||||
class Meta:
|
||||
|
||||
@@ -181,8 +181,10 @@ def createsporttracksworkoutdata(w):
|
||||
maxhr = int(row.df[' HRCur (bpm)'].max())
|
||||
|
||||
# adding diff, trying to see if this is valid
|
||||
t = row.df.ix[:,'TimeStamp (sec)'].values-10*row.df.ix[0,'TimeStamp (sec)']
|
||||
#t = row.df.ix[:,'TimeStamp (sec)'].values-10*row.df.ix[0,'TimeStamp (sec)']
|
||||
t = row.df.ix[:,'TimeStamp (sec)'].values-row.df.ix[0,'TimeStamp (sec)']
|
||||
t[0] = t[1]
|
||||
|
||||
d = row.df.ix[:,'cum_dist'].values
|
||||
d[0] = d[1]
|
||||
t = t.astype(int)
|
||||
@@ -196,9 +198,12 @@ def createsporttracksworkoutdata(w):
|
||||
try:
|
||||
lat = row.df[' latitude'].values
|
||||
lon = row.df[' longitude'].values
|
||||
if not lat.std() and not lon.std():
|
||||
haslatlon = 0
|
||||
except KeyError:
|
||||
haslatlon = 0
|
||||
|
||||
|
||||
haspower = 1
|
||||
try:
|
||||
power = row.df[' Power (watts)'].values
|
||||
|
||||
@@ -8,34 +8,34 @@
|
||||
{% localtime on %}
|
||||
{% block content %}
|
||||
|
||||
{{ js_res | safe }}
|
||||
{{ css_res| safe }}
|
||||
{{ js_res | safe }}
|
||||
{{ css_res| safe }}
|
||||
|
||||
<script type="text/javascript" src="/static/js/bokeh-0.12.3.min.js"></script>
|
||||
<script type="text/javascript" src="/static/js/bokeh-widgets-0.12.3.min.js"></script>
|
||||
<script async="true" type="text/javascript">
|
||||
<script type="text/javascript" src="/static/js/bokeh-0.12.3.min.js"></script>
|
||||
<script type="text/javascript" src="/static/js/bokeh-widgets-0.12.3.min.js"></script>
|
||||
<script async="true" type="text/javascript">
|
||||
Bokeh.set_log_level("info");
|
||||
</script>
|
||||
</script>
|
||||
|
||||
{{ the_script |safe }}
|
||||
{{ the_script |safe }}
|
||||
|
||||
|
||||
<style>
|
||||
<style>
|
||||
/* Need this to get the page in "desktop mode"; not having an infinite height.*/
|
||||
html, body {height: 100%; margin:5px;}
|
||||
</style>
|
||||
</style>
|
||||
|
||||
<div id="navigation" class="grid_12 alpha">
|
||||
{% if user.is_authenticated and mayedit %}
|
||||
<div class="grid_2 alpha">
|
||||
<p>
|
||||
<a class="button gray small" href="/rowers/workout/{{ id }}/edit">Edit Workout</a>
|
||||
</p>
|
||||
</p>
|
||||
</div>
|
||||
<div class="grid_2 suffix_8 omega">
|
||||
<p>
|
||||
<a class="button gray small" href="/rowers/workout/{{ id }}/advanced">Advanced Edit</a>
|
||||
</p>
|
||||
</p>
|
||||
|
||||
</div>
|
||||
{% endif %}
|
||||
@@ -139,10 +139,11 @@
|
||||
{% csrf_token %}
|
||||
{% if workstrokesonly %}
|
||||
<input type="hidden" name="workstrokesonly" value="True">
|
||||
<input class="grid_2 alpha button blue small" value="Remove Rest Strokes" type="Submit">
|
||||
{% else %}
|
||||
<input class="grid_2 alpha button blue small" type="hidden" name="workstrokesonly" value="False">
|
||||
<input class="grid_2 alpha button blue small" value="Include Rest Strokes" type="Submit">
|
||||
{% endif %}
|
||||
<input class="grid_2 alpha button blue small" value="Toggle Work Strokes" type="Submit">
|
||||
</form>
|
||||
<span class="tooltiptext">If your data source allows, this will show or hide strokes taken during rest intervals.</span>
|
||||
</div>
|
||||
|
||||
@@ -174,10 +174,11 @@
|
||||
{% csrf_token %}
|
||||
{% if workstrokesonly %}
|
||||
<input type="hidden" name="workstrokesonly" value="True">
|
||||
<input class="grid_2 alpha button blue small" value="Remove Rest Strokes" type="Submit">
|
||||
{% else %}
|
||||
<input class="grid_2 alpha button blue small" type="hidden" name="workstrokesonly" value="False">
|
||||
<input class="grid_2 alpha button blue small" value="Include Rest Strokes" type="Submit">
|
||||
{% endif %}
|
||||
<input class="grid_2 alpha button blue small" value="Toggle Work Strokes" type="Submit">
|
||||
</form>
|
||||
<span class="tooltiptext">If your data source allows, this will show or hide strokes taken during rest intervals.</span>
|
||||
</div>
|
||||
|
||||
@@ -8,22 +8,22 @@
|
||||
{% localtime on %}
|
||||
{% block content %}
|
||||
|
||||
{{ js_res | safe }}
|
||||
{{ css_res| safe }}
|
||||
{{ js_res | safe }}
|
||||
{{ css_res| safe }}
|
||||
|
||||
<script type="text/javascript" src="/static/js/bokeh-0.12.3.min.js"></script>
|
||||
<script type="text/javascript" src="/static/js/bokeh-widgets-0.12.3.min.js"></script>
|
||||
<script async="true" type="text/javascript">
|
||||
<script type="text/javascript" src="/static/js/bokeh-0.12.3.min.js"></script>
|
||||
<script type="text/javascript" src="/static/js/bokeh-widgets-0.12.3.min.js"></script>
|
||||
<script async="true" type="text/javascript">
|
||||
Bokeh.set_log_level("info");
|
||||
</script>
|
||||
</script>
|
||||
|
||||
{{ the_script |safe }}
|
||||
{{ the_script |safe }}
|
||||
|
||||
|
||||
<style>
|
||||
<style>
|
||||
/* Need this to get the page in "desktop mode"; not having an infinite height.*/
|
||||
html, body {height: 100%; margin:5px;}
|
||||
</style>
|
||||
</style>
|
||||
|
||||
<div id="navigation" class="grid_12 alpha">
|
||||
{% if user.is_authenticated and mayedit %}
|
||||
@@ -32,13 +32,28 @@
|
||||
<a class="button gray small" href="/rowers/workout/{{ id }}/edit">Edit Workout</a>
|
||||
</p>
|
||||
</div>
|
||||
<div class="grid_2 suffix_8 omega">
|
||||
<div class="grid_2 suffix_2">
|
||||
<p>
|
||||
<a class="button gray small" href="/rowers/workout/{{ id }}/advanced">Advanced Edit</a>
|
||||
</p>
|
||||
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
<div class="grid_2 suffix_4 omega tooltip">
|
||||
<form enctype="multipart/form-data" action="{{ formloc }}" method="post">
|
||||
{% csrf_token %}
|
||||
{% if workstrokesonly %}
|
||||
<input type="hidden" name="workstrokesonly" value="True">
|
||||
<input class="grid_2 alpha button blue small" value="Remove Rest Strokes" type="Submit">
|
||||
{% else %}
|
||||
<input class="grid_2 alpha button blue small" type="hidden" name="workstrokesonly" value="False">
|
||||
<input class="grid_2 alpha button blue small" value="Include Rest Strokes" type="Submit">
|
||||
{% endif %}
|
||||
</form>
|
||||
<span class="tooltiptext">If your data source allows, this will show or hide strokes taken during rest intervals.</span>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
</p>
|
||||
{% endif %}
|
||||
<div class="grid_6 alpha">
|
||||
<h1>Heart Rate Bands</h1>
|
||||
<h2>Heart Rate Bands</h2>
|
||||
|
||||
<form enctype="multipart/form-data" action="" method="post">
|
||||
<table>
|
||||
@@ -22,8 +22,8 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="grid_6 omega">
|
||||
<h1>Functional Threshold Power</h1>
|
||||
<p>
|
||||
<h2>Functional Threshold Power</h2>
|
||||
<form enctype="multipart/form-data" action="" method="post">
|
||||
<table>
|
||||
{{ powerform.as_table }}
|
||||
@@ -34,6 +34,31 @@
|
||||
</form>
|
||||
</div>
|
||||
</p>
|
||||
{% if grants %}
|
||||
<p>
|
||||
<h2>Applications</h2>
|
||||
<table width="100%">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Application</th>
|
||||
<th>Scope</th>
|
||||
<th>Revoke</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for grant in grants %}
|
||||
<tr>
|
||||
<td>{{ grant.application }}</td>
|
||||
<td>{{ grant.scope }}</td>
|
||||
<td>
|
||||
<a class="button red small" href="/rowers/me/revokeapp/{{ grant.application.id }}">Revoke</a>
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</p>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
+45
-1
@@ -2,7 +2,7 @@ from django.conf import settings
|
||||
from django.conf.urls import url, include
|
||||
from django.contrib.auth.models import User
|
||||
|
||||
from models import Workout,Rower,StrokeData
|
||||
from models import Workout,Rower,StrokeData,FavoriteChart
|
||||
|
||||
from rest_framework import routers, serializers, viewsets,permissions
|
||||
from rest_framework.urlpatterns import format_suffix_patterns
|
||||
@@ -19,6 +19,16 @@ from rowers.serializers import (
|
||||
WorkoutSerializer,
|
||||
RowerSerializer,
|
||||
StrokeDataSerializer,
|
||||
FavoriteChartSerializer,
|
||||
)
|
||||
|
||||
from oauth2_provider.views import (
|
||||
AuthorizedTokensListView,
|
||||
AuthorizedTokenDeleteView,
|
||||
)
|
||||
|
||||
from oauth2_provider.views.base import (
|
||||
RevokeTokenView
|
||||
)
|
||||
|
||||
class WorkoutViewSet(viewsets.ModelViewSet):
|
||||
@@ -36,12 +46,45 @@ class WorkoutViewSet(viewsets.ModelViewSet):
|
||||
IsOwnerOrNot,
|
||||
)
|
||||
|
||||
class RowerViewSet(viewsets.ModelViewSet):
|
||||
model = Rower
|
||||
serializer_class = RowerSerializer
|
||||
#queryset = Rower.objects.all()
|
||||
|
||||
def get_queryset(self):
|
||||
r = Rower.objects.filter(user=self.request.user)
|
||||
return r
|
||||
|
||||
permission_classes = (
|
||||
IsOwnerOrNot,
|
||||
)
|
||||
|
||||
http_method_names = ['get','patch']
|
||||
|
||||
|
||||
class FavoriteChartViewSet(viewsets.ModelViewSet):
|
||||
model = FavoriteChart
|
||||
serializer_class = FavoriteChartSerializer
|
||||
#queryset = FavoriteChart.objects.all()
|
||||
|
||||
def get_queryset(self):
|
||||
r = Rower.objects.filter(user=self.request.user)
|
||||
return FavoriteChart.objects.filter(user=r)
|
||||
|
||||
permission_classes = (
|
||||
IsOwnerOrNot,
|
||||
)
|
||||
|
||||
http_method_names = ['get','put','patch','delete']
|
||||
|
||||
class StrokeDataViewSet(viewsets.ModelViewSet):
|
||||
serializer_class = StrokeDataSerializer
|
||||
|
||||
# Routers provide an easy way of automatically determining the URL conf.
|
||||
router = routers.DefaultRouter()
|
||||
router.register(r'api/workouts',WorkoutViewSet, 'workout')
|
||||
router.register(r'api/me',RowerViewSet, 'rower')
|
||||
router.register(r'api/charts',FavoriteChartViewSet, 'charts')
|
||||
|
||||
|
||||
handler500 = 'views.error500_view'
|
||||
@@ -159,6 +202,7 @@ urlpatterns = [
|
||||
url(r'^me/edit/$',views.rower_edit_view),
|
||||
url(r'^me/edit/(.+.*)/$',views.rower_edit_view),
|
||||
url(r'^me/c2authorize/$',views.rower_c2_authorize),
|
||||
url(r'^me/revokeapp/(\d+)$',views.rower_revokeapp_view),
|
||||
url(r'^me/stravaauthorize/$',views.rower_strava_authorize),
|
||||
url(r'^me/sporttracksauthorize/$',views.rower_sporttracks_authorize),
|
||||
url(r'^me/sporttracksrefresh/$',views.rower_sporttracks_token_refresh),
|
||||
|
||||
+46
-5
@@ -75,6 +75,8 @@ import stravalib
|
||||
from stravalib.exc import ActivityUploadFailed,TimeoutExceeded
|
||||
from weather import get_wind_data
|
||||
|
||||
from oauth2_provider.models import Application,Grant,AccessToken
|
||||
|
||||
import django_rq
|
||||
queue = django_rq.get_queue('default')
|
||||
queuelow = django_rq.get_queue('low')
|
||||
@@ -857,7 +859,7 @@ def workout_tcxemail_view(request,id=0):
|
||||
})
|
||||
except:
|
||||
successmessage = ""
|
||||
message = "Something went wrong (strava export) "+str(sys.exc_info()[0])
|
||||
message = "Something went wrong (TCX export) "+str(sys.exc_info()[0])
|
||||
with open("media/c2errors.log","a") as errorlog:
|
||||
errorstring = str(sys.exc_info()[0])
|
||||
timestr = strftime("%Y%m%d-%H%M%S")
|
||||
@@ -1076,7 +1078,6 @@ def workout_sporttracks_upload_view(request,id=0):
|
||||
url = "https://api.sporttracks.mobi/api/v2/fitnessActivities.json"
|
||||
response = requests.post(url,headers=headers,data=json.dumps(data))
|
||||
|
||||
|
||||
# check for duplicate error first
|
||||
if (response.status_code == 409 ):
|
||||
message = "Duplicate error"
|
||||
@@ -1091,7 +1092,7 @@ def workout_sporttracks_upload_view(request,id=0):
|
||||
return HttpResponseRedirect(url)
|
||||
else:
|
||||
s = response
|
||||
message = "Something went wrong in workout_sporttracks_upload_view %s" % s
|
||||
message = "Something went wrong in workout_sporttracks_upload_view: %s" % s.reason
|
||||
|
||||
else:
|
||||
message = "You are not authorized to upload this workout"
|
||||
@@ -1467,7 +1468,7 @@ def cum_flex(request,theuser=0,
|
||||
})
|
||||
|
||||
@user_passes_test(promember,login_url="/",redirect_field_name=None)
|
||||
def workout_forcecurve_view(request,id=0):
|
||||
def workout_forcecurve_view(request,id=0,workstrokesonly=False):
|
||||
row = Workout.objects.get(id=id)
|
||||
promember=0
|
||||
mayedit=0
|
||||
@@ -1482,7 +1483,15 @@ def workout_forcecurve_view(request,id=0):
|
||||
if not promember:
|
||||
return HttpResponseRedirect("/rowers/about/")
|
||||
|
||||
script,div,js_resources,css_resources = interactive_forcecurve([row])
|
||||
if request.method == 'POST' and 'workstrokesonly' in request.POST:
|
||||
workstrokesonly = request.POST['workstrokesonly']
|
||||
if workstrokesonly == 'True':
|
||||
workstrokesonly = True
|
||||
else:
|
||||
workstrokesonly = False
|
||||
|
||||
script,div,js_resources,css_resources = interactive_forcecurve([row],
|
||||
workstrokesonly=workstrokesonly)
|
||||
|
||||
return render(request,
|
||||
'forcecurve_single.html',
|
||||
@@ -1493,6 +1502,7 @@ def workout_forcecurve_view(request,id=0):
|
||||
'css_res':css_resources,
|
||||
'id':id,
|
||||
'mayedit':mayedit,
|
||||
'workstrokesonly': not workstrokesonly,
|
||||
})
|
||||
|
||||
@login_required()
|
||||
@@ -3766,6 +3776,13 @@ def workout_upload_view(request,message=""):
|
||||
response = HttpResponseRedirect(url)
|
||||
return response
|
||||
|
||||
if fileformat == 'rowprolog':
|
||||
message = "This RowPro logbook summary does not contain stroke data. Please use the Stroke Data CSV file for the individual workout in your log."
|
||||
url = reverse(workout_upload_view,
|
||||
args=[str(message)])
|
||||
response = HttpResponseRedirect(url)
|
||||
return response
|
||||
|
||||
if fileformat == 'unknown':
|
||||
message = "We couldn't recognize the file type"
|
||||
url = reverse(workout_upload_view,
|
||||
@@ -4779,14 +4796,38 @@ def rower_edit_view(request,message=""):
|
||||
r = Rower.objects.get(user=request.user)
|
||||
form = RowerForm(instance=r)
|
||||
powerform = RowerPowerForm(instance=r)
|
||||
grants = AccessToken.objects.filter(user=request.user)
|
||||
return render(request, 'rower_form.html',
|
||||
{
|
||||
'form':form,
|
||||
'powerform':powerform,
|
||||
'grants':grants,
|
||||
})
|
||||
except Rower.DoesNotExist:
|
||||
return HttpResponse("This user doesn't exist")
|
||||
|
||||
@login_required()
|
||||
def rower_revokeapp_view(request,id=0):
|
||||
tokens = AccessToken.objects.filter(user=request.user,application=id)
|
||||
refreshtokens = AccessToken.objects.filter(user=request.user,application=id)
|
||||
for token in tokens:
|
||||
token.revoke()
|
||||
for token in refreshtokens:
|
||||
token.revoke()
|
||||
|
||||
r = Rower.objects.get(user=request.user)
|
||||
form = RowerForm(instance=r)
|
||||
powerform = RowerPowerForm(instance=r)
|
||||
grants = AccessToken.objects.filter(user=request.user)
|
||||
return render(request, 'rower_form.html',
|
||||
{
|
||||
'form':form,
|
||||
'powerform':powerform,
|
||||
'grants':grants,
|
||||
})
|
||||
|
||||
|
||||
|
||||
class JSONResponse(HttpResponse):
|
||||
def __init__(self, data, **kwargs):
|
||||
content = JSONRenderer().render(data)
|
||||
|
||||
Reference in New Issue
Block a user