Recurring Payment
diff --git a/rowers/templates/analysis.html b/rowers/templates/analysis.html index 8fd8ef83..6b959f44 100644 --- a/rowers/templates/analysis.html +++ b/rowers/templates/analysis.html @@ -13,7 +13,7 @@-
Ranking Pieces
- +
@@ -25,7 +25,7 @@
Stroke Analysis
- +
@@ -37,7 +37,7 @@
Power Histogram
- +@@ -48,7 +48,7 @@
Statistics
- +@@ -59,7 +59,7 @@
Box Chart
- +@@ -71,7 +71,7 @@
OTW Critical Power
- +@@ -82,7 +82,7 @@
OTE Critical Power
- +@@ -94,7 +94,7 @@
Trend Flex
- +diff --git a/rowers/templates/flexchart3otw.html b/rowers/templates/flexchart3otw.html index e675ca2d..2eb32cf0 100644 --- a/rowers/templates/flexchart3otw.html +++ b/rowers/templates/flexchart3otw.html @@ -21,11 +21,11 @@
{% if workout|previousworkout:rower.user %} - Previous {% endif %} {% if workout|nextworkout:rower.user %} - Next {% endif %}
@@ -61,12 +61,12 @@- - + Contact
diff --git a/rowers/templates/menu_plan.html b/rowers/templates/menu_plan.html index 83b6b01c..c46e0c0f 100644 --- a/rowers/templates/menu_plan.html +++ b/rowers/templates/menu_plan.html @@ -1,6 +1,6 @@ {% load staticfiles %} {% load rowerfilters %} -Plan
+Plan
-
diff --git a/rowers/templates/menu_profile.html b/rowers/templates/menu_profile.html
index 90bd73b9..5da7d5fe 100644
--- a/rowers/templates/menu_profile.html
+++ b/rowers/templates/menu_profile.html
@@ -1,6 +1,6 @@
{% load staticfiles %}
{% load rowerfilters %}
-
Profile
+Profile
-
diff --git a/rowers/templates/menu_racing.html b/rowers/templates/menu_racing.html
index c9c61cd8..c66bcd7f 100644
--- a/rowers/templates/menu_racing.html
+++ b/rowers/templates/menu_racing.html
@@ -1,34 +1,34 @@
-
Racing
+Racing
- - + Races
- - + New Race
- - + New Indoor Race {% if race %} {% if results %}
- - + Compare Results {% endif %} {% if reguest.user.is_anonymous %}
- {% if race.sessiontype == 'race' %} - + Register {% else %} - + Register {% endif %} @@ -37,51 +37,51 @@ {% if button == 'registerbutton' %}
- {% if race.sessiontype == 'race' %} - + Register {% else %} - + Register {% endif %} {% endif %} {% if button == 'submitbutton' %}
- - + Submit Workout
- - + Upload your race result
- - + Enter Result {% endif %} {% if button == 'resubmitbutton' %}
- - Submit New Result + Submit New Result {% endif %} {% if button == 'withdrawbutton' %} - + Withdraw {% endif %} {% if button == 'adddisciplinebutton' %} - + Register New Boat {% endif %} {% if button == 'editbutton' %}
- {% if race.sessiontype == 'race' %} - Edit Race + Edit Race {% else %} - Edit Race + Edit Race {% endif %} @@ -89,7 +89,7 @@ {% endfor %} {% endif %}
- - + Courses @@ -99,32 +99,32 @@
- - + View
- - + Map View {% if course.manager == rower %}
- - + Download as KML
- - + Edit {% if nosessions %}
- - + Delete {% endif %}
- - + Update Markers {% endif %} diff --git a/rowers/templates/menu_teams.html b/rowers/templates/menu_teams.html index dda6ce6d..84551097 100644 --- a/rowers/templates/menu_teams.html +++ b/rowers/templates/menu_teams.html @@ -1,16 +1,16 @@ {% load staticfiles %} {% load rowerfilters %} -
Teams
+Teams
- - + Leave
- - + Delete @@ -72,7 +72,7 @@
-
diff --git a/rowers/templates/menu_racing.html b/rowers/templates/menu_racing.html
index c9c61cd8..c66bcd7f 100644
--- a/rowers/templates/menu_racing.html
+++ b/rowers/templates/menu_racing.html
@@ -1,34 +1,34 @@
-
- - + Leave diff --git a/rowers/templates/menu_workout.html b/rowers/templates/menu_workout.html index 093b9b6d..01a372b7 100644 --- a/rowers/templates/menu_workout.html +++ b/rowers/templates/menu_workout.html @@ -7,53 +7,53 @@
- {% if user.is_authenticated and workout|may_edit:request %} - + View {% else %} - + View {% endif %} {% if user.is_authenticated and workout|may_edit:request %}
- - + Edit
- - + Intervals {% endif %} {% if user.is_authenticated %}
- - + Comments ({{ workout|aantalcomments }}) {% endif %}
- - + Statistics
- - + Compare {% if user.is_authenticated and workout|may_edit:request %}
- - + Upload Image
- - + Delete @@ -65,23 +65,23 @@
- - + Flex Chart {% if workout|water %}
- - + Map
- - + Force Curve
- - + Corrected Pace Plot @@ -94,28 +94,28 @@
- - + Time
- - + Distance
- - + Power (Pie)
- - + Heart Rate (Pie) {% if workout|water %}
- - + OTW Power @@ -136,7 +136,7 @@ Connect to Concept2 {% else %} - + Concept2 {% endif %} @@ -151,7 +151,7 @@ Connect to Strava {% else %} - + Strava {% endif %} @@ -166,7 +166,7 @@ Connect to SportTracks {% else %} - + SportTracks {% endif %} @@ -181,7 +181,7 @@ Connect to Runkeeper {% else %} - + Runkeeper {% endif %} @@ -196,7 +196,7 @@ Connect to MapMyFitness {% else %} - + MapMyFitness {% endif %} @@ -211,23 +211,23 @@ Connect to TrainingPeaks {% else %} - + TrainingPeaks {% endif %}
- - + CSV
- - + GPX
- - + TCX @@ -238,12 +238,12 @@
- - + Smoothen
- - + Restore Raw @@ -253,12 +253,12 @@
- - + Split Workout
- - + Explore Raw Data
- - + Wind
- - + Stream
- - + OTW Power {% endif %}
- - + In-Stroke Metrics
- - + Update Summary diff --git a/rowers/templates/menu_workouts.html b/rowers/templates/menu_workouts.html index 1721f0bd..f7e2cd66 100644 --- a/rowers/templates/menu_workouts.html +++ b/rowers/templates/menu_workouts.html @@ -1,12 +1,12 @@ {% load staticfiles %} {% load rowerfilters %} -
- - Workouts List + Workouts List
- - Charts + Charts
- {% if team %} @@ -23,9 +23,9 @@
-
{% if user|is_promember %}
-
+
{% else %}
-
+
{% endif %}
Glue Workouts
@@ -35,12 +35,12 @@
-
-
- Concept2 -
- Strava -
- RunKeeper -
- SportTracks -
- MapMyFitness -
- Polar +
- Concept2 +
- Strava +
- RunKeeper +
- SportTracks +
- MapMyFitness +
- Polar
-
-
Click on the PayPal button to pay for your Pro membership. Before you pay, please register for the free Basic membership and add your user name to the form. +
Click on the PayPal button to pay for your Pro membership. Before you pay, please register for the free Basic membership and add your user name to the form. Your payment will be valid for one year. You will be taken to the secure PayPal payment site.
diff --git a/rowers/templates/rankings.html b/rowers/templates/rankings.html index ee1bc30b..fbdf682b 100644 --- a/rowers/templates/rankings.html +++ b/rowers/templates/rankings.html @@ -73,7 +73,7 @@{{ workout.averagehr }} {{ workout.maxhr }} - + {{ workout.name }} @@ -90,13 +90,13 @@Missing your best pieces? Upload stroke data of any Concept2 ranking piece and they will be automatically added to this page.
Don't have stroke data for official Concept2 ranking pieces? - The PRO membership ranking piece functionality + The PRO membership ranking piece functionality allows you to include your best non ranking pieces and even use parts of workouts for improved calculation accuracy.
Want to add race results but you don't have stroke data? - Click here.
+ Click here.Scroll down for the chart and pace predictions for ranking pieces.
@@ -207,91 +207,91 @@100m + href="/rowers/agegrouprecords/{{ sex }}/{{ weightcategory }}/100m/">100m 500m + href="/rowers/agegrouprecords/{{ sex }}/{{ weightcategory }}/500m/">500m 1000m + href="/rowers/agegrouprecords/{{ sex }}/{{ weightcategory }}/1000m/">1000m 2000m + href="/rowers/agegrouprecords/{{ sex }}/{{ weightcategory }}/2000m/">2000m 5000m + href="/rowers/agegrouprecords/{{ sex }}/{{ weightcategory }}/5000m/">5000m 6000m + href="/rowers/agegrouprecords/{{ sex }}/{{ weightcategory }}/6000m/">6000m 10000m + href="/rowers/agegrouprecords/{{ sex }}/{{ weightcategory }}/10000m/">10000m Half Marathon + href="/rowers/agegrouprecords/{{ sex }}/{{ weightcategory }}/21097m/">Half Marathon Full Marathon + href="/rowers/agegrouprecords/{{ sex }}/{{ weightcategory }}/42195m/">Full Marathon 1 minute + href="/rowers/agegrouprecords/{{ sex }}/{{ weightcategory }}/1min/">1 minute 4 minutes + href="/rowers/agegrouprecords/{{ sex }}/{{ weightcategory }}/4min/">4 minutes 30 minutes + href="/rowers/agegrouprecords/{{ sex }}/{{ weightcategory }}/30min/">30 minutes 1 hour + href="/rowers/agegrouprecords/{{ sex }}/{{ weightcategory }}/60min/">1 hour - + diff --git a/rowers/templates/registration_form.html b/rowers/templates/registration_form.html index e09e9365..6ddf9632 100644 --- a/rowers/templates/registration_form.html +++ b/rowers/templates/registration_form.html @@ -22,7 +22,7 @@ {{ form.as_table }}
- Terms of Service + Terms of Service diff --git a/rowers/templates/rower_form.html b/rowers/templates/rower_form.html index b58f18fb..df55dc5b 100644 --- a/rowers/templates/rower_form.html +++ b/rowers/templates/rower_form.html @@ -54,7 +54,7 @@ {% csrf_token %} {% if rower.clubsize < 100 and rower.user == user %} {% else %}@@ -63,7 +63,7 @@ {% endif %} {% if rower.rowerplan != 'basic' and rower.user == user %}
- Cancel Subscription + Cancel Subscription
{% endif %} @@ -73,13 +73,13 @@GDPR - Data Protection
- Download your data + Download your data
- @@ -99,7 +99,7 @@
{{ grant.application }} {{ grant.scope }} - Revoke + Revoke {% if workout|previousworkout:rower.user %} - Previous {% endif %} {% if workout|nextworkout:rower.user %} - Next {% endif %}
@@ -30,7 +30,7 @@Public link to this workout - https://rowsandall.com/rowers/workout/{{ workout.id }} + https://rowsandall.com/rowers/workout/{{ workout.id }} diff --git a/rowers/templates/team.html b/rowers/templates/team.html index 35d82bc5..24085d5b 100644 --- a/rowers/templates/team.html +++ b/rowers/templates/team.html @@ -16,13 +16,13 @@
You have requested access to this team
{% elif team not in myteams and team not in memberteams %}You can request access to this team. By requesting access, you - agree to the Privacy Policy regarding + agree to the Privacy Policy regarding team functionality. You agree to share your workout data (except workouts marked as "private") to all team members and the team manager. You also grant the team manager access to your heart rate and power zone settings, as well as your functional threshold information. You are granting the team manager permission to edit your workouts.
- Join + Join A request will be sent to the team manager {% endif %}
@@ -38,9 +38,9 @@
{% for member in members %}
-
Closest Airport Weather: {{ airport }} ({{ airportdistance | floatformat:-1 }} km) - Airport Data
+ Airport Data- Dark Sky Data + Dark Sky Data
Download wind speed and bearing from The Dark Sky
diff --git a/rowers/templates/workflowconfig.html b/rowers/templates/workflowconfig.html index d5795eb4..d4dc7988 100644 --- a/rowers/templates/workflowconfig.html +++ b/rowers/templates/workflowconfig.html @@ -12,7 +12,7 @@ {% if workoutid %} {% endif %} diff --git a/rowers/templates/workflowconfig2.html b/rowers/templates/workflowconfig2.html index 5d8e2bf3..9dff8e1a 100644 --- a/rowers/templates/workflowconfig2.html +++ b/rowers/templates/workflowconfig2.html @@ -13,7 +13,7 @@ {% if workoutid %} - {% endif %} @@ -35,10 +35,10 @@
-
{% if rower.defaultlandingpage == 'workout_edit_view' %}
Default landing page is Edit View. Set default landing page to
- Workflow View + Workflow View {% else %}Default landing page is Workflow View. Set default landing page to
- Edit View + Edit View {% endif %}
diff --git a/rowers/templates/workout_comments.html b/rowers/templates/workout_comments.html
index 10c88061..1eae9f00 100644
--- a/rowers/templates/workout_comments.html
+++ b/rowers/templates/workout_comments.html
@@ -12,11 +12,11 @@
{% block main %}
-
@@ -86,7 +86,7 @@ $('#id_workouttype').change();Public link to this workout: - https://rowsandall.com/rowers/workout/{{ workout.id }} + https://rowsandall.com/rowers/workout/{{ workout.id }}/ Racing
{% for race in indoorraces %}- Submit this to Indoor Race {{ race.name }} + Submit this to Indoor Race {{ race.name }}
{% endfor %}
diff --git a/rowers/templates/workout_view.html b/rowers/templates/workout_view.html
index 2bf749df..0252f485 100644
--- a/rowers/templates/workout_view.html
+++ b/rowers/templates/workout_view.html
@@ -42,7 +42,7 @@
{% for record in records %}
- - + {% if user.is_authenticated %}
- - + {% if user.rower.rowerplan == 'pro' %} {% elif user.rower.rowerplan == 'coach' %} @@ -163,19 +163,19 @@ {% elif user.rower.rowerplan == 'plan' %} {% else %} - + {% endif %}
- - + {% else %}
- - + @@ -195,12 +195,12 @@
- - + {% if user.is_authenticated %}
- - + {% if user.rower.rowerplan == 'pro' %} {% elif user.rower.rowerplan == 'coach' %} @@ -173,19 +173,19 @@ {% elif user.rower.rowerplan == 'plan' %} {% else %} - + {% endif %}
- - + {% else %}
- - + @@ -206,12 +206,12 @@
-
{% if workout|water %}
Workouts
+Workouts
{{ workout.averagehr }} {{ workout.maxhr }} - {{ workout.name }} + {{ workout.name }} diff --git a/rowers/templates/otwrankings.html b/rowers/templates/otwrankings.html index 5ca5321e..e51aad90 100644 --- a/rowers/templates/otwrankings.html +++ b/rowers/templates/otwrankings.html @@ -96,7 +96,7 @@{{ workout.averagehr }} {{ workout.maxhr }} - {{ workout.name }} + {{ workout.name }} diff --git a/rowers/templates/paidplans.html b/rowers/templates/paidplans.html index 331792e9..3ad4c821 100644 --- a/rowers/templates/paidplans.html +++ b/rowers/templates/paidplans.html @@ -180,11 +180,11 @@{% if user.is_anonymous %} {% elif rower and rower.rowerplan == 'basic' and rower.protrialexpires|date_dif == 1 %} {% else %} @@ -193,11 +193,11 @@ {% if user.is_anonymous %} {% elif rower and rower.rowerplan == 'basic' and rower.plantrialexpires|date_dif == 1 %} {% else %} @@ -217,16 +217,16 @@ {% if user.is_anonymous %} {% if ps.name != '' %} {{ ps.name }} + href="/rowers/sessions/{{ ps.id }}/">{{ ps.name }} {% else %} Unnamed Session + href="/rowers/sessions/{{ ps.id }}/">Unnamed Session {% endif %} {{ ps.sessionvalue }} @@ -78,7 +78,7 @@- Delete + Delete {% endfor %} diff --git a/rowers/templates/plannedsessionteamcreate.html b/rowers/templates/plannedsessionteamcreate.html index 0a437804..534e2602 100644 --- a/rowers/templates/plannedsessionteamcreate.html +++ b/rowers/templates/plannedsessionteamcreate.html @@ -65,23 +65,23 @@{% if ps.name != '' %} {{ ps.name }} + href="/rowers/sessions/{{ ps.id }}/">{{ ps.name }} {% else %} Unnamed Session + href="/rowers/sessions/{{ ps.id }}/">Unnamed Session {% endif %} {{ ps.sessionvalue }} {{ ps.sessionunit }} - Edit + Edit - Clone + Clone - Delete + Delete {% endfor %} diff --git a/rowers/templates/promembership.html b/rowers/templates/promembership.html index 391d9f51..9d87da11 100644 --- a/rowers/templates/promembership.html +++ b/rowers/templates/promembership.html @@ -154,12 +154,12 @@ sign up for the trial. After your trial period expires, you will be automatically reset to the Basic plan, unless you upgrade to Pro. -Yes, I want to try Pro membership for 14 days for free. No strings attached.
-Yes, I want to try Self-Coach membership for 14 days for free. No strings attached.
+Yes, I want to try Pro membership for 14 days for free. No strings attached.
+Yes, I want to try Self-Coach membership for 14 days for free. No strings attached.
{% endif %}- {% endfor %} @@ -76,14 +76,14 @@ {{ team.name }}{{ member.user.first_name }} {{ member.user.last_name }} +{{ member.user.first_name }} {{ member.user.last_name }} {% if team.manager == user %} -Drop +Drop {% else %}- Leave + Leave - Delete + Delete {% endfor %} {% endif %} - New Team + New Team {% endif %} {% if invites or requests or myrequests or myinvites %} @@ -92,11 +92,11 @@This section lists open invites to join a team. By accepting a team invite, you are agreeing with the sharing of personal data between team members and coaches according to - our privacy policy. + our privacy policy.
As a team manager, by accepting a team invite, you are agreeing - with our privacy policy regarding teams and + with our privacy policy regarding teams and personal data owned by team members.
@@ -112,39 +112,39 @@ {% for i in invites %}
diff --git a/rowers/templates/workout_form.html b/rowers/templates/workout_form.html index 59136d08..155759f0 100644 --- a/rowers/templates/workout_form.html +++ b/rowers/templates/workout_form.html @@ -43,11 +43,11 @@ $('#id_workouttype').change();- {% endfor %} {% for i in requests %}{{ i.team.name }} +{{ i.team.name }} {{ i.team.manager.first_name }} {{ i.team.manager.last_name }} {{ user.first_name }} {{ user.last_name }} -Accept + Accept - Reject + Reject - {% endfor %} {% for i in myrequests %}{{ i.team.name }} +{{ i.team.name }} {{ i.team.manager.first_name }} {{ i.team.manager.last_name }} {{ user.first_name }} {{ user.last_name }} - Revoke + Revoke - {% endfor %} {% for i in myinvites %}{{ i.team.name }} +{{ i.team.name }} {{ i.team.manager.first_name }} {{ i.team.manager.last_name }} {{ i.user.first_name }} {{ i.user.last_name }} -Accept + Accept - Reject + Reject - {% endfor %} diff --git a/rowers/templates/windedit.html b/rowers/templates/windedit.html index 933f5705..e509ff2e 100644 --- a/rowers/templates/windedit.html +++ b/rowers/templates/windedit.html @@ -41,9 +41,9 @@{{ i.team.name }} +{{ i.team.name }} {{ i.team.manager.first_name }} {{ i.team.manager.last_name }} {% if i.user %}{{ i.user.first_name }} {{ i.user.last_name }} @@ -153,7 +153,7 @@ {% endif %}- Revoke + Revoke {% if workout|previousworkout:rower.user %} - Previous {% endif %} {% if workout|nextworkout:rower.user %} - Next {% endif %}
@@ -38,7 +38,7 @@Public link to this workout - https://rowsandall.com/rowers/workout/{{ workout.id }} + https://rowsandall.com/rowers/workout/{{ workout.id }}/ {% if workout|previousworkout:rower.user %} - Previous {% endif %} {% if workout|nextworkout:rower.user %} - Next {% endif %}
@@ -57,7 +57,7 @@ $('#id_workouttype').change();This workout was a race. See race result here: - {{ record.race.name }} + {{ record.race.name }}
{% endfor %} {% endif %} @@ -50,7 +50,7 @@ {% for record in recordsindoor %}This workout was a race. See race result here: - {{ record.race.name }} + {{ record.race.name }}
{% endfor %} {% endif %} @@ -94,7 +94,7 @@Comments - Comment ({{ aantalcomments }}) + Comment ({{ aantalcomments }}) Garmin International Export by rowingdata + + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ + ++ diff --git a/rowers/urls.py b/rowers/urls.py index 6a43039e..7328859b 100644 --- a/rowers/urls.py +++ b/rowers/urls.py @@ -453,7 +453,7 @@ urlpatterns = [ url(r'^checkouts/$',views.checkouts_view,name='checkouts'), url(r'^upgradecheckouts/$',views.upgrade_checkouts_view,name='upgrade_checkouts'), url(r'^downgradecheckouts/$',views.downgrade_checkouts_view,name='downgrade_checkouts'), - url(r'^planrequired',views.planrequired_view), + url(r'^planrequired/',views.planrequired_view), url(r'^starttrial/$',views.start_trial_view), url(r'^startplantrial/$',views.start_plantrial_view), # url(r'^planmembership', TemplateView.as_view(template_name='planmembership.html'),name='planmembership'), diff --git a/rowers/views.py b/rowers/views.py index e5b7efe9..ad59b882 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -3500,7 +3500,7 @@ def cum_flex(request,theuser=0, def planrequired_view(request): messages.info(request,"This functionality requires Coach or Self-Coach membership") - return render(request,'promembership.html') + return HttpResponseRedirect(reverse(paidplans_view)) @user_passes_test(hasplannedsessions,login_url="/rowers/paidplans", message="This functionality requires a Coach or Self-Coach plan", @@ -3576,7 +3576,7 @@ def workout_forcecurve_view(request,id=0,workstrokesonly=False): breadcrumbs = [ { - 'url':'/rowers/list-workouts', + 'url':'/rowers/list-workouts/', 'name':'Workouts' }, { @@ -3646,7 +3646,7 @@ def workout_histo_view(request,id=0): breadcrumbs = [ { - 'url':'/rowers/list-workouts', + 'url':'/rowers/list-workouts/', 'name':'Workouts' }, { @@ -3855,7 +3855,7 @@ def addmanual_view(request): breadcrumbs = [ { - 'url':'/rowers/list-workouts', + 'url':'/rowers/list-workouts/', 'name':'Workouts' }, { @@ -6051,7 +6051,7 @@ def team_comparison_select(request, if id: breadcrumbs = [ { - 'url':'/rowers/list-workouts', + 'url':'/rowers/list-workouts/', 'name':'Workouts' }, { @@ -6066,7 +6066,7 @@ def team_comparison_select(request, else: breadcrumbs = [ { - 'url':'/rowers/list-workouts', + 'url':'/rowers/list-workouts/', 'name':'Workouts' }, { @@ -6369,7 +6369,7 @@ def multi_compare_view(request,id=0,userid=0): breadcrumbs = [ { - 'url':'/rowers/list-workouts', + 'url':'/rowers/list-workouts/', 'name':'Workouts' }, { @@ -7709,7 +7709,7 @@ def workouts_view(request,message='',successmessage='', breadcrumbs = [ { - 'url':'/rowers/list-workouts', + 'url':'/rowers/list-workouts/', 'name':'Workouts' }, ] @@ -7891,7 +7891,7 @@ def workout_fusion_list(request,id=0,message='',successmessage='', breadcrumbs = [ { - 'url':'/rowers/list-workouts', + 'url':'/rowers/list-workouts/', 'name':'Workouts' }, { @@ -7988,7 +7988,7 @@ def workout_view(request,id=0): breadcrumbs = [ { - 'url':'/rowers/list-workouts', + 'url':'/rowers/list-workouts/', 'name':'Workouts' }, { @@ -8122,7 +8122,7 @@ def workout_crewnerd_summary_view(request,id=0,message="",successmessage=""): r = getrower(request.user) breadcrumbs = [ { - 'url':'/rowers/list-workouts', + 'url':'/rowers/list-workouts/', 'name':'Workouts' }, { @@ -8332,7 +8332,7 @@ def workout_wind_view(request,id=0,message="",successmessage=""): r = getrower(request.user) breadcrumbs = [ { - 'url':'/rowers/list-workouts', + 'url':'/rowers/list-workouts/', 'name':'Workouts' }, { @@ -8520,7 +8520,7 @@ def workout_stream_view(request,id=0,message="",successmessage=""): breadcrumbs = [ { - 'url':'/rowers/list-workouts', + 'url':'/rowers/list-workouts/', 'name':'Workouts' }, { @@ -8652,7 +8652,7 @@ def workout_otwsetpower_view(request,id=0,message="",successmessage=""): breadcrumbs = [ { - 'url':'/rowers/list-workouts', + 'url':'/rowers/list-workouts/', 'name':'Workouts' }, { @@ -8692,7 +8692,7 @@ def instroke_view(request,id=0): breadcrumbs = [ { - 'url':'/rowers/list-workouts', + 'url':'/rowers/list-workouts/', 'name':'Workouts' }, { @@ -9170,7 +9170,7 @@ def workout_data_view(request, id=0): breadcrumbs = [ { - 'url':'/rowers/list-workouts', + 'url':'/rowers/list-workouts/', 'name':'Workouts' }, { @@ -9272,7 +9272,7 @@ def workout_stats_view(request,id=0,message="",successmessage=""): breadcrumbs = [ { - 'url':'/rowers/list-workouts', + 'url':'/rowers/list-workouts/', 'name':'Workouts' }, { @@ -9807,7 +9807,7 @@ def workout_workflow_view(request,id): breadcrumbs = [ { - 'url':'/rowers/list-workouts', + 'url':'/rowers/list-workouts/', 'name':'Workouts' }, { @@ -10093,7 +10093,7 @@ def workout_flexchart3_view(request,*args,**kwargs): breadcrumbs = [ { - 'url':'/rowers/list-workouts', + 'url':'/rowers/list-workouts/', 'name':'Workouts' }, { @@ -10187,7 +10187,7 @@ def workout_otwpowerplot_view(request,id=0,message="",successmessage=""): breadcrumbs = [ { - 'url':'/rowers/list-workouts', + 'url':'/rowers/list-workouts/', 'name':'Workouts' }, { @@ -10414,7 +10414,7 @@ def workout_comment_view(request,id=0): breadcrumbs = [ { - 'url':'/rowers/list-workouts', + 'url':'/rowers/list-workouts/', 'name':'Workouts' }, { @@ -10854,7 +10854,7 @@ def workout_edit_view(request,id=0,message="",successmessage=""): breadcrumbs = [ { - 'url':'/rowers/list-workouts', + 'url':'/rowers/list-workouts/', 'name':'Workouts' }, { @@ -10902,7 +10902,7 @@ def workout_map_view(request,id=0): breadcrumbs = [ { - 'url':'/rowers/list-workouts', + 'url':'/rowers/list-workouts/', 'name':'Workouts' }, { @@ -11128,7 +11128,7 @@ def workout_uploadimage_view(request,id): breadcrumbs = [ { - 'url':'/rowers/list-workouts', + 'url':'/rowers/list-workouts/', 'name':'Workouts' }, { @@ -11394,7 +11394,7 @@ def workout_stravaimport_view(request,message="",userid=0): breadcrumbs = [ { - 'url':'/rowers/list-workouts', + 'url':'/rowers/list-workouts/', 'name':'Workouts' }, { @@ -11450,7 +11450,7 @@ def workout_runkeeperimport_view(request,message="",userid=0): breadcrumbs = [ { - 'url':'/rowers/list-workouts', + 'url':'/rowers/list-workouts/', 'name':'Workouts' }, { @@ -11502,7 +11502,7 @@ def workout_underarmourimport_view(request,message="",userid=0): rower = getrower(request.user) breadcrumbs = [ { - 'url':'/rowers/list-workouts', + 'url':'/rowers/list-workouts/', 'name':'Workouts' }, { @@ -11555,7 +11555,7 @@ def workout_polarimport_view(request,userid=0): breadcrumbs = [ { - 'url':'/rowers/list-workouts', + 'url':'/rowers/list-workouts/', 'name':'Workouts' }, { @@ -11627,7 +11627,7 @@ def workout_sporttracksimport_view(request,message="",userid=0): breadcrumbs = [ { - 'url':'/rowers/list-workouts', + 'url':'/rowers/list-workouts/', 'name':'Workouts' }, { @@ -11772,7 +11772,7 @@ def workout_c2import_view(request,page=1,userid=0,message=""): breadcrumbs = [ { - 'url':'/rowers/list-workouts', + 'url':'/rowers/list-workouts/', 'name':'Workouts' }, { @@ -12082,7 +12082,7 @@ def workout_upload_view(request, breadcrumbs = [ { - 'url':'/rowers/list-workouts', + 'url':'/rowers/list-workouts/', 'name':'Workouts' }, { @@ -12508,7 +12508,7 @@ def team_workout_upload_view(request,message="", breadcrumbs = [ { - 'url':'/rowers/list-workouts', + 'url':'/rowers/list-workouts/', 'name':'Workouts' }, { @@ -12816,7 +12816,7 @@ def graph_show_view(request,id): breadcrumbs = [ { - 'url':'/rowers/list-workouts', + 'url':'/rowers/list-workouts/', 'name':'Workouts' }, { @@ -12908,7 +12908,7 @@ def workout_split_view(request,id=id): breadcrumbs = [ { - 'url':'/rowers/list-workouts', + 'url':'/rowers/list-workouts/', 'name':'Workouts' }, { @@ -13041,7 +13041,7 @@ def workout_fusion_view(request,id1=0,id2=1): breadcrumbs = [ { - 'url':'/rowers/list-workouts', + 'url':'/rowers/list-workouts/', 'name':'Workouts' }, { @@ -13079,7 +13079,7 @@ def workout_summary_edit_view(request,id,message="",successmessage="" r = getrower(request.user) breadcrumbs = [ { - 'url':'/rowers/list-workouts', + 'url':'/rowers/list-workouts/', 'name':'Workouts' }, { @@ -13575,7 +13575,7 @@ def rower_exportsettings_view(request,userid=0): breadcrumbs = [ { - 'url':'/rowers/me', + 'url':'/rowers/me/edit/', 'name': 'Profile' }, { @@ -13601,7 +13601,7 @@ def rower_edit_view(request,rowerid=0,userid=0,message=""): breadcrumbs = [ { - 'url':'/rowers/me/edit', + 'url':'/rowers/me/edit/', 'name': 'Profile' }, { @@ -13906,7 +13906,7 @@ def rower_prefs_view(request,userid=0,message=""): breadcrumbs = [ { - 'url':'/rowers/me/edit', + 'url':'/rowers/me/edit/', 'name': 'Profile' }, { @@ -16142,7 +16142,10 @@ def plannedsessions_manage_view(request,userid=0, initialsession=0 if initialsession: - ps0 = PlannedSession.objects.get(id=initialsession) + try: + ps0 = PlannedSession.objects.get(id=initialsession) + except PlannedSession.DoesNotExist: + ps0 = None else: ps0 = None @@ -18667,7 +18670,7 @@ class GraphDelete(DeleteView): breadcrumbs = [ { - 'url':'/rowers/list-workouts', + 'url':'/rowers/list-workouts/', 'name':'Workouts' }, { @@ -18713,7 +18716,7 @@ class WorkoutDelete(DeleteView): breadcrumbs = [ { - 'url':'/rowers/list-workouts', + 'url':'/rowers/list-workouts/', 'name':'Workouts' }, { diff --git a/templates/newbase.html b/templates/newbase.html index 462a2e02..74608dff 100644 --- a/templates/newbase.html +++ b/templates/newbase.html @@ -149,13 +149,13 @@+ ++ +2016-05-20T13:41:26.962390+00:00 ++ +537 +2000 +1 ++ +148 ++ +156 +Active +21 +Manual + +<Element 'Notes' at 0x1499d4e0> ++ +rowsandall.com/rowingdata ++ +rowingdata ++ ++ +0 +75 +Release +EN +000-00000-00 +