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

made everything work with async

Browse Source
This commit is contained in:
Sander Roosendaal
2018-05-17 18:19:42 +02:00
parent b6c67f7e2b
commit 4f8bdf1543
5 changed files with 137 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
rowers/views.py
View File

@@ -12857,6 +12857,9 @@ def plannedsessions_view(request,timeperiod='thisweek',rowerid=0):
sps = get_sessions(r,startdate=startdate,enddate=enddate)
for ps in sps:
print ps.name,ps.sessiontype
completeness = {}
actualvalue = {}
completiondate = {}
@@ -13187,7 +13190,7 @@ def plannedsession_view(request,id=0,rowerid=0,
ws = get_workouts_session(r,ps)
ratio,status,completiondate = is_session_complete(r,ps)
ratio = int(100.*ratio)
# ranking for test
@@ -13214,19 +13217,34 @@ def plannedsession_view(request,id=0,rowerid=0,
'type': w.workouttype,
}
if ps.sessiontype == 'coursetest':
(
coursetimeseconds,
coursemeters,
coursecompleted
) = courses.get_time_course([w],ps.course)
intsecs = int(coursetimeseconds)
microsecs = int(1.e6*(coursetimeseconds-intsecs))
vs = CourseTestResult.objects.filter(plannedsession=ps)
if vs:
for record in vs:
if record.workoutid == w.id:
coursemeters = record.distance
coursecompleted = record.coursecompleted
t = record.duration
wdict['time'] = datetime.timedelta(
hours=t.hour,
seconds=t.second,
minutes=t.minute,
microseconds=t.microsecond
)
wdict['distance'] = int(round(coursemeters))
else:
(
coursetimeseconds,
coursemeters,
coursecompleted
) = courses.get_time_course([w],ps.course)
intsecs = int(coursetimeseconds)
microsecs = int(1.e6*(coursetimeseconds-intsecs))
wdict['time'] = datetime.timedelta(
seconds=intsecs,
microseconds=microsecs
wdict['time'] = datetime.timedelta(
seconds=intsecs,
microseconds=microsecs
)
wdict['distance'] = int(round(coursemeters))
wdict['distance'] = int(round(coursemeters))
ranking.append(wdict)
@@ -13631,7 +13649,7 @@ def virtualevent_create_view(request):
end_time=end_time,
course=geocourse,
comment=comment,
sessiontype = 'coursetest',
sessiontype = 'race',
timezone=timezone_str,
evaluation_closure=evaluation_closure,
registration_closure=registration_closure,