From de452fc78153c6b05d795de511c566e8d32b4951 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Fri, 28 May 2021 12:35:44 +0200 Subject: [PATCH 1/5] proof of concept for HR, as a sstart --- rowers/interactiveplots.py | 197 ++++++++++++++++++++++++++ rowers/templates/trainingzones.html | 35 +++++ rowers/tests/testdata/testdata.tcx.gz | Bin 4001 -> 4000 bytes rowers/urls.py | 2 + rowers/views/analysisviews.py | 42 ++++++ 5 files changed, 276 insertions(+) create mode 100644 rowers/templates/trainingzones.html diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index c4a92124..3cb67bd8 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -6557,3 +6557,200 @@ def interactive_otw_advanced_pace_chart(id=0,promember=0): div = '' return [script,div] + +def get_zones_report(rower,startdate,enddate): + duration = enddate-startdate + + totaldays = duration.total_seconds()/(24*3600) + + dates = [] + dates_sorting = [] + minutes = [] + zones = [] + + workouts = Workout.objects.filter( + user=rower, + startdatetime__gte=startdate, + startdatetime__lte=enddate, + duplicate=False, + ).order_by("-startdatetime") + + ids = [w.id for w in workouts] + + columns = ['workoutid','hr','power','time'] + + df = dataprep.getsmallrowdata_db(columns,ids=ids) + try: + df['deltat'] = df['time'].diff().clip(lower=0) + except KeyError: + pass + + df = dataprep.clean_df_stats(df,workstrokesonly=False, + ignoreadvanced=True,ignorehr=False) + + #totalmeters,totalhours, totalminutes, totalseconds = get_totals(workouts) + + hrzones = rower.hrzones + + for w in workouts: + dd = w.date.strftime('%m/%d') + dd2 = w.date.strftime('%Y/%m/%d') + dd3 = w.date.strftime('%Y/%m') + + qryw = 'workoutid == {workoutid}'.format(workoutid=w.id) + + qry = 'hr < {ut2}'.format(ut2=rower.ut2) + timeinzone = df.query(qry).query(qryw)['deltat'].sum()/(60*1e3) + if totaldays<30: + dates.append(dd) + dates_sorting.append(dd2) + else: # pragma: no cover + dates.append(dd3) + dates_sorting.append(dd3) + minutes.append(timeinzone) + zones.append(' + + + + +

Training Zones

