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

more pep

Browse Source
This commit is contained in:
Sander Roosendaal
2022-03-03 17:58:21 +01:00
parent f984d25f6a
commit 81b035d6e8
6 changed files with 30 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
rowers/plannedsessions.py
View File

@@ -6,7 +6,6 @@ from rowers.models import (
get_course_timezone, IndoorVirtualRaceResult, VirtualRace, createmacrofillers,
createmesofillers, createmicrofillers, CourseStandard,
)
from rowers.utils import totaltime_sec_to_string
from rowers.tasks import (
handle_sendemail_raceregistration, handle_sendemail_racesubmission
)
@@ -372,8 +371,6 @@ def get_todays_micro(plan, thedate=timezone.now()):
if thismicro:
thismicro = thismicro[0]
else: # pragma: no cover
mms = TrainingMicroCycle.objects.all()
return None
return thismicro
@@ -421,17 +418,14 @@ def add_workouts_plannedsession(ws, ps, r):
coursecompleted=False,
)
record.save()
job = myqueue(queue, handle_check_race_course, w.csvfilename,
w.id, ps.course.id, record.id,
w.user.user.email, w.user.user.first_name,
mode='coursetest')
_ = myqueue(queue, handle_check_race_course, w.csvfilename,
w.id, ps.course.id, record.id,
w.user.user.email, w.user.user.first_name,
mode='coursetest')
if ps.sessiontype == 'fastest_distance': # pragma: no cover
records = CourseTestResult.objects.filter(
userid=w.user.id, plannedsession=ps)
for record in records:
#w1 = Workout.objects.get(id=record.workoutid)
#w1.plannedsession = None
# w1.save()
record.delete()
df = dataprep.getsmallrowdata_db(
@@ -463,9 +457,6 @@ def add_workouts_plannedsession(ws, ps, r):
records = CourseTestResult.objects.filter(
userid=w.user.id, plannedsession=ps)
for record in records:
#w1 = Workout.objects.get(id=record.workoutid)
#w1.plannedsession = None
# w1.save()
record.delete()
df = dataprep.getsmallrowdata_db(
@@ -638,7 +629,7 @@ def is_session_complete_ws(ws, ps):
value *= 1000.
cratiomin = 1
cratiomax = 1
# cratiomax = 1
cratios = {
'better than nothing': 0,
@@ -651,12 +642,12 @@ def is_session_complete_ws(ws, ps):
if ps.criterium == 'none':
if ps.sessiontype == 'session':
cratiomin = 0.8
cratiomax = 1.2
# cratiomax = 1.2
else:
cratios['on target'] = 0.9167
cratios['over target'] = 1.0833
cratiomin = 0.9167
cratiomax = 1.0833
# cratiomax = 1.0833
score = 0
completiondate = None
@@ -790,10 +781,10 @@ def is_session_complete_ws(ws, ps):
coursecompleted=False,
)
record.save()
job = myqueue(queue, handle_check_race_course, ws[0].csvfilename,
ws[0].id, ps.course.id, record.id,
ws[0].user.user.email, ws[0].user.user.first_name,
mode='coursetest')
_ = myqueue(queue, handle_check_race_course, ws[0].csvfilename,
ws[0].id, ps.course.id, record.id,
ws[0].user.user.email, ws[0].user.user.first_name,
mode='coursetest')
return (0, 'not done', None)
@@ -804,8 +795,6 @@ def is_session_complete_ws(ws, ps):
def is_session_complete(r, ps):
verdict = 'not done'
if r not in ps.rower.all(): # pragma: no cover
return 0, 'not assigned', None
@@ -1290,7 +1279,7 @@ def race_can_submit(r, race):
if timezone.now() > startdatetime and timezone.now() < evaluation_closure:
is_complete, has_registered = race_rower_status(r, race)
if is_complete == False:
if is_complete is False:
return True
else:
return True
@@ -1311,7 +1300,7 @@ def race_can_editentry(r, race):
if timezone.now() < evaluation_closure:
is_complete, has_registered = race_rower_status(r, race)
if is_complete == False:
if is_complete is False:
return True
else: # pragma: no cover
return False
@@ -1594,7 +1583,6 @@ def add_workout_fastestrace(ws, race, r, recordid=0, doregister=False):
errors.append('For tests, you can only attach one workout')
return result, comments, errors, 0
username = r.user.first_name+' '+r.user.last_name
if r.birthdate:
age = calculate_age(r.birthdate)
else: # pragma: no cover
@@ -1634,7 +1622,6 @@ def add_workout_fastestrace(ws, race, r, recordid=0, doregister=False):
records = IndoorVirtualRaceResult.objects.filter(
userid=r.id,
race=race,
#workoutid = ws[0].id
)
if ws[0].workouttype != record.boatclass: # pragma: no cover
@@ -1767,7 +1754,6 @@ def add_workout_indoorrace(ws, race, r, recordid=0, doregister=False):
errors.append('For tests, you can only attach one workout')
return result, comments, errors, 0
username = r.user.first_name+' '+r.user.last_name
if r.birthdate:
age = calculate_age(r.birthdate)
else: # pragma: no cover
@@ -1915,7 +1901,6 @@ def add_workout_race(ws, race, r, splitsecond=0, recordid=0, doregister=False):
errors.append('For tests, you can only attach one workout')
return result, comments, errors, 0
username = r.user.first_name+' '+r.user.last_name
if r.birthdate:
age = calculate_age(r.birthdate)
else: # pragma: no cover
@@ -1971,8 +1956,6 @@ def add_workout_race(ws, race, r, splitsecond=0, recordid=0, doregister=False):
if ws[0].workouttype != record.boatclass: # pragma: no cover
ws[0].workouttype = record.boatclass
ws[0].save()
#errors.append('Your workout boat class is different than on your race registration')
# return 0,comments,errors,0
if ws[0].boattype != record.boattype: # pragma: no cover
errors.append(