From c3fac1f11c6ca8c25cd040bcfae1f4242f0ea9b2 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Thu, 28 May 2020 13:35:20 +0200 Subject: [PATCH] removing new models --- rowers/admin.py | 7 +- rowers/models.py | 133 +++++++++++++++++++------------------ rowers/scoring.py | 2 +- rowers/views/statements.py | 6 +- 4 files changed, 77 insertions(+), 71 deletions(-) diff --git a/rowers/admin.py b/rowers/admin.py index 490fe9c3..6f749fbf 100644 --- a/rowers/admin.py +++ b/rowers/admin.py @@ -11,7 +11,8 @@ from .models import ( Team,TeamInvite,TeamRequest, WorkoutComment,C2WorldClassAgePerformance,PlannedSession, GeoCourse,GeoPolygon,GeoPoint,VirtualRace,VirtualRaceResult, - PaidPlan,IndoorVirtualRaceResult,ShareKey, CourseStandard,StandardCollection, + PaidPlan,IndoorVirtualRaceResult,ShareKey, + #CourseStandard,StandardCollection, ) # Register your models here so you can use them in the Admin module @@ -166,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/models.py b/rowers/models.py index 9f0e8d46..c3e63a3e 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): @@ -2959,8 +2959,8 @@ 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') + #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, @@ -2986,12 +2986,12 @@ class VirtualRaceResult(models.Model): s = self.sex, ) else: - if self.entrycategory: - return u'Entry for {n} for "{r}" in {g}'.format( - n = name, - r = self.race, - g = self.entrycategory, - ) + # if self.entrycategory: + # return u'Entry for {n} for "{r}" in {g}'.format( + # n = name, + # r = self.race, + # g = self.entrycategory, + # ) return u'Entry for {n} for "{r}" in {c} {d} ({s})'.format( n = name, r = self.race, @@ -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, @@ -3060,12 +3060,12 @@ class IndoorVirtualRaceResult(models.Model): s = self.sex, ) else: - if self.entrycategory: - return u'Entry for {n} for "{r}" in {g}'.format( - n = name, - r = self.race, - g = self.entrycategory, - ) + # if self.entrycategory: + # return u'Entry for {n} for "{r}" in {g}'.format( + # n = name, + # r = self.race, + # g = self.entrycategory, + # ) return u'Entry for {n} for "{r}" on {c} ({s})'.format( n = name, r = self.race, @@ -3086,7 +3086,8 @@ class IndoorVirtualRaceResultForm(ModelForm): class Meta: model = IndoorVirtualRaceResult fields = ['teamname','weightcategory','boatclass','age','adaptiveclass', - 'entrycategory'] + #'entrycategory' + ] def __init__(self, *args, **kwargs): @@ -3102,7 +3103,9 @@ class VirtualRaceResultForm(ModelForm): class Meta: model = VirtualRaceResult fields = ['teamname','weightcategory','boatclass','boattype', - 'age','adaptiveclass','entrycategory'] + 'age','adaptiveclass', + #'entrycategory' + ] def __init__(self, *args, **kwargs): diff --git a/rowers/scoring.py b/rowers/scoring.py index 8e24257b..7d3bd833 100644 --- a/rowers/scoring.py +++ b/rowers/scoring.py @@ -1,4 +1,4 @@ -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/views/statements.py b/rowers/views/statements.py index 2d6f0761..1a77b6bb 100644 --- a/rowers/views/statements.py +++ b/rowers/views/statements.py @@ -93,7 +93,8 @@ from rowers.forms import ( FitnessMetricForm,PredictedPieceFormNoDistance, EmailForm, RegistrationForm, RegistrationFormTermsOfService, RegistrationFormUniqueEmail,RegistrationFormSex, - CNsummaryForm,UpdateWindForm,StandardsForm, + CNsummaryForm,UpdateWindForm, + #StandardsForm, UpdateStreamForm,WorkoutMultipleCompareForm,ChartParamChoiceForm, FusionMetricChoiceForm,BoxPlotChoiceForm,MultiFlexChoiceForm, TrendFlexModalForm,WorkoutSplitForm,WorkoutJoinParamForm, @@ -113,7 +114,8 @@ from rowers.models import ( RaceLogo,RowerBillingAddressForm,PaidPlan, AlertEditForm, ConditionEditForm, PlannedSessionComment,CoachRequest,CoachOffer, - VideoAnalysis,ShareKey,StandardCollection,CourseStandard, + VideoAnalysis,ShareKey, + #StandardCollection,CourseStandard, ) from rowers.models import ( RowerPowerForm,RowerForm,GraphImage,AdvancedWorkoutForm,