sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

excluding basic users from auto sync

Browse Source
This commit is contained in:
Sander Roosendaal
2018-06-07 18:08:17 +02:00
parent a8f6e0ac07
commit e054b0d1a0
6 changed files with 43 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
rowers/views.py
View File

@@ -926,6 +926,8 @@ def hasplannedsessions(user):
return result
from rowers.utils import isprorower
# Check if a user is a Pro member
def ispromember(user):
if not user.is_anonymous():
@@ -934,10 +936,8 @@ def ispromember(user):
except Rower.DoesNotExists:
r = Rower(user=user)
r.save()
result = user.is_authenticated() and (r.rowerplan=='pro' or r.rowerplan=='coach' or r.rowerplan=='plan')
if not result and r.protrialexpires:
result = user.is_authenticated() and r.rowerplan=='basic' and r.protrialexpires >= datetime.date.today()
result = user.is_authenticated() and isprorower(r)
else:
result = False
return result
@@ -2684,9 +2684,6 @@ def imports_view(request):
r.save()
# polar_auto_import = cd['polar_auto_import']
# r.polar_auto_import = polar_auto_import
# r.save()
else:
form = RowerImportExportForm(instance=r)
@@ -10516,7 +10513,7 @@ def workout_upload_view(request,
request.session['async_tasks'] = [(jobid,'make_plot')]
# upload to C2
if (upload_to_c2) or (w.user.c2_auto_export):
if (upload_to_c2) or (w.user.c2_auto_export and isprorower(w.user)):
try:
message,id = c2stuff.workout_c2_upload(request.user,w)
except C2NoTokenError:
@@ -10527,7 +10524,7 @@ def workout_upload_view(request,
else:
messages.error(request,message)
if (upload_to_strava) or (w.user.strava_auto_export):
if (upload_to_strava) or (w.user.strava_auto_export and isprorower(w.user)):
try:
message,id = stravastuff.workout_strava_upload(
request.user,w
@@ -10540,7 +10537,7 @@ def workout_upload_view(request,
else:
messages.error(request,message)
if (upload_to_st) or (w.user.sporttracks_auto_export):
if (upload_to_st) or (w.user.sporttracks_auto_export and isprorower(w.user)):
try:
message,id = sporttracksstuff.workout_sporttracks_upload(
request.user,w
@@ -10553,7 +10550,7 @@ def workout_upload_view(request,
else:
messages.error(request,message)
if (upload_to_rk) or (w.user.runkeeper_auto_export):
if (upload_to_rk) or (w.user.runkeeper_auto_export and isprorower(w.user)):
try:
message,id = runkeeperstuff.workout_runkeeper_upload(
request.user,w
@@ -10568,7 +10565,7 @@ def workout_upload_view(request,
messages.error(request,message)
if (upload_to_ua) or (w.user.mapmyfitness_auto_export):
if (upload_to_ua) or (w.user.mapmyfitness_auto_export and isprorower(w.user)):
try:
message,id = underarmourstuff.workout_ua_upload(
request.user,w
@@ -10583,7 +10580,7 @@ def workout_upload_view(request,
messages.error(request,message)
if (upload_to_tp) or (w.user.trainingpeaks_auto_export):
if (upload_to_tp) or (w.user.trainingpeaks_auto_export and isprorower(w.user)):
try:
message,id = tpstuff.workout_tp_upload(
request.user,w