diff --git a/rowers/templates/c2_list_import2.html b/rowers/templates/c2_list_import2.html index c88715aa..5e1ffa68 100644 --- a/rowers/templates/c2_list_import2.html +++ b/rowers/templates/c2_list_import2.html @@ -19,11 +19,11 @@

{% if page > 1 %} - + {% endif %} - + diff --git a/rowers/templates/comparison_list.html b/rowers/templates/comparison_list.html index 08910d38..ab60d9ce 100644 --- a/rowers/templates/comparison_list.html +++ b/rowers/templates/comparison_list.html @@ -105,7 +105,7 @@

{% if workouts.has_previous %} - < + < {% endif %} @@ -113,7 +113,7 @@ {% if workouts.has_next %} - > + > {% endif %}
diff --git a/rowers/templates/cumstats.html b/rowers/templates/cumstats.html index fbf39f11..548fbbf9 100644 --- a/rowers/templates/cumstats.html +++ b/rowers/templates/cumstats.html @@ -81,6 +81,23 @@
    +
  • +
    + + {{ optionsform.as_table }} +
    + +
    • +
  • + + {{ form.as_table }} +
    +
    • +
  • + {% csrf_token %} + + +

  • Summary for {{ theuser.first_name }} {{ theuser.last_name }} @@ -162,23 +179,6 @@ {% endif %}

    • -
  • -
    - - {{ optionsform.as_table }} -
    - -
    • -
  • - - {{ form.as_table }} -
    -
    • -
  • - {% csrf_token %} - - -
{% endblock %} diff --git a/rowers/templates/flexchart3otw.html b/rowers/templates/flexchart3otw.html index 6dc19c95..94d40ac9 100644 --- a/rowers/templates/flexchart3otw.html +++ b/rowers/templates/flexchart3otw.html @@ -49,12 +49,12 @@
  • {% if favoritenr > 0 %} - {% else %} - @@ -68,12 +68,12 @@ {% endif %} {% if favoritenr < maxfav %} - {% else %} - diff --git a/rowers/templates/fusion_list.html b/rowers/templates/fusion_list.html index 8da7c441..9dd58932 100644 --- a/rowers/templates/fusion_list.html +++ b/rowers/templates/fusion_list.html @@ -58,17 +58,17 @@ {% if workouts.has_previous %} {% if request.GET.q %} - + - + {% else %} - + - + {% endif %} @@ -80,17 +80,17 @@ {% if workouts.has_next %} {% if request.GET.q %} - + - + {% else %} - + - + {% endif %} diff --git a/rowers/templates/list_graphs.html b/rowers/templates/list_graphs.html index 15174455..ff6e1022 100644 --- a/rowers/templates/list_graphs.html +++ b/rowers/templates/list_graphs.html @@ -27,17 +27,17 @@ {% if graphs.has_previous %} {% if request.GET.q %} - + - + {% else %} - + - + {% endif %} @@ -49,17 +49,17 @@ {% if graphs.has_next %} {% if request.GET.q %} - + - + {% else %} - + - + {% endif %} diff --git a/rowers/templates/list_workouts.html b/rowers/templates/list_workouts.html index 2ba41c61..6a52a07f 100644 --- a/rowers/templates/list_workouts.html +++ b/rowers/templates/list_workouts.html @@ -97,17 +97,18 @@ xo {% if workouts.has_previous %} {% if request.GET.q %} - + - + {% else %} - + - + {% endif %} @@ -119,17 +120,18 @@ xo {% if workouts.has_next %} {% if request.GET.q %} - + - - + + {% else %} - + - + {% endif %} diff --git a/rowers/templates/menu_analytics.html b/rowers/templates/menu_analytics.html index ba495712..cedc4bb5 100644 --- a/rowers/templates/menu_analytics.html +++ b/rowers/templates/menu_analytics.html @@ -3,7 +3,7 @@

    Analysis

    • - +
        @@ -30,7 +30,7 @@
    • - + diff --git a/rowers/templates/menu_workout.html b/rowers/templates/menu_workout.html index 0347e01c..01a2f1d8 100644 --- a/rowers/templates/menu_workout.html +++ b/rowers/templates/menu_workout.html @@ -41,11 +41,13 @@  Statistics
      • -
    • + {% if user.is_authenticated and workout|may_edit:request %}
    • diff --git a/rowers/templates/menu_workouts.html b/rowers/templates/menu_workouts.html index 4ec05fce..738c9130 100644 --- a/rowers/templates/menu_workouts.html +++ b/rowers/templates/menu_workouts.html @@ -40,7 +40,7 @@ {% if user.is_authenticated and user|is_manager %}

       

      -{% if user|team_members %| +{% if user|team_members %}
      • @@ -61,3 +61,4 @@
      {% endif %} +{% endif %} diff --git a/rowers/urls.py b/rowers/urls.py index ef065810..f29bba2d 100644 --- a/rowers/urls.py +++ b/rowers/urls.py @@ -134,13 +134,13 @@ urlpatterns = [ url(r'^agegrouprecords/(?P\w+.*)/(?P\w+.*)$', views.agegrouprecordview), url(r'^list-workouts/ranking$',views.workouts_view,{'rankingonly':True}), - url(r'^list-workouts/team/(?P\d+)/(?P\w+.*)/(?P\w+.*)$',views.workouts_view), + url(r'^list-workouts/team/(?P\d+)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)$',views.workouts_view), url(r'^list-workouts/team/(?P\d+)/$',views.workouts_view), url(r'^(?P\d+)/list-workouts/$',views.workouts_view), - url(r'^(?P\d+)/list-workouts/(?P\w+.*)/(?P\w+.*)$',views.workouts_view), + url(r'^(?P\d+)/list-workouts/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)$',views.workouts_view), url(r'^list-workouts/user/(?P\d+)/$',views.workouts_view), - url(r'^list-workouts/(?P\w+.*)/(?P\w+.*)/user/(?P\d+)/$',views.workouts_view), - url(r'^list-workouts/(?P\w+.*)/(?P\w+.*)$',views.workouts_view), + url(r'^list-workouts/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/user/(?P\d+)/$',views.workouts_view), + url(r'^list-workouts/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)$',views.workouts_view), url(r'^virtualevents$',views.virtualevents_view), url(r'^virtualevent/create$',views.virtualevent_create_view), url(r'^virtualevent/(?P\d+)$',views.virtualevent_view), @@ -155,20 +155,20 @@ urlpatterns = [ url(r'^list-courses/$',views.courses_view), url(r'^courses/upload$',views.course_upload_view), url(r'^addmanual/$',views.addmanual_view), - url(r'^team-compare-select/team/(?P\d+)/(?P\w+.*)/(?P\w+.*)$',views.team_comparison_select), + url(r'^team-compare-select/team/(?P\d+)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)$',views.team_comparison_select), url(r'^team-compare-select/team/(?P\d+)/$',views.team_comparison_select), - url(r'^team-compare-select/(?P\w+.*)/(?P\w+.*)$',views.team_comparison_select), + url(r'^team-compare-select/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)$',views.team_comparison_select), url(r'^team-compare-select/$',views.team_comparison_select), - url(r'^workouts-join-select/team/(?P\d+)/(?P\w+.*)/(?P\w+.*)$',views.workouts_join_select), + url(r'^workouts-join-select/team/(?P\d+)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)$',views.workouts_join_select), url(r'^workouts-join$',views.workouts_join_view), url(r'^workouts-join-select/team/(?P\d+)/$',views.workouts_join_select), - url(r'^workouts-join-select/(?P\w+.*)/(?P\w+.*)$',views.workouts_join_select), + url(r'^workouts-join-select/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)$',views.workouts_join_select), url(r'^workouts-join-select/$',views.workouts_join_select), url(r'^user-boxplot-select/user/(?P\d+)/$',views.user_boxplot_select), url(r'^user-boxplot-select/$',views.user_boxplot_select), - url(r'^user-multiflex-select/user/(?P\d+)/(?P\w+.*)/(?P\w+.*)$',views.user_multiflex_select), + url(r'^user-multiflex-select/user/(?P\d+)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)$',views.user_multiflex_select), url(r'^user-multiflex-select/user/(?P\d+)/$',views.user_multiflex_select), - url(r'^user-multiflex-select/(?P\w+.*)/(?P\w+.*)$',views.user_multiflex_select), + url(r'^user-multiflex-select/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)$',views.user_multiflex_select), url(r'^user-multiflex-select/$',views.user_multiflex_select), url(r'^list-jobs/$',views.session_jobs_view), url(r'^jobs-status/$',views.session_jobs_status), @@ -182,36 +182,36 @@ urlpatterns = [ url(r'^fitness-progress/$',views.fitnessmetric_view), url(r'^fitness-progress/user/(?P\d+)$',views.fitnessmetric_view), url(r'^fitness-progress/user/(?P\d+)/(?P\w+.*)$',views.fitnessmetric_view), - url(r'^ote-bests/user/(?P\d+)/(?P\w+.*)/(?P\w+.*)$',views.rankings_view), + url(r'^ote-bests/user/(?P\d+)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)$',views.rankings_view), url(r'^ote-bests/user/(?P\d+)$',views.rankings_view), - url(r'^ote-bests/(?P\w+.*)/(?P\w+.*)$',views.rankings_view), + url(r'^ote-bests/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)$',views.rankings_view), url(r'^ote-bests/$',views.rankings_view), url(r'^(?P\d+)/ote-bests/$',views.rankings_view), - url(r'^(?P\d+)/ote-bests2/(?P\w+.*)/(?P\w+.*)$',views.rankings_view2), + url(r'^(?P\d+)/ote-bests2/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)$',views.rankings_view2), url(r'^ote-bests2/user/(?P\d+)$',views.rankings_view2), - url(r'^ote-bests2/(?P\w+.*)/(?P\w+.*)$',views.rankings_view2), + url(r'^ote-bests2/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)$',views.rankings_view2), url(r'^ote-bests2/$',views.rankings_view2), - url(r'^otw-bests/user/(?P\d+)/(?P\w+.*)/(?P\w+.*)$',views.otwrankings_view), - url(r'^otw-bests/(?P\w+.*)/(?P\w+.*)$',views.otwrankings_view), + url(r'^otw-bests/user/(?P\d+)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)$',views.otwrankings_view), + url(r'^otw-bests/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)$',views.otwrankings_view), url(r'^otw-bests/$',views.otwrankings_view), - url(r'^ote-ranking/user/(?P\d+)/(?P\w+.*)/(?P\w+.*)$',views.oterankings_view), - url(r'^ote-ranking/(?P\w+.*)/(?P\w+.*)$',views.oterankings_view), + url(r'^ote-ranking/user/(?P\d+)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)$',views.oterankings_view), + url(r'^ote-ranking/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)$',views.oterankings_view), url(r'^ote-ranking/$',views.oterankings_view), url(r'^ote-ranking/user/(?P\d+)/$',views.oterankings_view), - url(r'^flexall/(?P\w+.*)/(?P\w+.*)/(?P\w+.*)/(?P\w+.*)/(?P\w+.*)/user/(?P\d+)$',views.cum_flex), - url(r'^flexall/(?P\w+.*)/(?P\w+.*)/(?P\w+.*)/(?P\w+.*)/(?P\w+.*)/$',views.cum_flex), + url(r'^flexall/(?P\w+.*)/(?P\w+.*)/(?P\w+.*)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/user/(?P\d+)$',views.cum_flex), + url(r'^flexall/(?P\w+.*)/(?P\w+.*)/(?P\w+.*)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.cum_flex), url(r'^flexall/(?P\w+.*)/(?P\w+.*)/(?P\w+.*)/$',views.cum_flex), url(r'^flexall/user/(?P\d+)/$',views.cum_flex), url(r'^flexall/$',views.cum_flex), url(r'^flexalldata/$',views.cum_flex_data), url(r'^histo/user/(?P\d+)$',views.histo), url(r'^histodata$',views.histo_data), - url(r'^histo/user/(?P\d+)/(?P\w+.*)/(?P\w+.*)$',views.histo), + url(r'^histo/user/(?P\d+)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)$',views.histo), url(r'^histo/$',views.histo), url(r'^cumstats/user/(?P\d+)$',views.cumstats), - url(r'^cumstats/(?P\w+.*)/(?P\w+.*)$',views.cumstats), - url(r'^cumstats/user/(?P\d+)/(?P\w+.*)/(?P\w+.*)$',views.cumstats), - url(r'^cumstats/(?P\w+.*)/(?P\w+.*)$',views.cumstats), + url(r'^cumstats/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)$',views.cumstats), + url(r'^cumstats/user/(?P\d+)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)$',views.cumstats), + url(r'^cumstats/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)$',views.cumstats), url(r'^cumstats/$',views.cumstats), url(r'^graph/(?P\d+)/$',views.graph_show_view), url(r'^graph/(?P\d+)/delete$',views.GraphDelete.as_view(),name='graph_delete'), @@ -230,11 +230,11 @@ urlpatterns = [ url(r'^workout/(?P\d+)/emailgpx$',views.workout_gpxemail_view), url(r'^workout/(?P\d+)/emailcsv$',views.workout_csvemail_view), url(r'^workout/(?P\d+)/csvtoadmin$',views.workout_csvtoadmin_view), - url(r'^ergcpdatatoadmin/(?P\d+)/(?P\d+-\d+-\d+)/(?P\w+.*)$',views.otecp_toadmin_view), - url(r'^otwcpdatatoadmin/(?P\d+)/(?P\d+-\d+-\d+)/(?P\w+.*)$',views.otwcp_toadmin_view), + url(r'^ergcpdatatoadmin/(?P\d+)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)$',views.otecp_toadmin_view), + url(r'^otwcpdatatoadmin/(?P\d+)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)$',views.otwcp_toadmin_view), # url(r'^workout/compare/(?P\d+)/$',views.workout_comparison_list), # url(r'^workout/compare2/(?P\d+)/(?P\d+)/(?P\w+.*)/(?P\w+.*)/$',views.workout_comparison_view), - url(r'^workout/compare/(?P\d+)/(?P\d+-\d+-\d+)/(?P\w+.*)$',views.workout_comparison_list), + url(r'^workout/compare/(?P\d+)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)$',views.workout_comparison_list), url(r'^workout/(?P\d+)/edit$',views.workout_edit_view, name='workout_edit_view'), url(r'^workout/(?P\d+)/map$',views.workout_map_view), @@ -262,7 +262,7 @@ urlpatterns = [ url(r'^workout/(?P\d+)/$',views.workout_view), url(r'^workout/fusion/(?P\d+)/(?P\d+)$',views.workout_fusion_view), url(r'^workout/fusion/(?P\d+)/$',views.workout_fusion_list), - url(r'^workout/fusion/(?P\d+)/(?P\d+-\d+-\d+)/(?P\w+.*)$',views.workout_fusion_list), + url(r'^workout/fusion/(?P\d+)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)$',views.workout_fusion_list), url(r'^help$',TemplateView.as_view( template_name='help.html'),name='help' ), diff --git a/rowers/views.py b/rowers/views.py index 0a682435..bd00ac81 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -7531,7 +7531,7 @@ def workout_otwsetpower_view(request,id=0,message="",successmessage=""): rowdata.write_csv(f1,gzip=True) # do power calculation (asynchronous) - r = row.user + r = w.user u = r.user first_name = u.first_name