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

Merge branch 'release/v4.81'

Browse Source
This commit is contained in:
Sander Roosendaal
2017-11-03 14:10:37 +01:00
parent aac9a68ffc df82b53018
commit fdb308a6ac
18 changed files with 187 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rowers/dataprep.py
+1
View File
@@ -527,6 +527,7 @@ def fetchcp(rower,theworkouts,table='cpdata'):
theids = [int(w.id) for w in theworkouts]
columns = ['power','workoutid','time']
df = getsmallrowdata_db(columns,ids=theids)
df.dropna(inplace=True,axis=0)
if df.empty:
avgpower2 = {}
for id in theids:
rowers/forms.py
+5
View File
@@ -164,6 +164,11 @@ nextpages = list(landingpages)
nextpages.append(('workout_upload_view','Upload Another File'))
nextpages = tuple(nextpages)
class LandingPageForm(forms.Form):
landingpage = forms.ChoiceField(choices=nextpages,
initial='workout_edit_view',
label='After Upload, go to')
class UploadOptionsForm(forms.Form):
plotchoices = (
('timeplot','Time Plot'),
rowers/tasks.py
+51 -8
View File
@@ -16,7 +16,9 @@ from matplotlib.backends.backend_agg import FigureCanvas
#from matplotlib.backends.backend_cairo import FigureCanvasCairo as FigureCanvas
import matplotlib.pyplot as plt
from rowsandall_app.settings import SITE_URL
from rowsandall_app.settings_dev import SITE_URL as SITE_URL_DEV
from rowsandall_app.settings import PROGRESS_CACHE_SECRET
import pandas as pd
@@ -296,11 +298,17 @@ def handle_sendemailtcx(first_name, last_name, email, tcxfile,debug=False):
@app.task
def handle_zip_file(emailfrom, subject, file,debug=False):
message = "... zip processing ... "
if debug:
print message
email = EmailMessage(subject, message,
emailfrom,
['workouts@rowsandall.com'])
email.attach_file(file)
if debug:
print "attaching"
res = email.send()
if debug:
print "sent"
time.sleep(60)
return 1
@@ -338,12 +346,36 @@ def handle_sendemailcsv(first_name, last_name, email, csvfile,debug=False):
# Calculate wind and stream corrections for OTW rowing
@app.task
def handle_otwsetpower(f1, boattype, weightvalue,
first_name, last_name, email, workoutid, ps=[
1, 1, 1, 1],
ratio=1.0,
debug=False):
@app.task(bind=True)
def handle_otwsetpower(self,f1, boattype, weightvalue,
first_name, last_name, email, workoutid,
**kwargs):
# ps=[
# 1, 1, 1, 1],
# ratio=1.0,
# debug=False):
job = self.request
job_id = job.id
if 'jobkey' in kwargs:
job_id = kwargs.pop('jobkey')
if 'ps' in kwargs:
ps = kwargs['ps']
else:
ps = [1,1,1,1]
if 'ratio' in kwargs:
ratio = kwargs['ratio']
else:
ratio = 1.0
if 'debug' in kwargs:
debug = kwargs['debug']
else:
debug = False
kwargs['jobid'] = job_id
try:
rowdata = rdata(f1)
except IOError:
@@ -377,8 +409,19 @@ def handle_otwsetpower(f1, boattype, weightvalue,
except KeyError:
pass
progressurl = SITE_URL
if debug:
progressurl = SITE_URL_DEV
secret = PROGRESS_CACHE_SECRET
progressurl += "/rowers/record-progress/"
progressurl += job_id
rowdata.otw_setpower_silent(skiprows=5, mc=weightvalue, rg=rg,
powermeasured=powermeasured)
powermeasured=powermeasured,
progressurl=progressurl,
secret=secret
)
# save data
rowdata.write_csv(f1, gzip=True)
rowers/templates/async_tasks.html
+5
View File
@@ -51,6 +51,11 @@
</script>
{% endblock %}
{% block scripts %}
{% include "monitorjobs.html" %}
{% endblock %}
{% block content %}
rowers/templates/list_graphs.html
+4
View File
@@ -4,6 +4,10 @@
{% block title %}Rowsandall Recent Graphs{% endblock %}
{% block scripts %}
{% include "monitorjobs.html" %}
{% endblock %}
{% block content %}
<h1>Recent Graphs</h1>
rowers/templates/monitorjobs.html
+30
View File
@@ -0,0 +1,30 @@
<script type='text/javascript'
src='https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js'>
</script>
<script>
var previous = null;
var current = null;
var formNotChanged = true;
(function checkJobs() {
console.log('polling');
console.log(formNotChanged)
$.getJSON(window.location.protocol + '//'+window.location.host + '/rowers/list-jobs/', function(json) {
current = JSON.stringify(json);
$('form').each(function() {
$(this).change(function() {
formNotChanged = false;
console.log("Form Changed");
console.log(formNotChanged)
});
});
if (previous && current && previous !== current && formNotChanged) {
console.log('refresh');
location.reload();
};
previous = current;
});
setTimeout(checkJobs, 15000);
}());
</script>
rowers/templates/otwrankings.html
+4
View File
@@ -2,6 +2,10 @@
{% load staticfiles %}
{% load rowerfilters %}
{% block scripts %}
{% include "monitorjobs.html" %}
{% endblock %}
{% block title %}Workouts{% endblock %}
{% block content %}
rowers/templates/panel_ranking.html
+6
View File
@@ -0,0 +1,6 @@
<div class="grid_2 alpha">
<p>
<a class="button gray small" href="/rowers/workout/{{ workout.id }}/updatecp">
Make Ranking Piece</a>
</p>
</div>
rowers/templates/rankings.html
+3
View File
@@ -3,6 +3,9 @@
{% load rowerfilters %}
{% block title %}Workouts{% endblock %}
{% block scripts %}
{% include "monitorjobs.html" %}
{% endblock %}
{% block content %}
rowers/templates/summary_edit.html
+4
View File
@@ -79,6 +79,10 @@
<td>Four intervals of 6, 5, 3 and 3 minutes length, 3 minutes rest</td>
</tr>
<tr>
<td>8x500m/3:30min </td>
<td>8 times 500m with 3 minutes 30 seconds rest</td>
</tr>
<tr>
<td>4x(500m+500m)/5min</td><td>4 times 1km, but each km is reported as two 500m intervals without rest</td>
</tr>
<tr>
rowers/templates/workflow.html
+5
View File
@@ -23,6 +23,11 @@
{% endfor %}
{% endblock %}
{% block scripts %}
{% include "monitorjobs.html" %}
{% endblock %}
{% block content %}
<div id="page" class="grid_12 alpha">
<div class="grid_10 prefix_2 alpha">
rowers/templates/workout_comments.html
+4
View File
@@ -3,6 +3,10 @@
{% load rowerfilters %}
{% load tz %}
{% block scripts %}
{% include "monitorjobs.html" %}
{% endblock %}
{% block title %}Change Workout {% endblock %}
{% block content %}
rowers/templates/workout_form.html
+10 -2
View File
@@ -13,6 +13,13 @@
{% block og_description %}{{ workout.name }}
{{ workout.date }} - {{ workout.distance }}m - {{ workout.duration |durationprint:"%H:%M:%S.%f" }}{% endblock %}
{% block scripts %}
{% include "monitorjobs.html" %}
<script type='text/javascript'
src='https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js'>
</script>
{% endblock %}
{% block content %}
<div id="workouts" class="grid_6 alpha">
@@ -89,8 +96,9 @@
</tr>
</table>
</div>
<div class="grid_6 alpha">
<form enctype="multipart/form-data" action="" method="post">
<div id="form-div" class="grid_6 alpha">
<form id="importantform"
enctype="multipart/form-data" action="" method="post">
<table width=100%>
{{ form.as_table }}
</table>
rowers/templates/workout_view.html
+3
View File
@@ -1,6 +1,9 @@
{% extends "base.html" %}
{% load staticfiles %}
{% load rowerfilters %}
{% block scripts %}
{% include "monitorjobs.html" %}
{% endblock %}
{% block title %}{{ workout.name }} {% endblock %}
{% block og_title %}{{ workout.name }} {% endblock %}
rowers/urls.py
+2
View File
@@ -144,6 +144,8 @@ urlpatterns = [
url(r'^test-job/(?P<aantal>\d+)$',views.test_job_view),
url(r'^test-job2/(?P<aantal>\d+)$',views.test_job_view2),
url(r'^record-progress/(?P<value>\d+)/(?P<id>.*)$',views.post_progress),
url(r'^record-progress/(?P<id>.*)$',views.post_progress),
url(r'^record-progress$',views.post_progress),
url(r'^list-graphs/$',views.graphs_view),
url(r'^(?P<theuser>\d+)/ote-bests/(?P<startdatestring>\w+.*)/(?P<enddatestring>\w+.*)$',views.rankings_view),
url(r'^(?P<theuser>\d+)/ote-bests/(?P<deltadays>\d+)$',views.rankings_view),
rowers/utils.py
+7
View File
@@ -45,6 +45,7 @@ workflowleftpanel = (
('panel_editstream.html','Edit Stream Data'),
('panel_otwpower.html','Run OTW Power Calculations'),
('panel_mapview.html','Map'),
('panel_ranking.html','Ranking View'),
)
defaultleft = [
@@ -222,11 +223,17 @@ def isbreakthrough(delta,cpvalues,p0,p1,p2,p3,ratio):
def myqueue(queue,function,*args,**kwargs):
if settings.DEBUG:
kwargs['debug'] = True
print 'myqueue'
print args
print kwargs
job = function.delay(*args,**kwargs)
else:
job_id = str(uuid.uuid4())
kwargs['job_id'] = job_id
kwargs['jobkey'] = job_id
job = queue.enqueue(function,*args,**kwargs)
return job
rowers/views.py
+35 -11
View File
@@ -27,6 +27,7 @@ from rowers.forms import (
LoginForm,DocumentsForm,UploadOptionsForm,
TeamUploadOptionsForm,WorkFlowLeftPanelForm,WorkFlowMiddlePanelForm,
WorkFlowLeftPanelElement,WorkFlowMiddlePanelElement,
LandingPageForm,
)
from django.core.urlresolvers import reverse
from django.core.exceptions import PermissionDenied
@@ -194,9 +195,9 @@ redis_connection = StrictRedis()
r = Redis()
# this doesn't yet work on production
if settings.DEBUG:
client = SessionTaskListener(r,['tasks'])
client.start()
#if settings.DEBUG:
# client = SessionTaskListener(r,['tasks'])
# client.start()
rq_registry = StartedJobRegistry(queue.name,connection=redis_connection)
@@ -367,19 +368,32 @@ def test_job_view2(request,aantal=100):
@csrf_exempt
def post_progress(request,id=None,value=0):
if request.method == 'POST':
try:
secret = request.POST['secret']
except KeyError:
return HttpResponse('Access Denied',status=401)
if secret == settings.PROGRESS_CACHE_SECRET:
if id:
if not id:
try:
id = request.POST['id']
except KeyError:
return HttpResponse('Invalid request',400)
try:
value = request.POST['value']
except KeyError:
pass
cache.set(id,value,3600)
# test
result = cache.get(id)
return HttpResponse('progress cached '+str(result),status=200)
else:
return HttpResponse('access denied',status=400)
return HttpResponse('progress cached '+str(result),
status=201)
else: # secret not given
return HttpResponse('access denied',status=401)
else:
return HttpResponse('hi',status=200)
else: # request method is not POST
return HttpResponse('GET method not allowed',status=405)
def get_all_queued_jobs(userid=0):
r = StrictRedis()
@@ -3239,7 +3253,10 @@ def workout_update_cp_view(request,id=0):
dataprep.runcpupdate(r)
if row.workouttype in ('water','coastal'):
url = reverse(otwrankings_view)
else:
url = reverse(oterankings_view)
return HttpResponseRedirect(url)
@@ -7571,6 +7588,7 @@ def workout_add_chart_view(request,id,plotnr=1):
@login_required()
def workout_stravaimport_view(request,message=""):
res = stravastuff.get_strava_workout_list(request.user)
if (res.status_code != 200):
if (res.status_code == 401):
r = getrower(request.user)
@@ -8176,7 +8194,11 @@ def workout_upload_view(request,
if 'uploadoptions' in request.session:
uploadoptions = request.session['uploadoptions']
try:
defaultlandingpage = uploadoptions['landingpage']
except KeyError:
uploadoptions['landingpage'] = r.defaultlandingpage
defaultlandingpage = r.defaultlandingpage
else:
request.session['uploadoptions'] = uploadoptions
@@ -8208,6 +8230,7 @@ def workout_upload_view(request,
landingpage = uploadoptions['landingpage']
except KeyError:
landingpage = r.defaultlandingpage
uploadoptions['landingpage'] = landingpage
try:
upload_to_c2 = uploadoptions['upload_to_C2']
@@ -8276,7 +8299,7 @@ def workout_upload_view(request,
'upload_to_RunKeeper':upload_to_rk,
'upload_to_MapMyFitness':upload_to_ua,
'upload_to_TrainingPeaks':upload_to_tp,
'landingpage':r.defaultlandingpage,
'landingpage':landingpage,
}
@@ -9153,7 +9176,8 @@ def rower_favoritecharts_view(request):
'xparam':f.xparam,
'plottype':f.plottype,
'workouttype':f.workouttype,
'reststrokes':f.reststrokes}
'reststrokes':f.reststrokes,
'notes':f.notes,}
for f in favorites]
FavoriteChartFormSet = formset_factory(FavoriteForm,formset=BaseFavoriteFormSet,extra=0)
if aantal==0:
templates/basebase.html
+1 -26
View File
@@ -9,32 +9,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
<html lang="en">
<head>
<script type='text/javascript'
src='https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js'>
</script>
<script type="text/javascript">
window.jQuery || document.write('<script src="/static/js/jquery-3.1.0.js"><' + '/script>');
</script>
<script>
var previous = null;
var current = null;
(function checkJobs() {
console.log('polling');
$.getJSON(window.location.protocol + '//'+window.location.host + '/rowers/list-jobs/', function(json) {
current = JSON.stringify(json);
if (previous && current && previous !== current) {
console.log('refresh');
location.reload();
};
previous = current;
});
setTimeout(checkJobs, 15000);
}());
</script>
{% block scripts %} {% endblock %}
<script src="/static/cookielaw/js/cookielaw.js"></script>
{% analytical_head_top %}