+ +{{ the_script | safe }} + + + +{% endblock %} + +{% block scripts %} +{% endblock %} + +{% block sidebar %} +{% include 'menu_plan.html' %} +{% endblock %} diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz index 887f897c7b8beb74ccd409c1e0b300093d3a5815..a7bf26c371bf25b5ba97b247e23c8071125964bb 100644 GIT binary patch literal 4000 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\d+)/$',views.performancemanager_view,name='performancemanager_view'), re_path(r'^performancemanager/user/(?P\d+)/(?P\w+.*)/$',views.performancemanager_view,name='performancemanager_view'), + re_path(r'^trainingzones/$',views.trainingzones_view,name='trainingzones_view'), + re_path(r'^trainingzones/user/(?P\d+)/$',views.trainingzones_view,name='trainingzones_view'), re_path(r'^ote-bests2/user/(?P\d+)/$',views.rankings_view2,name='rankings_view2'), re_path(r'^ote-bests2/$',views.rankings_view2,name='rankings_view2'), re_path(r'^analysisdata/$',views.analysis_view_data,name='analysis_view_data'), diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py index 365bf5dd..3641bce5 100644 --- a/rowers/views/analysisviews.py +++ b/rowers/views/analysisviews.py @@ -1049,6 +1049,48 @@ def goldmedalscores_view(request,userid=0, 'bestworkouts':bestworkouts, }) +@user_passes_test(ispromember, login_url="/rowers/paidplans", + message="This functionality requires a Pro plan or higher. If you are already a Pro user, please log in to access this functionality", + redirect_field_name=None) +@permission_required('rower.is_coach',fn=get_user_by_userid,raise_exception=True) +def trainingzones_view(request,userid=0,mode='rower', + startdate=timezone.now()-timezone.timedelta(days=365), + enddate=timezone.now()): + + is_ajax = request_is_ajax(request) + + r = getrequestrower(request,userid=userid) + + startdate,enddate = get_dates_timeperiod(request) + enddate = timezone.now() + startdate = enddate-datetime.timedelta(days=29) + + data = get_zones_report(r,startdate,enddate) + + + script, div = interactive_zoneschart(data,startdate,enddate) + + breadcrumbs = [ + { + 'url':'/rowers/analysis', + 'name':'Analysis' + }, + { + 'url':reverse('trainingzones_view'), + 'name': 'Training Zones' + } + ] + + return render(request,'trainingzones.html', + { + 'active':'nav-analysis', + 'breadcrumbs':breadcrumbs, + 'rower':r, + 'the_script':script, + 'the_div':div, + } + ) + @user_passes_test(ispromember, login_url="/rowers/paidplans", message="This functionality requires a Pro plan or higher. If you are already a Pro user, please log in to access this functionality", From 8966dfec9279b80ee9e2baf04dd90de4463b8957 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Fri, 28 May 2021 13:18:53 +0200 Subject: [PATCH 2/5] fix --- rowers/interactiveplots.py | 64 +++++++++++++++++++++-------- rowers/templates/trainingzones.html | 18 +++++++- rowers/views/analysisviews.py | 15 +++++-- 3 files changed, 76 insertions(+), 21 deletions(-) diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index 3cb67bd8..5ef7b657 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -6566,6 +6566,7 @@ def get_zones_report(rower,startdate,enddate): dates = [] dates_sorting = [] minutes = [] + hours = [] zones = [] workouts = Workout.objects.filter( @@ -6608,7 +6609,8 @@ def get_zones_report(rower,startdate,enddate): dates.append(dd3) dates_sorting.append(dd3) minutes.append(timeinzone) - zones.append('= 30: + df.drop('minutes',inplace=True,axis='columns') + else: + df.drop('hours',inplace=True,axis='columns') + source = ColumnDataSource(df) @@ -6723,19 +6758,14 @@ def interactive_zoneschart(data,startdate,enddate): hv.extension('bokeh') - table = hv.Table(df,[ - ('date','Date'), - ('minutes','minutes'), - ('zones','zones')] - ) - - bars = hv.Bars(df, kdims = ['date','zones']).aggregate(function=np.sum) + bars = hv.Bars(df, kdims = ['date','zones']).aggregate(function=np.sum).redim.values(zones=zones_order) #bars = table.to.bars(['date','zones'],['minutes']) bars.opts( - opts.Bars(cmap=colors,show_legend=True,stacked=True, + opts.Bars(cmap=color_map,show_legend=True,stacked=True, tools=['tap','hover'],width=550,xrotation=45,padding=(0,(0,.1)), - legend_position='bottom',show_frame=False) + legend_position='bottom', + show_frame=False) ) p = hv.render(bars) diff --git a/rowers/templates/trainingzones.html b/rowers/templates/trainingzones.html index ccf4051a..35265ff9 100644 --- a/rowers/templates/trainingzones.html +++ b/rowers/templates/trainingzones.html @@ -15,16 +15,32 @@

Training Zones

+ + + {{ the_script | safe }}
  • -
    +
    {{ the_div|safe }}
    • +
  • +

    +

    + {% csrf_token %} + + {{ form.as_table }} +
    + +
    +

    +
