fixes
This commit is contained in:
@@ -48,6 +48,7 @@ queue = django_rq.get_queue('default')
|
||||
queuelow = django_rq.get_queue('low')
|
||||
queuehigh = django_rq.get_queue('low')
|
||||
|
||||
from rowers.session_utils import timefield_to_minutes_duration
|
||||
|
||||
def to_time(milliseconds):
|
||||
seconds = milliseconds/1000.
|
||||
@@ -325,23 +326,17 @@ def get_indoorraces(workout):
|
||||
sessionmode='distance',
|
||||
sessionvalue=workout.distance)
|
||||
|
||||
duration = timefield_to_minutes_duration(workout.duration)
|
||||
|
||||
races2 = VirtualRace.objects.filter(
|
||||
sessiontype='indoorrace',
|
||||
startdate__lte=workout.date,
|
||||
enddate__gte=workout.date,
|
||||
sessionmode='time',
|
||||
sessionvalue=duration)
|
||||
|
||||
races = races1 | races2
|
||||
|
||||
if workout.duration is None:
|
||||
workout.duration = timedelta(0)
|
||||
|
||||
if workout.duration.seconds == 0 and workout.duration.microseconds == 0:
|
||||
duration = 60*workout.duration.hour+workout.duration.minute
|
||||
|
||||
races2 = VirtualRace.objects.filter(
|
||||
sessiontype='indoorrace',
|
||||
startdate__lte=workout.date,
|
||||
enddate__gte=workout.date,
|
||||
sessionmode='time',
|
||||
sessionvalue=duration)
|
||||
|
||||
races = races1 | races2
|
||||
else:
|
||||
races = races1
|
||||
|
||||
registrations = IndoorVirtualRaceResult.objects.filter(
|
||||
race__in=races,
|
||||
|
||||
@@ -10,7 +10,11 @@ def timefield_to_seconds_duration(t):
|
||||
|
||||
return duration
|
||||
|
||||
|
||||
def timefield_to_minutes_duration(t):
|
||||
duration = t.hour*60.
|
||||
duration += t.minute
|
||||
|
||||
return duration
|
||||
|
||||
def is_session_complete_ws(ws, ps):
|
||||
ws = ws.order_by("date")
|
||||
|
||||
BIN
rowers/tests/testdata/testdata.tcx.gz
vendored
BIN
rowers/tests/testdata/testdata.tcx.gz
vendored
Binary file not shown.
Reference in New Issue
Block a user