diff --git a/rowers/templates/menu_workout.html b/rowers/templates/menu_workout.html index cf9e7c26..28f1292c 100644 --- a/rowers/templates/menu_workout.html +++ b/rowers/templates/menu_workout.html @@ -308,6 +308,11 @@  OTW Power +
  • + +  Remove Power Data + +
    • {% if 'speedcoach2' in workout.workoutsource %}
  • diff --git a/rowers/templates/workout_remove_power_confirm.html b/rowers/templates/workout_remove_power_confirm.html new file mode 100644 index 00000000..a6b3b9e0 --- /dev/null +++ b/rowers/templates/workout_remove_power_confirm.html @@ -0,0 +1,41 @@ +{% extends "newbase.html" %} +{% load staticfiles %} +{% load rowerfilters %} + +{% block title %}Change Workout {% endblock %} + +{% block main %} +

    Delete Power?

    +
      +
    • +

      + This will delete the power data for the following workout: +

      + + + + + + + + + + + + +
      Name:{{ workout.name }}
      Date:{{ workout.date }}
      Time:{{ workout.starttime }}
      Distance:{{ workout.distance }}m
      Duration:{{ workout.duration |durationprint:"%H:%M:%S.%f" }}
      +
      • +
    • +
      + {% csrf_token %} + +
      +
      • +
    + + +{% endblock %} + +{% block sidebar %} +{% include 'menu_workout.html' %} +{% endblock %} diff --git a/rowers/urls.py b/rowers/urls.py index 565dde1c..23f431d9 100644 --- a/rowers/urls.py +++ b/rowers/urls.py @@ -437,6 +437,8 @@ urlpatterns = [ re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/stats/$',views.workout_stats_view,name='workout_stats_view'), re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/data/$',views.workout_data_view, name='workout_data_view'), + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/zeropower-confirm/$',views.remove_power_confirm_view, + name='remove_power_confirm_view'), re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/zeropower/$',views.remove_power_view, name='remove_power_view'), re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/otwsetpower/$',views.workout_otwsetpower_view,name='workout_otwsetpower_view'), diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py index 1bd74872..19d0deb6 100644 --- a/rowers/views/workoutviews.py +++ b/rowers/views/workoutviews.py @@ -1274,6 +1274,36 @@ def workouts_join_select(request, 'teams':get_my_teams(request.user), }) +@login_required() +def remove_power_confirm_view(request,id=0): + r = getrower(request.user) + workout = get_workout_by_opaqueid(request,id) + + breadcrumbs = [ + { + 'url':'/rowers/list-workouts/', + 'name':'Workouts' + }, + { + 'url':get_workout_default_page(request,encoder.encode_hex(workout.id)), + 'name': encoder.encode_hex(workout.id) + }, + { 'url':reverse('remove_power_confirm_view', + kwargs={'id':encoder.encode_hex(workout.id)}), + 'name': 'Delete' + } + + ] + + return render(request, + 'workout_remove_power_confirm.html', + { + 'workout':workout, + 'rower':r, + 'breadcrumbs':breadcrumbs, + }) + + @login_required() def remove_power_view(request,id=0): r = getrower(request.user) @@ -1299,6 +1329,11 @@ def remove_power_view(request,id=0): res = dataprep.dataprep(row.df, id=workout.id) cpdf,delta,cpvalues = dataprep.setcp(workout) + workout.normp = 0 + workout.rscore = 0 + workout.save() + + dataprep.initiate_cp(r)