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

race registration records now with id

Browse Source
This commit is contained in:
Sander Roosendaal
2018-04-21 08:51:38 +02:00
parent 1db23056d0
commit 98ab345151
5 changed files with 56 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
rowers/plannedsessions.py
View File

@@ -48,7 +48,7 @@ def add_workouts_plannedsession(ws,ps,r):
ids = [w.id for w in wold] + [w.id for w in ws]
ids = list(set(ids))
if len(ids)>1 and ps.sessiontype in ['test','coursetest']:
if len(ids)>1 and ps.sessiontype in ['test','coursetest','race']:
errors.append('For tests, you can only attach one workout')
return result,comments,errors
@@ -271,7 +271,7 @@ def is_session_complete_ws(ws,ps):
if not completiondate:
completiondate = ws.reverse()[0].date
return ratio,'partial',completiondate
elif ps.sessiontype == 'coursetest':
elif ps.sessiontype in ['coursetest','race']:
if ps.course:
(
coursetime,
@@ -615,8 +615,8 @@ def add_rower_race(r,race):
def remove_rower_race(r,race):
race.rower.remove(r)
records = VirtualRaceResult.objects.filter(user=r,
workout__isnull=True,
records = VirtualRaceResult.objects.filter(userid=r.id,
workoutid__isnull=True,
race=race)
for r in records:
@@ -659,7 +659,7 @@ def add_workout_race(ws,race,r):
ids = [w.id for w in ws]
ids = list(set(ids))
if len(ids)>1 and race.sessiontype in ['test','coursetest']:
if len(ids)>1 and race.sessiontype in ['test','coursetest','race']:
errors.append('For tests, you can only attach one workout')
return result,comments,errors
@@ -693,7 +693,7 @@ def add_workout_race(ws,race,r):
duration = totaltime_sec_to_string(coursetime)
records = VirtualRaceResult.objects.filter(
user=r,
userid=r.id,
race=race
)
@@ -708,18 +708,19 @@ def add_workout_race(ws,race,r):
return result,comments, errors
record.coursecompleted=coursecompleted
record.workout=ws[0]
record.workoutid=ws[0].id
record.duration = duration
record.save()
add_workouts_plannedsession(ws,race,r)
return result,comments,errors
def delete_race_result(workout,race):
results = VirtualRaceResult.objects.filter(workout=workout,race=race)
results = VirtualRaceResult.objects.filter(workoutid=workout.id,race=race)
for r in results:
r.delete()
r.workoutid = None
r.save()