+ +
+ {% if user.rower.rowerplan == 'pro' or user.rower.rowerplan == 'coach' %} + OTW Ranking Pieces + {% else %} + OTW Ranking Pieces + {% endif %} +
++ Analyse power vs piece duration to make predictions. +
+
+ Summary for {{ theuser.first_name }} {{ theuser.last_name }} + between {{ startdate|date }} and {{ enddate|date }}
+ +Direct link for other users: + https://rowsandall.com/rowers/{{ id }}/otw-bests/{{ startdate|date:"Y-m-d" }}/{{ enddate|date:"Y-m-d" }} +
+ +The table gives the OTW efforts you marked as Ranking Piece. + The graph shows the best segments from those pieces, plotted as + average power (over the segment) vs the duration of the segment/ + In other words: How long you can hold that power. +
+At the bottom of the page, you will find predictions derived from the model.
+Use this form to select a different date range:
++ Select start and end date for a date range: +
| Distance | +Duration | +Avg Power | +Date | +Avg HR | +Max HR | +Edit | +
|---|---|---|---|---|---|---|
| {{ workout.distance }} m | +{{ workout.duration |durationprint:"%H:%M:%S.%f" }} | +{{ avgpower|lookup:workout.id }} W | +{{ workout.date }} | +{{ workout.averagehr }} | +{{ workout.maxhr }} | ++ {{ workout.name }} | + +
No ranking workouts found
+ {% endif %} + +Add non-ranking piece using the form. The piece will be added in the prediction tables below.
+ + + +| Duration | +Power | +
|---|---|
| {{ value }} W | + {% endif %} + {% if key == "duration" %} +{{ value |deltatimeprint }} | + {% endif %} + {% endfor %} +
No ranking pieces found.
' + paulslope = 1 + paulintercept = 1 + p1 = [1,1,1,1] + message = "" + + + if request.method == 'POST' and "piece" in request.POST: + form = PredictedPieceForm(request.POST) + clean = form.is_valid() + value = form.cleaned_data['value'] + hourvalue,value = divmod(value,60) + if hourvalue >= 24: + hourvalue = 23 + rankingdurations.append(datetime.time(minute=value,hour=hourvalue)) + else: + form = PredictedPieceForm() + + + predictions = [] + cpredictions = [] + + + + for rankingduration in rankingdurations: + t = 3600.*rankingduration.hour + t += 60.*rankingduration.minute + t += rankingduration.second + t += rankingduration.microsecond/1.e6 + + + # CP model + pwr = p1[0]/(1+t/p1[2]) + pwr += p1[1]/(1+t/p1[3]) + + if pwr <= 0: + pwr = 50. + + if not np.isnan(pwr): + a = { + 'duration':timedeltaconv(t), + 'power':int(pwr)} + cpredictions.append(a) + + + del form.fields["pieceunit"] + + messages.error(request,message) + return render(request, 'otwrankings.html', + {'rankingworkouts':theworkouts, + 'interactiveplot':script, + 'the_div':div, + 'predictions':predictions, + 'cpredictions':cpredictions, + 'avgpower':avgpower, + 'form':form, + 'dateform':dateform, + 'deltaform':deltaform, + 'id': theuser, + 'theuser':uu, + 'startdate':startdate, + 'enddate':enddate, + 'teams':get_my_teams(request.user), + }) + # Reload the workout and calculate the summary from the stroke data (lapIDx) @login_required() def workout_recalcsummary_view(request,id=0): @@ -2762,7 +3096,7 @@ def workout_makepublic_view(request,id, row.privacy = 'visible' row.save() - rr = Rower.objects.get(user=request.user) + rr = getrower(request.user) teams = rr.team.all() for team in teams: @@ -2821,7 +3155,7 @@ def team_comparison_select(request, teamid=0): try: - r = Rower.objects.get(user=request.user) + r = getrower(request.user) except Rower.DoesNotExist: raise Http404("Rower doesn't exist") @@ -2906,7 +3240,7 @@ def team_comparison_select(request, def multi_compare_view(request): promember=0 if not request.user.is_anonymous(): - r = Rower.objects.get(user=request.user) + r = getrower(request.user) result = request.user.is_authenticated() and ispromember(request.user) if result: promember=1 @@ -2997,10 +3331,8 @@ def user_boxplot_select(request, else: user = User.objects.get(id=userid) - try: - r = Rower.objects.get(user=user) - except Rower.DoesNotExist: - raise Http404("Rower doesn't exist") + + r = getrower(user) if 'startdate' in request.session: startdate = iso8601.parse_date(request.session['startdate']) @@ -3259,7 +3591,7 @@ def workouts_view(request,message='',successmessage='', enddate=timezone.now()+datetime.timedelta(days=1), teamid=0): try: - r = Rower.objects.get(user=request.user) + r = getrower(request.user) except Rower.DoesNotExist: raise Http404("Rower doesn't exist") @@ -3360,7 +3692,7 @@ def workout_comparison_list(request,id=0,message='',successmessage='', enddate=timezone.now()): try: - r = Rower.objects.get(user=request.user) + r = getrower(request.user) u = User.objects.get(id=r.user.id) if request.method == 'POST': dateform = DateRangeForm(request.POST) @@ -3440,7 +3772,7 @@ def workout_fusion_list(request,id=0,message='',successmessage='', enddate=timezone.now()): try: - r = Rower.objects.get(user=request.user) + r = getrower(request.user) u = User.objects.get(id=r.user.id) if request.method == 'POST': dateform = DateRangeForm(request.POST) @@ -3840,7 +4172,7 @@ def workout_wind_view(request,id=0,message="",successmessage=""): # get data f1 = row.csvfilename u = row.user.user - r = Rower.objects.get(user=u) + r = getrower(u) # create bearing rowdata = rdata(f1) @@ -3961,7 +4293,7 @@ def workout_stream_view(request,id=0,message="",successmessage=""): # create interactive plot f1 = row.csvfilename u = row.user.user - r = Rower.objects.get(user=u) + r = getrower(u) rowdata = rdata(f1) if rowdata == 0: @@ -4128,7 +4460,7 @@ def workout_geeky_view(request,id=0,message="",successmessage=""): # create interactive plot f1 = row.csvfilename u = row.user.user - r = Rower.objects.get(user=u) + r = getrower(u) # create interactive plot try: @@ -4198,7 +4530,7 @@ def cumstats(request,theuser=0, theuser = request.user.id if not request.user.is_anonymous(): - r = Rower.objects.get(user=request.user) + r = getrower(request.user) result = request.user.is_authenticated() and ispromember(request.user) if result: promember=1 @@ -4266,7 +4598,7 @@ def cumstats(request,theuser=0, optionsform = StatsOptionsForm() try: - r2 = Rower.objects.get(user=theuser) + r2 = getrower(theuser) allergworkouts = Workout.objects.filter(user=r2, workouttype__in=workouttypes, startdatetime__gte=startdate, @@ -4407,7 +4739,7 @@ def cumstats(request,theuser=0, @login_required() def workout_stats_view(request,id=0,message="",successmessage=""): - r = Rower.objects.get(user=request.user) + r = getrower(request.user) try: w = Workout.objects.get(id=id) except Workout.DoesNotExist: @@ -4562,7 +4894,7 @@ def workout_advanced_view(request,id=0,message="",successmessage=""): # create interactive plot f1 = row.csvfilename u = row.user.user - r = Rower.objects.get(user=u) + r = getrower(u) # create interactive plot try: @@ -4595,7 +4927,7 @@ def workout_advanced_view(request,id=0,message="",successmessage=""): def workout_comparison_view(request,id1=0,id2=0,xparam='distance',yparam='spm'): promember=0 if not request.user.is_anonymous(): - r = Rower.objects.get(user=request.user) + r = getrower(request.user) result = request.user.is_authenticated() and ispromember(request.user) if result: promember=1 @@ -4630,7 +4962,7 @@ def workout_comparison_view2(request,id1=0,id2=0,xparam='distance', yparam='spm',plottype='line'): promember=0 if not request.user.is_anonymous(): - r = Rower.objects.get(user=request.user) + r = getrower(request.user) result = request.user.is_authenticated() and ispromember(request.user) if result: promember=1 @@ -4706,7 +5038,7 @@ def workout_flexchart3_view(request,*args,**kwargs): promember=0 mayedit=0 if not request.user.is_anonymous(): - r = Rower.objects.get(user=request.user) + r = getrower(request.user) result = request.user.is_authenticated() and ispromember(request.user) if result: promember=1 @@ -4781,7 +5113,7 @@ def workout_flexchart3_view(request,*args,**kwargs): if not request.user.is_anonymous(): workstrokesonly = request.POST['workstrokesonlysave'] reststrokes = not workstrokesonly - r = Rower.objects.get(user=request.user) + r = getrower(request.user) f = FavoriteChart(user=r,xparam=xparam, yparam1=yparam1,yparam2=yparam2, plottype=plottype,workouttype=workouttype, @@ -4889,12 +5221,12 @@ def workout_biginteractive_view(request,id=0,message="",successmessage=""): # create interactive plot f1 = row.csvfilename u = row.user.user - # r = Rower.objects.get(user=u) + # r = getrower(u) promember=0 mayedit=0 if not request.user.is_anonymous(): - r = Rower.objects.get(user=request.user) + r = getrower(request.user) result = request.user.is_authenticated() and ispromember(request.user) if result: promember=1 @@ -4933,12 +5265,12 @@ def workout_otwpowerplot_view(request,id=0,message="",successmessage=""): # create interactive plot f1 = row.csvfilename u = row.user.user - # r = Rower.objects.get(user=u) + # r = getrower(u) promember=0 mayedit=0 if not request.user.is_anonymous(): - r = Rower.objects.get(user=request.user) + r = getrower(request.user) result = request.user.is_authenticated() and ispromember(request.user) if result: promember=1 @@ -5187,6 +5519,11 @@ def workout_edit_view(request,id=0,message="",successmessage=""): privacy = request.POST['privacy'] except KeyError: privacy = Workout.objects.get(id=id).privacy + try: + rankingpiece = form.cleaned_data['rankingpiece'] + except KeyError: + rankingpiece =- Workout.objects.get(id=id).rankingpiece + startdatetime = (str(date) + ' ' + str(starttime)) startdatetime = datetime.datetime.strptime(startdatetime, "%Y-%m-%d %H:%M:%S") @@ -5203,6 +5540,7 @@ def workout_edit_view(request,id=0,message="",successmessage=""): row.distance = distance row.boattype = boattype row.privacy = privacy + row.rankingpiece = rankingpiece try: row.save() except IntegrityError: @@ -5247,7 +5585,7 @@ def workout_edit_view(request,id=0,message="",successmessage=""): # create interactive plot f1 = row.csvfilename u = row.user.user - r = Rower.objects.get(user=u) + r = getrower(u) rowdata = rdata(f1) hascoordinates = 1 if rowdata != 0: @@ -5314,7 +5652,7 @@ def workout_add_otw_powerplot_view(request,id): imagename = f1+timestr+'.png' fullpathimagename = 'static/plots/'+imagename u = w.user.user - r = Rower.objects.get(user=u) + r = getrower(u) powerperc = 100*np.array([r.pw_ut2, r.pw_ut1, r.pw_at, @@ -5375,7 +5713,7 @@ def workout_add_piechart_view(request,id): imagename = f1+timestr+'.png' fullpathimagename = 'static/plots/'+imagename u = w.user.user - r = Rower.objects.get(user=u) + r = getrower(u) powerperc = 100*np.array([r.pw_ut2, r.pw_ut1, @@ -5436,7 +5774,7 @@ def workout_add_power_piechart_view(request,id): imagename = f1+timestr+'.png' fullpathimagename = 'static/plots/'+imagename u = w.user.user - r = Rower.objects.get(user=u) + r = getrower(u) powerperc = 100*np.array([r.pw_ut2, r.pw_ut1, @@ -5495,7 +5833,7 @@ def workout_add_timeplot_view(request,id): imagename = f1+timestr+'.png' fullpathimagename = 'static/plots/'+imagename u = w.user.user - r = Rower.objects.get(user=u) + r = getrower(u) powerperc = 100*np.array([r.pw_ut2, r.pw_ut1, r.pw_at, @@ -5555,7 +5893,7 @@ def workout_add_distanceplot_view(request,id): imagename = f1+timestr+'.png' fullpathimagename = 'static/plots/'+imagename u = w.user.user - r = Rower.objects.get(user=u) + r = getrower(u) powerperc = 100*np.array([r.pw_ut2, r.pw_ut1, r.pw_at, @@ -5613,7 +5951,7 @@ def workout_add_distanceplot2_view(request,id): imagename = f1+timestr+'.png' fullpathimagename = 'static/plots/'+imagename u = w.user.user - r = Rower.objects.get(user=u) + r = getrower(u) powerperc = 100*np.array([r.pw_ut2, r.pw_ut1, r.pw_at, @@ -5673,7 +6011,7 @@ def workout_add_timeplot2_view(request,id): imagename = f1+timestr+'.png' fullpathimagename = 'static/plots/'+imagename u = w.user.user - r = Rower.objects.get(user=u) + r = getrower(u) powerperc = 100*np.array([r.pw_ut2, r.pw_ut1, r.pw_at, @@ -5722,7 +6060,7 @@ 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 = Rower.objects.get(user=request.user) + r = getrower(request.user) if (r.stravatoken == '') or (r.stravatoken is None): s = "Token doesn't exist. Need to authorize" return HttpResponseRedirect("/rowers/me/stravaauthorize/") @@ -5735,7 +6073,7 @@ def workout_stravaimport_view(request,message=""): return HttpResponseRedirect(url) else: workouts = [] - r = Rower.objects.get(user=request.user) + r = getrower(request.user) stravaids = [int(item['id']) for item in res.json()] knownstravaids = uniqify([ w.uploadedtostrava for w in Workout.objects.filter(user=r) @@ -5772,7 +6110,7 @@ def workout_runkeeperimport_view(request,message=""): res = runkeeperstuff.get_runkeeper_workout_list(request.user) if (res.status_code != 200): if (res.status_code == 401): - r = Rower.objects.get(user=request.user) + r = getrower(request.user) if (r.runkeepertoken == '') or (r.runkeepertoken is None): s = "Token doesn't exist. Need to authorize" return HttpResponseRedirect("/rowers/me/runkeeperauthorize/") @@ -5809,7 +6147,7 @@ def workout_underarmourimport_view(request,message=""): res = underarmourstuff.get_underarmour_workout_list(request.user) if (res.status_code != 200): if (res.status_code == 401): - r = Rower.objects.get(user=request.user) + r = getrower(request.user) if (r.underarmourtoken == '') or (r.underarmourtoken is None): s = "Token doesn't exist. Need to authorize" return HttpResponseRedirect("/rowers/me/underarmourauthorize/") @@ -5857,7 +6195,7 @@ def workout_sporttracksimport_view(request,message=""): res = sporttracksstuff.get_sporttracks_workout_list(request.user) if (res.status_code != 200): if (res.status_code == 401): - r = Rower.objects.get(user=request.user) + r = getrower(request.user) if (r.sporttrackstoken == '') or (r.sporttrackstoken is None): s = "Token doesn't exist. Need to authorize" return HttpResponseRedirect("/rowers/me/sporttracksauthorize/") @@ -5870,7 +6208,7 @@ def workout_sporttracksimport_view(request,message=""): return HttpResponseRedirect(url) else: workouts = [] - r = Rower.objects.get(user=request.user) + r = getrower(request.user) stids = [int(getidfromsturi(item['uri'])) for item in res.json()['items']] knownstids = uniqify([ w.uploadedtosporttracks for w in Workout.objects.filter(user=r) @@ -5906,7 +6244,7 @@ def c2listdebug_view(request,message=""): except C2NoTokenError: return HttpResponseRedirect("/rowers/me/c2authorize/") - r = Rower.objects.get(user=request.user) + r = getrower(request.user) res = c2stuff.get_c2_workout_list(request.user) @@ -5954,7 +6292,7 @@ def workout_getc2workout_all(request,message=""): message = "Something went wrong in workout_c2import_view (C2 token refresh)" messages.error(request,message) else: - r = Rower.objects.get(user=request.user) + r = getrower(request.user) c2ids = [item['id'] for item in res.json()['data']] knownc2ids = uniqify([ w.uploadedtoc2 for w in Workout.objects.filter(user=r) @@ -6011,7 +6349,7 @@ def workout_c2import_view(request,message=""): return HttpResponseRedirect(url) else: workouts = [] - r = Rower.objects.get(user=request.user) + r = getrower(request.user) c2ids = [item['id'] for item in res.json()['data']] knownc2ids = uniqify([ w.uploadedtoc2 for w in Workout.objects.filter(user=r) @@ -6141,7 +6479,7 @@ def workout_getsporttracksworkout_view(request,sporttracksid): def workout_getsporttracksworkout_all(request): res = sporttracksstuff.get_sporttracks_workout_list(request.user) if (res.status_code == 200): - r = Rower.objects.get(user=request.user) + r = getrower(request.user) stids = [int(getidfromsturi(item['uri'])) for item in res.json()['items']] knownstids = uniqify([ w.uploadedtosporttracks for w in Workout.objects.filter(user=r) @@ -6170,7 +6508,7 @@ def workout_getsporttracksworkout_all(request): def workout_getstravaworkout_all(request): res = stravastuff.get_strava_workout_list(request.user) if (res.status_code == 200): - r = Rower.objects.get(user=request.user) + r = getrower(request.user) stravaids = [int(item['id']) for item in res.json()] knownstravaids = uniqify([ w.uploadedtostrava for w in Workout.objects.filter(user=r) @@ -6357,7 +6695,7 @@ def workout_upload_view(request, except KeyError: upload_totp = False - r = Rower.objects.get(user=request.user) + r = getrower(request.user) if request.method == 'POST': form = DocumentsForm(request.POST,request.FILES) optionsform = UploadOptionsForm(request.POST) @@ -6431,7 +6769,7 @@ def workout_upload_view(request, imagename = f1[:-4]+'.png' fullpathimagename = 'static/plots/'+imagename u = request.user - r = Rower.objects.get(user=request.user) + r = getrower(request.user) powerperc = 100*np.array([r.pw_ut2, r.pw_ut1, r.pw_at, @@ -6605,7 +6943,7 @@ def team_workout_upload_view(request,message="", make_plot = uploadoptions['make_plot'] plottype = uploadoptions['plottype'] - r = Rower.objects.get(user=request.user) + r = getrower(request.user) if request.method == 'POST': form = DocumentsForm(request.POST,request.FILES) optionsform = TeamUploadOptionsForm(request.POST) @@ -6620,7 +6958,7 @@ def team_workout_upload_view(request,message="", if rowerform.is_valid(): u = rowerform.cleaned_data['user'] if u: - r = Rower.objects.get(user=u) + r = getrower(u) else: message = 'Please select a rower' messages.error(request,message) @@ -6834,7 +7172,7 @@ def graph_delete_view(request,id=0): @login_required() def graphs_view(request): try: - r = Rower.objects.get(user=request.user) + r = getrower(request.user) workouts = Workout.objects.filter(user=r).order_by("-date", "-starttime") query = request.GET.get('q') if query: @@ -6892,7 +7230,7 @@ def workout_summary_restore_view(request,id,message="",successmessage=""): # still here - this is a workout we may edit f1 = row.csvfilename u = row.user.user - r = Rower.objects.get(user=u) + r = getrower(u) powerperc = 100*np.array([r.pw_ut2, r.pw_ut1, r.pw_at, @@ -7010,7 +7348,7 @@ def workout_summary_edit_view(request,id,message="",successmessage="" # still here - this is a workout we may edit f1 = row.csvfilename u = row.user.user - r = Rower.objects.get(user=u) + r = getrower(u) powerperc = 100*np.array([r.pw_ut2, r.pw_ut1, r.pw_at, @@ -7208,7 +7546,7 @@ def workout_summary_edit_view(request,id,message="",successmessage="" def rower_favoritecharts_view(request): message = '' successmessage = '' - r = Rower.objects.get(user=request.user) + r = getrower(request.user) favorites = FavoriteChart.objects.filter(user=r).order_by('id') aantal = len(favorites) favorites_data = [{'yparam1':f.yparam1, @@ -7272,7 +7610,7 @@ def rower_favoritecharts_view(request): # Add email address to form so user can change his email address @login_required() def rower_edit_view(request,message=""): - r = Rower.objects.get(user=request.user) + r = getrower(request.user) if request.method == 'POST' and "ut2" in request.POST: form = RowerForm(request.POST) if form.is_valid(): @@ -7286,7 +7624,7 @@ def rower_edit_view(request,message=""): an = cd['an'] rest = cd['rest'] try: - r = Rower.objects.get(user=request.user) + r = getrower(request.user) r.max = max(min(hrmax,250),10) r.ut2 = max(min(ut2,250),10) r.ut1 = max(min(ut1,250),10) @@ -7343,7 +7681,7 @@ def rower_edit_view(request,message=""): ftp = cd['ftp'] otwslack = cd['otwslack'] try: - r = Rower.objects.get(user=request.user) + r = getrower(request.user) powerfrac = 100*np.array([r.pw_ut2, r.pw_ut1, r.pw_at, @@ -7401,7 +7739,7 @@ def rower_edit_view(request,message=""): anname = cd['anname'] powerzones = [ut3name,ut2name,ut1name,atname,trname,anname] try: - r = Rower.objects.get(user=request.user) + r = getrower(request.user) r.pw_ut2 = pw_ut2 r.pw_ut1 = pw_ut1 r.pw_at = pw_at @@ -7465,7 +7803,7 @@ def rower_edit_view(request,message=""): if len(email): u.email = email u.save() - r = Rower.objects.get(user=u) + r = getrower(u) r.weightcategory = weightcategory r.save() form = RowerForm(instance=r) @@ -7501,7 +7839,7 @@ def rower_edit_view(request,message=""): else: try: - r = Rower.objects.get(user=request.user) + r = getrower(request.user) form = RowerForm(instance=r) powerform = RowerPowerForm(instance=r) @@ -7536,7 +7874,7 @@ def rower_revokeapp_view(request,id=0): for token in refreshtokens: token.revoke() - r = Rower.objects.get(user=request.user) + r = getrower(request.user) form = RowerForm(instance=r) powerform = RowerPowerForm(instance=r) grants = AccessToken.objects.filter(user=request.user) @@ -7700,7 +8038,7 @@ def strokedatajson(request,id): row.csvfilename = csvfilename row.save() - r = Rower.objects.get(user=request.user) + r = getrower(request.user) powerperc = 100*np.array([r.pw_ut2, r.pw_ut1, r.pw_at, @@ -7733,7 +8071,7 @@ import teams def team_view(request,id=0): ismember = 0 hasrequested = 0 - r = Rower.objects.get(user=request.user) + r = getrower(request.user) myteams = Team.objects.filter(manager=request.user) try: @@ -7799,7 +8137,7 @@ def team_leaveconfirm_view(request,id=0): @login_required() def team_leave_view(request,id=0): - r = Rower.objects.get(user=request.user) + r = getrower(request.user) teams.remove_member(id,r) url = reverse(rower_teams_view) @@ -7822,7 +8160,7 @@ def rower_teams_view(request,message='',successmessage=''): else: form = TeamInviteCodeForm() - r = Rower.objects.get(user=request.user) + r = getrower(request.user) ts = Team.objects.filter(rower=r) myteams = Team.objects.filter(manager=request.user) otherteams = Team.objects.filter(private='open').exclude(rower=r).exclude(manager=request.user).order_by('name') @@ -8050,7 +8388,7 @@ def team_create_view(request): @user_passes_test(iscoachmember,login_url="/",redirect_field_name=None) def team_deleteconfirm_view(request,id): - r = Rower.objects.get(user=request.user) + r = getrower(request.user) try: t = Team.objects.get(id=id) except Team.DoesNotExist: @@ -8066,7 +8404,7 @@ def team_deleteconfirm_view(request,id): @user_passes_test(iscoachmember,login_url="/",redirect_field_name=None) def team_delete_view(request,id): - r = Rower.objects.get(user=request.user) + r = getrower(request.user) try: t = Team.objects.get(id=id) except Team.DoesNotExist: @@ -8082,7 +8420,7 @@ def team_delete_view(request,id): @user_passes_test(iscoachmember,login_url="/",redirect_field_name=None) def team_members_stats_view(request,id): - r = Rower.objects.get(user=request.user) + r = getrower(request.user) try: t = Team.objects.get(id=id) except Team.DoesNotExist: diff --git a/static/img/gpx.jpg b/static/img/gpx.jpg new file mode 100644 index 00000000..b81a5ef4 Binary files /dev/null and b/static/img/gpx.jpg differ