diff --git a/rowers/management/commands/processemail.py b/rowers/management/commands/processemail.py index 8988d1cc..f4790e6e 100644 --- a/rowers/management/commands/processemail.py +++ b/rowers/management/commands/processemail.py @@ -13,6 +13,7 @@ from django_mailbox.models import Message, MessageAttachment,Mailbox from django.core.urlresolvers import reverse from django.conf import settings +from django.utils import timezone from rowers.models import Workout, Rower from rowingdata import rower as rrower diff --git a/rowers/plannedsessions.py b/rowers/plannedsessions.py index 853ccccb..bce4fe64 100644 --- a/rowers/plannedsessions.py +++ b/rowers/plannedsessions.py @@ -966,18 +966,14 @@ def email_submit_race(r,race,workoutid): record = records[0] workouts = Workout.objects.filter(id=w.id) - print workouts - print record.id - print 'aap' result,comments,errors,jobid = add_workout_indoorrace( workouts,race,r,recordid=record.id ) - print result,'noot' if result: - otherrecords = resultobj.objects.filter( + otherrecords = IndoorVirtualRaceResult.objects.filter( race = race).exclude(userid = r.id) for otherrecord in otherrecords: @@ -996,13 +992,12 @@ def email_submit_race(r,race,workoutid): return 1 else: - for error in errors: - print error - print 'fail' + return 0 else: return 0 + return 0 def race_can_register(r,race): diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz index 3138a524..a1e65d61 100644 Binary files a/rowers/tests/testdata/testdata.csv.gz and b/rowers/tests/testdata/testdata.csv.gz differ diff --git a/rowers/tests/testdata/testdata.tcx b/rowers/tests/testdata/testdata.tcx index a9968393..858b5297 100644 --- a/rowers/tests/testdata/testdata.tcx +++ b/rowers/tests/testdata/testdata.tcx @@ -2502,7 +2502,7 @@ - <Element 'Notes' at 0x13de37f0> + <Element 'Notes' at 0x15bdb668>