+ + {% endblock %} {% block scripts %} diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py index 3641bce5..356950a9 100644 --- a/rowers/views/analysisviews.py +++ b/rowers/views/analysisviews.py @@ -1061,14 +1061,22 @@ def trainingzones_view(request,userid=0,mode='rower', r = getrequestrower(request,userid=userid) - startdate,enddate = get_dates_timeperiod(request) + enddate = timezone.now() - startdate = enddate-datetime.timedelta(days=29) + startdate = enddate-datetime.timedelta(days=365) + + form = DateRangeForm() + if request.method == 'POST': + form = DateRangeForm(request.POST) + if form.is_valid(): + startdate = form.cleaned_data['startdate'] + enddate = form.cleaned_data['enddate'] + data = get_zones_report(r,startdate,enddate) - script, div = interactive_zoneschart(data,startdate,enddate) + script, div = interactive_zoneschart(r,data,startdate,enddate) breadcrumbs = [ { @@ -1088,6 +1096,7 @@ def trainingzones_view(request,userid=0,mode='rower', 'rower':r, 'the_script':script, 'the_div':div, + 'form':form, } ) From 9f0d4121e378c2e35a63f2dd32945eeb7ab7f055 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 30 May 2021 17:20:27 +0200 Subject: [PATCH 3/5] option to use power zones --- rowers/forms.py | 18 ++++ rowers/interactiveplots.py | 131 +++++++++++++++++++++++----- rowers/templates/trainingzones.html | 2 +- rowers/views/analysisviews.py | 13 +-- rowers/views/statements.py | 3 +- 5 files changed, 138 insertions(+), 29 deletions(-) diff --git a/rowers/forms.py b/rowers/forms.py index 76d00219..2661e1a3 100644 --- a/rowers/forms.py +++ b/rowers/forms.py @@ -58,6 +58,24 @@ class FlexibleDecimalField(forms.DecimalField): value = value.replace('.', '').replace(',', '.') return super(FlexibleDecimalField, self).to_python(value) +class TrainingZonesForm(forms.Form): + zoneschoices = ( + ('power','Power Zones'), + ('hr','Heart Rate Zones') + ) + + zones = forms.ChoiceField(initial='hr',label='Training Zones',choices=zoneschoices) + startdate = forms.DateField( + initial=timezone.now()-datetime.timedelta(days=365), + widget=AdminDateWidget(), #format='%Y-%m-%d'), + label='Start Date') + enddate = forms.DateField( + initial=timezone.now(), + # widget=SelectDateWidget(years=range(1990,2050)), + widget=AdminDateWidget(), #format='%Y-%m-%d'), + label='End Date') + + class InstantPlanSelectForm(forms.Form): datechoices = ( ('startdate','start date'), diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index 5ef7b657..28fac76e 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -715,13 +715,14 @@ def interactive_activitychart2(workouts,startdate,enddate,stack='type',toolbar_l dd = w.date.strftime('%m/%d') dd2 = w.date.strftime('%Y/%m/%d') dd3 = w.date.strftime('%Y/%m') + du = w.duration.hour*60+w.duration.minute trimp = w.trimp rscore = w.rscore if rscore == 0: # pragma: no cover rscore = w.hrtss - if totaldays<30: # pragma: no cover + if totaldays<=30: # pragma: no cover dates.append(dd) dates_sorting.append(dd2) else: @@ -759,7 +760,7 @@ def interactive_activitychart2(workouts,startdate,enddate,stack='type',toolbar_l dd = d.strftime('%d') - if totaldays<30: + if totaldays<=30: dates.append(d.strftime('%m/%d')) dates_sorting.append(d.strftime('%Y/%m/%d')) else: @@ -6558,7 +6559,7 @@ def interactive_otw_advanced_pace_chart(id=0,promember=0): return [script,div] -def get_zones_report(rower,startdate,enddate): +def get_zones_report(rower,startdate,enddate,trainingzones='hr'): duration = enddate-startdate totaldays = duration.total_seconds()/(24*3600) @@ -6592,90 +6593,141 @@ def get_zones_report(rower,startdate,enddate): #totalmeters,totalhours, totalminutes, totalseconds = get_totals(workouts) hrzones = rower.hrzones + powerzones = rower.powerzones for w in workouts: dd = w.date.strftime('%m/%d') dd2 = w.date.strftime('%Y/%m/%d') dd3 = w.date.strftime('%Y/%m') + dd4 = arrow.get(w.date).isocalendar()[1] + #print(w.date,arrow.get(w.date),arrow.get(w.date).isocalendar()) qryw = 'workoutid == {workoutid}'.format(workoutid=w.id) qry = 'hr < {ut2}'.format(ut2=rower.ut2) + if trainingzones == 'power': + qry = 'power < {ut2}'.format(ut2=rower.pw_ut2) timeinzone = df.query(qry).query(qryw)['deltat'].sum()/(60*1e3) - if totaldays<30: + if totaldays<=30: dates.append(dd) dates_sorting.append(dd2) + elif totaldays<=121: + dates.append(dd4) + dates_sorting.append(dd4) else: # pragma: no cover dates.append(dd3) dates_sorting.append(dd3) minutes.append(timeinzone) hours.append(timeinzone/60.) - zones.append('<{ut2}'.format(ut2=hrzones[1])) + if trainingzones == 'hr': + zones.append('<{ut2}'.format(ut2=hrzones[1])) + else: + zones.append('<{ut2}'.format(ut2=powerzones[1])) #print(w,dd,timeinzone,'= 30: + if totaldays > 30: df.drop('minutes',inplace=True,axis='columns') else: df.drop('hours',inplace=True,axis='columns') @@ -6754,6 +6836,7 @@ def interactive_zoneschart(rower,data,startdate,enddate): source = ColumnDataSource(df) df.sort_values('date_sorting',inplace=True) + df.drop('date_sorting',inplace=True,axis='columns') hv.extension('bokeh') @@ -6763,18 +6846,24 @@ def interactive_zoneschart(rower,data,startdate,enddate): #bars = table.to.bars(['date','zones'],['minutes']) bars.opts( opts.Bars(cmap=color_map,show_legend=True,stacked=True, - tools=['tap','hover'],width=550,xrotation=45,padding=(0,(0,.1)), + tools=['tap','hover'],width=550,padding=(0,(0,.1)), legend_position='bottom', show_frame=False) ) p = hv.render(bars) - p.title.text = 'Activity {d1} to {d2}'.format( + p.title.text = 'Activity {d1} to {d2} for {r}'.format( d1 = startdate.strftime("%Y-%m-%d"), d2 = enddate.strftime("%Y-%m-%d"), + r = str(rower), ) + if totaldays >= 30: + p.xaxis.axis_label = 'Week' + if totaldays >= 121: + p.xaxis.axis_label = 'Month' + p.plot_width=550 p.plot_height=350 p.toolbar_location = 'above' diff --git a/rowers/templates/trainingzones.html b/rowers/templates/trainingzones.html index 35265ff9..9c0075d5 100644 --- a/rowers/templates/trainingzones.html +++ b/rowers/templates/trainingzones.html @@ -33,7 +33,7 @@ {{ form.as_table }}
- +

diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py index 356950a9..9a90f306 100644 --- a/rowers/views/analysisviews.py +++ b/rowers/views/analysisviews.py @@ -1065,18 +1065,19 @@ def trainingzones_view(request,userid=0,mode='rower', enddate = timezone.now() startdate = enddate-datetime.timedelta(days=365) - form = DateRangeForm() + form = TrainingZonesForm() + zones = 'hr' if request.method == 'POST': - form = DateRangeForm(request.POST) + form = TrainingZonesForm(request.POST) if form.is_valid(): startdate = form.cleaned_data['startdate'] enddate = form.cleaned_data['enddate'] + zones = form.cleaned_data['zones'] + + data = get_zones_report(r,startdate,enddate,trainingzones=zones) - data = get_zones_report(r,startdate,enddate) - - - script, div = interactive_zoneschart(r,data,startdate,enddate) + script, div = interactive_zoneschart(r,data,startdate,enddate,trainingzones=zones) breadcrumbs = [ { diff --git a/rowers/views/statements.py b/rowers/views/statements.py index 5d9daa8d..b3d39580 100644 --- a/rowers/views/statements.py +++ b/rowers/views/statements.py @@ -77,7 +77,8 @@ from rowers.forms import ( VideoAnalysisCreateForm,WorkoutSingleSelectForm, VideoAnalysisMetricsForm,SurveyForm,HistorySelectForm, StravaChartForm,FitnessFitForm,PerformanceManagerForm, - TrainingPlanBillingForm,InstantPlanSelectForm + TrainingPlanBillingForm,InstantPlanSelectForm, + TrainingZonesForm, ) from django.urls import reverse, reverse_lazy From a2c41244e9babc6be108d5c8535e61d5e605dccb Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 31 May 2021 08:49:23 +0200 Subject: [PATCH 4/5] now working with ajax --- rowers/templates/trainingzones.html | 22 ++++++++++++++-- rowers/tests/testdata/testdata.tcx.gz | Bin 4000 -> 0 bytes rowers/urls.py | 2 ++ rowers/views/analysisviews.py | 36 +++++++++++++++++++++++--- 4 files changed, 55 insertions(+), 5 deletions(-) delete mode 100644 rowers/tests/testdata/testdata.tcx.gz diff --git a/rowers/templates/trainingzones.html b/rowers/templates/trainingzones.html index 9c0075d5..1bbe2149 100644 --- a/rowers/templates/trainingzones.html +++ b/rowers/templates/trainingzones.html @@ -18,7 +18,9 @@ -{{ the_script | safe }} +
+
+
  • @@ -44,8 +46,24 @@ {% endblock %} {% block scripts %} + + + {% endblock %} {% block sidebar %} -{% include 'menu_plan.html' %} +{% include 'menu_analytics.html' %} {% endblock %} diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz deleted file mode 100644 index a7bf26c371bf25b5ba97b247e23c8071125964bb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4000 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\d+)/(?P\w+.*)/$',views.performancemanager_view,name='performancemanager_view'), re_path(r'^trainingzones/$',views.trainingzones_view,name='trainingzones_view'), re_path(r'^trainingzones/user/(?P\d+)/$',views.trainingzones_view,name='trainingzones_view'), + re_path(r'^trainingzones/user/(?P\d+)/data/$',views.trainingzones_view_data,name="trainingzones_view_data"), + re_path(r'^trainingzones/data/$',views.trainingzones_view_data,name="trainingzones_view_data"), re_path(r'^ote-bests2/user/(?P\d+)/$',views.rankings_view2,name='rankings_view2'), re_path(r'^ote-bests2/$',views.rankings_view2,name='rankings_view2'), re_path(r'^analysisdata/$',views.analysis_view_data,name='analysis_view_data'), diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py index 9a90f306..df3b23a4 100644 --- a/rowers/views/analysisviews.py +++ b/rowers/views/analysisviews.py @@ -1074,10 +1074,9 @@ def trainingzones_view(request,userid=0,mode='rower', enddate = form.cleaned_data['enddate'] zones = form.cleaned_data['zones'] - data = get_zones_report(r,startdate,enddate,trainingzones=zones) - - script, div = interactive_zoneschart(r,data,startdate,enddate,trainingzones=zones) + script = '' + div = get_call() breadcrumbs = [ { @@ -1098,9 +1097,40 @@ def trainingzones_view(request,userid=0,mode='rower', 'the_script':script, 'the_div':div, 'form':form, + 'startdate':startdate, + 'enddate':enddate, + 'zones':zones, } ) +@login_required() +def trainingzones_view_data(request,userid=0): + r = getrequestrower(request,userid=userid) + + startdate = timezone.now()-datetime.timedelta(days=365) + enddate = timezone.now() + zones = 'hr' + + if request.GET.get('zones'): + zones = request.GET.get('zones') + + if request.GET.get('startdate'): + startdate = datetime.datetime.strptime(request.GET.get('startdate'),"%Y-%m-%d") + + if request.GET.get('enddate'): + enddate = datetime.datetime.strptime(request.GET.get('enddate'),"%Y-%m-%d") + + + data = get_zones_report(r,startdate,enddate,trainingzones=zones) + + script, div = interactive_zoneschart(r,data,startdate,enddate,trainingzones=zones) + + return JSONResponse({ + 'script': script, + 'div': div, + }) + + @user_passes_test(ispromember, login_url="/rowers/paidplans", message="This functionality requires a Pro plan or higher. If you are already a Pro user, please log in to access this functionality", From 2180287866afe149d4c502404595e097188f9ea8 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 31 May 2021 11:08:44 +0200 Subject: [PATCH 5/5] fixing tests coverage by creating tests of new functionality --- rowers/interactiveplots.py | 16 +++++++------- rowers/plannedsessions.py | 4 ++++ rowers/tests/test_analysis.py | 38 +++++++++++++++++++++++++++++++++ rowers/tests/test_aworkouts.py | 7 ++++++ rowers/tests/test_unit_tests.py | 2 ++ rowers/views/analysisviews.py | 5 +++-- rowers/views/workoutviews.py | 4 ++-- 7 files changed, 64 insertions(+), 12 deletions(-) diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index 28fac76e..d8d0c035 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -6584,7 +6584,7 @@ def get_zones_report(rower,startdate,enddate,trainingzones='hr'): df = dataprep.getsmallrowdata_db(columns,ids=ids) try: df['deltat'] = df['time'].diff().clip(lower=0) - except KeyError: + except KeyError: # pragma: no cover pass df = dataprep.clean_df_stats(df,workstrokesonly=False, @@ -6611,7 +6611,7 @@ def get_zones_report(rower,startdate,enddate,trainingzones='hr'): if totaldays<=30: dates.append(dd) dates_sorting.append(dd2) - elif totaldays<=121: + elif totaldays<=121: # pragma: no cover dates.append(dd4) dates_sorting.append(dd4) else: # pragma: no cover @@ -6632,7 +6632,7 @@ def get_zones_report(rower,startdate,enddate,trainingzones='hr'): if totaldays<=30: dates.append(dd) dates_sorting.append(dd2) - elif totaldays<=121: + elif totaldays<=121: # pragma: no cover dates.append(dd4) dates_sorting.append(dd4) else: # pragma: no cover @@ -6653,7 +6653,7 @@ def get_zones_report(rower,startdate,enddate,trainingzones='hr'): if totaldays<=30: dates.append(dd) dates_sorting.append(dd2) - elif totaldays<=121: + elif totaldays<=121: # pragma: no cover dates.append(dd4) dates_sorting.append(dd4) else: # pragma: no cover @@ -6674,7 +6674,7 @@ def get_zones_report(rower,startdate,enddate,trainingzones='hr'): if totaldays<=30: dates.append(dd) dates_sorting.append(dd2) - elif totaldays<=121: + elif totaldays<=121: # pragma: no cover dates.append(dd4) dates_sorting.append(dd4) else: # pragma: no cover @@ -6695,7 +6695,7 @@ def get_zones_report(rower,startdate,enddate,trainingzones='hr'): if totaldays<=30: dates.append(dd) dates_sorting.append(dd2) - elif totaldays<=121: + elif totaldays<=121: # pragma: no cover dates.append(dd4) dates_sorting.append(dd4) else: # pragma: no cover @@ -6716,7 +6716,7 @@ def get_zones_report(rower,startdate,enddate,trainingzones='hr'): if totaldays<=30: dates.append(dd) dates_sorting.append(dd2) - elif totaldays<=121: + elif totaldays<=121: # pragma: no cover dates.append(dd4) dates_sorting.append(dd4) else: # pragma: no cover @@ -6745,7 +6745,7 @@ def get_zones_report(rower,startdate,enddate,trainingzones='hr'): if totaldays <= 30: dates.append(d.strftime('%m/%d')) dates_sorting.append(d.strftime('%Y/%m/%d')) - elif totaldays<=121: + elif totaldays<=121: # pragma: no cover dd4 = arrow.get(d).isocalendar()[1] dates.append(dd4) dates_sorting.append(dd4) diff --git a/rowers/plannedsessions.py b/rowers/plannedsessions.py index 60e82e56..e57d9d2d 100644 --- a/rowers/plannedsessions.py +++ b/rowers/plannedsessions.py @@ -359,6 +359,8 @@ def get_todays_micro(plan,thedate=date.today()): enddate__gte = thedate ) + + if thismacro: thismeso = TrainingMesoCycle.objects.filter( plan=thismacro[0], @@ -366,6 +368,8 @@ def get_todays_micro(plan,thedate=date.today()): enddate__gte = thedate ) + + if thismeso: thismicro = TrainingMicroCycle.objects.filter( plan=thismeso[0], diff --git a/rowers/tests/test_analysis.py b/rowers/tests/test_analysis.py index 2d880509..f12a469b 100644 --- a/rowers/tests/test_analysis.py +++ b/rowers/tests/test_analysis.py @@ -1107,6 +1107,44 @@ class MarkerPerformanceTest(TestCase): self.assertRedirects(response, expected_url=expected_url, status_code=302,target_status_code=200) + @patch('rowers.dataprep.getsmallrowdata_db', side_effect=mocked_getsmallrowdata_uh) + def test_trainingzones_view(self,mocked_getsmallrowdata_db): + login = self.c.login(username=self.u.username,password=self.password) + self.assertTrue(login) + + startdate = (self.user_workouts[0].startdatetime-datetime.timedelta(days=3)).date() + enddate = (self.user_workouts[0].startdatetime+datetime.timedelta(days=3)).date() + zones = 'hr' + + url = reverse('trainingzones_view') + response = self.c.get(url) + self.assertEqual(response.status_code,200) + + url = reverse('trainingzones_view_data') + response = self.c.get(url) + self.assertEqual(response.status_code,200) + + url += '?startdate={startdate}&enddate={enddate}&zones={zones}'.format( + startdate = startdate.strftime("%Y-%m-%d"), + enddate = enddate.strftime("%Y-%m-%d"), + zones=zones, + ) + + response = self.c.get(url) + self.assertEqual(response.status_code,200) + + zones = 'power' + url = reverse('trainingzones_view_data') + url += '?startdate={startdate}&enddate={enddate}&zones={zones}'.format( + startdate = startdate.strftime("%Y-%m-%d"), + enddate = enddate.strftime("%Y-%m-%d"), + zones=zones, + ) + + response = self.c.get(url) + self.assertEqual(response.status_code,200) + + @patch('rowers.dataprep.create_engine') @patch('rowers.dataprep.getsmallrowdata_db') def test_performancemanager_view(self, mocked_sqlalchemy, diff --git a/rowers/tests/test_aworkouts.py b/rowers/tests/test_aworkouts.py index 95c46902..f145156f 100644 --- a/rowers/tests/test_aworkouts.py +++ b/rowers/tests/test_aworkouts.py @@ -820,6 +820,13 @@ class WorkoutViewTest(TestCase): response = self.c.get(url) self.assertEqual(response.status_code,200) + form_data = { + 'ruptures':'ruptures', + } + + response = self.c.post(url,form_data) + self.assertEqual(response.status_code,200) + form_data = { 'intervalstring':'4x2min/1min', } diff --git a/rowers/tests/test_unit_tests.py b/rowers/tests/test_unit_tests.py index 9fd5c5a1..0bf42abb 100644 --- a/rowers/tests/test_unit_tests.py +++ b/rowers/tests/test_unit_tests.py @@ -232,6 +232,7 @@ class PlannedSessionTests(TestCase): elif not sundays: sundays = [cycle.enddate] + for i in range(len(sundays)): if i==0: monday = cycle.startdate @@ -239,6 +240,7 @@ class PlannedSessionTests(TestCase): monday = sundays[i]-datetime.timedelta(days=6) if monday < cycle.startdate: monday = cycle.startdate + nextsunday = sundays[i] diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py index df3b23a4..6fea37d8 100644 --- a/rowers/views/analysisviews.py +++ b/rowers/views/analysisviews.py @@ -1067,7 +1067,7 @@ def trainingzones_view(request,userid=0,mode='rower', form = TrainingZonesForm() zones = 'hr' - if request.method == 'POST': + if request.method == 'POST': # pragma: no cover form = TrainingZonesForm(request.POST) if form.is_valid(): startdate = form.cleaned_data['startdate'] @@ -1116,10 +1116,11 @@ def trainingzones_view_data(request,userid=0): if request.GET.get('startdate'): startdate = datetime.datetime.strptime(request.GET.get('startdate'),"%Y-%m-%d") + startdate = arrow.get(startdate).datetime if request.GET.get('enddate'): enddate = datetime.datetime.strptime(request.GET.get('enddate'),"%Y-%m-%d") - + enddate = arrow.get(enddate).datetime data = get_zones_report(r,startdate,enddate,trainingzones=zones) diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py index 4fb21bef..34b50c72 100644 --- a/rowers/views/workoutviews.py +++ b/rowers/views/workoutviews.py @@ -4915,7 +4915,7 @@ def workout_upload_api(request): w.timezone = timezone w.save() - + if make_plot: # pragma: no cover @@ -6171,7 +6171,7 @@ def workout_summary_edit_view(request,id,message="",successmessage="" try: rowdata.updateinterval_string(s) - except: + except: # pragma: no cover messages.error(request,"Nope, you were not lucky") intervalstats = rowdata.allstats()