From da0842fc8b5bc60d9835dc218ccdfa832e1aaec4 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Fri, 22 Mar 2019 10:59:49 +0100 Subject: [PATCH] passing checks with django 2.1.7 --- rowers/dataprep.py | 12 +- rowers/decorators.py | 2 +- rowers/middleware.py | 33 +- rowers/tasks_standalone.py | 1 - rowers/tpstuff.py | 2 +- rowers/urls.py | 838 +++++++++++++++++----------------- rowers/views/analysisviews.py | 36 +- rowers/views/errorviews.py | 8 +- rowers/views/otherviews.py | 4 +- rowers/views/paymentviews.py | 2 +- rowers/views/racesviews.py | 24 +- rowers/views/statements.py | 33 +- rowers/views/workoutviews.py | 44 +- rowsandall_app/settings.py | 10 +- rowsandall_app/urls.py | 89 ++-- rowsandall_app/views.py | 3 +- 16 files changed, 570 insertions(+), 571 deletions(-) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index ab3bdd13..3e7e767c 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -54,7 +54,7 @@ from rowers.models import strokedatafields #allowedcolumns = [item[0] for item in rowingmetrics] allowedcolumns = [key for key,value in strokedatafields.items()] -from async_messages import messages as a_messages +#from async_messages import messages as a_messages import os import zipfile import pandas as pd @@ -920,12 +920,6 @@ def save_workout_database(f2, r, dosmooth=True, workouttype='rower', for key, value in checks.items(): if not value: allchecks = 0 - if consistencychecks: - a_messages.error( - r.user, 'Failed consistency check: ' + key + ', autocorrected') - else: - pass - # a_messages.error(r.user,'Failed consistency check: '+key+', not corrected') except ZeroDivisionError: pass @@ -1148,9 +1142,6 @@ def save_workout_database(f2, r, dosmooth=True, workouttype='rower', # submit email task to send email about breakthrough workout if isbreakthrough: - a_messages.info( - r.user, 'It looks like you have a new breakthrough workout' - ) if r.getemailnotifications and not r.emailbounced: job = myqueue(queuehigh,handle_sendemail_breakthrough, w.id, @@ -1161,7 +1152,6 @@ def save_workout_database(f2, r, dosmooth=True, workouttype='rower', # submit email task to send email about breakthrough workout if ishard: - a_messages.info(r.user, 'That was a pretty hard workout') if r.getemailnotifications and not r.emailbounced: job = myqueue(queuehigh,handle_sendemail_hard, w.id, diff --git a/rowers/decorators.py b/rowers/decorators.py index 36a4a3b5..f9d03ed7 100644 --- a/rowers/decorators.py +++ b/rowers/decorators.py @@ -42,7 +42,7 @@ def login_required_message(function=None, message=default_message): to the log-in page if necessary. """ actual_decorator = user_passes_test( - lambda u: u.is_authenticated(), + lambda u: u.is_authenticated, message=message, ) if function: diff --git a/rowers/middleware.py b/rowers/middleware.py index a4e9249a..9b49e13a 100644 --- a/rowers/middleware.py +++ b/rowers/middleware.py @@ -9,6 +9,7 @@ queuelow = django_rq.get_queue('low') from rowers.tasks import handle_updatefitnessmetric,handle_sendemail_expired from rowers.mytypes import otwtypes from django.contrib import messages +from django.http import HttpResponse def getrower(user): try: @@ -70,11 +71,18 @@ def do_update(user,mode='rower',days=42): class PowerTimeFitnessMetricMiddleWare(object): - def process_request(self, request): + def __init__(self, get_response): + self.get_response = get_response + + def __call__(self, request): # Code to be executed before the view is called - if request.user.is_authenticated(): + if request.user.is_authenticated: result = do_update(request.user,mode='rower') result = do_update(request.user,mode='water') + + response = self.get_response(request) + + return response from django.shortcuts import redirect @@ -93,8 +101,11 @@ allowed_paths = [ ] class GDPRMiddleWare(object): - def process_request(self, request): - if request.user.is_authenticated() and request.path not in allowed_paths: + def __init__(self, get_response): + self.get_response = get_response + + def __call__(self, request): + if request.user.is_authenticated and request.path not in allowed_paths: r = getrower(request.user) nexturl = request.path if 'optin' in nexturl: @@ -104,9 +115,16 @@ class GDPRMiddleWare(object): '/rowers/me/gdpr-optin/?next=%s' % nexturl ) + response = self.get_response(request) + + return response + class RowerPlanMiddleWare(object): - def process_request(self, request): - if request.user.is_authenticated() and request.user.rower.rowerplan != 'basic': + def __init__(self, get_response): + self.get_response = get_response + + def __call__(self, request): + if request.user.is_authenticated and request.user.rower.rowerplan != 'basic': if request.user.rower.paymenttype == 'single': if request.user.rower.planexpires < timezone.now().date(): messg = 'Your paid plan has expired. We have reset you to a free basic plan.' @@ -122,3 +140,6 @@ class RowerPlanMiddleWare(object): r.user.last_name, str(r.planexpires)) + response = self.get_response(request) + + return response diff --git a/rowers/tasks_standalone.py b/rowers/tasks_standalone.py index f20586c3..d2b2375c 100644 --- a/rowers/tasks_standalone.py +++ b/rowers/tasks_standalone.py @@ -14,7 +14,6 @@ django.setup() import time from celery import app from django_rq import job -from async_messages import message_user,messages from rowers.models import Workout from django.contrib.auth.models import User diff --git a/rowers/tpstuff.py b/rowers/tpstuff.py index 2e2e79b3..6a412e74 100644 --- a/rowers/tpstuff.py +++ b/rowers/tpstuff.py @@ -25,7 +25,7 @@ tpapilocation = "https://api.trainingpeaks.com" from celery import Celery,app from django_rq import job import time -from async_messages import message_user,messages +#from async_messages import message_user,messages oauth_data = { 'client_id': TP_CLIENT_ID, diff --git a/rowers/urls.py b/rowers/urls.py index 99a1dcf8..82a398f0 100644 --- a/rowers/urls.py +++ b/rowers/urls.py @@ -4,6 +4,7 @@ from __future__ import print_function from __future__ import unicode_literals from django.conf import settings from django.conf.urls import url, include +from django.urls import path, re_path from django.contrib.auth.models import User from django.contrib.auth.decorators import login_required, permission_required from rowers.models import Workout,Rower,StrokeData,FavoriteChart @@ -107,586 +108,587 @@ handler400 = 'views.error400_view' handler403 = 'views.error403_view' from oauth2_provider.views import base +app_name = "rowers" urlpatterns = [ - url(r'^o/authorize/$', base.AuthorizationView.as_view(), name="authorize"), - url(r'^o/token/$', base.TokenView.as_view(), name="token"), - url(r'^', include(router.urls)), - url(r'^api-docs/$', views.schema_view,name='schema_view'), - url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')), - url(r'^api/workouts/(?P\b[0-9A-Fa-f]+\b)/strokedata/$',views.strokedatajson,name='strokedatajson'), - url(r'^500v/$',views.error500_view,name='error500_view'), - url(r'^502/$', TemplateView.as_view(template_name='502.html'),name='502'), - url(r'^500/$', TemplateView.as_view(template_name='500.html'),name='500'), - url(r'^404/$', TemplateView.as_view(template_name='404.html'),name='404'), - url(r'^400/$', TemplateView.as_view(template_name='400.html'),name='400'), - url(r'^403/$', TemplateView.as_view(template_name='403.html'),name='403'), -# url(r'^imports/$', views.imports_view), - url(r'^exportallworkouts/?/$',views.workouts_summaries_email_view,name='workouts_summaries_email_view'), - url(r'^update_empower/$',views.rower_update_empower_view,name='rower_update_empower_view'), - url(r'^agegroupcp/(?P\d+)/$',views.agegroupcpview,name='agegroupcpview'), - url(r'^agegroupcp/(?P\d+)/(?P\d+)/$',views.agegroupcpview,name='agegroupcpview'), - url(r'^ajax_agegroup/(?P\d+)/(?P\w+.*)/(?P\w+.*)/(?P\d+)/$', + re_path(r'^o/authorize/$', base.AuthorizationView.as_view(), name="authorize"), + re_path(r'^o/token/$', base.TokenView.as_view(), name="token"), + re_path(r'^', include(router.urls)), + re_path(r'^api-docs/$', views.schema_view,name='schema_view'), + re_path(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework')), + re_path(r'^api/workouts/(?P\b[0-9A-Fa-f]+\b)/strokedata/$',views.strokedatajson,name='strokedatajson'), + re_path(r'^500v/$',views.error500_view,name='error500_view'), + re_path(r'^502/$', TemplateView.as_view(template_name='502.html'),name='502'), + re_path(r'^500/$', TemplateView.as_view(template_name='500.html'),name='500'), + re_path(r'^404/$', TemplateView.as_view(template_name='404.html'),name='404'), + re_path(r'^400/$', TemplateView.as_view(template_name='400.html'),name='400'), + re_path(r'^403/$', TemplateView.as_view(template_name='403.html'),name='403'), +# re_path(r'^imports/$', views.imports_view), + re_path(r'^exportallworkouts/?/$',views.workouts_summaries_email_view,name='workouts_summaries_email_view'), + re_path(r'^update_empower/$',views.rower_update_empower_view,name='rower_update_empower_view'), + re_path(r'^agegroupcp/(?P\d+)/$',views.agegroupcpview,name='agegroupcpview'), + re_path(r'^agegroupcp/(?P\d+)/(?P\d+)/$',views.agegroupcpview,name='agegroupcpview'), + re_path(r'^ajax_agegroup/(?P\d+)/(?P\w+.*)/(?P\w+.*)/(?P\d+)/$', views.ajax_agegrouprecords,name='ajax_agegrouprecords'), - url(r'^updatefitness/(?P\w+.*)/(?P\d+)/$',views.fitness_metric_view,name='fitness_metric_view'), - url(r'^updatefitness/(?P\w+.*)/$',views.fitness_metric_view,name='fitness_metric_view'), - url(r'^updatefitness/$',views.fitness_metric_view,name='fitness_metric_view'), - url(r'^agegrouprecords/(?P\w+.*)/(?P\w+.*)/(?P\d+)m/$', + re_path(r'^updatefitness/(?P\w+.*)/(?P\d+)/$',views.fitness_metric_view,name='fitness_metric_view'), + re_path(r'^updatefitness/(?P\w+.*)/$',views.fitness_metric_view,name='fitness_metric_view'), + re_path(r'^updatefitness/$',views.fitness_metric_view,name='fitness_metric_view'), + re_path(r'^agegrouprecords/(?P\w+.*)/(?P\w+.*)/(?P\d+)m/$', views.agegrouprecordview,name='agegrouprecordview'), - url(r'^agegrouprecords/(?P\w+.*)/(?P\w+.*)/(?P\d+)min/$', + re_path(r'^agegrouprecords/(?P\w+.*)/(?P\w+.*)/(?P\d+)min/$', views.agegrouprecordview,name='agegrouprecordview'), - url(r'^agegrouprecords/(?P\w+.*)/(?P\w+.*)/$', + re_path(r'^agegrouprecords/(?P\w+.*)/(?P\w+.*)/$', views.agegrouprecordview,name='agegrouprecordview'), - url(r'^list-workouts/ranking/$',views.workouts_view,{'rankingonly':True}, + re_path(r'^list-workouts/ranking/$',views.workouts_view,{'rankingonly':True}, name='workouts_view'), -# url(r'^list-workouts/team/(?P\d+)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.workouts_view, +# re_path(r'^list-workouts/team/(?P\d+)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.workouts_view, # name='workouts_view'), - url(r'^list-workouts/team/(?P\d+)/$',views.workouts_view, + re_path(r'^list-workouts/team/(?P\d+)/$',views.workouts_view, name='workouts_view'), - url(r'^(?P\d+)/list-workouts/$',views.workouts_view, + re_path(r'^(?P\d+)/list-workouts/$',views.workouts_view, name='workouts_view'), -# url(r'^(?P\d+)/list-workouts/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.workouts_view, +# re_path(r'^(?P\d+)/list-workouts/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.workouts_view, # name='workouts_view'), - url(r'^list-workouts/ranking/user/(?P\d+)/$',views.workouts_view,{'rankingonly':True}, + re_path(r'^list-workouts/ranking/user/(?P\d+)/$',views.workouts_view,{'rankingonly':True}, name='workouts_view'), - url(r'^list-workouts/user/(?P\d+)/$',views.workouts_view, + re_path(r'^list-workouts/user/(?P\d+)/$',views.workouts_view, name='workouts_view'), -# url(r'^list-workouts/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/user/(?P\d+)/$',views.workouts_view, +# re_path(r'^list-workouts/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/user/(?P\d+)/$',views.workouts_view, # name='workouts_view'), -# url(r'^list-workouts/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.workouts_view, +# re_path(r'^list-workouts/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.workouts_view, # name='workouts_view'), - url(r'^virtualevents/$',views.virtualevents_view,name='virtualevents_view'), - url(r'^virtualevent/create/$',views.virtualevent_create_view,name='virtualevent_create_view'), - url(r'^virtualevent/createindoor/$',views.indoorvirtualevent_create_view,name='indoorvirtualevent_create_view'), - url(r'^raceregistration/togglenotification/(?P\d+)/$', + re_path(r'^virtualevents/$',views.virtualevents_view,name='virtualevents_view'), + re_path(r'^virtualevent/create/$',views.virtualevent_create_view,name='virtualevent_create_view'), + re_path(r'^virtualevent/createindoor/$',views.indoorvirtualevent_create_view,name='indoorvirtualevent_create_view'), + re_path(r'^raceregistration/togglenotification/(?P\d+)/$', views.virtualevent_toggle_email_view,name='virtualevent_toggle_email_view'), - url(r'^indoorraceregistration/togglenotification/(?P\d+)/$', + re_path(r'^indoorraceregistration/togglenotification/(?P\d+)/$', views.indoorvirtualevent_toggle_email_view,name='indoorvirtualevent_toggle_email_view'), - url(r'^virtualevent/(?P\d+)/$',views.virtualevent_view,name='virtualevent_view'), - url(r'^virtualevent/(?P\d+)/ranking$',views.virtualevent_ranking_view,name='virtualevent_ranking_view'), - url(r'^virtualevent/(?P\d+)/edit/$',views.virtualevent_edit_view,name='virtualevent_edit_view'), - url(r'^virtualevent/(?P\d+)/editindoor/$',views.indoorvirtualevent_edit_view,name='indoorvirtualevent_edit_view'), - url(r'^virtualevent/(?P\d+)/register/$',views.virtualevent_register_view,name='virtualevent_register_view'), - url(r'^virtualevent/(?P\d+)/registerindoor/$',views.indoorvirtualevent_register_view,name='indoorvirtualevent_register_view'), - url(r'^virtualevent/(?P\d+)/adddiscipline/$',views.virtualevent_addboat_view,name='virtualevent_addboat_view'), - url(r'^virtualevent/(?P\d+)/withdraw/(?P\d+)/$',views.virtualevent_withdraw_view,name='virtualevent_withdraw_view'), - url(r'^virtualevent/(?P\d+)/withdraw/$',views.virtualevent_withdraw_view,name='virtualevent_withdraw_view'), - url(r'^virtualevent/(?P\b[0-9A-Fa-f]+\b)/submit/$', + re_path(r'^virtualevent/(?P\d+)/$',views.virtualevent_view,name='virtualevent_view'), + re_path(r'^virtualevent/(?P\d+)/ranking$',views.virtualevent_ranking_view,name='virtualevent_ranking_view'), + re_path(r'^virtualevent/(?P\d+)/edit/$',views.virtualevent_edit_view,name='virtualevent_edit_view'), + re_path(r'^virtualevent/(?P\d+)/editindoor/$',views.indoorvirtualevent_edit_view,name='indoorvirtualevent_edit_view'), + re_path(r'^virtualevent/(?P\d+)/register/$',views.virtualevent_register_view,name='virtualevent_register_view'), + re_path(r'^virtualevent/(?P\d+)/registerindoor/$',views.indoorvirtualevent_register_view,name='indoorvirtualevent_register_view'), + re_path(r'^virtualevent/(?P\d+)/adddiscipline/$',views.virtualevent_addboat_view,name='virtualevent_addboat_view'), + re_path(r'^virtualevent/(?P\d+)/withdraw/(?P\d+)/$',views.virtualevent_withdraw_view,name='virtualevent_withdraw_view'), + re_path(r'^virtualevent/(?P\d+)/withdraw/$',views.virtualevent_withdraw_view,name='virtualevent_withdraw_view'), + re_path(r'^virtualevent/(?P\b[0-9A-Fa-f]+\b)/submit/$', views.virtualevent_submit_result_view,name='virtualevent_submit_result_view'), - url(r'^virtualevent/(?P\d+)/submit/(?P\b[0-9A-Fa-f]+\b)/$', + re_path(r'^virtualevent/(?P\d+)/submit/(?P\b[0-9A-Fa-f]+\b)/$', views.virtualevent_submit_result_view,name='virtualevent_submit_result_view'), - url(r'^virtualevent/(?P\d+)/disqualify/(?P\d+)/', + re_path(r'^virtualevent/(?P\d+)/disqualify/(?P\d+)/', views.virtualevent_disqualify_view,name='virtualevent_disqualify_view'), - url(r'^list-workouts/$',views.workouts_view,name='workouts_view'), - url(r'^list-courses/$',views.courses_view,name='courses_view'), - url(r'^courses/upload/$',views.course_upload_view,name='course_upload_view'), - url(r'^workout/addmanual/$',views.addmanual_view,name='addmanual_view'), - url(r'^team-compare-select/workout/(?P\d+)/team/(?P\d+)/user/(?P\d+)/$',views.team_comparison_select,name='team_comparison_select'), -# url(r'^team-compare-select/team/(?P\d+)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/user/(?P\d+)/$',views.team_comparison_select,name='team_comparison_select'), -# url(r'^team-compare-select/team/(?P\d+)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.team_comparison_select,name='team_comparison_select'), - url(r'^team-compare-select/workout/(?P\b[0-9A-Fa-f]+\b)/team/(?P\d+)/$',views.team_comparison_select,name='team_comparison_select'), -# url(r'^team-compare-select/team/(?P\d+)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.team_comparison_select,name='team_comparison_select'), -# url(r'^team-compare-select/team/(?P\d+)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/user/(?P\d+)/$',views.team_comparison_select,name='team_comparison_select'), - url(r'^team-compare-select/workout/(?P\b[0-9A-Fa-f]+\b)/team/(?P\d+)/$',views.team_comparison_select,name='team_comparison_select'), - url(r'^team-compare-select/workout/(?P\b[0-9A-Fa-f]+\b)/team/(?P\d+)/user/(?P\d+)/$',views.team_comparison_select,name='team_comparison_select'), -# url(r'^team-compare-select/workout/(?P\b[0-9A-Fa-f]+\b)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.team_comparison_select,name='team_comparison_select'), -# url(r'^team-compare-select/workout/(?P\b[0-9A-Fa-f]+\b)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/user/(?P\d+)/$',views.team_comparison_select,name='team_comparison_select'), -# url(r'^team-compare-select/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/user/(?P\d+)/$',views.team_comparison_select,name='team_comparison_select'), - url(r'^team-compare-select/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.team_comparison_select,name='team_comparison_select'), - url(r'^team-compare-select/workout/(?P\b[0-9A-Fa-f]+\b)/user/(?P\d+)/$',views.team_comparison_select,name='team_comparison_select'), - url(r'^team-compare-select/team/(?P\d+)/user/(?P\d+)/$',views.team_comparison_select,name='team_comparison_select'), - url(r'^team-compare-select/workout/(?P\b[0-9A-Fa-f]+\b)/$',views.team_comparison_select,name='team_comparison_select'), - url(r'^team-compare-select/team/(?P\d+)/$',views.team_comparison_select,name='team_comparison_select'), - url(r'^team-compare-select/user/(?P\d+)/$',views.team_comparison_select,name='team_comparison_select'), - url(r'^team-compare-select/$',views.team_comparison_select,name='team_comparison_select'), -# url(r'^workouts-join-select/team/(?P\d+)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.workouts_join_select, + re_path(r'^list-workouts/$',views.workouts_view,name='workouts_view'), + re_path(r'^list-courses/$',views.courses_view,name='courses_view'), + re_path(r'^courses/upload/$',views.course_upload_view,name='course_upload_view'), + re_path(r'^workout/addmanual/$',views.addmanual_view,name='addmanual_view'), + re_path(r'^team-compare-select/workout/(?P\d+)/team/(?P\d+)/user/(?P\d+)/$',views.team_comparison_select,name='team_comparison_select'), +# re_path(r'^team-compare-select/team/(?P\d+)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/user/(?P\d+)/$',views.team_comparison_select,name='team_comparison_select'), +# re_path(r'^team-compare-select/team/(?P\d+)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.team_comparison_select,name='team_comparison_select'), + re_path(r'^team-compare-select/workout/(?P\b[0-9A-Fa-f]+\b)/team/(?P\d+)/$',views.team_comparison_select,name='team_comparison_select'), +# re_path(r'^team-compare-select/team/(?P\d+)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.team_comparison_select,name='team_comparison_select'), +# re_path(r'^team-compare-select/team/(?P\d+)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/user/(?P\d+)/$',views.team_comparison_select,name='team_comparison_select'), + re_path(r'^team-compare-select/workout/(?P\b[0-9A-Fa-f]+\b)/team/(?P\d+)/$',views.team_comparison_select,name='team_comparison_select'), + re_path(r'^team-compare-select/workout/(?P\b[0-9A-Fa-f]+\b)/team/(?P\d+)/user/(?P\d+)/$',views.team_comparison_select,name='team_comparison_select'), +# re_path(r'^team-compare-select/workout/(?P\b[0-9A-Fa-f]+\b)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.team_comparison_select,name='team_comparison_select'), +# re_path(r'^team-compare-select/workout/(?P\b[0-9A-Fa-f]+\b)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/user/(?P\d+)/$',views.team_comparison_select,name='team_comparison_select'), +# re_path(r'^team-compare-select/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/user/(?P\d+)/$',views.team_comparison_select,name='team_comparison_select'), + re_path(r'^team-compare-select/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.team_comparison_select,name='team_comparison_select'), + re_path(r'^team-compare-select/workout/(?P\b[0-9A-Fa-f]+\b)/user/(?P\d+)/$',views.team_comparison_select,name='team_comparison_select'), + re_path(r'^team-compare-select/team/(?P\d+)/user/(?P\d+)/$',views.team_comparison_select,name='team_comparison_select'), + re_path(r'^team-compare-select/workout/(?P\b[0-9A-Fa-f]+\b)/$',views.team_comparison_select,name='team_comparison_select'), + re_path(r'^team-compare-select/team/(?P\d+)/$',views.team_comparison_select,name='team_comparison_select'), + re_path(r'^team-compare-select/user/(?P\d+)/$',views.team_comparison_select,name='team_comparison_select'), + re_path(r'^team-compare-select/$',views.team_comparison_select,name='team_comparison_select'), +# re_path(r'^workouts-join-select/team/(?P\d+)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.workouts_join_select, # name='workouts_join_select'), - url(r'^workouts-join/$',views.workouts_join_view,name='workouts_join_view'), - url(r'^workouts-join-select/team/(?P\d+)/$',views.workouts_join_select,name='workouts_join_select'), - # url(r'^workouts-join-select/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.workouts_join_select,name='workouts_join_select'), - url(r'^workouts-join-select/$',views.workouts_join_select,name='workouts_join_select'), - url(r'^workouts-join-select/user/(?P\d+)/$',views.workouts_join_select,name='workouts_join_select'), - url(r'^user-boxplot-select/user/(?P\d+)/$',views.user_boxplot_select,name='user_boxplot_select'), - url(r'^user-boxplot-select/$',views.user_boxplot_select,name='user_boxplot_select'), -# url(r'^user-multiflex-select/user/(?P\d+)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.user_multiflex_select,name='user_multiflex_select'), - url(r'^user-multiflex-select/user/(?P\d+)/$',views.user_multiflex_select,name='user_multiflex_select'), -# url(r'^user-multiflex-select/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.user_multiflex_select,name='user_multiflex_select'), - url(r'^user-multiflex-select/$',views.user_multiflex_select,name='user_multiflex_select'), - url(r'^list-jobs/$',views.session_jobs_view,name='session_jobs_view'), - url(r'^jobs-status/$',views.session_jobs_status,name='session_jobs_status'), - url(r'^job-kill/(?P.*)/$',views.kill_async_job), - url(r'^test-job/(?P\d+)/$',views.test_job_view), - url(r'^test-job2/(?P\d+)/$',views.test_job_view2), - url(r'^record-progress/(?P\d+)/(?P.*)/$',views.post_progress,name='post_progress'), - url(r'^record-progress/(?P.*)/$',views.post_progress), - url(r'^record-progress/$',views.post_progress), - url(r'^list-graphs/$',views.graphs_view,name='graphs_view'), - url(r'^fitness-progress/$',views.fitnessmetric_view,name='fitnessmetric_view'), - url(r'^fitness-progress/user/(?P\d+)/$',views.fitnessmetric_view,name='fitnessmetric_view'), - url(r'^fitness-progress/user/(?P\d+)/(?P\w+.*)/$',views.fitnessmetric_view,name='fitnessmetric_view'), -# url(r'^ote-bests/user/(?P\d+)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.rankings_view,name='rankings_view'), - url(r'^ote-bests/user/(?P\d+)/$',views.rankings_view,name='rankings_view'), -# url(r'^ote-bests/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.rankings_view,name='rankings_view'), - url(r'^ote-bests/$',views.rankings_view,name='rankings_view'), - url(r'^(?P\d+)/ote-bests/$',views.rankings_view,name='rankings_view'), -# url(r'^(?P\d+)/ote-bests2/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.rankings_view2,name='rankings_view2'), - url(r'^ote-bests2/user/(?P\d+)/$',views.rankings_view2,name='rankings_view2'), -# url(r'^ote-bests2/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.rankings_view2,name='rankings_view2'), - url(r'^ote-bests2/$',views.rankings_view2,name='rankings_view2'), -# url(r'^otw-bests/user/(?P\d+)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.otwrankings_view,name='otwrankings_view'), -# url(r'^otw-bests/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.otwrankings_view,name='otwrankings_view'), - url(r'^otw-bests/user/(?P\d+)/$',views.otwrankings_view,name='otwrankings_view'), - url(r'^otw-bests/$',views.otwrankings_view,name='otwrankings_view'), -# url(r'^ote-ranking/user/(?P\d+)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.oterankings_view,name='oterankings_view'), -# url(r'^ote-ranking/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.oterankings_view,name='oterankings_view'), - url(r'^ote-ranking/$',views.oterankings_view,name='oterankings_view'), - url(r'^ote-ranking/user/(?P\d+)/$',views.oterankings_view,name='oterankings_view'), -# url(r'^flexall/(?P\w+.*)/(?P\w+.*)/(?P\w+.*)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/user/(?P\d+)/$',views.cum_flex,name='cum_flex'), -# url(r'^flexall/(?P\w+.*)/(?P\w+.*)/(?P\w+.*)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.cum_flex,name='cum_flex'), - url(r'^flexall/(?P\w+.*)/(?P\w+.*)/(?P\w+.*)/$',views.cum_flex,name='cum_flex'), - url(r'^flexall/user/(?P\d+)/$',views.cum_flex,name='cum_flex'), - url(r'^flexall/$',views.cum_flex,name='cum_flex'), - url(r'^flexalldata/$',views.cum_flex_data,name='cum_flex_data'), - url(r'^histo/user/(?P\d+)/$',views.histo,name='histo'), - url(r'^histodata/$',views.histo_data,name='histo_data'), -# url(r'^histo/user/(?P\d+)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.histo,name='histo'), - url(r'^histo/$',views.histo,name='histo'), - url(r'^cumstats/user/(?P\d+)/$',views.cumstats,name='cumstats'), -# url(r'^cumstats/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.cumstats,name='cumstats'), -# url(r'^cumstats/user/(?P\d+)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.cumstats,name='cumstats'), -# url(r'^cumstats/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.cumstats,name='cumstats'), - url(r'^cumstats/$',views.cumstats,name='cumstats'), - url(r'^graph/(?P\d+)/$',views.graph_show_view,name='graph_show_view'), - url(r'^graph/(?P\d+)/delete/$',views.GraphDelete.as_view(),name='graph_delete'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/get-thumbnails/$',views.get_thumbnails, + re_path(r'^workouts-join/$',views.workouts_join_view,name='workouts_join_view'), + re_path(r'^workouts-join-select/team/(?P\d+)/$',views.workouts_join_select,name='workouts_join_select'), + # re_path(r'^workouts-join-select/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.workouts_join_select,name='workouts_join_select'), + re_path(r'^workouts-join-select/$',views.workouts_join_select,name='workouts_join_select'), + re_path(r'^workouts-join-select/user/(?P\d+)/$',views.workouts_join_select,name='workouts_join_select'), + re_path(r'^user-boxplot-select/user/(?P\d+)/$',views.user_boxplot_select,name='user_boxplot_select'), + re_path(r'^user-boxplot-select/$',views.user_boxplot_select,name='user_boxplot_select'), +# re_path(r'^user-multiflex-select/user/(?P\d+)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.user_multiflex_select,name='user_multiflex_select'), + re_path(r'^user-multiflex-select/user/(?P\d+)/$',views.user_multiflex_select,name='user_multiflex_select'), +# re_path(r'^user-multiflex-select/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.user_multiflex_select,name='user_multiflex_select'), + re_path(r'^user-multiflex-select/$',views.user_multiflex_select,name='user_multiflex_select'), + re_path(r'^list-jobs/$',views.session_jobs_view,name='session_jobs_view'), + re_path(r'^jobs-status/$',views.session_jobs_status,name='session_jobs_status'), + re_path(r'^job-kill/(?P.*)/$',views.kill_async_job), + re_path(r'^test-job/(?P\d+)/$',views.test_job_view), + re_path(r'^test-job2/(?P\d+)/$',views.test_job_view2), + re_path(r'^record-progress/(?P\d+)/(?P.*)/$',views.post_progress,name='post_progress'), + re_path(r'^record-progress/(?P.*)/$',views.post_progress), + re_path(r'^record-progress/$',views.post_progress), + re_path(r'^list-graphs/$',views.graphs_view,name='graphs_view'), + re_path(r'^fitness-progress/$',views.fitnessmetric_view,name='fitnessmetric_view'), + re_path(r'^fitness-progress/user/(?P\d+)/$',views.fitnessmetric_view,name='fitnessmetric_view'), + re_path(r'^fitness-progress/user/(?P\d+)/(?P\w+.*)/$',views.fitnessmetric_view,name='fitnessmetric_view'), +# re_path(r'^ote-bests/user/(?P\d+)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.rankings_view,name='rankings_view'), + re_path(r'^ote-bests/user/(?P\d+)/$',views.rankings_view,name='rankings_view'), +# re_path(r'^ote-bests/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.rankings_view,name='rankings_view'), + re_path(r'^ote-bests/$',views.rankings_view,name='rankings_view'), + re_path(r'^(?P\d+)/ote-bests/$',views.rankings_view,name='rankings_view'), +# re_path(r'^(?P\d+)/ote-bests2/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.rankings_view2,name='rankings_view2'), + re_path(r'^ote-bests2/user/(?P\d+)/$',views.rankings_view2,name='rankings_view2'), +# re_path(r'^ote-bests2/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.rankings_view2,name='rankings_view2'), + re_path(r'^ote-bests2/$',views.rankings_view2,name='rankings_view2'), +# re_path(r'^otw-bests/user/(?P\d+)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.otwrankings_view,name='otwrankings_view'), +# re_path(r'^otw-bests/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.otwrankings_view,name='otwrankings_view'), + re_path(r'^otw-bests/user/(?P\d+)/$',views.otwrankings_view,name='otwrankings_view'), + re_path(r'^otw-bests/$',views.otwrankings_view,name='otwrankings_view'), +# re_path(r'^ote-ranking/user/(?P\d+)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.oterankings_view,name='oterankings_view'), +# re_path(r'^ote-ranking/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.oterankings_view,name='oterankings_view'), + re_path(r'^ote-ranking/$',views.oterankings_view,name='oterankings_view'), + re_path(r'^ote-ranking/user/(?P\d+)/$',views.oterankings_view,name='oterankings_view'), +# re_path(r'^flexall/(?P\w+.*)/(?P\w+.*)/(?P\w+.*)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/user/(?P\d+)/$',views.cum_flex,name='cum_flex'), +# re_path(r'^flexall/(?P\w+.*)/(?P\w+.*)/(?P\w+.*)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.cum_flex,name='cum_flex'), + re_path(r'^flexall/(?P\w+.*)/(?P\w+.*)/(?P\w+.*)/$',views.cum_flex,name='cum_flex'), + re_path(r'^flexall/user/(?P\d+)/$',views.cum_flex,name='cum_flex'), + re_path(r'^flexall/$',views.cum_flex,name='cum_flex'), + re_path(r'^flexalldata/$',views.cum_flex_data,name='cum_flex_data'), + re_path(r'^histo/user/(?P\d+)/$',views.histo,name='histo'), + re_path(r'^histodata/$',views.histo_data,name='histo_data'), +# re_path(r'^histo/user/(?P\d+)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.histo,name='histo'), + re_path(r'^histo/$',views.histo,name='histo'), + re_path(r'^cumstats/user/(?P\d+)/$',views.cumstats,name='cumstats'), +# re_path(r'^cumstats/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.cumstats,name='cumstats'), +# re_path(r'^cumstats/user/(?P\d+)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.cumstats,name='cumstats'), +# re_path(r'^cumstats/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.cumstats,name='cumstats'), + re_path(r'^cumstats/$',views.cumstats,name='cumstats'), + re_path(r'^graph/(?P\d+)/$',views.graph_show_view,name='graph_show_view'), + re_path(r'^graph/(?P\d+)/delete/$',views.GraphDelete.as_view(),name='graph_delete'), + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/get-thumbnails/$',views.get_thumbnails, name='get_thumbnails'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/toggle-ranking/$',views.workout_toggle_ranking, + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/toggle-ranking/$',views.workout_toggle_ranking, name='workout_toggle_ranking'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/get-testscript/$',views.get_testscript, + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/get-testscript/$',views.get_testscript, name='get_testscript'), - url(r'^workout/upload/team/$',views.team_workout_upload_view,name='team_workout_upload_view'), - url(r'^workout/upload/$',views.workout_upload_view,name='workout_upload_view'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/histo/$',views.workout_histo_view, + re_path(r'^workout/upload/team/$',views.team_workout_upload_view,name='team_workout_upload_view'), + re_path(r'^workout/upload/$',views.workout_upload_view,name='workout_upload_view'), + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/histo/$',views.workout_histo_view, name='workout_histo_view'), -# url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/task/$',views.workout_test_task_view,name='workout_test_task_view'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/forcecurve/$',views.workout_forcecurve_view, +# re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/task/$',views.workout_test_task_view,name='workout_test_task_view'), + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/forcecurve/$',views.workout_forcecurve_view, name='workout_forcecurve_view'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/unsubscribe/$',views.workout_unsubscribe_view, + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/unsubscribe/$',views.workout_unsubscribe_view, name='workout_unsubscribe_view'), -# url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/export/$',views.workout_export_view), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/comment/$',views.workout_comment_view, +# re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/export/$',views.workout_export_view), + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/comment/$',views.workout_comment_view, name='workout_comment_view'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/emailtcx/$',views.workout_tcxemail_view, + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/emailtcx/$',views.workout_tcxemail_view, name='workout_tcxemail_view'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/emailgpx/$',views.workout_gpxemail_view, + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/emailgpx/$',views.workout_gpxemail_view, name='workout_gpxemail_view'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/emailcsv/$',views.workout_csvemail_view, + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/emailcsv/$',views.workout_csvemail_view, name='workout_csvemail_view'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/csvtoadmin/$',views.workout_csvtoadmin_view, + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/csvtoadmin/$',views.workout_csvtoadmin_view, name='workout_csvtoadmin_view'), -# url(r'^ergcpdatatoadmin/(?P\d+)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.otecp_toadmin_view,name='otecp_toadmin_view'), -# url(r'^otwcpdatatoadmin/(?P\d+)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.otwcp_toadmin_view,name='otwcp_toadmin_view'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/edit/$',views.workout_edit_view, +# re_path(r'^ergcpdatatoadmin/(?P\d+)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.otecp_toadmin_view,name='otecp_toadmin_view'), +# re_path(r'^otwcpdatatoadmin/(?P\d+)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.otwcp_toadmin_view,name='otwcp_toadmin_view'), + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/edit/$',views.workout_edit_view, name='workout_edit_view'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/map/$',views.workout_map_view,name='workout_map_view'), -# url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/setprivate/$',views.workout_setprivate_view), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/updatecp/$',views.workout_update_cp_view,name='workout_update_cp_view'), -# url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/makepublic/$',views.workout_makepublic_view), -# url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/geeky/$',views.workout_geeky_view), -# url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/advanced/$',views.workout_advanced_view), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/instroke/(?P\w+.*)/$',views.instroke_chart,name='instroke_chart'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/instroke/$',views.instroke_view,name='instroke_view'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/stats/$',views.workout_stats_view,name='workout_stats_view'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/data/$',views.workout_data_view, + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/map/$',views.workout_map_view,name='workout_map_view'), +# re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/setprivate/$',views.workout_setprivate_view), + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/updatecp/$',views.workout_update_cp_view,name='workout_update_cp_view'), +# re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/makepublic/$',views.workout_makepublic_view), +# re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/geeky/$',views.workout_geeky_view), +# re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/advanced/$',views.workout_advanced_view), + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/instroke/(?P\w+.*)/$',views.instroke_chart,name='instroke_chart'), + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/instroke/$',views.instroke_view,name='instroke_view'), + 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'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/otwsetpower/$',views.workout_otwsetpower_view,name='workout_otwsetpower_view'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/interactiveotwplot/$',views.workout_otwpowerplot_view,name='workout_otwpowerplot_view'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/wind/$',views.workout_wind_view,name='workout_wind_view'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/image/$',views.workout_uploadimage_view,name='workout_uploadimage_view'), - url(r'^virtualevent/(?P\d+)/compare/$',views.virtualevent_compare_view,name='virtualevent_compare_view'), - url(r'^virtualevent/(?P\d+)/image/$', + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/otwsetpower/$',views.workout_otwsetpower_view,name='workout_otwsetpower_view'), + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/interactiveotwplot/$',views.workout_otwpowerplot_view,name='workout_otwpowerplot_view'), + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/wind/$',views.workout_wind_view,name='workout_wind_view'), + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/image/$',views.workout_uploadimage_view,name='workout_uploadimage_view'), + re_path(r'^virtualevent/(?P\d+)/compare/$',views.virtualevent_compare_view,name='virtualevent_compare_view'), + re_path(r'^virtualevent/(?P\d+)/image/$', views.virtualevent_uploadimage_view,name='virtualevent_uploadimage_view'), - url(r'^virtualevent/(?P\d+)/setimage/(?P\d+)/$', + re_path(r'^virtualevent/(?P\d+)/setimage/(?P\d+)/$', views.virtualevent_setlogo_view,name='virtualevent_setlog_view'), - url(r'^logo/(?P\d+)/delete/$', + re_path(r'^logo/(?P\d+)/delete/$', views.logo_delete_view,name='logo_delete_view'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/darkskywind/$',views.workout_downloadwind_view,name='workout_downloadwind_view'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/metar/(?P\w+)/$',views.workout_downloadmetar_view,name='workout_downloadmetar_view'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/stream/$',views.workout_stream_view,name='workout_stream_view'), -# url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/crewnerdsummary/$',views.workout_crewnerd_summary_view), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/editintervals/$',views.workout_summary_edit_view, + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/darkskywind/$',views.workout_downloadwind_view,name='workout_downloadwind_view'), + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/metar/(?P\w+)/$',views.workout_downloadmetar_view,name='workout_downloadmetar_view'), + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/stream/$',views.workout_stream_view,name='workout_stream_view'), +# re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/crewnerdsummary/$',views.workout_crewnerd_summary_view), + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/editintervals/$',views.workout_summary_edit_view, name='workout_summary_edit_view'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/restore/$',views.workout_summary_restore_view,name='workout_summary_restore_view'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/split/$',views.workout_split_view,name='workout_split_view'), -# url(r'^workout/(?P\d+)/interactiveplot/$',views.workout_biginteractive_view), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/view/$',views.workout_view,name='workout_view'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/$',views.workout_view,name='workout_view'), - url(r'^workout/fusion/(?P\b[0-9A-Fa-f]+\b)/(?P\b[0-9A-Fa-f]+\b)/$',views.workout_fusion_view,name='workout_fusion_view'), - url(r'^workout/fusion/(?P\b[0-9A-Fa-f]+\b)/$',views.workout_fusion_list,name='workout_fusion_list'), -# url(r'^workout/fusion/(?P\b[0-9A-Fa-f]+\b)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.workout_fusion_list,name='workout_fusion_list'), - url(r'^help/$',TemplateView.as_view( + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/restore/$',views.workout_summary_restore_view,name='workout_summary_restore_view'), + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/split/$',views.workout_split_view,name='workout_split_view'), +# re_path(r'^workout/(?P\d+)/interactiveplot/$',views.workout_biginteractive_view), + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/view/$',views.workout_view,name='workout_view'), + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/$',views.workout_view,name='workout_view'), + re_path(r'^workout/fusion/(?P\b[0-9A-Fa-f]+\b)/(?P\b[0-9A-Fa-f]+\b)/$',views.workout_fusion_view,name='workout_fusion_view'), + re_path(r'^workout/fusion/(?P\b[0-9A-Fa-f]+\b)/$',views.workout_fusion_list,name='workout_fusion_list'), +# re_path(r'^workout/fusion/(?P\b[0-9A-Fa-f]+\b)/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$',views.workout_fusion_list,name='workout_fusion_list'), + re_path(r'^help/$',TemplateView.as_view( template_name='help.html'),name='help' ), - url(r'^physics/$',TemplateView.as_view(template_name='physics.html'),name='physics'), - url(r'^partners/$',TemplateView.as_view(template_name='partners.html'),name='partners'), + re_path(r'^physics/$',TemplateView.as_view(template_name='physics.html'),name='physics'), + re_path(r'^partners/$',TemplateView.as_view(template_name='partners.html'),name='partners'), # keeping the old URLs for retrofit - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/addtimeplot/$', + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/addtimeplot/$', views.workout_add_chart_view, {'plotnr':'1'},name='workout_add_chart_view'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/adddistanceplot/$', + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/adddistanceplot/$', views.workout_add_chart_view, {'plotnr':'2'},name='workout_add_chart_view'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/addpiechart/$', + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/addpiechart/$', views.workout_add_chart_view, {'plotnr':'3'},name='workout_add_chart_view'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/adddistanceplot2/$', + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/adddistanceplot2/$', views.workout_add_chart_view, {'plotnr':'7'},name='workout_add_chart_view'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/addtimeplot2/$', + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/addtimeplot2/$', views.workout_add_chart_view, {'plotnr':'8'},name='workout_add_chart_view'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/addotwpowerplot/$', + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/addotwpowerplot/$', views.workout_add_chart_view, {'plotnr':'9'},name='workout_add_chart_view'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/addpowerpiechart/$', + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/addpowerpiechart/$', views.workout_add_chart_view, {'plotnr':'13'},name='workout_add_chart_view'), # addstatic is the new URL -> need to update in templates - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/addstatic/(?P\d+)/$', + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/addstatic/(?P\d+)/$', views.workout_add_chart_view,name='workout_add_chart_view'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/addstatic/$',views.workout_add_chart_view,name='workout_add_chart_view'), - url(r'^workout/(?P\d+)/delete/$',login_required( + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/addstatic/$',views.workout_add_chart_view,name='workout_add_chart_view'), + re_path(r'^workout/(?P\d+)/delete/$',login_required( views.WorkoutDelete.as_view()), name='workout_delete'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/delete/$',login_required( + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/delete/$',login_required( views.workout_code_delete_view),name='workout_code_delete'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/smoothenpace/$',views.workout_smoothenpace_view,name='workout_smoothenpace_view'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/undosmoothenpace/$',views.workout_undo_smoothenpace_view,name='workout_undo_smoothenpace_view'), - url(r'^workout/c2import/$',views.workout_c2import_view,name='workout_c2import_view'), - url(r'^workout/c2list/$',views.workout_c2import_view,name='workout_c2import_view'), - url(r'^workout/c2list/(?P\d+)/$',views.workout_c2import_view,name='workout_c2import_view'), - url(r'^workout/c2list/user/(?P\d+)/$',views.workout_c2import_view,name='workout_c2import_view'), - url(r'^workout/c2list/(?P\d+)/user/(?P\d+)/$',views.workout_c2import_view,name='workout_c2import_view'), - url(r'^workout/stravaimport/$',views.workout_stravaimport_view,name='workout_stravaimport_view'), - url(r'^workout/stravaimport/user/(?P\d+)/$',views.workout_stravaimport_view,name='workout_stravaimport_view'), - url(r'^workout/c2import/all/$',views.workout_getc2workout_all,name='workout_getc2workout_all'), - url(r'^workout/c2import/all/(?P\d+)/$',views.workout_getc2workout_all,name='workout_getc2workout_all'), - url(r'^workout/(?P\w+.*)import/(?P\d+)/$',views.workout_getimportview,name='workout_getimportview'), - url(r'^workout/stravaimport/all/$',views.workout_getstravaworkout_all,name='workout_getstravaworkout_all'), - url(r'^workout/stravaimport/next/$',views.workout_getstravaworkout_next,name='workout_getstravaworkout_next'), - url(r'^workout/sporttracksimport/$',views.workout_sporttracksimport_view,name='workout_sporttracksimport_view'), - url(r'^workout/sporttracksimport/user/(?P\d+)/$',views.workout_sporttracksimport_view,name='workout_sporttracksimport_view'), - url(r'^workout/sporttracksimport/all/$',views.workout_getsporttracksworkout_all,name='workout_getsporttracksworkout_all'), - url(r'^workout/polarimport/$',views.workout_polarimport_view,name='workout_polarimport_view'), - url(r'^workout/polarimport/user/(?P\d+)/',views.workout_polarimport_view,name='workout_polarimport_view'), - url(r'^workout/runkeeperimport/$',views.workout_runkeeperimport_view,name='workout_runkeeperimport_view'), - url(r'^workout/runkeeperimport/user/(?P\d+)/$',views.workout_runkeeperimport_view,name='workout_runkeeperimport_view'), - url(r'^workout/underarmourimport/$',views.workout_underarmourimport_view,name='workout_underarmourimport_view'), -# url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/deleteconfirm/$',views.workout_delete_confirm_view), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/c2uploadw/$',views.workout_c2_upload_view,name='workout_c2_upload_view'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/stravauploadw/$',views.workout_strava_upload_view,name='workout_strava_upload_view'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/recalcsummary/$',views.workout_recalcsummary_view,name='workout_recalcsummary_view'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/sporttracksuploadw/$',views.workout_sporttracks_upload_view,name='workout_sporttracks_upload_view'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/runkeeperuploadw/$',views.workout_runkeeper_upload_view,name='workout_runkeeper_upload_view'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/underarmouruploadw/$',views.workout_underarmour_upload_view,name='workout_underarmour_upload_view'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/tpuploadw/$',views.workout_tp_upload_view,name='workout_tp_upload_view'), - url(r'^multi-compare/workout/(?P\b[0-9A-Fa-f]+\b)/user/(?P\d+)/$',views.multi_compare_view, + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/smoothenpace/$',views.workout_smoothenpace_view,name='workout_smoothenpace_view'), + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/undosmoothenpace/$',views.workout_undo_smoothenpace_view,name='workout_undo_smoothenpace_view'), + re_path(r'^workout/c2import/$',views.workout_c2import_view,name='workout_c2import_view'), + re_path(r'^workout/c2list/$',views.workout_c2import_view,name='workout_c2import_view'), + re_path(r'^workout/c2list/(?P\d+)/$',views.workout_c2import_view,name='workout_c2import_view'), + re_path(r'^workout/c2list/user/(?P\d+)/$',views.workout_c2import_view,name='workout_c2import_view'), + re_path(r'^workout/c2list/(?P\d+)/user/(?P\d+)/$',views.workout_c2import_view,name='workout_c2import_view'), + re_path(r'^workout/stravaimport/$',views.workout_stravaimport_view,name='workout_stravaimport_view'), + re_path(r'^workout/stravaimport/user/(?P\d+)/$',views.workout_stravaimport_view,name='workout_stravaimport_view'), + re_path(r'^workout/c2import/all/$',views.workout_getc2workout_all,name='workout_getc2workout_all'), + re_path(r'^workout/c2import/all/(?P\d+)/$',views.workout_getc2workout_all,name='workout_getc2workout_all'), + re_path(r'^workout/(?P\w+.*)import/(?P\d+)/$',views.workout_getimportview,name='workout_getimportview'), + re_path(r'^workout/stravaimport/all/$',views.workout_getstravaworkout_all,name='workout_getstravaworkout_all'), + re_path(r'^workout/stravaimport/next/$',views.workout_getstravaworkout_next,name='workout_getstravaworkout_next'), + re_path(r'^workout/sporttracksimport/$',views.workout_sporttracksimport_view,name='workout_sporttracksimport_view'), + re_path(r'^workout/sporttracksimport/user/(?P\d+)/$',views.workout_sporttracksimport_view,name='workout_sporttracksimport_view'), + re_path(r'^workout/sporttracksimport/all/$',views.workout_getsporttracksworkout_all,name='workout_getsporttracksworkout_all'), + re_path(r'^workout/polarimport/$',views.workout_polarimport_view,name='workout_polarimport_view'), + re_path(r'^workout/polarimport/user/(?P\d+)/',views.workout_polarimport_view,name='workout_polarimport_view'), + re_path(r'^workout/runkeeperimport/$',views.workout_runkeeperimport_view,name='workout_runkeeperimport_view'), + re_path(r'^workout/runkeeperimport/user/(?P\d+)/$',views.workout_runkeeperimport_view,name='workout_runkeeperimport_view'), + re_path(r'^workout/underarmourimport/$',views.workout_underarmourimport_view,name='workout_underarmourimport_view'), +# re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/deleteconfirm/$',views.workout_delete_confirm_view), + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/c2uploadw/$',views.workout_c2_upload_view,name='workout_c2_upload_view'), + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/stravauploadw/$',views.workout_strava_upload_view,name='workout_strava_upload_view'), + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/recalcsummary/$',views.workout_recalcsummary_view,name='workout_recalcsummary_view'), + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/sporttracksuploadw/$',views.workout_sporttracks_upload_view,name='workout_sporttracks_upload_view'), + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/runkeeperuploadw/$',views.workout_runkeeper_upload_view,name='workout_runkeeper_upload_view'), + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/underarmouruploadw/$',views.workout_underarmour_upload_view,name='workout_underarmour_upload_view'), + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/tpuploadw/$',views.workout_tp_upload_view,name='workout_tp_upload_view'), + re_path(r'^multi-compare/workout/(?P\b[0-9A-Fa-f]+\b)/user/(?P\d+)/$',views.multi_compare_view, name='multi_compare_view'), - url(r'^multi-compare/workout/(?P\b[0-9A-Fa-f]+\b)/$',views.multi_compare_view,name='multi_compare_view'), - url(r'^multi-compare/$',views.multi_compare_view,name='multi_compare_view'), - url(r'^user-boxplot/user/(?P\d+)/$',views.boxplot_view,name='boxplot_view'), - url(r'^user-boxplot/$',views.boxplot_view,name='boxplot_view'), - url(r'^user-boxplot-data/$',views.boxplot_view_data,name='boxplot_view_data'), - url(r'^user-multiflex/user/(?P\d+)/$',views.multiflex_view,name='multiflex_view'), - url(r'^user-multiflex/$',views.multiflex_view,name='multiflex_view'), - url(r'^user-multiflex-data/$',views.multiflex_data,name='multiflex_data'), - url(r'^me/deactivate/$',views.deactivate_user,name='deactivate_user'), - url(r'^me/delete/$',views.remove_user,name='remove_user'), - url(r'^me/gdpr-optin-confirm/?/$',views.user_gdpr_confirm,name='user_gdpr_confirm'), - url(r'^me/gdpr-optin-confirm/$',views.user_gdpr_confirm,name='user_gdpr_confirm'), - url(r'^me/gdpr-optin/?/$',views.user_gdpr_optin,name='user_gdpr_optin'), - url(r'^me/gdpr-optin/$',views.user_gdpr_optin,name='user_gdpr_optin'), - url(r'^me/teams/$',views.rower_teams_view,name='rower_teams_view'), - url(r'^me/calcdps/$',views.rower_calcdps_view,name='rower_calcdps_view'), - url(r'^me/exportsettings/$',views.rower_exportsettings_view,name='rower_exportsettings_view'), - url(r'^me/exportsettings/user/(?P\d+)/$',views.rower_exportsettings_view,name='rower_exportsettings_view'), - url(r'^team/(?P\d+)/$',views.team_view,name='team_view'), - url(r'^team/(?P\d+)/memberstats/$',views.team_members_stats_view,name='team_members_stats_view'), - url(r'^team/(?P\d+)/edit/$',views.team_edit_view,name='team_edit_view'), - url(r'^team/(?P\d+)/leaveconfirm/$',views.team_leaveconfirm_view,name='team_leaveconfirm_view'), - url(r'^team/(?P\d+)/leave/$',views.team_leave_view,name='team_leave_view'), - url(r'^team/(?P\d+)/deleteconfirm/$',views.team_deleteconfirm_view,name='team_deleteconfirm_view'), - url(r'^team/(?P\d+)/requestmembership/(?P\d+)/$',views.team_requestmembership_view,name='team_requestmembership_view'), - url(r'^me/coachrequest/(?P\d+)/reject/$',views.reject_revoke_coach_request, + re_path(r'^multi-compare/workout/(?P\b[0-9A-Fa-f]+\b)/$',views.multi_compare_view,name='multi_compare_view'), + re_path(r'^multi-compare/$',views.multi_compare_view,name='multi_compare_view'), + re_path(r'^user-boxplot/user/(?P\d+)/$',views.boxplot_view,name='boxplot_view'), + re_path(r'^user-boxplot/$',views.boxplot_view,name='boxplot_view'), + re_path(r'^user-boxplot-data/$',views.boxplot_view_data,name='boxplot_view_data'), + re_path(r'^user-multiflex/user/(?P\d+)/$',views.multiflex_view,name='multiflex_view'), + re_path(r'^user-multiflex/$',views.multiflex_view,name='multiflex_view'), + re_path(r'^user-multiflex-data/$',views.multiflex_data,name='multiflex_data'), + re_path(r'^me/deactivate/$',views.deactivate_user,name='deactivate_user'), + re_path(r'^me/delete/$',views.remove_user,name='remove_user'), + re_path(r'^me/gdpr-optin-confirm/?/$',views.user_gdpr_confirm,name='user_gdpr_confirm'), + re_path(r'^me/gdpr-optin-confirm/$',views.user_gdpr_confirm,name='user_gdpr_confirm'), + re_path(r'^me/gdpr-optin/?/$',views.user_gdpr_optin,name='user_gdpr_optin'), + re_path(r'^me/gdpr-optin/$',views.user_gdpr_optin,name='user_gdpr_optin'), + re_path(r'^me/teams/$',views.rower_teams_view,name='rower_teams_view'), + re_path(r'^me/calcdps/$',views.rower_calcdps_view,name='rower_calcdps_view'), + re_path(r'^me/exportsettings/$',views.rower_exportsettings_view,name='rower_exportsettings_view'), + re_path(r'^me/exportsettings/user/(?P\d+)/$',views.rower_exportsettings_view,name='rower_exportsettings_view'), + re_path(r'^team/(?P\d+)/$',views.team_view,name='team_view'), + re_path(r'^team/(?P\d+)/memberstats/$',views.team_members_stats_view,name='team_members_stats_view'), + re_path(r'^team/(?P\d+)/edit/$',views.team_edit_view,name='team_edit_view'), + re_path(r'^team/(?P\d+)/leaveconfirm/$',views.team_leaveconfirm_view,name='team_leaveconfirm_view'), + re_path(r'^team/(?P\d+)/leave/$',views.team_leave_view,name='team_leave_view'), + re_path(r'^team/(?P\d+)/deleteconfirm/$',views.team_deleteconfirm_view,name='team_deleteconfirm_view'), + re_path(r'^team/(?P\d+)/requestmembership/(?P\d+)/$',views.team_requestmembership_view,name='team_requestmembership_view'), + re_path(r'^me/coachrequest/(?P\d+)/reject/$',views.reject_revoke_coach_request, name='reject_revoke_coach_request'), - url(r'^coaches/(?P\d+)/dropconfirm/$',views.coach_drop_athlete_confirm_view, + re_path(r'^coaches/(?P\d+)/dropconfirm/$',views.coach_drop_athlete_confirm_view, name='coach_drop_athlete_confirm_view'), - url(r'^coaches/(?P\d+)/drop/$',views.coach_drop_athlete_view, + re_path(r'^coaches/(?P\d+)/drop/$',views.coach_drop_athlete_view, name='coach_drop_athlete_view'), - url(r'^coaches/(?P\d+)/dropcoachconfirm/$',views.athlete_drop_coach_confirm_view, + re_path(r'^coaches/(?P\d+)/dropcoachconfirm/$',views.athlete_drop_coach_confirm_view, name='athlete_drop_coach_confirm_view'), - url(r'^coaches/(?P\d+)/dropcoach/$',views.athlete_drop_coach_view, + re_path(r'^coaches/(?P\d+)/dropcoach/$',views.athlete_drop_coach_view, name='athlete_drop_coach_view'), - url(r'^me/coachrequest/(?P\d+)/revoke/$',views.reject_revoke_coach_request, + re_path(r'^me/coachrequest/(?P\d+)/revoke/$',views.reject_revoke_coach_request, name='reject_revoke_coach_request'), - url(r'^me/coachoffer/(?P\d+)/reject/$',views.reject_revoke_coach_offer, + re_path(r'^me/coachoffer/(?P\d+)/reject/$',views.reject_revoke_coach_offer, name='reject_revoke_coach_offer'), - url(r'^me/coachoffer/(?P\d+)/revoke/$',views.reject_revoke_coach_offer, + re_path(r'^me/coachoffer/(?P\d+)/revoke/$',views.reject_revoke_coach_offer, name='reject_revoke_coach_offer'), - url(r'^me/coachrequest/(?P\d+)/$',views.request_coaching_view, + re_path(r'^me/coachrequest/(?P\d+)/$',views.request_coaching_view, name='request_coaching_view'), - url(r'^me/coachoffer/(?P\d+)/$',views.offer_coaching_view, + re_path(r'^me/coachoffer/(?P\d+)/$',views.offer_coaching_view, name='offer_coaching_view'), - url(r'^me/coachrequest/(?P\w+.*)/accept/$',views.coach_accept_coachrequest_view, + re_path(r'^me/coachrequest/(?P\w+.*)/accept/$',views.coach_accept_coachrequest_view, name='coach_accept_coachrequest_view'), - url(r'^me/coachoffer/(?P\w+.*)/accept/$',views.rower_accept_coachoffer_view, + re_path(r'^me/coachoffer/(?P\w+.*)/accept/$',views.rower_accept_coachoffer_view, name='rower_accept_coachoffer_view'), - url(r'^team/(?P\d+)/delete/$',views.team_delete_view,name='team_delete_view'), - url(r'^team/create/$',views.team_create_view,name='team_create_view'), - url(r'^me/team/(?P\d+)/drop/(?P\d+)/$',views.manager_member_drop_view,name='manager_member_drop_view'), - url(r'^me/invitation/(?P\d+)/reject/$',views.invitation_reject_view,name='invitation_reject_view'), - url(r'^me/invitation/(?P\d+)/revoke/$',views.invitation_revoke_view,name='invitation_revoke_view'), - url(r'^me/invitation/$',views.rower_invitations_view,name='rower_invitations_view'), - url(r'^me/raise500/$',views.raise_500,name='raise_500'), - url(r'^me/invitation/(\w+.*)/$',views.rower_invitations_view,name='rower_invitations_view'), - url(r'^me/request/(?P\d+)/revoke/$',views.request_revoke_view,name='request_revoke_view'), - url(r'^me/request/(?P\d+)/reject/$',views.request_reject_view,name='request_reject_view'), - url(r'^me/request/(\w+.*)/$',views.manager_requests_view,name='manager_requests_view'), - url(r'^me/request/$',views.manager_requests_view,name='manager_requests_view'), - url(r'^me/edit/$',views.rower_edit_view,name='rower_edit_view'), - url(r'^me/edit/user/(?P\d+)/$',views.rower_edit_view,name='rower_edit_view'), - url(r'^me/preferences/$',views.rower_prefs_view,name='rower_prefs_view'), - url(r'^me/transactions/$',views.transactions_view,name='transactions_view'), - url(r'^me/preferences/user/(?P\d+)/$',views.rower_prefs_view,name='rower_prefs_view'), - url(r'^me/edit/(.+.*)/$',views.rower_edit_view,name='rower_edit_view'), - url(r'^me/c2authorize/$',views.rower_c2_authorize,name='rower_c2_authorize'), - url(r'^me/polarauthorize/$',views.rower_polar_authorize,name='rower_polar_authorize'), - url(r'^me/revokeapp/(?P\d+)/$',views.rower_revokeapp_view,name='rower_revokeapp_view'), - url(r'^me/stravaauthorize/$',views.rower_strava_authorize,name='rower_strava_authorize'), - url(r'^me/sporttracksauthorize/$',views.rower_sporttracks_authorize,name='rower_sporttracks_authorize'), - url(r'^me/underarmourauthorize/$',views.rower_underarmour_authorize,name='rower_underarmour_authorize'), - url(r'^me/tpauthorize/$',views.rower_tp_authorize,name='rower_tp_authorize'), - url(r'^me/runkeeperauthorize/$',views.rower_runkeeper_authorize,name='rower_runkeeper_authorize'), - url(r'^me/sporttracksrefresh/$',views.rower_sporttracks_token_refresh,name='rower_sporttracks_token_refresh'), - url(r'^me/underarmourrefresh/$',views.rower_underarmour_token_refresh,name='rower_underarmoud_token_refresh'), - url(r'^me/tprefresh/$',views.rower_tp_token_refresh,name='rower_tp_token_refresh'), - url(r'^me/c2refresh/$',views.rower_c2_token_refresh,name='rower_c2_token_refresh'), - url(r'^me/favoritecharts/$',views.rower_favoritecharts_view,name='rower_favoritecharts_view'), - url(r'^me/favoritecharts/user/(?P\d+)/$',views.rower_favoritecharts_view,name='rower_favoritecharts_view'), -# url(r'^me/workflowconfig/$',views.workout_workflow_config_view), - url(r'^me/workflowconfig2/$',views.workout_workflow_config2_view,name='workout_workflow_config2_view'), - url(r'^me/workflowconfig2/user/(?P\d+)/$',views.workout_workflow_config2_view,name='workout_workflow_config2_view'), - url(r'^me/workflowdefault/$',views.workflow_default_view,name='workflow_default_view'), - url(r'^email/send/$', views.sendmail,name='sendmail'), - url(r'^email/thankyou/$', TemplateView.as_view(template_name='thankyou.html'), name='thankyou'), - url(r'^email/$', TemplateView.as_view(template_name='email.html'), name='email'), - url(r'^about', TemplateView.as_view(template_name='about_us.html'),name='about'), - url(r'^brochure/$',TemplateView.as_view(template_name='brochure.html'), + re_path(r'^team/(?P\d+)/delete/$',views.team_delete_view,name='team_delete_view'), + re_path(r'^team/create/$',views.team_create_view,name='team_create_view'), + re_path(r'^me/team/(?P\d+)/drop/(?P\d+)/$',views.manager_member_drop_view,name='manager_member_drop_view'), + re_path(r'^me/invitation/(?P\d+)/reject/$',views.invitation_reject_view,name='invitation_reject_view'), + re_path(r'^me/invitation/(?P\d+)/revoke/$',views.invitation_revoke_view,name='invitation_revoke_view'), + re_path(r'^me/invitation/$',views.rower_invitations_view,name='rower_invitations_view'), + re_path(r'^me/raise500/$',views.raise_500,name='raise_500'), + re_path(r'^me/invitation/(\w+.*)/$',views.rower_invitations_view,name='rower_invitations_view'), + re_path(r'^me/request/(?P\d+)/revoke/$',views.request_revoke_view,name='request_revoke_view'), + re_path(r'^me/request/(?P\d+)/reject/$',views.request_reject_view,name='request_reject_view'), + re_path(r'^me/request/(\w+.*)/$',views.manager_requests_view,name='manager_requests_view'), + re_path(r'^me/request/$',views.manager_requests_view,name='manager_requests_view'), + re_path(r'^me/edit/$',views.rower_edit_view,name='rower_edit_view'), + re_path(r'^me/edit/user/(?P\d+)/$',views.rower_edit_view,name='rower_edit_view'), + re_path(r'^me/preferences/$',views.rower_prefs_view,name='rower_prefs_view'), + re_path(r'^me/transactions/$',views.transactions_view,name='transactions_view'), + re_path(r'^me/preferences/user/(?P\d+)/$',views.rower_prefs_view,name='rower_prefs_view'), + re_path(r'^me/edit/(.+.*)/$',views.rower_edit_view,name='rower_edit_view'), + re_path(r'^me/c2authorize/$',views.rower_c2_authorize,name='rower_c2_authorize'), + re_path(r'^me/polarauthorize/$',views.rower_polar_authorize,name='rower_polar_authorize'), + re_path(r'^me/revokeapp/(?P\d+)/$',views.rower_revokeapp_view,name='rower_revokeapp_view'), + re_path(r'^me/stravaauthorize/$',views.rower_strava_authorize,name='rower_strava_authorize'), + re_path(r'^me/sporttracksauthorize/$',views.rower_sporttracks_authorize,name='rower_sporttracks_authorize'), + re_path(r'^me/underarmourauthorize/$',views.rower_underarmour_authorize,name='rower_underarmour_authorize'), + re_path(r'^me/tpauthorize/$',views.rower_tp_authorize,name='rower_tp_authorize'), + re_path(r'^me/runkeeperauthorize/$',views.rower_runkeeper_authorize,name='rower_runkeeper_authorize'), + re_path(r'^me/sporttracksrefresh/$',views.rower_sporttracks_token_refresh,name='rower_sporttracks_token_refresh'), + re_path(r'^me/underarmourrefresh/$',views.rower_underarmour_token_refresh,name='rower_underarmoud_token_refresh'), + re_path(r'^me/tprefresh/$',views.rower_tp_token_refresh,name='rower_tp_token_refresh'), + re_path(r'^me/c2refresh/$',views.rower_c2_token_refresh,name='rower_c2_token_refresh'), + re_path(r'^me/favoritecharts/$',views.rower_favoritecharts_view,name='rower_favoritecharts_view'), + re_path(r'^me/favoritecharts/user/(?P\d+)/$',views.rower_favoritecharts_view,name='rower_favoritecharts_view'), +# re_path(r'^me/workflowconfig/$',views.workout_workflow_config_view), + re_path(r'^me/workflowconfig2/$',views.workout_workflow_config2_view,name='workout_workflow_config2_view'), + re_path(r'^me/workflowconfig2/user/(?P\d+)/$',views.workout_workflow_config2_view,name='workout_workflow_config2_view'), + re_path(r'^me/workflowdefault/$',views.workflow_default_view,name='workflow_default_view'), + re_path(r'^email/send/$', views.sendmail,name='sendmail'), + re_path(r'^email/thankyou/$', TemplateView.as_view(template_name='thankyou.html'), name='thankyou'), + re_path(r'^email/$', TemplateView.as_view(template_name='email.html'), name='email'), + re_path(r'^about', TemplateView.as_view(template_name='about_us.html'),name='about'), + re_path(r'^brochure/$',TemplateView.as_view(template_name='brochure.html'), name='brochure'), - url(r'^developers', TemplateView.as_view(template_name='developers.html'),name='about'), -# url(r'^compatibility', TemplateView.as_view(template_name='compatibility.html'),name='about'), -# url(r'^videos', TemplateView.as_view(template_name='videos.html'),name='videos'), - url(r'^analysis/user/(?P\d+)/$', views.analysis_view,name='analysis'), - url(r'^laboratory/user/(?P\d+)/$', views.laboratory_view,name='laboratory'), - url(r'^analysis/$', views.analysis_view,name='analysis'), - url(r'^laboratory/$', views.laboratory_view,name='laboratory'), - url(r'^promembership', TemplateView.as_view(template_name='promembership.html'),name='promembership'), - url(r'^checkout/(?P\d+)/$',views.payment_confirm_view,name='payment_confirm_view'), - url(r'^upgradecheckout/(?P\d+)/$',views.upgrade_confirm_view,name='upgrade_confirm_view'), - url(r'^downgradecheckout/(?P\d+)/$',views.downgrade_confirm_view,name='downgrade_confirm_view'), - url(r'^billing/$',views.billing_view,name='billing'), - url(r'^upgrade/$',views.upgrade_view,name='upgrade'), - url(r'^downgrade/$',views.downgrade_view,name='downgrade'), - url(r'^paymentcompleted/$',views.payment_completed_view,name='payment_completed_view'), - url(r'^downgradecompleted/$',views.downgrade_completed_view,name='downgrade_completed_view'), - url(r'^paidplans/$',views.paidplans_view,name='paidplans'), - url(r'^me/cancelsubscriptions/$',views.plan_stop_view,name='plan_stop_view'), - url(r'^me/cancelsubscription/(?P[\w\ ]+.*)/$',views.plan_tobasic_view,name='plan_tobasic_view'), - 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,name='planrequired_view'), - url(r'^starttrial/$',views.start_trial_view,name='start_trial_view'), - url(r'^startplantrial/$',views.start_plantrial_view,name='start_plantrial_view'), -# url(r'^planmembership', TemplateView.as_view(template_name='planmembership.html'),name='planmembership'), - # url(r'^paypaltest', TemplateView.as_view(template_name='paypaltest.html'),name='paypaltest'), - url(r'^legal', TemplateView.as_view(template_name='legal.html'),name='legal'), - url(r'^register/$',views.rower_register_view,name='rower_register_view'), - url(r'^register/thankyou/$', TemplateView.as_view(template_name='registerthankyou.html'), name='registerthankyou'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/workflow/$',views.workout_workflow_view, + re_path(r'^developers', TemplateView.as_view(template_name='developers.html'),name='about'), +# re_path(r'^compatibility', TemplateView.as_view(template_name='compatibility.html'),name='about'), +# re_path(r'^videos', TemplateView.as_view(template_name='videos.html'),name='videos'), + re_path(r'^analysis/user/(?P\d+)/$', views.analysis_view,name='analysis'), + re_path(r'^laboratory/user/(?P\d+)/$', views.laboratory_view,name='laboratory'), + re_path(r'^analysis/$', views.analysis_view,name='analysis'), + re_path(r'^laboratory/$', views.laboratory_view,name='laboratory'), + re_path(r'^promembership', TemplateView.as_view(template_name='promembership.html'),name='promembership'), + re_path(r'^checkout/(?P\d+)/$',views.payment_confirm_view,name='payment_confirm_view'), + re_path(r'^upgradecheckout/(?P\d+)/$',views.upgrade_confirm_view,name='upgrade_confirm_view'), + re_path(r'^downgradecheckout/(?P\d+)/$',views.downgrade_confirm_view,name='downgrade_confirm_view'), + re_path(r'^billing/$',views.billing_view,name='billing'), + re_path(r'^upgrade/$',views.upgrade_view,name='upgrade'), + re_path(r'^downgrade/$',views.downgrade_view,name='downgrade'), + re_path(r'^paymentcompleted/$',views.payment_completed_view,name='payment_completed_view'), + re_path(r'^downgradecompleted/$',views.downgrade_completed_view,name='downgrade_completed_view'), + re_path(r'^paidplans/$',views.paidplans_view,name='paidplans'), + re_path(r'^me/cancelsubscriptions/$',views.plan_stop_view,name='plan_stop_view'), + re_path(r'^me/cancelsubscription/(?P[\w\ ]+.*)/$',views.plan_tobasic_view,name='plan_tobasic_view'), + re_path(r'^checkouts/$',views.checkouts_view,name='checkouts'), + re_path(r'^upgradecheckouts/$',views.upgrade_checkouts_view,name='upgrade_checkouts'), + re_path(r'^downgradecheckouts/$',views.downgrade_checkouts_view,name='downgrade_checkouts'), + re_path(r'^planrequired/',views.planrequired_view,name='planrequired_view'), + re_path(r'^starttrial/$',views.start_trial_view,name='start_trial_view'), + re_path(r'^startplantrial/$',views.start_plantrial_view,name='start_plantrial_view'), +# re_path(r'^planmembership', TemplateView.as_view(template_name='planmembership.html'),name='planmembership'), + # re_path(r'^paypaltest', TemplateView.as_view(template_name='paypaltest.html'),name='paypaltest'), + re_path(r'^legal', TemplateView.as_view(template_name='legal.html'),name='legal'), + re_path(r'^register/$',views.rower_register_view,name='rower_register_view'), + re_path(r'^register/thankyou/$', TemplateView.as_view(template_name='registerthankyou.html'), name='registerthankyou'), + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/workflow/$',views.workout_workflow_view, name='workout_workflow_view'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/flexchart/(?P[\w\ ]+.*)/(?P[\w\ ]+.*)/(?P[\w\ ]+.*)/(?P\w+)/$',views.workout_flexchart3_view,name='workout_flexchart3_view'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/flexchart/(?P\w+.*)/(?P[\w\ ]+.*)/(?P[\w\ ]+.*)/(?P\w+.*)/$',views.workout_flexchart3_view,name='workout_flexchart3_view'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/flexchart/(?P\w+.*)/(?P[\w\ ]+.*)/(?P[\w\ ]+.*)/$',views.workout_flexchart3_view,name='workout_flexchart3_view'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/flexchart/$',views.workout_flexchart3_view,name='workout_flexchart3_view'), -# url(r'^workout/compare/(?P\d+)/(?P\d+)/(?P\w+.*)/(?P[\w\ ]+.*)/(?P[\w\ ]+.*)/$',views.workout_comparison_view2), -# url(r'^workout/compare/(?P\d+)/(?P\d+)/(?P\w+.*)/(?P[\w\ ]+.*)/$',views.workout_comparison_view2), - url(r'^test\_callback',views.rower_process_testcallback,name='rower_process_testcallback'), - url(r'^createplan/$',views.rower_create_trainingplan,name='rower_create_trainingplan'), - url(r'^createplan/user/(?P\d+)/$',views.rower_create_trainingplan,name='rower_create_trainingplan'), - url(r'^deleteplan/(?P\d+)/$',login_required( + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/flexchart/(?P[\w\ ]+.*)/(?P[\w\ ]+.*)/(?P[\w\ ]+.*)/(?P\w+)/$',views.workout_flexchart3_view,name='workout_flexchart3_view'), + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/flexchart/(?P\w+.*)/(?P[\w\ ]+.*)/(?P[\w\ ]+.*)/(?P\w+.*)/$',views.workout_flexchart3_view,name='workout_flexchart3_view'), + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/flexchart/(?P\w+.*)/(?P[\w\ ]+.*)/(?P[\w\ ]+.*)/$',views.workout_flexchart3_view,name='workout_flexchart3_view'), + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/flexchart/$',views.workout_flexchart3_view,name='workout_flexchart3_view'), +# re_path(r'^workout/compare/(?P\d+)/(?P\d+)/(?P\w+.*)/(?P[\w\ ]+.*)/(?P[\w\ ]+.*)/$',views.workout_comparison_view2), +# re_path(r'^workout/compare/(?P\d+)/(?P\d+)/(?P\w+.*)/(?P[\w\ ]+.*)/$',views.workout_comparison_view2), + re_path(r'^test\_callback',views.rower_process_testcallback,name='rower_process_testcallback'), + re_path(r'^createplan/$',views.rower_create_trainingplan,name='rower_create_trainingplan'), + re_path(r'^createplan/user/(?P\d+)/$',views.rower_create_trainingplan,name='rower_create_trainingplan'), + re_path(r'^deleteplan/(?P\d+)/$',login_required( views.TrainingPlanDelete.as_view()),name='trainingplan_delete_view'), - url(r'^deletemicrocycle/(?P\d+)/$',login_required( + re_path(r'^deletemicrocycle/(?P\d+)/$',login_required( views.MicroCycleDelete.as_view()),name='microcycle_delete_view'), - url(r'^deletemesocycle/(?P\d+)/$',login_required( + re_path(r'^deletemesocycle/(?P\d+)/$',login_required( views.MesoCycleDelete.as_view()),name='mesocycle_delete_view'), - url(r'^deletemacrocycle/(?P\d+)/$',login_required( + re_path(r'^deletemacrocycle/(?P\d+)/$',login_required( views.MacroCycleDelete.as_view()),name='macrocycle_delete_view'), -# url(r'^deleteplan/(?P\d+)/$',views.rower_delete_trainingplan), - url(r'^plan/(?P\d+)/$',views.rower_trainingplan_view, +# re_path(r'^deleteplan/(?P\d+)/$',views.rower_delete_trainingplan), + re_path(r'^plan/(?P\d+)/$',views.rower_trainingplan_view, name='rower_trainingplan_view'), - url(r'^plan/(?P\d+)/user/(?P\d+)/$',views.rower_trainingplan_view, + re_path(r'^plan/(?P\d+)/user/(?P\d+)/$',views.rower_trainingplan_view, name='rower_trainingplan_view'), - url(r'^plan/(?P\d+)/micro/(?P\d+)/$',views.rower_trainingplan_view, + re_path(r'^plan/(?P\d+)/micro/(?P\d+)/$',views.rower_trainingplan_view, name='rower_trainingplan_view'), - url(r'^plan/(?P\d+)/micro/(?P\d+)/user/(?P\d+)/$',views.rower_trainingplan_view, + re_path(r'^plan/(?P\d+)/micro/(?P\d+)/user/(?P\d+)/$',views.rower_trainingplan_view, name='rower_trainingplan_view'), - url(r'^plan/(?P\d+)/meso/(?P\d+)/$',views.rower_trainingplan_view, + re_path(r'^plan/(?P\d+)/meso/(?P\d+)/$',views.rower_trainingplan_view, name='rower_trainingplan_view'), - url(r'^plan/(?P\d+)/meso/(?P\d+)/user/(?P\d+)/$',views.rower_trainingplan_view, + re_path(r'^plan/(?P\d+)/meso/(?P\d+)/user/(?P\d+)/$',views.rower_trainingplan_view, name='rower_trainingplan_view'), - url(r'^plan/(?P\d+)/macro/(?P\d+)/$',views.rower_trainingplan_view, + re_path(r'^plan/(?P\d+)/macro/(?P\d+)/$',views.rower_trainingplan_view, name='rower_trainingplan_view'), - url(r'^plan/(?P\d+)/macro/(?P\d+)/user/(?P\d+)/$',views.rower_trainingplan_view, + re_path(r'^plan/(?P\d+)/macro/(?P\d+)/user/(?P\d+)/$',views.rower_trainingplan_view, name='rower_trainingplan_view'), - url(r'^macrocycle/(?P\d+)/$',login_required( + re_path(r'^macrocycle/(?P\d+)/$',login_required( views.TrainingMacroCycleUpdate.as_view()), name='macrocycle_update_view'), - url(r'^mesocycle/(?P\d+)/$',login_required( + re_path(r'^mesocycle/(?P\d+)/$',login_required( views.TrainingMesoCycleUpdate.as_view()), name='mesocycle_update_view'), - url(r'^macrocycle/(?P\d+)/planbymonths/$',login_required( + re_path(r'^macrocycle/(?P\d+)/planbymonths/$',login_required( views.planmacrocyclebymonth)), - url(r'^macrocycle/(?P\d+)/planbymonths/user/(?P\d+)/$',views.planmacrocyclebymonth), - url(r'^mesocycle/(?P\d+)/planbyweeks/$',views.planmesocyclebyweek), - url(r'^mesocycle/(?P\d+)/planbyweeks/user/(?P\d+)/$',views.planmesocyclebyweek), - url(r'^microcycle/(?P\d+)/$',login_required( + re_path(r'^macrocycle/(?P\d+)/planbymonths/user/(?P\d+)/$',views.planmacrocyclebymonth), + re_path(r'^mesocycle/(?P\d+)/planbyweeks/$',views.planmesocyclebyweek), + re_path(r'^mesocycle/(?P\d+)/planbyweeks/user/(?P\d+)/$',views.planmesocyclebyweek), + re_path(r'^microcycle/(?P\d+)/$',login_required( views.TrainingMicroCycleUpdate.as_view()), name='microcycle_update_view'), - url(r'^deletetarget/(?P\d+)/$',views.rower_delete_trainingtarget, + re_path(r'^deletetarget/(?P\d+)/$',views.rower_delete_trainingtarget, name='rower_delete_trainingtarget'), - url(r'^editplan/(?P\d+)/$',login_required( + re_path(r'^editplan/(?P\d+)/$',login_required( views.TrainingPlanUpdate.as_view()), name='trainingplan_update_view'), - url(r'^edittarget/(?P\d+)/$',login_required( + re_path(r'^edittarget/(?P\d+)/$',login_required( views.TrainingTargetUpdate.as_view()), name='trainingtarget_update_view'), - url(r'^workout/(?P\b[0-9A-Fa-f]+\b)/test\_strokedata/$',views.strokedataform), - url(r'^sessions/teamcreate/user/(?P\d+)/$',views.plannedsession_teamcreate_view, + re_path(r'^workout/(?P\b[0-9A-Fa-f]+\b)/test\_strokedata/$',views.strokedataform), + re_path(r'^sessions/teamcreate/user/(?P\d+)/$',views.plannedsession_teamcreate_view, name='plannedsession_teamcreate_view'), - url(r'^sessions/teamcreate/team/(?P\d+)/user/(?P\d+)/$', + re_path(r'^sessions/teamcreate/team/(?P\d+)/user/(?P\d+)/$', views.plannedsession_teamcreate_view, name='plannedsession_teamcreate_view'), - url(r'^sessions/teamcreate/$',views.plannedsession_teamcreate_view, + re_path(r'^sessions/teamcreate/$',views.plannedsession_teamcreate_view, name='plannedsession_teamcreate_view'), - url(r'^sessions/teamcreate/team/$', + re_path(r'^sessions/teamcreate/team/$', views.plannedsession_teamcreate_view, name='plannedsession_teamcreate_view'), - url(r'^sessions/teamedit/(?P\d+)/$',views.plannedsession_teamedit_view, + re_path(r'^sessions/teamedit/(?P\d+)/$',views.plannedsession_teamedit_view, name='plannedsession_teamedit_view'), - url(r'^sessions/teamedit/(?P\d+)/user/(?P\d+)/$', + re_path(r'^sessions/teamedit/(?P\d+)/user/(?P\d+)/$', views.plannedsession_teamedit_view, name='plannedsession_teamedit_view'), - url(r'^sessions/create/$',views.plannedsession_create_view, + re_path(r'^sessions/create/$',views.plannedsession_create_view, name='plannedsession_create_view'), - url(r'^sessions/create/user/(?P\d+)/$', + re_path(r'^sessions/create/user/(?P\d+)/$', views.plannedsession_create_view, name='plannedsession_create_view'), -# url(r'^sessions/create/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$', +# re_path(r'^sessions/create/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$', # views.plannedsession_create_view, # name='plannedsession_create_view'), -# url(r'^sessions/create/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/user/(?P\d+)/$', +# re_path(r'^sessions/create/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/user/(?P\d+)/$', # views.plannedsession_create_view, # name='plannedsession_create_view'), - url(r'^sessions/multiclone/$',views.plannedsession_multiclone_view), - url(r'^sessions/multiclone/user/(?P\d+)/$', + re_path(r'^sessions/multiclone/$',views.plannedsession_multiclone_view), + re_path(r'^sessions/multiclone/user/(?P\d+)/$', views.plannedsession_multiclone_view, name='plannedsession_multiclone_view'), - url(r'^sessions/multicreate/$',views.plannedsession_multicreate_view, + re_path(r'^sessions/multicreate/$',views.plannedsession_multicreate_view, name='plannedsession_multicreate_view'), - url(r'^sessions/multicreate/user/(?P\d+)/extra/(?P\d+)/$', + re_path(r'^sessions/multicreate/user/(?P\d+)/extra/(?P\d+)/$', views.plannedsession_multicreate_view, name='plannedsession_multicreate_view'), - url(r'^sessions/multicreate/user/(?P\d+)/$', + re_path(r'^sessions/multicreate/user/(?P\d+)/$', views.plannedsession_multicreate_view, name='plannedsession_multicreate_view'), - url(r'^sessions/(?P\d+)/edit/$',views.plannedsession_edit_view), - url(r'^sessions/(?P\d+)/compare/$', + re_path(r'^sessions/(?P\d+)/edit/$',views.plannedsession_edit_view), + re_path(r'^sessions/(?P\d+)/compare/$', views.plannedsession_compare_view, name='plannedsession_compare_view'), - url(r'^sessions/(?P\d+)/compare/user/(?P\d+)/$', + re_path(r'^sessions/(?P\d+)/compare/user/(?P\d+)/$', views.plannedsession_compare_view, name='plannedsession_compare_view'), - url(r'^sessions/(?P\d+)/edit/user/(?P\d+)/$',views.plannedsession_edit_view), - url(r'^sessions/(?P\d+)/clone/user/(?P\d+)/$',views.plannedsession_clone_view), - url(r'^sessions/(?P\d+)/clone/$',views.plannedsession_clone_view), - url(r'^sessions/(?P\d+)/detach/(?P\b[0-9A-Fa-f]+\b)/user/(?P\d+)/$',views.plannedsession_detach_view), - url(r'^sessions/(?P\d+)/detach/(?P\b[0-9A-Fa-f]+\b)/$',views.plannedsession_detach_view), - url(r'^sessions/(?P\d+)/$',views.plannedsession_view, + re_path(r'^sessions/(?P\d+)/edit/user/(?P\d+)/$',views.plannedsession_edit_view), + re_path(r'^sessions/(?P\d+)/clone/user/(?P\d+)/$',views.plannedsession_clone_view), + re_path(r'^sessions/(?P\d+)/clone/$',views.plannedsession_clone_view), + re_path(r'^sessions/(?P\d+)/detach/(?P\b[0-9A-Fa-f]+\b)/user/(?P\d+)/$',views.plannedsession_detach_view), + re_path(r'^sessions/(?P\d+)/detach/(?P\b[0-9A-Fa-f]+\b)/$',views.plannedsession_detach_view), + re_path(r'^sessions/(?P\d+)/$',views.plannedsession_view, name='plannedsession_view'), - url(r'^sessions/(?P\d+)/user/(?P\d+)/$',views.plannedsession_view, + re_path(r'^sessions/(?P\d+)/user/(?P\d+)/$',views.plannedsession_view, name='plannedsession_view'), - url(r'^sessions/(?P\d+)/deleteconfirm/$',login_required( + re_path(r'^sessions/(?P\d+)/deleteconfirm/$',login_required( views.PlannedSessionDelete.as_view())), - url(r'^sessions/(?P\d+)/delete/$',login_required( + re_path(r'^sessions/(?P\d+)/delete/$',login_required( views.PlannedSessionDelete.as_view()), name='plannedsession_delete_view'), - url(r'^sessions/manage/session/(?P\d+)/$', + re_path(r'^sessions/manage/session/(?P\d+)/$', views.plannedsessions_manage_view, name='plannedsessions_manage_view'), - url(r'^sessions/manage/session/(?P\d+)/user/(?P\d+)/$', + re_path(r'^sessions/manage/session/(?P\d+)/user/(?P\d+)/$', views.plannedsessions_manage_view, name='plannedsessions_manage_view'), - url(r'^sessions/manage/?/$', + re_path(r'^sessions/manage/?/$', views.plannedsessions_manage_view, name='plannedsessions_manage_view'), - url(r'^sessions/manage/user/(?P\d+)/$', + re_path(r'^sessions/manage/user/(?P\d+)/$', views.plannedsessions_manage_view, name='plannedsessions_manage_view'), - url(r'^sessions/coach/$',views.plannedsessions_coach_view, + re_path(r'^sessions/coach/$',views.plannedsessions_coach_view, name='plannedsessions_coach_view'), - url(r'^sessions/coach/user/(?P\d+)/$',views.plannedsessions_coach_view, + re_path(r'^sessions/coach/user/(?P\d+)/$',views.plannedsessions_coach_view, name='plannedsessions_coach_view'), - url(r'^sessions/print/?/$',views.plannedsessions_print_view, + re_path(r'^sessions/print/?/$',views.plannedsessions_print_view, name='plannedsessions_print_view'), - url(r'^sessions/(?P\d+)/comments/user/(?P\d+)/$',views.plannedsession_comment_view, + re_path(r'^sessions/(?P\d+)/comments/user/(?P\d+)/$',views.plannedsession_comment_view, name='plannedsession_comment_view'), - url(r'^sessions/(?P\d+)/comments/$',views.plannedsession_comment_view, + re_path(r'^sessions/(?P\d+)/comments/$',views.plannedsession_comment_view, name='plannedsession_comment_view'), - url(r'^sessions/print/user/(?P\d+)/$',views.plannedsessions_print_view, + re_path(r'^sessions/print/user/(?P\d+)/$',views.plannedsessions_print_view, name='plannedsessions_print_view'), - url(r'^sessions/sendcalendar/$',views.plannedsessions_icsemail_view, + re_path(r'^sessions/sendcalendar/$',views.plannedsessions_icsemail_view, name='plannedsessions_icsemail_view'), - url(r'^sessions/sendcalendar/user/(?P\d+)/$',views.plannedsessions_icsemail_view, + re_path(r'^sessions/sendcalendar/user/(?P\d+)/$',views.plannedsessions_icsemail_view, name='plannedsessions_icsemail_view'), - url(r'^sessions/$',views.plannedsessions_view, + re_path(r'^sessions/$',views.plannedsessions_view, name='plannedsessions_view'), - url(r'^sessions/user/(?P\d+)/$',views.plannedsessions_view, + re_path(r'^sessions/user/(?P\d+)/$',views.plannedsessions_view, name='plannedsessions_view'), -# url(r'^sessions/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$', +# re_path(r'^sessions/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/$', # views.plannedsessions_view, # name='plannedsessions_view'), -# url(r'^sessions/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/user/(?P\d+)/$', +# re_path(r'^sessions/(?P\d+-\d+-\d+)/(?P\d+-\d+-\d+)/user/(?P\d+)/$', # views.plannedsessions_view, # name='plannedsessions_view'), - url(r'^courses/(?P\d+)/edit/$',views.course_edit_view, + re_path(r'^courses/(?P\d+)/edit/$',views.course_edit_view, name='course_edit_view'), - url(r'^courses/(?P\d+)/delete/$',views.course_delete_view), - url(r'^courses/(?P\d+)/downloadkml/$',views.course_kmldownload_view, + re_path(r'^courses/(?P\d+)/delete/$',views.course_delete_view), + re_path(r'^courses/(?P\d+)/downloadkml/$',views.course_kmldownload_view, name='course_kmldownload_view'), - url(r'^courses/(?P\d+)/replace/$',views.course_replace_view, + re_path(r'^courses/(?P\d+)/replace/$',views.course_replace_view, name='course_replace_view'), - url(r'^courses/(?P\d+)/$',views.course_view,name='course_view'), - url(r'^courses/(?P\d+)/map/$',views.course_map_view,name='course_map_view'), + re_path(r'^courses/(?P\d+)/$',views.course_view,name='course_view'), + re_path(r'^courses/(?P\d+)/map/$',views.course_map_view,name='course_map_view'), # URLS to be created - url(r'^help/$',TemplateView.as_view(template_name='help.html'), name='help'), + re_path(r'^help/$',TemplateView.as_view(template_name='help.html'), name='help'), ] if settings.DEBUG: urlpatterns += [ - url(r'^c2listug/(?P\d+)/$',views.c2listdebug_view), - url(r'^c2listug/$',views.c2listdebug_view), + re_path(r'^c2listug/(?P\d+)/$',views.c2listdebug_view), + re_path(r'^c2listug/$',views.c2listdebug_view), ] #urlpatterns = format_suffix_patterns(urlpatterns) diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py index 8784e060..581d3144 100644 --- a/rowers/views/analysisviews.py +++ b/rowers/views/analysisviews.py @@ -155,8 +155,8 @@ def histo(request,theuser=0, promember=0 mayedit=0 - if not request.user.is_anonymous(): - result = request.user.is_authenticated() and ispromember(request.user) + if not request.user.is_anonymous: + result = request.user.is_authenticated and ispromember(request.user) if result: promember = 1 @@ -239,9 +239,9 @@ def cum_flex_data( if theuser == 0: theuser = request.user.id - if not request.user.is_anonymous(): + if not request.user.is_anonymous: r = getrower(request.user) - result = request.user.is_authenticated() and ispromember(request.user) + result = request.user.is_authenticated and ispromember(request.user) if result: promember=1 @@ -337,9 +337,9 @@ def histo_data( if theuser == 0: theuser = request.user.id - if not request.user.is_anonymous(): + if not request.user.is_anonymous: r = getrower(request.user) - result = request.user.is_authenticated() and ispromember(request.user) + result = request.user.is_authenticated and ispromember(request.user) if result: promember=1 @@ -543,8 +543,8 @@ def cum_flex(request,theuser=0, promember=0 mayedit=0 - if not request.user.is_anonymous(): - result = request.user.is_authenticated() and ispromember(request.user) + if not request.user.is_anonymous: + result = request.user.is_authenticated and ispromember(request.user) if result: promember = 1 @@ -649,7 +649,7 @@ def rankings_view(request,theuser=0, theuser = request.user.id promember=0 - if not request.user.is_anonymous(): + if not request.user.is_anonymous: r = getrower(request.user) if r.birthdate: age = calculate_age(r.birthdate) @@ -661,7 +661,7 @@ def rankings_view(request,theuser=0, else: worldclasspower = None - result = request.user.is_authenticated() and ispromember(request.user) + result = request.user.is_authenticated and ispromember(request.user) if result: promember=1 @@ -1002,7 +1002,7 @@ def rankings_view2(request,theuser=0, promember=0 - if not request.user.is_anonymous(): + if not request.user.is_anonymous: r = getrower(request.user) wcdurations = [] wcpower = [] @@ -1069,7 +1069,7 @@ def rankings_view2(request,theuser=0, request.session['options'] = options - result = request.user.is_authenticated() and ispromember(request.user) + result = request.user.is_authenticated and ispromember(request.user) if result: promember=1 @@ -1421,9 +1421,9 @@ def otwrankings_view(request,theuser=0, theuser = request.user.id promember=0 - if not request.user.is_anonymous(): + if not request.user.is_anonymous: r = Rower.objects.get(user=request.user) - result = request.user.is_authenticated() and ispromember(request.user) + result = request.user.is_authenticated and ispromember(request.user) if result: promember=1 @@ -1827,9 +1827,9 @@ def oterankings_view(request,theuser=0, promember=0 - if not request.user.is_anonymous(): + if not request.user.is_anonymous: r = Rower.objects.get(user=request.user) - result = request.user.is_authenticated() and ispromember(request.user) + result = request.user.is_authenticated and ispromember(request.user) if result: promember=1 @@ -3372,9 +3372,9 @@ def cumstats(request,theuser=0, if theuser == 0: theuser = request.user.id - if not request.user.is_anonymous(): + if not request.user.is_anonymous: r = getrower(request.user) - result = request.user.is_authenticated() and ispromember(request.user) + result = request.user.is_authenticated and ispromember(request.user) if result: promember=1 diff --git a/rowers/views/errorviews.py b/rowers/views/errorviews.py index eeaa7496..bf4c3f3a 100644 --- a/rowers/views/errorviews.py +++ b/rowers/views/errorviews.py @@ -7,28 +7,28 @@ from rowers.views.statements import * # Custom error pages with Rowsandall headers def error500_view(request): - response = render_to_response('500.html', {}, + response = render('500.html', {}, context_instance = RequestContext(request)) response.status_code = 500 return response def error404_view(request): - response = render_to_response('404.html', {}, + response = render('404.html', {}, context_instance = RequestContext(request)) response.status_code = 404 return response def error400_view(request): - response = render_to_response('400.html', {}, + response = render('400.html', {}, context_instance = RequestContext(request)) response.status_code = 400 return response def error403_view(request): - response = render_to_response('403.html', {}, + response = render('403.html', {}, context_instance = RequestContext(request)) response.status_code = 403 diff --git a/rowers/views/otherviews.py b/rowers/views/otherviews.py index d42a773b..920d8859 100644 --- a/rowers/views/otherviews.py +++ b/rowers/views/otherviews.py @@ -11,7 +11,7 @@ def deactivate_user(request): pk = request.user.id user = User.objects.get(pk=pk) user_form = DeactivateUserForm(instance=user) - if request.user.is_authenticated() and request.user.id == user.id: + if request.user.is_authenticated and request.user.id == user.id: if request.method == "POST": user_form = DeactivateUserForm(request.POST, instance=user) if user_form.is_valid(): @@ -80,7 +80,7 @@ def remove_user(request): pk = request.user.id user = User.objects.get(pk=pk) user_form = DeleteUserForm(instance=user) - if request.user.is_authenticated() and request.user.id == user.id: + if request.user.is_authenticated and request.user.id == user.id: if request.method == "POST": user_form = DeleteUserForm(request.POST,instance=user) if user_form.is_valid(): diff --git a/rowers/views/paymentviews.py b/rowers/views/paymentviews.py index 61cba565..4bf1adfe 100644 --- a/rowers/views/paymentviews.py +++ b/rowers/views/paymentviews.py @@ -6,7 +6,7 @@ from __future__ import unicode_literals from rowers.views.statements import * def paidplans_view(request): - if not request.user.is_anonymous(): + if not request.user.is_anonymous: r = request.user.rower if r.paymentprocessor != 'braintree' and r.paymenttype == 'recurring': messages.error(request,'Automated payment processing is currently only available through BrainTree (by PayPal). You are currently on a recurring payment plan with PayPal. Contact the site administrator at support@rowsandall.com before you proceed') diff --git a/rowers/views/racesviews.py b/rowers/views/racesviews.py index 793f98a0..1cc53312 100644 --- a/rowers/views/racesviews.py +++ b/rowers/views/racesviews.py @@ -495,7 +495,7 @@ def virtualevents_view(request): races = (races1 | races2).order_by("startdate","start_time") - if not request.user.is_anonymous(): + if not request.user.is_anonymous: r = getrower(request.user) else: r = None @@ -687,7 +687,7 @@ def virtualevent_disqualify_view(request,raceid=0,recordid=0): buttons = [] - if not request.user.is_anonymous(): + if not request.user.is_anonymous: if race_can_register(r,race): buttons += ['registerbutton'] @@ -724,7 +724,7 @@ def virtualevent_view(request,id=0): results = [] - if not request.user.is_anonymous(): + if not request.user.is_anonymous: r = getrower(request.user) else: r = None @@ -757,7 +757,7 @@ def virtualevent_view(request,id=0): ) - if not request.user.is_anonymous(): + if not request.user.is_anonymous: if race_can_register(r,race): buttons += ['registerbutton'] @@ -907,7 +907,7 @@ def virtualevent_ranking_view(request,id=0): results = [] - if not request.user.is_anonymous(): + if not request.user.is_anonymous: r = getrower(request.user) else: r = None @@ -940,7 +940,7 @@ def virtualevent_ranking_view(request,id=0): ) - if not request.user.is_anonymous(): + if not request.user.is_anonymous: if race_can_register(r,race): buttons += ['registerbutton'] @@ -1247,7 +1247,7 @@ def virtualevent_addboat_view(request,id=0): buttons = [] - if not request.user.is_anonymous(): + if not request.user.is_anonymous: if race_can_register(r,race): buttons += ['registerbutton'] @@ -1401,7 +1401,7 @@ def virtualevent_register_view(request,id=0): buttons = [] - if not request.user.is_anonymous(): + if not request.user.is_anonymous: if race_can_register(r,race): buttons += ['registerbutton'] @@ -1592,7 +1592,7 @@ def indoorvirtualevent_register_view(request,id=0): buttons = [] - if not request.user.is_anonymous(): + if not request.user.is_anonymous: if race_can_register(r,race): buttons += ['registerbutton'] @@ -1940,7 +1940,7 @@ def virtualevent_edit_view(request,id=0): buttons = [] - if not request.user.is_anonymous(): + if not request.user.is_anonymous: if race_can_register(r,race): buttons += ['registerbutton'] @@ -2039,7 +2039,7 @@ def indoorvirtualevent_edit_view(request,id=0): buttons = [] - if not request.user.is_anonymous(): + if not request.user.is_anonymous: if race_can_register(r,race): buttons += ['registerbutton'] @@ -2254,7 +2254,7 @@ def virtualevent_submit_result_view(request,id=0,workoutid=0): buttons = [] - if not request.user.is_anonymous(): + if not request.user.is_anonymous: if race_can_register(r,race): buttons += ['registerbutton'] diff --git a/rowers/views/statements.py b/rowers/views/statements.py index 76691ab1..c6e5054d 100644 --- a/rowers/views/statements.py +++ b/rowers/views/statements.py @@ -60,10 +60,7 @@ from rowers.forms import ( disqualifiers,SearchForm,BillingForm,PlanSelectForm ) -try: - from django.core.urlresolvers import reverse, reverse_lazy -except ModuleNotFoundError: - from django.urls import reverse, reverse_lazy +from django.urls import reverse, reverse_lazy from django.core.exceptions import PermissionDenied from django.template import RequestContext @@ -187,7 +184,7 @@ from rowers.tasks import ( ) from scipy.signal import savgol_filter -from django.shortcuts import render_to_response +#from django.shortcuts import render_to_response try: from Cookie import SimpleCookie except ModuleNotFoundError: @@ -268,7 +265,7 @@ def getfavorites(r,row): return favorites,maxfav def get_workout_default_page(request,id): - if request.user.is_anonymous(): + if request.user.is_anonymous: return reverse('workout_view',kwargs={'id':id}) else: r = Rower.objects.get(user=request.user) @@ -346,10 +343,10 @@ def getrequestplanrower(request,rowerid=0,userid=0,notpermanent=False): def getrower(user): try: - if user.is_anonymous(): + if user.is_anonymous: return None except AttributeError: - if User.objects.get(id=user).is_anonymous(): + if User.objects.get(id=user).is_anonymous: return None try: r = Rower.objects.get(user=user) @@ -767,7 +764,7 @@ def get_thumbnails(request,id): r = getrower(request.user) - result = request.user.is_authenticated() and ispromember(request.user) + result = request.user.is_authenticated and ispromember(request.user) if result: promember=1 if request.user == row.user.user: @@ -998,21 +995,21 @@ from rowers.models import ( # Check if a user is a Coach member def iscoachmember(user): - if not user.is_anonymous(): + if not user.is_anonymous: try: r = Rower.objects.get(user=user) except Rower.DoesNotExist: r = Rower(user=user) r.save() - result = user.is_authenticated() and (r.rowerplan=='coach') + result = user.is_authenticated and (r.rowerplan=='coach') else: result = False return result def cancreateteam(user): - if user.is_anonymous(): + if user.is_anonymous: return False try: @@ -1021,7 +1018,7 @@ def cancreateteam(user): r = Rower(user=user) r.save() - if user.is_authenticated() and (r.rowerplan=='coach'): + if user.is_authenticated and (r.rowerplan=='coach'): return True elif user.is_athenticated() and r.rowerplan in ['plan','pro']: ts = Team.objects.filter(manager=user) @@ -1030,16 +1027,16 @@ def cancreateteam(user): # Check if a user can create planned sessions def hasplannedsessions(user): - if not user.is_anonymous(): + if not user.is_anonymous: try: r = Rower.objects.get(user=user) except Rower.DoesNotExist: r = Rower(user=user) r.save() - result = user.is_authenticated() and (r.rowerplan=='coach' or r.rowerplan=='plan') + result = user.is_authenticated and (r.rowerplan=='coach' or r.rowerplan=='plan') if not result and r.plantrialexpires: - result = user.is_authenticated() and r.plantrialexpires >= datetime.date.today() + result = user.is_authenticated and r.plantrialexpires >= datetime.date.today() else: result = False @@ -1049,14 +1046,14 @@ from rowers.utils import isprorower,ProcessorCustomerError # Check if a user is a Pro member def ispromember(user): - if not user.is_anonymous(): + if not user.is_anonymous: try: r = Rower.objects.get(user=user) except Rower.DoesNotExist: r = Rower(user=user) r.save() - result = user.is_authenticated() and isprorower(r) + result = user.is_authenticated and isprorower(r) else: result = False return result diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py index a2dd3f36..08d64c50 100644 --- a/rowers/views/workoutviews.py +++ b/rowers/views/workoutviews.py @@ -15,9 +15,9 @@ def workout_forcecurve_view(request,id=0,workstrokesonly=False): promember=0 mayedit=0 - if not request.user.is_anonymous(): + if not request.user.is_anonymous: r = getrower(request.user) - result = request.user.is_authenticated() and ispromember(request.user) + result = request.user.is_authenticated and ispromember(request.user) if result: promember=1 if request.user == row.user.user: @@ -91,9 +91,9 @@ def workout_histo_view(request,id=0): promember=0 mayedit=0 - if not request.user.is_anonymous(): + if not request.user.is_anonymous: r = getrower(request.user) - result = request.user.is_authenticated() and ispromember(request.user) + result = request.user.is_authenticated and ispromember(request.user) if result: promember=1 if request.user == w.user.user: @@ -395,9 +395,9 @@ def workout_recalcsummary_view(request,id=0): redirect_field_name=None) def workouts_join_view(request): promember=0 - if not request.user.is_anonymous(): + if not request.user.is_anonymous: r = getrower(request.user) - result = request.user.is_authenticated() and ispromember(request.user) + result = request.user.is_authenticated and ispromember(request.user) if result: promember=1 @@ -813,9 +813,9 @@ def virtualevent_compare_view(request,id=0): results = [] promember = 0 - if not request.user.is_anonymous(): + if not request.user.is_anonymous: r = getrower(request.user) - result = request.user.is_authenticated() and ispromember(request.user) + result = request.user.is_authenticated and ispromember(request.user) if result: promember=1 else: @@ -1013,9 +1013,9 @@ def plannedsession_compare_view(request,id=0,userid=0): @login_required() def multi_compare_view(request,id=0,userid=0): promember=0 - if not request.user.is_anonymous(): + if not request.user.is_anonymous: r = getrower(request.user) - result = request.user.is_authenticated() and ispromember(request.user) + result = request.user.is_authenticated and ispromember(request.user) if result: promember=1 @@ -1477,7 +1477,7 @@ def workout_fusion_list(request,id=0,message='',successmessage='', def workout_view(request,id=0): request.session['referer'] = absolute(request)['PATH'] - if not request.user.is_anonymous(): + if not request.user.is_anonymous: rower = getrower(request.user) else: rower = None @@ -2722,7 +2722,7 @@ def workout_workflow_view(request,id): row = get_workout_permittedview(request.user,id) r = getrower(request.user) - result = request.user.is_authenticated() and ispromember(request.user) + result = request.user.is_authenticated and ispromember(request.user) if result: promember=1 if request.user == row.user.user: @@ -2824,9 +2824,9 @@ def workout_flexchart3_view(request,*args,**kwargs): promember=0 mayedit=0 - if not request.user.is_anonymous(): + if not request.user.is_anonymous: r = getrower(request.user) - result = request.user.is_authenticated() and ispromember(request.user) + result = request.user.is_authenticated and ispromember(request.user) if result: promember=1 if request.user == row.user.user: @@ -2877,7 +2877,7 @@ def workout_flexchart3_view(request,*args,**kwargs): else: yparam2 = 'hr' - if not request.user.is_anonymous(): + if not request.user.is_anonymous: r = getrower(request.user) if favoritenr>=0 and r.showfavoritechartnotes: try: @@ -2907,7 +2907,7 @@ def workout_flexchart3_view(request,*args,**kwargs): workstrokesonly = False if request.method == 'POST' and 'savefavorite' in request.POST: - if not request.user.is_anonymous(): + if not request.user.is_anonymous: workstrokesonly = request.POST['workstrokesonlysave'] reststrokes = not workstrokesonly r = getrower(request.user) @@ -3135,9 +3135,9 @@ def workout_otwpowerplot_view(request,id=0,message="",successmessage=""): promember=0 mayedit=0 - if not request.user.is_anonymous(): + if not request.user.is_anonymous: r = getrower(request.user) - result = request.user.is_authenticated() and ispromember(request.user) + result = request.user.is_authenticated and ispromember(request.user) if result: promember=1 if request.user == w.user.user: @@ -3609,9 +3609,9 @@ def workout_map_view(request,id=0): mapdiv = "" mayedit=0 - if not request.user.is_anonymous(): + if not request.user.is_anonymous: r = getrower(request.user) - result = request.user.is_authenticated() and ispromember(request.user) + result = request.user.is_authenticated and ispromember(request.user) if result: promember=1 if request.user == w.user.user: @@ -5242,9 +5242,9 @@ class WorkoutDelete(DeleteView): mayedit=0 promember=0 - if not self.request.user.is_anonymous(): + if not self.request.user.is_anonymous: r = getrower(self.request.user) - result = self.request.user.is_authenticated() and ispromember(self.request.user) + result = self.request.user.is_authenticated and ispromember(self.request.user) if result: promember=1 if self.request.user == self.object.user.user: diff --git a/rowsandall_app/settings.py b/rowsandall_app/settings.py index 88aaae22..e4f32a32 100644 --- a/rowsandall_app/settings.py +++ b/rowsandall_app/settings.py @@ -58,7 +58,7 @@ INSTALLED_APPS = [ 'suit_rq', 'leaflet', 'django_rq', - 'django_rq_dashboard', +# 'django_rq_dashboard', # 'translation_manager', 'django_mailbox', 'rest_framework', @@ -80,7 +80,7 @@ AUTHENTICATION_BACKENDS = ( 'django.contrib.auth.backends.ModelBackend', ) -MIDDLEWARE_CLASSES = [ +MIDDLEWARE = [ # 'django.middleware.cache.UpdateCacheMiddleware', 'django.middleware.common.CommonMiddleware', 'django.middleware.common.BrokenLinkEmailsMiddleware', @@ -94,10 +94,9 @@ MIDDLEWARE_CLASSES = [ 'corsheaders.middleware.CorsMiddleware', 'django.middleware.common.CommonMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', 'oauth2_provider.middleware.OAuth2TokenMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', - 'async_messages.middleware.AsyncMiddleware', +# 'async_messages.middleware.AsyncMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', 'tz_detect.middleware.TimezoneMiddleware', 'rowers.middleware.GDPRMiddleWare', @@ -389,8 +388,7 @@ REST_FRAMEWORK = { 'DEFAULT_AUTHENTICATION_CLASSES': ( 'rest_framework.authentication.BasicAuthentication', 'rest_framework.authentication.SessionAuthentication', - 'oauth2_provider.ext.rest_framework.OAuth2Authentication', -# 'oauth2_provider.contrib.rest_framework.OAuth2Authentication', + 'oauth2_provider.contrib.rest_framework.OAuth2Authentication', ), 'PAGE_SIZE': 20, 'DEFAULT_PAGINATION_CLASS':'rest_framework.pagination.LimitOffsetPagination', diff --git a/rowsandall_app/urls.py b/rowsandall_app/urls.py index c70d9d7f..fd484e20 100644 --- a/rowsandall_app/urls.py +++ b/rowsandall_app/urls.py @@ -5,15 +5,16 @@ The `urlpatterns` list routes URLs to views. For more information please see: Examples: Function views 1. Add an import: from my_app import views - 2. Add a URL to urlpatterns: url(r'^$', views.home, name='home') + 2. Add a URL to urlpatterns: re_path(r'^$', views.home, name='home') Class-based views 1. Add an import: from other_app.views import Home - 2. Add a URL to urlpatterns: url(r'^$', Home.as_view(), name='home') + 2. Add a URL to urlpatterns: re_path(r'^$', Home.as_view(), name='home') Including another URLconf 1. Import the include() function: from django.conf.urls import url, include - 2. Add a URL to urlpatterns: url(r'^blog/', include('blog.urls')) + 2. Add a URL to urlpatterns: re_path(r'^blog/', include('blog.urls')) """ from django.conf.urls import url,include +from django.urls import path, re_path from django.conf import settings from django.conf.urls.static import static from django.contrib import admin @@ -35,61 +36,53 @@ handler500 = 'rowers.views.error500_view' urlpatterns = [ - url('^', include('django.contrib.auth.urls')), - url(r'^django-rq/',include('django_rq.urls')), - url(r'^password_change_done/$',auth_views.password_change_done,name='password_change_done'), -# url(r'^password_change_done/$',auth_views.PasswordChangeDoneView,name='password_change_done'), - url(r'^password_change/$',auth_views.password_change), -# url(r'^password_change/$',auth_views.PasswordChangeView,name='password_change'), - url(r'^password_reset/$', - auth_views.password_reset, -# auth_views.PasswordResetView, + re_path('^', include('django.contrib.auth.urls')), + re_path(r'^django-rq/',include('django_rq.urls')), + re_path(r'^password_change_done/$',auth_views.PasswordChangeDoneView,name='password_change_done'), + re_path(r'^password_change/$',auth_views.PasswordChangeView,name='password_change'), + re_path(r'^password_reset/$', + auth_views.PasswordResetView, {'template_name': 'rowers/templates/registration/password_reset.html'}, name='password_reset'), - url(r'^password_reset/done/$', - auth_views.password_reset_done, -# auth_views.PasswordResetDoneView, + re_path(r'^password_reset/done/$', + auth_views.PasswordResetDoneView, name='password_reset_done'), - url(r'^reset/(?P[0-9A-Za-z_\-]+)/(?P.+)/$', - auth_views.password_reset_confirm, -# auth_views.PasswordResetConfirmView, + re_path(r'^reset/(?P[0-9A-Za-z_\-]+)/(?P.+)/$', + auth_views.PasswordResetConfirmView, name='password_reset_confirm'), - url(r'^reset/done/$', - auth_views.password_reset_complete, -# auth_views.PasswordResetCompleteView, + re_path(r'^reset/done/$', + auth_views.PasswordResetCompleteView, name='password_reset_complete'), ] urlpatterns += [ - url(r'^robots\.txt$', TemplateView.as_view(template_name='robots.txt', + re_path(r'^robots\.txt$', TemplateView.as_view(template_name='robots.txt', content_type='text/plain')), - url(r'^admin/', admin.site.urls), - url(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework2')), - url(r'^$',rootview), - url(r'^getblogs/$',rowersviews.get_blog_posts), - url(r'^login/', - auth_views.login, -# auth_views.LoginView, + re_path(r'^admin/', admin.site.urls), + re_path(r'^api-auth/', include('rest_framework.urls', namespace='rest_framework2')), + re_path(r'^$',rootview), + re_path(r'^getblogs/$',rowersviews.get_blog_posts), + re_path(r'^login/', + auth_views.LoginView, name='login'), - url(r'^logout/$', - auth_views.logout, -# auth_views.LogoutView, + re_path(r'^logout/$', + auth_views.LogoutView, {'next_page': '/'}, name='logout',), - url(r'^rowers/',include('rowers.urls')), -# url(r'^cvkbrno/',include('cvkbrno.urls')), - url(r'^admin/rq/',include('django_rq_dashboard.urls')), - url(r'^call\_back',rowersviews.rower_process_callback), - url(r'^stravacall\_back',rowersviews.rower_process_stravacallback), - url(r'^sporttracks\_callback',rowersviews.rower_process_sporttrackscallback), - url(r'^underarmour\_callback',rowersviews.rower_process_underarmourcallback), - url(r'^polarflowcallback',rowersviews.rower_process_polarcallback), - url(r'^runkeeper\_callback',rowersviews.rower_process_runkeepercallback), - url(r'^tp\_callback',rowersviews.rower_process_tpcallback), - url(r'^twitter\_callback',rowersviews.rower_process_twittercallback), - url(r'^i18n/', include('django.conf.urls.i18n')), - url(r'^tz_detect/', include('tz_detect.urls')), - url(r'^jsi18n/', django.views.i18n.javascript_catalog,name='jsi18n'), + re_path(r'^rowers/',include('rowers.urls')), +# re_path(r'^cvkbrno/',include('cvkbrno.urls')), +# re_path(r'^admin/rq/',include('django_rq_dashboard.urls')), + re_path(r'^call\_back',rowersviews.rower_process_callback), + re_path(r'^stravacall\_back',rowersviews.rower_process_stravacallback), + re_path(r'^sporttracks\_callback',rowersviews.rower_process_sporttrackscallback), + re_path(r'^underarmour\_callback',rowersviews.rower_process_underarmourcallback), + re_path(r'^polarflowcallback',rowersviews.rower_process_polarcallback), + re_path(r'^runkeeper\_callback',rowersviews.rower_process_runkeepercallback), + re_path(r'^tp\_callback',rowersviews.rower_process_tpcallback), + re_path(r'^twitter\_callback',rowersviews.rower_process_twittercallback), + re_path(r'^i18n/', include('django.conf.urls.i18n')), + re_path(r'^tz_detect/', include('tz_detect.urls')), +# re_path(r'^jsi18n/', django.views.i18n.javascript_catalog,name='jsi18n'), ] @@ -97,8 +90,8 @@ if settings.DEBUG: import debug_toolbar import django urlpatterns += [ -# url(r'^__debug__/','debug_toolbar.urls'), - url(r'^static/(?P.*)$', +# re_path(r'^__debug__/','debug_toolbar.urls'), + re_path(r'^static/(?P.*)$', django.views.static.serve, kwargs={'document_root': settings.STATIC_ROOT,} ) diff --git a/rowsandall_app/views.py b/rowsandall_app/views.py index e439e787..ac25d7d7 100644 --- a/rowsandall_app/views.py +++ b/rowsandall_app/views.py @@ -1,5 +1,4 @@ -from django.shortcuts import render, redirect, render_to_response -from django.template.loader import render_to_string +from django.shortcuts import render, redirect from django.template import RequestContext from django.conf import settings from rowers.forms import LoginForm