diff --git a/rowers/admin.py b/rowers/admin.py index d2e9b731..18364c3e 100644 --- a/rowers/admin.py +++ b/rowers/admin.py @@ -12,7 +12,7 @@ from .models import ( WorkoutComment,C2WorldClassAgePerformance,PlannedSession, GeoCourse,GeoPolygon,GeoPoint,VirtualRace,VirtualRaceResult, PaidPlan,IndoorVirtualRaceResult,ShareKey, - CourseStandard,StandardCollection, +# CourseStandard,StandardCollection, ) # Register your models here so you can use them in the Admin module @@ -142,11 +142,11 @@ class IndoorVirtualRaceResultAdmin(admin.ModelAdmin): class PaidPlanAdmin(admin.ModelAdmin): list_display = ('name','shortname','price','paymenttype','paymentprocessor','external_id') -class StandardCollectionAdmin(admin.ModelAdmin): - list_display = ('name','manager') +#class StandardCollectionAdmin(admin.ModelAdmin): +# list_display = ('name','manager') -class CourseStandardAdmin(admin.ModelAdmin): - list_display = ('name','standardcollection') +#class CourseStandardAdmin(admin.ModelAdmin): +# list_display = ('name','standardcollection') admin.site.unregister(User) admin.site.register(User,UserAdmin) @@ -167,5 +167,5 @@ admin.site.register(VirtualRaceResult, VirtualRaceResultAdmin) admin.site.register(IndoorVirtualRaceResult, IndoorVirtualRaceResultAdmin) admin.site.register(PaidPlan,PaidPlanAdmin) admin.site.register(ShareKey,ShareKeyAdmin) -admin.site.register(CourseStandard,CourseStandardAdmin) -admin.site.register(StandardCollection,StandardCollectionAdmin) +#admin.site.register(CourseStandard,CourseStandardAdmin) +#admin.site.register(StandardCollection,StandardCollectionAdmin) diff --git a/rowers/forms.py b/rowers/forms.py index 7110da87..b625c8a2 100644 --- a/rowers/forms.py +++ b/rowers/forms.py @@ -212,18 +212,18 @@ class CourseForm(forms.Form): from django.forms.widgets import HiddenInput super(CourseForm, self).__init__(*args, **kwargs) -# The form used for uploading images -class StandardsForm(forms.Form): - name = forms.CharField(max_length=150,label='Course Name') - file = forms.FileField(required=False, - validators=[must_be_csv]) - notes = forms.CharField(required=False, - max_length=200,label='Course Notes', - widget=forms.Textarea) +# The form used for uploading files +#class StandardsForm(forms.Form): +# name = forms.CharField(max_length=150,label='Course Name') +# file = forms.FileField(required=False, +# validators=[must_be_csv]) +# notes = forms.CharField(required=False, +# max_length=200,label='Course Notes', +# widget=forms.Textarea) - def __init__(self, *args, **kwargs): - from django.forms.widgets import HiddenInput - super(StandardsForm, self).__init__(*args, **kwargs) +# def __init__(self, *args, **kwargs): +# from django.forms.widgets import HiddenInput +# super(StandardsForm, self).__init__(*args, **kwargs) # The form used for uploading files class DocumentsForm(forms.Form): @@ -1230,11 +1230,11 @@ class RaceResultFilterForm(forms.Form): initial=['None','PR1','PR2','PR3','FES'], widget=forms.CheckboxSelectMultiple()) - entrycategory = forms.MultipleChoiceField( - choices = [], - label = 'Groups', - widget=forms.CheckboxSelectMultiple() - ) +# entrycategory = forms.MultipleChoiceField( +# choices = [], +# label = 'Groups', +# widget=forms.CheckboxSelectMultiple() +# ) def __init__(self, *args, **kwargs): if 'records' in kwargs: @@ -1244,19 +1244,18 @@ class RaceResultFilterForm(forms.Form): if records: # group - thecategories = [record.entrycategory for record in records] - thecategories = list(set(thecategories)) - if len(thecategories) <= 1: - del self.fields['entrycategory'] - else: - categorychoices = [] - for category in thecategories: - if category is not None: - categorychoices.append( - (category.id,category) - ) - self.fields['entrycategory'].choices = categorychoices - self.fields['entrycategory'].initial = [cat[0] for cat in categorychoices] +# thecategories = [record.entrycategory for record in records] +# thecategories = list(set(thecategories)) +# if len(thecategories) <= 1: +# del self.fields['entrycategory'] +# else: +# categorychoices = [] +# for category in thecategories: +## categorychoices.append( +# (category.id,category) +# ) +# self.fields['entrycategory'].choices = categorychoices +# self.fields['entrycategory'].initial = [cat[0] for cat in categorychoices] # sex thesexes = [record.sex for record in records] diff --git a/rowers/models.py b/rowers/models.py index 53f1d609..007c6b88 100644 --- a/rowers/models.py +++ b/rowers/models.py @@ -2183,38 +2183,38 @@ class PlannedSession(models.Model): from django.core.validators import RegexValidator,validate_email -class StandardCollection(models.Model): - name = models.CharField(max_length=150) - manager = models.ForeignKey(User, null=True,on_delete=models.CASCADE) - notes = models.CharField(blank=True,null=True,max_length=1000) - active = models.BooleanField(default=True) +#class StandardCollection(models.Model): +# name = models.CharField(max_length=150) +# manager = models.ForeignKey(User, null=True,on_delete=models.CASCADE) +# notes = models.CharField(blank=True,null=True,max_length=1000) +# active = models.BooleanField(default=True) - def __str__(self): - return self.name +# def __str__(self): +# return self.name -class CourseStandard(models.Model): - name = models.CharField(max_length=150) - coursedistance = models.IntegerField() - coursetime = models.CharField(max_length=100,default="") - referencespeed = models.FloatField() # average boat speed - agemin = models.IntegerField(default=0) - agemax = models.IntegerField(default=120) - boatclass = models.CharField(max_length=150) # corresponds to workout workouttype - boattype = models.CharField(choices=mytypes.boattypes,max_length=50,default='1x') - sex = models.CharField(max_length=150) - weightclass = models.CharField(max_length=150) - adaptiveclass = models.CharField(choices=mytypes.adaptivetypes,max_length=50,default="None") - skillclass = models.CharField(max_length=150) - standardcollection = models.ForeignKey(StandardCollection,on_delete=models.CASCADE) +#class CourseStandard(models.Model): +# name = models.CharField(max_length=150) +# coursedistance = models.IntegerField() +# coursetime = models.CharField(max_length=100,default="") +# referencespeed = models.FloatField() # average boat speed +# agemin = models.IntegerField(default=0) +# agemax = models.IntegerField(default=120) +# boatclass = models.CharField(max_length=150) # corresponds to workout workouttype +# boattype = models.CharField(choices=mytypes.boattypes,max_length=50,default='1x') +# sex = models.CharField(max_length=150) +# weightclass = models.CharField(max_length=150) +# adaptiveclass = models.CharField(choices=mytypes.adaptivetypes,max_length=50,default="None") +# skillclass = models.CharField(max_length=150) +# standardcollection = models.ForeignKey(StandardCollection,on_delete=models.CASCADE) - class Meta: - unique_together = ( - ('name','standardcollection') - ) +# class Meta: +# unique_together = ( +# ('name','standardcollection') +# ) - def __str__(self): - return self.name +# def __str__(self): +# return self.name registerchoices = ( ('windowstart','Start of challenge Window'), @@ -2253,8 +2253,8 @@ class VirtualRace(PlannedSession): contact_email = models.EmailField(max_length=254, validators=[validate_email],blank=True) - coursestandards = models.ForeignKey(StandardCollection,null=True,on_delete=models.SET_NULL, - verbose_name='Standard Times',blank=True) +# coursestandards = models.ForeignKey(StandardCollection,null=True,on_delete=models.SET_NULL, +# verbose_name='Standard Times',blank=True) def __str__(self): @@ -2424,7 +2424,7 @@ class IndoorVirtualRaceForm(ModelForm): 'registration_closure', 'evaluation_closure', 'comment', - 'coursestandards', +# 'coursestandards', 'contact_phone', 'contact_email', ] @@ -2458,7 +2458,7 @@ class IndoorVirtualRaceForm(ModelForm): self.fields['sessionunit'].initial = 'm' if timezone: self.fields['timezone'].initial = timezone - self.fields['coursestandards'].queryset = StandardCollection.objects.filter(active=True) +# self.fields['coursestandards'].queryset = StandardCollection.objects.filter(active=True) def clean(self): cd = self.cleaned_data @@ -2562,7 +2562,7 @@ class VirtualRaceForm(ModelForm): 'registration_closure', 'evaluation_closure', 'course', - 'coursestandards', +# 'coursestandards', 'comment', 'contact_phone', 'contact_email', @@ -2586,7 +2586,7 @@ class VirtualRaceForm(ModelForm): def __init__(self,*args,**kwargs): super(VirtualRaceForm, self).__init__(*args, **kwargs) self.fields['course'].queryset = GeoCourse.objects.all().order_by("country","name") - self.fields['coursestandards'].queryset = StandardCollection.objects.filter(active=True) +# self.fields['coursestandards'].queryset = StandardCollection.objects.filter(active=True) def clean(self): @@ -2932,12 +2932,12 @@ class VirtualRaceResult(models.Model): adaptiveclass = models.CharField(default="None",max_length=50, choices=mytypes.adaptivetypes, verbose_name="Adaptive Class") - skillclass = models.CharField(default="Open",max_length=50, - verbose_name="Skill Class") +# skillclass = models.CharField(default="Open",max_length=50, +# verbose_name="Skill Class") race = models.ForeignKey(VirtualRace,on_delete=models.CASCADE) duration = models.TimeField(default=datetime.time(1,0)) distance = models.IntegerField(default=0) - points = models.IntegerField(default=0) +# points = models.IntegerField(default=0) boatclass = models.CharField(choices=boatclasses, max_length=40, default='water', @@ -2958,9 +2958,9 @@ class VirtualRaceResult(models.Model): startsecond = models.FloatField(default=0) endsecond = models.FloatField(default=0) - referencespeed = models.FloatField(default=5.0) - entrycategory = models.ForeignKey(CourseStandard,null=True,on_delete=models.SET_NULL, - verbose_name='Group') +# referencespeed = models.FloatField(default=5.0) +# entrycategory = models.ForeignKey(CourseStandard,null=True,on_delete=models.SET_NULL, +# verbose_name='Group') def __str__(self): rr = Rower.objects.get(id=self.userid) @@ -2969,13 +2969,13 @@ class VirtualRaceResult(models.Model): u2 = rr.user.last_name, ) if self.teamname: - if self.entrycategory: - return u'Entry for {n} for "{r}" in {g} with {t}'.format( - n = name, - r = self.race, - g = self.entrycategory, - t = self.teamname, - ) +# if self.entrycategory: +# return u'Entry for {n} for "{r}" in {g} with {t}'.format( +# n = name, +# r = self.race, +# g = self.entrycategory, +# t = self.teamname, +# ) return u'Entry for {n} for "{r}" in {c} {d} with {t} ({s})'.format( n = name, @@ -3015,13 +3015,13 @@ class IndoorVirtualRaceResult(models.Model): adaptiveclass = models.CharField(default="None",max_length=50, choices=mytypes.adaptivetypes, verbose_name="Adaptive Class") - skillclass = models.CharField(default="Open",max_length=50, - verbose_name="Skill Class") +# skillclass = models.CharField(default="Open",max_length=50, +# verbose_name="Skill Class") race = models.ForeignKey(VirtualRace,on_delete=models.CASCADE) duration = models.TimeField(default=datetime.time(1,0)) distance = models.IntegerField(default=0) referencespeed = models.FloatField(default=5.0) - points = models.IntegerField(default=0) +# points = models.IntegerField(default=0) boatclass = models.CharField(choices=boatclasses, max_length=40, default='rower', @@ -3035,8 +3035,8 @@ class IndoorVirtualRaceResult(models.Model): age = models.IntegerField(null=True) emailnotifications = models.BooleanField(default=True, verbose_name = 'Receive challenge notifications by email') - entrycategory = models.ForeignKey(CourseStandard,null=True,on_delete=models.SET_NULL, - verbose_name='Group') +# entrycategory = models.ForeignKey(CourseStandard,null=True,on_delete=models.SET_NULL, +# verbose_name='Group') def __str__(self): rr = Rower.objects.get(id=self.userid) @@ -3045,13 +3045,13 @@ class IndoorVirtualRaceResult(models.Model): u2 = rr.user.last_name, ) if self.teamname: - if self.entrycategory: - return u'Entry for {n} for "{r}" in {g} with {t}'.format( - n = name, - r = self.race, - g = self.entrycategory, - t = self.teamname, - ) +# if self.entrycategory: +# return u'Entry for {n} for "{r}" in {g} with {t}'.format( +# n = name, +# r = self.race, +# g = self.entrycategory, +# t = self.teamname, +# ) return u'Entry for {n} for "{r}" on {c} with {t} ({s})'.format( n = name, r = self.race, @@ -3091,13 +3091,13 @@ class IndoorVirtualRaceResultForm(ModelForm): def __init__(self, *args, **kwargs): - categories = kwargs.pop('categories',None) +# categories = kwargs.pop('categories',None) super(IndoorVirtualRaceResultForm, self).__init__(*args, **kwargs) - if categories is not None: - self.fields['entrycategory'].queryset = categories - self.fields['entrycategory'].empty_label = None - else: - self.fields.pop('entrycategory') +# if categories is not None: +# self.fields['entrycategory'].queryset = categories +# self.fields['entrycategory'].empty_label = None +# else: +# self.fields.pop('entrycategory') class VirtualRaceResultForm(ModelForm): class Meta: @@ -3110,7 +3110,7 @@ class VirtualRaceResultForm(ModelForm): def __init__(self, *args, **kwargs): boattypes = kwargs.pop('boattypes',None) - categories = kwargs.pop('categories',None) +# categories = kwargs.pop('categories',None) super(VirtualRaceResultForm, self).__init__(*args, **kwargs) if boattypes: @@ -3120,11 +3120,11 @@ class VirtualRaceResultForm(ModelForm): required=False, label='Mixed Gender') - if categories is not None: - self.fields['entrycategory'].queryset = categories - self.fields['entrycategory'].empty_label = None - else: - self.fields.pop('entrycategory') +# if categories is not None: +# self.fields['entrycategory'].queryset = categories +# self.fields['entrycategory'].empty_label = None +# else: +# self.fields.pop('entrycategory') from rowers.metrics import rowingmetrics diff --git a/rowers/plannedsessions.py b/rowers/plannedsessions.py index f703e206..3b81566f 100644 --- a/rowers/plannedsessions.py +++ b/rowers/plannedsessions.py @@ -1514,7 +1514,6 @@ def add_workout_race(ws,race,r,splitsecond=0,recordid=0): return 0,comments,errors,0 if ws[0].workouttype != record.boatclass: - print(ws[0].workouttype,record.boatclass) errors.append('Your workout boat class is different than on your race registration') return 0,comments,errors,0 @@ -1553,7 +1552,8 @@ def add_workout_race(ws,race,r,splitsecond=0,recordid=0): job = myqueue(queue,handle_check_race_course,ws[0].csvfilename, ws[0].id,race.course.id,record.id,splitsecond=splitsecond, - referencespeed=record.referencespeed,coursedistance=race.course.distance) +# referencespeed=record.referencespeed,coursedistance=race.course.distance + ) diff --git a/rowers/scoring.py b/rowers/scoring.py index 8e24257b..afde6869 100644 --- a/rowers/scoring.py +++ b/rowers/scoring.py @@ -1,4 +1,7 @@ -from rowers.models import StandardCollection,CourseStandard, VirtualRaceResult,IndoorVirtualRaceResult +from rowers.models import ( + #StandardCollection,CourseStandard, + VirtualRaceResult,IndoorVirtualRaceResult, + ) import pandas as pd import arrow diff --git a/rowers/tasks.py b/rowers/tasks.py index f2408632..93f77b4d 100644 --- a/rowers/tasks.py +++ b/rowers/tasks.py @@ -353,15 +353,15 @@ def handle_check_race_course(self, else: splitsecond = 0 - if 'referencespeed' in kwargs: - referencespeed = kwargs['referencespeed'] - else: - referencespeed = 5.0 +# if 'referencespeed' in kwargs: +# referencespeed = kwargs['referencespeed'] +# else: +# referencespeed = 5.0 - if 'coursedistance' in kwargs: - coursedistance = kwargs['coursedistance'] - else: - coursedistance = 0 +# if 'coursedistance' in kwargs: +# coursedistance = kwargs['coursedistance'] +# else: +# coursedistance = 0 mode = 'race' if 'mode' in kwargs: @@ -489,28 +489,30 @@ def handle_check_race_course(self, else: coursecompleted = False - points = 0 +# points = 0 if coursecompleted: - if coursedistance == 0: - coursedistance = coursemeters - velo = coursedistance/coursetimeseconds - points = int(100*(2.-referencespeed/velo)) - query = 'UPDATE rowers_virtualraceresult SET coursecompleted = 1, duration = "{duration}", distance = {distance}, workoutid = {workoutid}, startsecond = {startsecond}, endsecond = {endsecond}, points={points} WHERE id={recordid}'.format( +# if coursedistance == 0: +# coursedistance = coursemeters +# velo = coursedistance/coursetimeseconds +# points = int(100*(2.-referencespeed/velo)) +# query = 'UPDATE rowers_virtualraceresult SET coursecompleted = 1, duration = "{duration}", distance = {distance}, workoutid = {workoutid}, startsecond = {startsecond}, endsecond = {endsecond}, points={points} WHERE id={recordid}'.format( + query = 'UPDATE rowers_virtualraceresult SET coursecompleted = 1, duration = "{duration}", distance = {distance}, workoutid = {workoutid}, startsecond = {startsecond}, endsecond = {endsecond} WHERE id={recordid}'.format( recordid=recordid, duration=totaltime_sec_to_string(coursetimeseconds), distance=int(coursemeters), - points=points, +# points=points, workoutid=workoutid, startsecond=startsecond, endsecond=endsecond, ) if mode == 'coursetest': - query = 'UPDATE rowers_coursetestresult SET coursecompleted = 1, duration = "{duration}", distance = {distance}, workoutid = {workoutid}, startsecond = {startsecond}, endsecond = {endsecond}, points={points} WHERE id={recordid}'.format( +# query = 'UPDATE rowers_coursetestresult SET coursecompleted = 1, duration = "{duration}", distance = {distance}, workoutid = {workoutid}, startsecond = {startsecond}, endsecond = {endsecond}, points={points} WHERE id={recordid}'.format( + query = 'UPDATE rowers_coursetestresult SET coursecompleted = 1, duration = "{duration}", distance = {distance}, workoutid = {workoutid}, startsecond = {startsecond}, endsecond = {endsecond} WHERE id={recordid}'.format( recordid=recordid, duration=totaltime_sec_to_string(coursetimeseconds), distance=int(coursemeters), - points=points, +# points=points, workoutid=workoutid, startsecond=startsecond, endsecond=endsecond, diff --git a/rowers/templates/menu_racing.html b/rowers/templates/menu_racing.html index 8dd74087..f6b84c59 100644 --- a/rowers/templates/menu_racing.html +++ b/rowers/templates/menu_racing.html @@ -133,11 +133,13 @@ {% endif %} + {% comment %}
Standard Times are a way to compare results in a race category with @@ -580,6 +597,7 @@ be limited to those in the selected set of Standard Times.
{% endif %} + {% endcomment %} diff --git a/rowers/templates/virtualeventregister.html b/rowers/templates/virtualeventregister.html index 6a925ac7..ec01f4b3 100644 --- a/rowers/templates/virtualeventregister.html +++ b/rowers/templates/virtualeventregister.html @@ -35,6 +35,7 @@ as a Male crew. Check the "Mixed gender" check box to register as a mixed gender crew (except for 1x where this check box does nothing). + {% comment %} {% if race.coursestandards %}This race uses standard times and limits the race groups to those where standard times exist. The "Group" form choice will overrule other selections you @@ -45,6 +46,7 @@ You can check the valid race groups and standard times here.
{% endif %} + {% endcomment %}