Merge branch 'develop' into feature/testcoverage
This commit is contained in:
@@ -36,7 +36,7 @@ from rowers.opaque import encoder
|
|||||||
|
|
||||||
from rowers.models import User,VirtualRace,Workout
|
from rowers.models import User,VirtualRace,Workout
|
||||||
from rowers.plannedsessions import email_submit_race
|
from rowers.plannedsessions import email_submit_race
|
||||||
|
from rowers.rower_rules import user_is_not_basic
|
||||||
|
|
||||||
|
|
||||||
# If you find a solution that does not need the two paths, please comment!
|
# If you find a solution that does not need the two paths, please comment!
|
||||||
@@ -202,9 +202,10 @@ class Command(BaseCommand):
|
|||||||
res = polarstuff.get_all_new_workouts(polar_available)
|
res = polarstuff.get_all_new_workouts(polar_available)
|
||||||
|
|
||||||
# Concept2
|
# Concept2
|
||||||
rowers = Rower.objects.filter(c2_auto_import=True).exclude(rowerplan='basic')
|
rowers = Rower.objects.filter(c2_auto_import=True)
|
||||||
for r in rowers:
|
for r in rowers:
|
||||||
c2stuff.get_c2_workouts(r)
|
if user_is_not_basic(rower.user):
|
||||||
|
c2stuff.get_c2_workouts(r)
|
||||||
|
|
||||||
|
|
||||||
messages = Message.objects.filter(mailbox_id = workoutmailbox.id)
|
messages = Message.objects.filter(mailbox_id = workoutmailbox.id)
|
||||||
|
|||||||
Reference in New Issue
Block a user