From 30a3602774af0ae06d3550dd81b0d3049be08239 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 7 Jul 2020 15:32:13 +0200 Subject: [PATCH] fixes --- rowers/plannedsessions.py | 4 ++-- rowers/tasks.py | 14 +++++++++++++- rowers/views/racesviews.py | 4 +++- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/rowers/plannedsessions.py b/rowers/plannedsessions.py index 709ccf1d..eb2af21c 100644 --- a/rowers/plannedsessions.py +++ b/rowers/plannedsessions.py @@ -1385,7 +1385,7 @@ def default_class(r,w,race): adaptiveclass=adaptiveclass, boattype=boattype, ).order_by( - "agemax","-agemin","boattype","sex","weightcategory", + "agemax","-agemin","boattype","sex","weightclass", "referencespeed" ) if standards.count()==0: @@ -1394,7 +1394,7 @@ def default_class(r,w,race): boattype=boattype ).order_by( "agemax","-agemin","boattype","sex", - "weightcategory","referencespeed") + "weightclass","referencespeed") if standards.count()==0: standards = CourseStandard.objects.filter( agemin__lt=age,agemax__gt=age diff --git a/rowers/tasks.py b/rowers/tasks.py index 26ef86e3..4363f7f6 100644 --- a/rowers/tasks.py +++ b/rowers/tasks.py @@ -587,13 +587,25 @@ def handle_check_race_course(self, endsecond=endsecond, ) - with engine.connect() as conn, conn.begin(): result = conn.execute(query) conn.close() engine.dispose() + # add times for all gates to log file + with open(logfile,'a') as f: + t = time.localtime() + f.write('\n') + f.write(timestamp) + f.write(' ') + f.write('--- LOG of all gate times---') + + for path,polygon in (paths,polygons): + ( secs,meters,completed) = coursetime_paths(rowdata2, + [path],[polygon],logfile=logfile) + + # send email handle_sendemail_coursefail( useremail,userfirstname,logfile diff --git a/rowers/views/racesviews.py b/rowers/views/racesviews.py index a68ef3ba..cb12d553 100644 --- a/rowers/views/racesviews.py +++ b/rowers/views/racesviews.py @@ -3277,6 +3277,7 @@ def virtualevent_entry_edit_view(request,id=0,entryid=0): if form.is_valid(): cd = form.cleaned_data + teamname = cd['teamname'] try: boattype = cd['boattype'] @@ -3293,12 +3294,12 @@ def virtualevent_entry_edit_view(request,id=0,entryid=0): acceptsocialmedia = cd['acceptsocialmedia'] sex = r.sex + if mix: sex = 'mixed' if boattype == '1x' and r.birthdate: age = calculate_age(r.birthdate) - sex = r.sex if sex == 'not specified': sex = 'male' @@ -3328,6 +3329,7 @@ def virtualevent_entry_edit_view(request,id=0,entryid=0): messages.error(request,'You are older than the maximum age for this group') return HttpResponseRedirect(returnurl) + print(sex,coursestandard.sex) if sex == 'male' and coursestandard.sex != 'male': messages.error(request,'Men are not allowed to enter this category') return HttpResponseRedirect(returnurl)